Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

River Jiang

2020-10-21 c1d12cdfd23933a0db431a70ff5e145924864782

 Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs.meta

copy from Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs.meta
copy to Assets/Scripts/TowerDefense/UI/EndlessSettlement.cs.meta
File was copied from Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 77846cbd0fd353546b25fc2e0d6ad952
guid: f2125c50d4929b84fa889da0a3054cc7
MonoImporter:
  externalObjects: {}
  serializedVersion: 2