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

liuzhiwei

2020-11-26 18ce923e39033c39c4cab84581d03a492cb730f4

 Assets/Prefabs/UI/Endless/BottomCanvas.prefab

@@ -6221,12 +6221,12 @@
    - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
        type: 3}
      propertyPath: m_AnchoredPosition.x
      value: 144
      value: 992
      objectReference: {fileID: 0}
    - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 553
      value: 502
      objectReference: {fileID: 0}
    - target: {fileID: 2366615777647505734, guid: edd0f54808263644d9740a9c0040b493,
        type: 3}
@@ -7243,7 +7243,7 @@
    - target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
        type: 3}
      propertyPath: m_AnchoredPosition.y
      value: 436
      value: 502
      objectReference: {fileID: 0}
    - target: {fileID: 162820266587863501, guid: 4770a823e47024d4a80a36e9ed6641eb,
        type: 3}