更新一些冲突内容

2025-09-02 01:12:08 +08:00
parent 5365ab6441
commit f9f80aa559
6 changed files with 122 additions and 22 deletions
--- a/Convention/Editor/File.cs.meta
+++ b/Convention/Editor/File.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0fde7509f09639547adff8534a7d9698
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: