Merge branch 'china/dev' into china/test

dev_chengFeng
JieLing 2021-07-27 10:25:03 +08:00
commit 7551842ba7
12 changed files with 3 additions and 39 deletions

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b4537043d1f68304c913da4111a77182
guid: cdedee4e5ccd7034b9a7619aaf7c34ef
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -1,9 +1,5 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/ManagedResources/Atlas/CarbonNewAtlas.meta
guid: b4537043d1f68304c913da4111a77182
=======
guid: 6bdbd7bc353b72a479746188ff5ad788
>>>>>>> china/dev:Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: fd52b845f4615b2418f482acbcb2d5c6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4b9c36692b051dd4e9502147e4ee914e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 70e7feb15403e214f801e51b8b4e0461
guid: bd70b0c0583012446a99cc371213aa09
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 4ffaae1db0483704eae97ecc794d5e28
guid: 359d13b0df0eb3e43ab59c4cd68b11cb
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 9f6680e5797aa3a4da004c60b970a6d3
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 84e5263cf14c3fd42b34d74cee22462e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: