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

chenxin

2020-12-02 54181477c210344b037d88f17dbe2cddc5cbc930

 Assets/Scripts/Guide/GuidePanelNew.cs.meta

File was renamed from Assets/Scripts/Guide/ImageSkillRim.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b853ac60c2d385d4dbc98c0d558451bb
guid: 47bea72fb1148544ca4ffbee6b6ad7be
MonoImporter:
  externalObjects: {}
  serializedVersion: 2