Merge remote-tracking branch 'origin/master'

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -804,7 +804,6 @@ RectTransform:
   - {fileID: 5225098048774301080}
   - {fileID: 2897336336542776051}
   - {fileID: 6508395234197773420}
-  - {fileID: 6506910486868409184}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -1068,12 +1067,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6895274337125899519}
+  m_Father: {fileID: 6508395234197773420}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.3578, y: -45.1}
-  m_SizeDelta: {x: 0, y: 30.6732}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 68.5, y: -20.902199}
+  m_SizeDelta: {x: 117, y: 30.6732}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8449163745382179136
 CanvasRenderer:
@@ -1157,6 +1156,8 @@ GameObject:
   - component: {fileID: 6508395234197773420}
   - component: {fileID: 6546612787619616397}
   - component: {fileID: 5851476483486986221}
+  - component: {fileID: 2731907360025137753}
+  - component: {fileID: 6907455548631346063}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: myImage (2)
@@ -1176,13 +1177,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 6506910486868409184}
   m_Father: {fileID: 6895274337125899519}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -0.0000038146973, y: -45.09996}
-  m_SizeDelta: {x: 50.203, y: -28.1956}
+  m_SizeDelta: {x: 0, y: -28.1956}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6546612787619616397
 CanvasRenderer:
@@ -1235,6 +1237,46 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2731907360025137753
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2746795842072799363}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 10
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6907455548631346063
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2746795842072799363}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &2763360348310120830
 GameObject:
   m_ObjectHideFlags: 0