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

Assets/Res/Config/SmallPlacesConfig.json

@@ -6,7 +6,7 @@
       "placeDesc": 10438,
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 1,
-      "CompletionEventCount": 5,
+      "CompletionEventCount": 1,
       "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
@@ -16,7 +16,7 @@
       "placeDesc": 10439,
       "placeIcon": "bg_map_xdd_haibian",
       "PlacesId": 1,
-      "CompletionEventCount": 5,
+      "CompletionEventCount": 1,
       "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -2394,6 +2394,18 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: -0.5318985
       objectReference: {fileID: 0}
+    - target: {fileID: 5074312253101209296, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5074312253101209296, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5074312253101209296, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5564107046295165446, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
       propertyPath: m_Color.b
       value: 0.20784315
@@ -2420,7 +2432,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7051915568679705722, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 10.200012
+      value: 32
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091179387050076352, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091179387050076352, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.b
+      value: 0.47484267
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091179387050076352, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.g
+      value: 0.9912611
+      objectReference: {fileID: 0}
+    - target: {fileID: 7091179387050076352, guid: 3f147db5a528c2a4eb1eabb9b0b3ce4f, type: 3}
+      propertyPath: m_Color.r
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []