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

Assets/Res/UI/DivineSence/ComBatFrontPanel.prefab

@@ -602,7 +602,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: -13, y: 21}
+  m_AnchoredPosition: {x: -1, y: 43}
   m_SizeDelta: {x: 295, y: 179}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7772893736343577417
@@ -1406,13 +1406,17 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 87.7
       objectReference: {fileID: 0}
+    - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -132.16257
+      objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 10.8
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -38.5
+      value: -40.08128
       objectReference: {fileID: 0}
     - target: {fileID: 3195684101753423275, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_FontData.m_Alignment
@@ -1448,11 +1452,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 51.2
+      value: 36
       objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 30.2
+      value: 27
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/UI/DivineSence/ComBatFrontWidget.prefab

@@ -595,8 +595,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 75.26347, y: -43.400818}
-  m_SizeDelta: {x: -185.763, y: -131.8486}
+  m_AnchoredPosition: {x: 45.6905, y: -41.66256}
+  m_SizeDelta: {x: -151.381, y: -135.32512}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6875849157855808906
 CanvasRenderer:
@@ -628,10 +628,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 2
     m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -639,7 +639,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7B51\u57FA\u524D\u671F"
+  m_Text: "\u7B51\u57FA\u524D\u671F.\u7B2C\u4E00\u91CD"
 --- !u!114 &4491841701166917159
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -652,7 +652,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  effectColor: {r: 0.10196079, g: 0.17254902, b: 0.07450981, a: 1}
+  effectColor: {r: 0, g: 0, b: 0, a: 1}
   effectDistanceX: 2
   effectDistanceY: 2
   samplingRate: 10
@@ -772,7 +772,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 114.32349, y: 22.523483}
+  m_AnchoredPosition: {x: 69.2, y: 22.523483}
   m_SizeDelta: {x: 42.1514, y: 42.1514}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &2055311934404833937

UserSettings/EditorUserSettings.asset

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