Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.08221996
+    - _Alpha: 0.6672832
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.07833733
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/EventConfig.json

@@ -4732,6 +4732,12 @@
       "EventType": 1,
       "Score": 1,
       "EventQuality": 3,
+      "PrizeIDs": [
+        20013
+      ],
+      "PrizeNums": [
+        3
+      ],
       "RefreshProbability": 20,
       "RefreshCount": 1,
       "placeID": 1,
@@ -6018,6 +6024,12 @@
       "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
+      "EventConditionId": [
+        10
+      ],
+      "EventValue": [
+        9151
+      ],
       "EventName": 4287,
       "Description": 4367
     },
@@ -6052,6 +6064,12 @@
       "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
+      "EventConditionId": [
+        10
+      ],
+      "EventValue": [
+        9152
+      ],
       "EventName": 4288,
       "Description": 4368
     },
@@ -6083,6 +6101,12 @@
       "placeID": 0,
       "SmallPlacesId": 0,
       "XiantuID": 0,
+      "EventConditionId": [
+        10
+      ],
+      "EventValue": [
+        9153
+      ],
       "EventName": 4289,
       "Description": 4369
     },

Assets/Res/Config/HeroPowerUpConfig.json

@@ -968,8 +968,8 @@
         1
       ],
       "LeijieDamages": [
-        4390,
-        6585,
+        3293,
+        4939,
         2
       ],
       "HPFactor": 19.2727242,
@@ -1954,8 +1954,8 @@
         1
       ],
       "LeijieDamages": [
-        20608,
-        30912,
+        15456,
+        23184,
         3
       ],
       "HPFactor": 75.92114,
@@ -2940,8 +2940,8 @@
         1
       ],
       "LeijieDamages": [
-        99693,
-        149540,
+        74770,
+        112155,
         4
       ],
       "HPFactor": 270.09668,
@@ -3926,8 +3926,8 @@
         1
       ],
       "LeijieDamages": [
-        415918,
-        623877,
+        311938,
+        467907,
         5
       ],
       "HPFactor": 906.745056,
@@ -4912,8 +4912,8 @@
         1
       ],
       "LeijieDamages": [
-        1494431,
-        2241646,
+        1120823,
+        1681235,
         6
       ],
       "HPFactor": 2932.009,
@@ -5898,8 +5898,8 @@
         1
       ],
       "LeijieDamages": [
-        5157292,
-        7735937,
+        3867969,
+        5801953,
         7
       ],
       "HPFactor": 9235.161,
@@ -6884,8 +6884,8 @@
         1
       ],
       "LeijieDamages": [
-        17972672,
-        26959008,
+        13479504,
+        20219256,
         8
       ],
       "HPFactor": 28529.4766,
@@ -7870,8 +7870,8 @@
         1
       ],
       "LeijieDamages": [
-        61011000,
-        91516499,
+        45758250,
+        68637374,
         9
       ],
       "HPFactor": 86827.18,
@@ -8856,8 +8856,8 @@
         1
       ],
       "LeijieDamages": [
-        188845107,
-        283267661,
+        141633830,
+        212450745,
         10
       ],
       "HPFactor": 261137.984,
@@ -9839,8 +9839,8 @@
         1
       ],
       "LeijieDamages": [
-        589927320,
-        884890980,
+        442445490,
+        663668235,
         11
       ],
       "HPFactor": 777857.8,

Assets/Res/Config/LanguageChineseConfig.json

@@ -898,27 +898,27 @@
     },
     {
       "ID": 225,
-      "txt": "筑基期"
+      "txt": "练气期"
     },
     {
       "ID": 226,
-      "txt": "金丹期"
+      "txt": "筑基期"
     },
     {
       "ID": 227,
-      "txt": "元婴期"
+      "txt": "结丹期"
     },
     {
       "ID": 228,
-      "txt": "化神期"
+      "txt": "元婴期"
     },
     {
       "ID": 229,
-      "txt": "炼虚期"
+      "txt": "化神期"
     },
     {
       "ID": 230,
-      "txt": "合体期"
+      "txt": "炼虚期"
     },
     {
       "ID": 231,
@@ -13342,111 +13342,111 @@
     },
     {
       "ID": 4076,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4077,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4078,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4079,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4080,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4081,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4082,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4083,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4084,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4085,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4086,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4087,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4088,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4089,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4090,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4091,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4092,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4093,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4094,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4095,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4096,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4097,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4098,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4099,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4100,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4101,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4102,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     {
       "ID": 4114,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     {
       "ID": 4130,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4131,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     {
       "ID": 4192,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 4193,

Assets/Res/Config/SmallPlacesConfig.json

@@ -7,7 +7,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 1,
       "CompletionEventCount": 5,
-      "UnlockEnvetid": 10001,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -17,7 +17,7 @@
       "placeIcon": "bg_map_xdd_haibian",
       "PlacesId": 1,
       "CompletionEventCount": 4,
-      "UnlockEnvetid": 10004,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -27,7 +27,7 @@
       "placeIcon": "bg_map_xdd_mijing",
       "PlacesId": 1,
       "CompletionEventCount": 6,
-      "UnlockEnvetid": 10009,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle01"
     },
     {
@@ -37,7 +37,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 1,
       "CompletionEventCount": 8,
-      "UnlockEnvetid": 10012,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -47,7 +47,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10013,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle03"
     },
     {
@@ -57,7 +57,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10018,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -67,7 +67,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10022,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -77,7 +77,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10025,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -87,7 +87,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10028,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     },
     {
@@ -97,7 +97,7 @@
       "placeIcon": "bg_map_xdd_fudao",
       "PlacesId": 3,
       "CompletionEventCount": -1,
-      "UnlockEnvetid": -1,
+      "UnlockEnvetid": 0,
       "scencName": "LevelBattle02"
     }
   ]

Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -604,9 +604,9 @@ RectTransform:
   - {fileID: 4593831610564893055}
   m_Father: {fileID: 6698958863649085951}
   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: 178, y: -599.2}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 178, y: 225}
   m_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2476547123357523038
@@ -742,7 +742,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2874684587771247412}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -752,10 +752,10 @@ RectTransform:
   - {fileID: 3820099105373361810}
   m_Father: {fileID: 6698958863649085951}
   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: 11.096, y: -678.4}
-  m_SizeDelta: {x: 343.99, y: 14.198}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 11.096, y: 145.79993}
+  m_SizeDelta: {x: 343.99, y: 14.197998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8714767984209112062
 MonoBehaviour:
@@ -936,16 +936,16 @@ RectTransform:
   - {fileID: 4875318657264779440}
   - {fileID: 7744834589657720586}
   - {fileID: 2472727722875946098}
-  - {fileID: 4133974415825677973}
   - {fileID: 3908211497387841003}
   - {fileID: 1523123446230304984}
   - {fileID: 4107868657645293525}
+  - {fileID: 4133974415825677973}
   m_Father: {fileID: 7858018693182147813}
   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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &946542361168502325
 CanvasGroup:
@@ -993,9 +993,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6698958863649085951}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: -280.1, y: -740.8}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -330.1, y: 33.400024}
   m_SizeDelta: {x: 94, y: 94}
   m_Pivot: {x: 0, y: 0}
 --- !u!222 &1879604139991815501
@@ -1332,9 +1332,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6698958863649085951}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -240, y: 430}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -290, y: 480}
   m_SizeDelta: {x: 210, y: 446}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4331104227723466823
@@ -1623,9 +1623,9 @@ RectTransform:
   - {fileID: 925533245352772245}
   m_Father: {fileID: 6698958863649085951}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 278.5, y: -219.2}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 328.5, y: 555}
   m_SizeDelta: {x: 65, y: 65}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &2971171615382265200
@@ -1772,7 +1772,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 11.0961, y: -663.31726}
+  m_AnchoredPosition: {x: 11.0961, y: 110.88269}
   m_SizeDelta: {x: 343.9922, y: 27.8173}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3845421330084867094
@@ -2370,9 +2370,9 @@ RectTransform:
   - {fileID: 7837645566193001603}
   m_Father: {fileID: 6698958863649085951}
   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: -178.2, y: -599.2}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -178.2, y: 225}
   m_SizeDelta: {x: 244, y: 108}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8422212410502206005
@@ -2615,9 +2615,9 @@ RectTransform:
   - {fileID: 3510124831676996786}
   m_Father: {fileID: 6698958863649085951}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 278.5, y: -355.7}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 328.5, y: 418.5}
   m_SizeDelta: {x: 65, y: 65}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &6574333515156057038

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -107,8 +107,8 @@ RectTransform:
   m_GameObject: {fileID: 86016722660470058}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.81, y: 0.81, z: 0.81}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 5732359251589947491}
   m_Father: {fileID: 5854966778653116823}
@@ -145,7 +145,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &122561143660322292
 RectTransform:
   m_ObjectHideFlags: 0
@@ -160,10 +160,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 5854966778653116823}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -598}
-  m_SizeDelta: {x: 0, y: -1560.9799}
+  m_AnchorMin: {x: 0.5, y: 0.13268968}
+  m_AnchorMax: {x: 0.5, y: 0.13268968}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 63.02014}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1026066119927368560
 CanvasRenderer:
@@ -343,16 +343,16 @@ RectTransform:
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1889193699677240613}
-  - {fileID: 7854499311622563114}
   - {fileID: 9194368947421187015}
   - {fileID: 2574803626736627136}
+  - {fileID: 7854499311622563114}
   - {fileID: 122561143660322292}
   m_Father: {fileID: 0}
   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, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -677,7 +677,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: 25.800003, y: 0.099998474}
+  m_AnchoredPosition: {x: 25.800003, y: 0.1000061}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7796969034276455814
@@ -1002,7 +1002,7 @@ RectTransform:
   m_Father: {fileID: 5307082538927780276}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.974, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -1178,8 +1178,8 @@ RectTransform:
   m_GameObject: {fileID: 1932630478545625976}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 0.80999994, y: 0.80999994, z: 0.80999994}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 1503238667556115648}
   - {fileID: 615495664481778641}
@@ -1440,7 +1440,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7854499311622563114
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1457,8 +1457,6 @@ RectTransform:
   - {fileID: 342747676854343371}
   - {fileID: 4894137871019489262}
   - {fileID: 5444061590766171654}
-  - {fileID: 7240014786517417586}
-  - {fileID: 1453335509118501595}
   - {fileID: 2895624049724411662}
   m_Father: {fileID: 5854966778653116823}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1511,10 +1509,10 @@ RectTransform:
   - {fileID: 2037475872589937086}
   m_Father: {fileID: 7854499311622563114}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -20.7502}
-  m_SizeDelta: {x: 0, y: 118.0951}
+  m_SizeDelta: {x: 750, y: 118.0951}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3167469181355813890
 CanvasRenderer:
@@ -1828,9 +1826,9 @@ RectTransform:
   - {fileID: 2609054578107404841}
   m_Father: {fileID: 7854499311622563114}
   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: 212.8, y: -706.6}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -162.2, y: 105.400024}
   m_SizeDelta: {x: 284, y: 92}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &751266163501733369
@@ -2186,7 +2184,7 @@ RectTransform:
   m_Father: {fileID: 8620435976387716660}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0.454, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2450,12 +2448,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 7854499311622563114}
+  m_Children:
+  - {fileID: 1453335509118501595}
+  m_Father: {fileID: 5444061590766171654}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 11.400238, y: 5.0827637}
+  m_AnchoredPosition: {x: 0.00024414062, y: -27.818237}
   m_SizeDelta: {x: 343.9922, y: 27.8173}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2367995286785251227
@@ -2791,12 +2790,13 @@ RectTransform:
   - {fileID: 6243106425441244729}
   - {fileID: 286340287324116830}
   - {fileID: 361333686880044481}
+  - {fileID: 7240014786517417586}
   m_Father: {fileID: 7854499311622563114}
   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: 11.4, y: -772}
-  m_SizeDelta: {x: 343.99, y: 14.198}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 11.4, y: 40}
+  m_SizeDelta: {x: 343.99, y: 14.197998}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7670532780615826454
 MonoBehaviour:
@@ -3066,7 +3066,7 @@ RectTransform:
   m_Father: {fileID: 286340287324116830}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -3153,12 +3153,12 @@ RectTransform:
   m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7854499311622563114}
+  m_Father: {fileID: 7240014786517417586}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 11.40033, y: -793.0086}
-  m_SizeDelta: {x: -406.0078, y: -1596.1827}
+  m_AnchoredPosition: {x: 0.000091552734, y: 0.000061035156}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5439913488260530315
 CanvasRenderer:
@@ -3313,7 +3313,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2895624049724411662
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3466,7 +3466,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 727.5
+      value: 719.5
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -3617,7 +3617,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1333
+      value: 1325
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -3768,7 +3768,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1027.6
+      value: 1019.6
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -3919,7 +3919,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1333
+      value: 1325
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4070,7 +4070,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 428.1
+      value: 420.10004
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4221,7 +4221,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 727.5
+      value: 719.5
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4372,7 +4372,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1027.6
+      value: 1019.6
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4523,7 +4523,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 428.1
+      value: 420.10004
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4674,7 +4674,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 727.5
+      value: 719.5
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4825,7 +4825,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1027.6
+      value: 1019.6
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -4906,6 +4906,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2574803626736627136}
     m_Modifications:
+    - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 82.91
+      objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4990,6 +4994,42 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetItemType2
       objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 58.41
+      objectReference: {fileID: 0}
+    - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -21.027552
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 13.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -22.7
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -448,6 +448,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7041821263609704514}
   - {fileID: 8890424472982805434}
   - {fileID: 5726230650785077594}
   - {fileID: 1512494758013420663}
@@ -457,11 +458,11 @@ RectTransform:
   - {fileID: 4357773641780629209}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -369}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -52}
   m_SizeDelta: {x: 590.4349, y: 0}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2490359960032762277
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3314,11 +3315,11 @@ RectTransform:
   - {fileID: 7120283957178746682}
   - {fileID: 4528836587883012831}
   - {fileID: 5568653164330923395}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 1278222903210789576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -13.7, y: -264.3}
+  m_AnchoredPosition: {x: -13.7, y: 104.69995}
   m_SizeDelta: {x: 297.1665, y: 77.3102}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1906835344859869443
@@ -3775,7 +3776,6 @@ RectTransform:
   m_Children:
   - {fileID: 8212670971040085124}
   - {fileID: 4120615118355275965}
-  - {fileID: 7041821263609704514}
   - {fileID: 1278222903210789576}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/HeroInformainPanel/SelectBreakthroughItemPanel.prefab

@@ -480,7 +480,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 6.5, y: -8.9}
+  m_AnchoredPosition: {x: 6.5, y: -8.900024}
   m_SizeDelta: {x: 33.006195, y: 33.0062}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7261971253218406178
@@ -1335,12 +1335,13 @@ RectTransform:
   - {fileID: 1446556576223137171}
   - {fileID: 7269271526319791146}
   - {fileID: 9198324535325377333}
+  - {fileID: 6314286798691166058}
   m_Father: {fileID: 5318323102501209997}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 149.1}
-  m_SizeDelta: {x: 0, y: 485.6497}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -643.9}
+  m_SizeDelta: {x: 750, y: 485.64966}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &524714867080188752
 CanvasRenderer:
@@ -1698,7 +1699,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -329.4, y: -12.1}
+  m_AnchoredPosition: {x: -329.4, y: -12.099976}
   m_SizeDelta: {x: 169.4441, y: 27.0412}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6016738999040956583
@@ -1867,7 +1868,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000030517578, y: -0.000061035156}
+  m_AnchoredPosition: {x: -0.000030517578, y: 0}
   m_SizeDelta: {x: 750, y: 47.4487}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &2969552947440336104
@@ -2030,7 +2031,6 @@ RectTransform:
   - {fileID: 3577922257924512980}
   - {fileID: 6369059390182839404}
   - {fileID: 1528319131332351769}
-  - {fileID: 6314286798691166058}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2429,18 +2429,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9180492859032817554}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5378836280953730899}
   - {fileID: 7313993460370242381}
-  m_Father: {fileID: 5318323102501209997}
+  m_Father: {fileID: 1528319131332351769}
   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: 5.6, y: -600}
+  m_AnchoredPosition: {x: 5.6, y: -179.9248}
   m_SizeDelta: {x: 0, y: 74.0277}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5730157675857547190

Assets/Res/UI/HeroInformainPanel/SelectElixirPanel.prefab

@@ -239,7 +239,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: -223.8963, y: -11.040421}
+  m_AnchoredPosition: {x: -223.8963, y: -11.040405}
   m_SizeDelta: {x: 141, y: 175}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4005131581280527188
@@ -328,7 +328,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 5.700012, y: -6.600006}
+  m_AnchoredPosition: {x: 5.700012, y: -6.5999756}
   m_SizeDelta: {x: 36, y: 36}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7261971253218406178
@@ -910,7 +910,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -9.6826}
+  m_AnchoredPosition: {x: 0, y: -9.682617}
   m_SizeDelta: {x: 0, y: 217.8503}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4325278300601310220
@@ -1185,10 +1185,10 @@ RectTransform:
   - {fileID: 8003648020153173292}
   m_Father: {fileID: 5318323102501209997}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 149.1}
-  m_SizeDelta: {x: 0, y: 485.0744}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -643}
+  m_SizeDelta: {x: 750, y: 485.07446}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &524714867080188752
 CanvasRenderer:
@@ -1502,7 +1502,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -328.8, y: -11.4}
+  m_AnchoredPosition: {x: -328.8, y: -11.400024}
   m_SizeDelta: {x: 176.34161, y: 41.1811}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6016738999040956583

Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -57,7 +57,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-
+        //进入游戏全部检测一次
+        foreach (var playerDataEventLinkData in AccountFileInfo.Instance.playerData.eventList)
+        {
+            foreach (var eventLinkData in playerDataEventLinkData.eventLinks)
+            {
+                CeekEventGroupComplete(eventLinkData.eventConditions);
+            }
+        }
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
         EventManager.Instance.AddEventListener(CustomEventType.AddItem, ItemUpdate);

Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs

@@ -47,6 +47,7 @@ namespace Fort23.Mono
                 }
             });
         }
+
         public async override CTask GetFocus()
         {
             TitlePanel.OpenPanel(new List<int>() { 1001, 1002 });
@@ -86,7 +87,7 @@ namespace Fort23.Mono
             PlacesWidget placesWidget = obj as PlacesWidget;
             //加载地图
 
-            PlacesInfoPanel.OpenPanel(placesWidget.placesConfig.ID,null);
+            PlacesInfoPanel.OpenPanel(placesWidget.placesConfig.ID, null);
 
             //
             // if (placesWidget.placesConfig.ID > 1 && PlayerManager.Instance.GetMapBl(placesWidget.placesConfig.ID - 1) < 100)
@@ -125,17 +126,19 @@ namespace Fort23.Mono
                 }
             }
 
-     
-            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+
+            SmallPlacesConfig smallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
             // AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
-            
+
             PlacesConfig placesConfig =
                 ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
 
             Text_PlacesComplteProgress.text =
                 $"{LanguageManager.Instance.Text(placesConfig.placeName)}完成度：{PlayerManager.Instance.PlacesBl}%";
 
-            GameObjectPool gameObjectPool2 = await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");
+            GameObjectPool gameObjectPool2 =
+                await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");
             gameObjectPool2.own.transform.parent = PlacesRoot;
             gameObjectPool2.own.transform.localScale = Vector3.one;
             gameObjectPool2.own.transform.GetComponent<RectTransform>().anchoredPosition = Vector2.zero;
@@ -147,24 +150,26 @@ namespace Fort23.Mono
         public async void CustomInit()
         {
             int PlacesId = PlayerManager.Instance.GetMaxSmallPlacesId();
-            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlacesId);
+            SmallPlacesConfig smallPlacesConfig1 = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlacesId);
+            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig1.PlacesId);
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
 
             await ChangePlaces(bigMapConfig.ID);
             // await ChangeMap(bigMapConfig.ID);
             Sv2.gameObject.SetActive(true);
             LayoutRebuilder.ForceRebuildLayoutImmediate(PlacesRoot);
-            
-         
-            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+
+
+            SmallPlacesConfig smallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
             // AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
 
             foreach (var placesItemPlacesWidget in placesItem.PlacesWidgets)
             {
-                if (placesItemPlacesWidget.placesConfig.ID ==smallPlacesConfig.PlacesId)
+                if (placesItemPlacesWidget.placesConfig.ID == smallPlacesConfig.PlacesId)
                 {
                     // Rect_BiaoJi.anchoredPosition = transform.worldToLocalMatrix * placesItemPlacesWidget.Pos.position;
-                    Rect_BiaoJi.position =  placesItemPlacesWidget.Pos.position;
+                    Rect_BiaoJi.position = placesItemPlacesWidget.Pos.position;
                 }
             }
         }