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

liuzhiwei

2020-12-24 45f7442afa3b25cc79c76898224e48d6aed1a2ee

 Assets/Prefabs/UI/Endless/Energy.prefab

@@ -1031,7 +1031,7 @@
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      value: -52
      objectReference: {fileID: 0}
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
@@ -1075,6 +1075,11 @@
      objectReference: {fileID: 0}
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_LocalScale.y
      value: 13
      objectReference: {fileID: 0}
@@ -1083,25 +1088,10 @@
      propertyPath: m_LocalScale.z
      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 2982940003097308030, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_LocalScale.x
      value: 13
      objectReference: {fileID: 0}
    - target: {fileID: 3898746019252731035, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_Layer
      value: 5
      objectReference: {fileID: 0}
    - target: {fileID: 3993767359388031876, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 4804171030978848883, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}
      propertyPath: m_SortingOrder
      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5890933633274329196, guid: cc9473b9d3a93c5458c8e125a8130bc2,
        type: 3}