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

liuzhiwei

2020-11-17 df50daf0ca2cd0c442b10f83fdf0d25758fd9d2d

 Assets/Scenes/Levels/Battle/Endless2D.unity

@@ -677,6 +677,11 @@
      propertyPath: m_Name
      value: ClearCamera
      objectReference: {fileID: 0}
    - target: {fileID: 3091314759354326717, guid: 91d321cd869bc0c47808f6fd7d755ae3,
        type: 3}
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 91d321cd869bc0c47808f6fd7d755ae3, type: 3}
--- !u!43 &115306053