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

wangguan

2020-10-22 74daf5509be4fc140fd1bdb6d4df5f1c1002e368

 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