Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -248,7 +248,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 220, y: 0.20947266}
-  m_SizeDelta: {x: 221.2423, y: 4.8994}
+  m_SizeDelta: {x: 221.2423, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1404112302102908525
 CanvasRenderer:
@@ -566,8 +566,8 @@ GameObject:
   - component: {fileID: 8429405667931584362}
   - component: {fileID: 1526515506040239878}
   - component: {fileID: 9181876341202037186}
-  - component: {fileID: 1659429409413804256}
   - component: {fileID: 5277193031132899660}
+  - component: {fileID: 2905003392454692597}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ShenShiCount (1)
@@ -625,10 +625,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 34
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -637,7 +637,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u53CB\u4E8B\u4EF6"
---- !u!114 &1659429409413804256
+--- !u!114 &5277193031132899660
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -646,13 +646,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 1245667844451503244}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.38823533, g: 0.45098042, b: 0.3529412, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &5277193031132899660
+  id: 10154
+--- !u!114 &2905003392454692597
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -661,10 +659,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1245667844451503244}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10154
+  effectColor: {r: 0.112272955, g: 0.4103772, b: 0.18488856, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 5
 --- !u!1 &1737360981415971026
 GameObject:
   m_ObjectHideFlags: 0
@@ -701,9 +702,9 @@ RectTransform:
   - {fileID: 3138869795302671254}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -99.70001, y: -37}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 29, y: -37}
   m_SizeDelta: {x: 53.517395, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &342810598981405438
@@ -1034,16 +1035,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2476116567943002456}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -62.699554, y: -36.469482}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 62, y: -36.469482}
   m_SizeDelta: {x: 125.39911, y: 53.895996}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8276815795892205159
@@ -1238,7 +1239,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.1137255, g: 0.15294118, b: 0.121568635, a: 1}
+  m_Color: {r: 0.2299527, g: 0.3066036, b: 0.24528289, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1247,10 +1248,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 72
+    m_FontSize: 68
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 7
+    m_MinSize: 6
     m_MaxSize: 72
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -1421,7 +1422,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7830189, g: 0.76455146, b: 0.76455146, a: 1}
+  m_Color: {r: 0.8376645, g: 0.9811319, b: 0.9319799, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1430,10 +1431,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 44
-    m_FontStyle: 1
+    m_FontSize: 36
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 44
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -2292,7 +2293,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -7.700012, y: 2}
+  m_AnchoredPosition: {x: 8, y: 2}
   m_SizeDelta: {x: -553.2323, y: -6.971}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7790443248632903804
@@ -2326,7 +2327,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2534,7 +2535,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8941177, g: 0.97647065, b: 0.909804, a: 1}
+  m_Color: {r: 0.3264061, g: 0.42452818, b: 0.34372175, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2579,7 +2580,7 @@ GameObject:
   - component: {fileID: 7705849554225510677}
   - component: {fileID: 3127181873672424435}
   - component: {fileID: 1674366787068327515}
-  - component: {fileID: 4312004086963515338}
+  - component: {fileID: 4751600542081159404}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ShenShiCount (1)
@@ -2637,11 +2638,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 34
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
+    m_MinSize: 3
+    m_MaxSize: 47
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -2649,7 +2650,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u795E\u8BC6\u4E8B\u4EF6"
---- !u!114 &4312004086963515338
+--- !u!114 &4751600542081159404
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2658,12 +2659,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 7587375694572286685}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.6156863, g: 0.48235297, b: 0.2509804, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0.5801885, g: 0.41613734, b: 0.24904312, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 5
 --- !u!1 &7638606920926905235
 GameObject:
   m_ObjectHideFlags: 0
@@ -3014,8 +3016,8 @@ RectTransform:
   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: -220.6, y: 0.20947266}
-  m_SizeDelta: {x: 221.2423, y: 4.8994}
+  m_AnchoredPosition: {x: -220, y: 0.20947266}
+  m_SizeDelta: {x: 221.2423, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5380472091474674072
 CanvasRenderer:
@@ -3175,6 +3177,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -86.7
       objectReference: {fileID: 0}
+    - target: {fileID: 521768857768353200, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 521768857768353200, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 521768857768353200, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 595589076442330505, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 595589076442330505, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 690487615239233780, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_Color.b
       value: 0.3019608
@@ -3261,7 +3283,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2080350128756554473, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 1.2719
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2080350128756554473, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -3411,6 +3433,22 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 286
       objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.a
+      value: 0.6117647
+      objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.b
+      value: 0.35281673
+      objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.g
+      value: 0.4331556
+      objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.r
+      value: 0.47641498
+      objectReference: {fileID: 0}
     - target: {fileID: 4231878762216119874, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -3447,6 +3485,10 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 0.14901961
       objectReference: {fileID: 0}
+    - target: {fileID: 5637155694417808183, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5808298135736668641, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_Name
       value: ShengShiEventWidgetType2Game
@@ -3511,6 +3553,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -15.5
       objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 40
+      objectReference: {fileID: 0}
     - target: {fileID: 8807649875490934103, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_SizeDelta.x
       value: 682.732

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -622,7 +622,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.25882354, g: 0.4039216, b: 0.3529412, a: 1}
+  m_Color: {r: 0.40784317, g: 0.5058824, b: 0.40000004, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -812,7 +812,6 @@ GameObject:
   - component: {fileID: 1357364587688641971}
   - component: {fileID: 570113842003181522}
   - component: {fileID: 7694624349492924708}
-  - component: {fileID: 102496722109560873}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Go
@@ -861,7 +860,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9333334, g: 0.9058824, b: 0.8588236, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -870,10 +869,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 43
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 4
     m_MaxSize: 45
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -882,21 +881,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u524D\u5F80"
---- !u!114 &102496722109560873
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3348088768749406642}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.5058824, g: 0.40784317, b: 0.2784314, a: 1}
-  m_EffectDistance: {x: 1.5, y: -1.5}
-  m_UseGraphicAlpha: 1
 --- !u!1 &4038213450023413557
 GameObject:
   m_ObjectHideFlags: 0
@@ -1123,7 +1107,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_shenshi_dengji_sheng
+  _icon_name: dec_shenshi_dengji_fan
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
   packInfo:
@@ -1450,7 +1434,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.70980394, y: 0.68235296, z: 0.64705884, w: 1}
+      - {x: 0.5895335, y: 0.6792451, z: 0.63400584, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1481,7 +1465,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5568628, y: 0.6901961, z: 0.8196079, w: 1}
+      - {x: 0.601415, y: 0.72345334, z: 0.8018867, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1493,13 +1477,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1524,13 +1508,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1543,7 +1527,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.81568635, y: 0.73333335, z: 0.5568628, w: 1}
+      - {x: 0.8726414, y: 0.7377412, z: 0.44866928, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1555,13 +1539,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1574,7 +1558,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.81568635, y: 0.64705884, z: 0.54509807, w: 1}
+      - {x: 0.9198112, y: 0.65753794, z: 0.4989541, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1586,13 +1570,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1605,7 +1589,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7960785, y: 0.5686275, z: 0.5411765, w: 1}
+      - {x: 0.8537735, y: 0.49442026, z: 0.45105004, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1617,13 +1601,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1639,7 +1623,7 @@ MonoBehaviour:
   - {fileID: 6198714990258003341}
   - {fileID: 4231878762216119874}
   AllComsStateTypes: 4000000040000000800000004000000000020000
-  CurrIndex: 5
+  CurrIndex: 0
 --- !u!1 &6161269103075097772
 GameObject:
   m_ObjectHideFlags: 0
@@ -1847,7 +1831,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5686275, g: 0.72156864, b: 0.6392157, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1936,7 +1920,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9215687, g: 0.8941177, b: 0.8470589, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1945,8 +1929,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -1956,7 +1940,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E3B\u7EBF"
+  m_Text: "\u652F\u7EBF"
 --- !u!1 &6730899750744253868
 GameObject:
   m_ObjectHideFlags: 0
@@ -2016,7 +2000,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7960785, g: 0.5686275, b: 0.5411765, a: 1}
+  m_Color: {r: 0.5895335, g: 0.6792451, b: 0.63400584, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2082,7 +2066,7 @@ RectTransform:
   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: 0.000030517578, y: 0}
+  m_AnchoredPosition: {x: -1, y: 0.75}
   m_SizeDelta: {x: 53, y: 55}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8423151277308321694
@@ -2249,8 +2233,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -2425,7 +2409,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.54509807, g: 0.69411767, b: 0.6156863, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2435,7 +2419,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615