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

wangguan

2020-10-26 0e8a4a629f0db7d9dc7b8c3b9795a195c279f7b9

 Assets/Resources/UI/Props/EndlessDropEffect.prefab.meta

copy from Assets/Prefabs/UI/Props/PrimaryTreasure.prefab.meta
copy to Assets/Resources/UI/Props/EndlessDropEffect.prefab.meta
File was copied from Assets/Prefabs/UI/Props/PrimaryTreasure.prefab.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 37f3cf3f6391c564687f6800471d827a
guid: 91f05911117eb6a4bb002b4f2bcf04b1
PrefabImporter:
  externalObjects: {}
  userData: