报错修改

Assets/Domain/Main/AddressableRes/Dll/Android/DOTween.dll.bytes.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Domain/Main/AddressableRes/Dll/Android/DOTween.dll.bytes.meta
+guid: a1e0a32da8ded784bb35eb66cc2bf2ac
+TextScriptImporter:
+========
+guid: 829ac9eeedaa399498dc6714746ce97e
+folderAsset: yes
+DefaultImporter:
+>>>>>>>> origin/art:Assets/Art/X_06_01/Fbx/mdl_jinggao_main_v1.0.fbm.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3af48469959f59340baf7de53ec6ffca
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/HotUpdate_Main.pdb.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6c91c3e1b310fee4fab02b55d5128109
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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: 

Assets/Domain/Main/AddressableRes/Dll/Android/System.Core.dll.bytes.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Domain/Main/AddressableRes/Dll/Android/System.Core.dll.bytes.meta
+guid: 22816e81b7a05a646b4b3949917233e0
+TextScriptImporter:
+========
+guid: fcf5f64d92534304789fb6d13584a256
+folderAsset: yes
+DefaultImporter:
+>>>>>>>> origin/art:Assets/Art/X_06_01/Animation/jinggao/no use.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/UIFarme.RunTime.dll.bytes.meta

@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Domain/Main/AddressableRes/Dll/Android/UIFarme.RunTime.dll.bytes.meta
+guid: 107f42e40442d594d803c045e248ee9f
+TextScriptImporter:
+========
+guid: 4a346c5e5fba5b84e9481fc55f81fff4
+folderAsset: yes
+DefaultImporter:
+>>>>>>>> origin/art:Assets/Art/X_06_01/Fbx/mdl_beer_main_v1.0.fbm.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/UniTask.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0ce327dd409e03547bc214d0046e9021
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/UnityEngine.CoreModule.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2fda2e1471ddb4c4398c3747e4ab3526
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/YooAsset.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 70aa88f39a2de4e4bbe8b9a6563d79a3
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/com.stary.evo.runtime.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ab236117a0fd39b419387d8ca500d389
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Domain/Main/AddressableRes/Dll/Android/mscorlib.dll.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf951d3b374d445449bbee94e750258d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: