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

wangguan

2020-10-22 74daf5509be4fc140fd1bdb6d4df5f1c1002e368

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

copy from Assets/Scripts/Enum/EndlessBuffSelectState.cs.meta
copy to Assets/Scripts/TowerDefense/UI/EndlessSettlementPropList.cs.meta
File was copied from Assets/Scripts/Enum/EndlessBuffSelectState.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2c84e7dc1c95f754180e7ce300d5a81c
guid: b97ae3d4088d4654386dcf235e969200
MonoImporter:
  externalObjects: {}
  serializedVersion: 2