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

chenxin

2020-10-22 85f0d13945f3aef5aef1b3c1b47c77cea0514c17

 Assets/Prefabs/UI/BulletUI.prefab

@@ -91,6 +91,7 @@
  m_EditorClassIdentifier: 
  bulletScaleMask: {fileID: 4636030447972189695}
  fAdjValue: 0.008
  maxBulletNum: 6
--- !u!1 &4636030447972189693
GameObject:
  m_ObjectHideFlags: 0