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

liuzhiwei

2020-11-04 78e14d93c46238881339f33a56c81275c55d5089

 Assets/Scenes/Levels/Battle/Endless.unity

@@ -4514,6 +4514,8 @@
  m_EditorClassIdentifier: 
  AutoPickupTime: 5
  canvas: {fileID: 849284130}
  drapIcon: {fileID: 1227610056024535752, guid: cc402888b46cc884c87c113a3d36f138,
    type: 3}
--- !u!114 &567180766
MonoBehaviour:
  m_ObjectHideFlags: 0