root/plugin-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报错修改

Browse Source
This commit is contained in:
张铮
2025-07-02 10:05:26 +08:00
parent c2bf9196b8
commit ec8b2f7e25
405 changed files with 16738 additions and 1883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Assets/Domain/Main/AddressableRes/Prefabs/Watermark.prefab.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Domain/Main/AddressableRes/Prefabs/Watermark.prefab.meta
guid: 4e4ff64d09dc7874ca0b155e5f5dd5b3
========
guid: 01927d056a2ea3443bbf15bec6456163
>>>>>>>> origin/art:Assets/Art/X_06_01/Prefabs/mdl_gan_new.prefab.meta
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: