报错修改

2025-07-02 10:05:26 +08:00
parent c2bf9196b8
commit ec8b2f7e25
405 changed files with 16738 additions and 1883 deletions
--- a/Assets/Domain/Main/AddressableRes/Dll/Android/InformationSave.RunTime.dll.bytes.meta
+++ b/Assets/Domain/Main/AddressableRes/Dll/Android/InformationSave.RunTime.dll.bytes.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Domain/Main/AddressableRes/Dll/Android/InformationSave.RunTime.dll.bytes.meta
+guid: 927b64ab9c5ed2e47bdbcdbd9bf1c872
+TextScriptImporter:
+========
+guid: d56c47a8390407d4f8d2176cc0437e27
+PrefabImporter:
+>>>>>>>> origin/art:Assets/Art/X_06_01/Prefabs/mdl_jinggao_main_v1.0.prefab.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: