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

liuzhiwei

2020-12-24 45f7442afa3b25cc79c76898224e48d6aed1a2ee

1
2
3
4
5
6
7
8
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!890905787 &1
VersionControlSettings:
  m_ObjectHideFlags: 0
  m_Mode: Visible Meta Files
  m_CollabEditorSettings:
    inProgressEnabled: 1