Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle

wangguan

2020-10-27 bac1e673b54b1e5f773c4bd098e1b4fe8981c62e

 Assets/00000/package/Prefab/Effect_bingdong1026_02.prefab.meta

copy from Assets/Prefabs/EndlessEnemies/fire 1.prefab.meta
copy to Assets/00000/package/Prefab/Effect_bingdong1026_02.prefab.meta
File was copied from Assets/Prefabs/EndlessEnemies/fire 1.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 12668c960868b2e469bb3c7bf55aa033
guid: 44bf2307804847e4696a57c1ca7ac61b
PrefabImporter:
  externalObjects: {}
  userData: