Browse Source

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

李桃 2 days ago
parent
commit
861ad82955
38 changed files with 2568 additions and 1245 deletions
  1. 2 2
      Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat
  2. 131 131
      Assets/Res/Config/EventLinkConfig.json
  3. 635 635
      Assets/Res/Config/LanguageChineseConfig.json
  4. 4 4
      Assets/Res/Config/SmallPlacesConfig.json
  5. BIN
      Assets/Res/UI/DivineSence/20250924-153913.jpg
  6. 124 34
      Assets/Res/UI/DivineSence/DivineSenceRestoredPanel.prefab
  7. 15 15
      Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab
  8. BIN
      Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png
  9. 2 2
      Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png.meta
  10. BIN
      Assets/Res/UI/DivineSence/主界面-神识.png
  11. 0 203
      Assets/Res/UI/DivineSence/主界面-神识.png.meta
  12. BIN
      Assets/Res/UI/DivineSence/仙途事件-改png.png
  13. 0 203
      Assets/Res/UI/DivineSence/仙途事件-改png.png.meta
  14. 72 0
      Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.controller
  15. 8 0
      Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.controller.meta
  16. 571 0
      Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.prefab
  17. 7 0
      Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.prefab.meta
  18. 127 0
      Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanelOpen.anim
  19. 8 0
      Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanelOpen.anim.meta
  20. 648 7
      Assets/Res/UI/MainPanel/MainPanel.prefab
  21. 1 1
      Assets/Res/UI/RewardsPanel/RewardsPanel.prefab
  22. 2 0
      Assets/Res/UIAtlas/mainUI.spriteatlasv2
  23. 1 0
      Assets/Scripts/Core/Event/Event/CustomEventType.cs
  24. 2 2
      Assets/Scripts/Core/UI/Core/UIManager.cs
  25. 3 1
      Assets/Scripts/GameUI/EventManager/EventSystemManager.cs
  26. 2 0
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredWidget.cs
  27. 48 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanel.cs
  28. 11 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanel.cs.meta
  29. 40 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanelData.cs
  30. 11 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanelData.cs.meta
  31. 7 0
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs
  32. 51 5
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  33. 35 0
      Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs
  34. 0 0
      Assets/StreamingAssets/assetConfig.txt
  35. BIN
      Excel2Json/Excel/EventConfig.xlsx
  36. BIN
      Excel2Json/Excel/Language.xlsx
  37. BIN
      Excel2Json/Excel/Maps.xlsx
  38. 0 0
      UGUIPack/uguiconfig.db

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.4559332
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: -0.06117642
+    - _MainTexOffsetU: 0.64
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

File diff suppressed because it is too large
+ 131 - 131
Assets/Res/Config/EventLinkConfig.json


File diff suppressed because it is too large
+ 635 - 635
Assets/Res/Config/LanguageChineseConfig.json


+ 4 - 4
Assets/Res/Config/SmallPlacesConfig.json

@@ -4,7 +4,7 @@
       "ID": 1,
       "placeName": 10037,
       "PlacesId": 1,
-      "CompletionEventCount": 3,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 10001,
       "scencName": "LevelBattle02"
     },
@@ -12,7 +12,7 @@
       "ID": 2,
       "placeName": 10038,
       "PlacesId": 1,
-      "CompletionEventCount": 6,
+      "CompletionEventCount": 4,
       "UnlockEnvetid": 10004,
       "scencName": "LevelBattle02"
     },
@@ -20,7 +20,7 @@
       "ID": 3,
       "placeName": 10039,
       "PlacesId": 1,
-      "CompletionEventCount": 9,
+      "CompletionEventCount": 6,
       "UnlockEnvetid": 10009,
       "scencName": "LevelBattle01"
     },
@@ -28,7 +28,7 @@
       "ID": 4,
       "placeName": 10040,
       "PlacesId": 1,
-      "CompletionEventCount": 10,
+      "CompletionEventCount": 8,
       "UnlockEnvetid": 10012,
       "scencName": "LevelBattle02"
     },

BIN
Assets/Res/UI/DivineSence/20250924-153913.jpg


+ 124 - 34
Assets/Res/UI/DivineSence/DivineSenceRestoredPanel.prefab

@@ -142,8 +142,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: -0.8045044, y: 226.50027}
-  m_SizeDelta: {x: -62.0529, y: -613.3034}
+  m_AnchoredPosition: {x: -0.56381226, y: 266.55963}
+  m_SizeDelta: {x: -30.7806, y: -710.0225}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5167498229776329142
 CanvasRenderer:
@@ -166,7 +166,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.81568635, g: 0.7372549, b: 0.5529412, a: 1}
+  m_Color: {r: 0.8470589, g: 0.8235295, b: 0.7607844, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -183,7 +183,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -228,8 +228,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8842124393281780795}
+  - {fileID: 3914291755169970593}
   - {fileID: 7663317156490623705}
-  - {fileID: 2708046515207152597}
   - {fileID: 6275148584250070916}
   - {fileID: 3375913756600433316}
   - {fileID: 5866622043385976589}
@@ -237,8 +237,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: 0, y: 0}
-  m_SizeDelta: {x: 619.7278, y: 657.4299}
+  m_AnchoredPosition: {x: -0.8211, y: 72.68799}
+  m_SizeDelta: {x: 664.8527, y: 760.2731}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &507674846458028489
 CanvasRenderer:
@@ -326,8 +326,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 12.5, y: 0}
-  m_SizeDelta: {x: 32.8863, y: 32.5289}
+  m_AnchoredPosition: {x: 251.1, y: 0.000024319}
+  m_SizeDelta: {x: 38.951, y: 38.5277}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &3956759277254579743
 CanvasRenderer:
@@ -415,8 +415,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: 1.178009, y: 0.8644104}
-  m_SizeDelta: {x: -17.304077, y: -17.237}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -15.246704, y: -19.058594}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5143802336595678939
 CanvasRenderer:
@@ -501,11 +501,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5852862441037819201}
+  m_Father: {fileID: 3914291755169970593}
   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: 295.75}
+  m_AnchoredPosition: {x: -0.0000059604645, y: 0}
   m_SizeDelta: {x: 535.2303, y: 50.431}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1851182301441702079
@@ -529,7 +529,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5137255, g: 0.48235297, b: 0.3529412, a: 1}
+  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -538,11 +538,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 38
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
+    m_MaxSize: 42
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -598,7 +598,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: 15.075, y: -284.6}
+  m_AnchoredPosition: {x: 15.075, y: -294.8}
   m_SizeDelta: {x: 525.9169, y: 47.657}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2600124819267049154
@@ -622,7 +622,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.14901961, g: 0.13725491, b: 0.11764706, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -631,7 +631,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 25
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -680,8 +680,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: -2.0751, y: -21.54712}
-  m_SizeDelta: {x: 555.1339, y: 377.0047}
+  m_AnchoredPosition: {x: -0.56382, y: 29.1074}
+  m_SizeDelta: {x: 634.07, y: 380.9899}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3793524203819905834
 CanvasRenderer:
@@ -734,7 +734,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8588236, g: 0.83921576, b: 0.78823537, a: 1}
+  m_Color: {r: 0.8470589, g: 0.8235295, b: 0.7607844, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -751,7 +751,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -935,6 +935,96 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 0
+--- !u!1 &6573144540420729276
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3914291755169970593}
+  - component: {fileID: 5837731469000901826}
+  - component: {fileID: 4846221850105916576}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3914291755169970593
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6573144540420729276}
+  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: 2708046515207152597}
+  m_Father: {fileID: 5852862441037819201}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.56427, y: 334.48773}
+  m_SizeDelta: {x: -30.781, y: -701.9854}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5837731469000901826
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6573144540420729276}
+  m_CullTransparentMesh: 1
+--- !u!114 &4846221850105916576
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6573144540420729276}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4156863, g: 0.5058824, b: 0.46274513, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juxing_135
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  imageH: 777.9515
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6864546897549033815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1092,7 +1182,7 @@ RectTransform:
   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: 753, y: 1623}
+  m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2050812396940640416
 CanvasRenderer:
@@ -1122,7 +1212,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9c262a0a7985107478ae165836f1936a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: b4bb8185f4bbfad4d95fb27ae0cb488c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1211,12 +1301,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 5
+    m_Left: 23
     m_Right: 0
     m_Top: 16
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 10.9
+  m_Spacing: 37.72
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1259,7 +1349,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: 15.075, y: -241.9}
+  m_AnchoredPosition: {x: 0, y: -235.1}
   m_SizeDelta: {x: 525.9169, y: 47.657}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1376453331867545162
@@ -1283,7 +1373,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.14901961, g: 0.13725491, b: 0.11764707, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1292,7 +1382,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 20
+    m_FontSize: 28
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -1339,8 +1429,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: 38.82071, y: 1.7654}
-  m_SizeDelta: {x: 525.9169, y: 47.657}
+  m_AnchoredPosition: {x: 19.9724, y: 0.23427}
+  m_SizeDelta: {x: 488.2202, y: 50.719}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4294669017348956789
 CanvasRenderer:
@@ -1377,7 +1467,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -1490,7 +1580,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 92.36135
+      value: 110.36135
       objectReference: {fileID: 0}
     - target: {fileID: 4587225501482666958, guid: 826a64867193d0b4da5e6ab59aef6fe3, type: 3}
       propertyPath: m_AnchoredPosition.y

+ 15 - 15
Assets/Res/UI/DivineSence/DivineSenceRestoredWidget.prefab

@@ -35,8 +35,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: 0, y: -11.7}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchoredPosition: {x: -0.000010967, y: -5.3476}
+  m_SizeDelta: {x: 174.72, y: 50.7486}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4250289077533234639
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.33333334, g: 0.59607846, b: 0.37647063, a: 1}
+  m_Color: {r: 0.4901961, g: 0.6901961, b: 0.6, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,11 +68,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 44
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 3
-    m_MaxSize: 40
+    m_MaxSize: 50
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -226,8 +226,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: 0, y: 93.8}
-  m_SizeDelta: {x: 186.933, y: 186.933}
+  m_AnchoredPosition: {x: -6.3, y: 67.4}
+  m_SizeDelta: {x: 120, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3284452442884090342
 CanvasRenderer:
@@ -267,7 +267,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_item_1308
+  _icon_name: icon_shenshitishengfu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
   packInfo:
@@ -339,7 +339,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.38823533, g: 0.3803922, b: 0.43921572, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -348,7 +348,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
+    m_FontSize: 26
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -635,8 +635,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: 0, y: -123}
-  m_SizeDelta: {x: 172.2167, y: 54.4559}
+  m_AnchoredPosition: {x: 0.96849966, y: -126.92322}
+  m_SizeDelta: {x: 149.4776, y: 52.0837}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2491671589111119913
 CanvasRenderer:
@@ -659,7 +659,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.80392164, g: 0.65882355, b: 0.41176474, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -667,7 +667,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillMethod: 4
@@ -676,7 +676,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_shengji
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:

BIN
Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png


+ 2 - 2
Assets/Res/UI/DivineSence/20250924-153913.jpg.meta → Assets/Res/UI/DivineSence/主界面-神识-神识恢复弹窗.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Bikdsyj8UypgyYVD3wMtvyB8GqoxLRHW2CuW4kXsnrzgyUtLaAGdR5vbkZBI
+guid: XX5N5yKsW34vJwuZBPso/zkrfCz2+6cCh5dTYfU/gB7yrG5Gd0thYhhIS34w
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 20250924-153913
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Res/UI/DivineSence/主界面-神识.png


+ 0 - 203
Assets/Res/UI/DivineSence/主界面-神识.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: WywYs3+qW3L8aC4u8PN2RoOAEA4ojzjIJrdvcz/8wq/pXBfKirDqwakMlJPW
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: "\u4E3B\u754C\u9762-\u795E\u8BC6"
-  assetBundleVariant: 

BIN
Assets/Res/UI/DivineSence/仙途事件-改png.png


+ 0 - 203
Assets/Res/UI/DivineSence/仙途事件-改png.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: XXwesy+sASq20yiQ3dKoPBW2GPvlwyQ1N41zCNV6S3O9D21KidINNbw2fY13
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: "\u4ED9\u9014\u4E8B\u4EF6-\u6539png"
-  assetBundleVariant: 

+ 72 - 0
Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.controller

@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1107 &-7946071565220439783
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -2169179937204490219}
+    m_Position: {x: 380, y: -60, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -2169179937204490219}
+--- !u!1102 &-2169179937204490219
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlacesChangeInfoPanelOpen
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: a608527db988306489faebc364de880a, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlacesChangeInfoPanel
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -7946071565220439783}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}

+ 8 - 0
Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: C3MYtymkAnNsTBdihM4qohf5nvKsNa/GZ+cEMMJJ8OguRBUqaCcwxThzviSD
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 571 - 0
Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.prefab

@@ -0,0 +1,571 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3927624695352479384
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6373320624650887012}
+  - component: {fileID: 326693713506391476}
+  - component: {fileID: 6625413194295706007}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6373320624650887012
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3927624695352479384}
+  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: []
+  m_Father: {fileID: 4534880848114758260}
+  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: 655, y: 653}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &326693713506391476
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3927624695352479384}
+  m_CullTransparentMesh: 1
+--- !u!114 &6625413194295706007
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3927624695352479384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ecdad83423fd33441af7684d1c861771, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_map_qiehuan
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
+  imageH: 646.9775
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5936847983662490449
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7354664618027818273}
+  - component: {fileID: 1359551343155104095}
+  - component: {fileID: 2337773986720364468}
+  - component: {fileID: 4119980142080941945}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7354664618027818273
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  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: []
+  m_Father: {fileID: 9037135992368401232}
+  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: 748, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1359551343155104095
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  m_CullTransparentMesh: 1
+--- !u!114 &2337773986720364468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.6901961}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8a39f9817e4bb6048a00dd9dd1f76544, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4119980142080941945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5936847983662490449}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2337773986720364468}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6510083600123788025
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4534880848114758260}
+  - component: {fileID: 6624760465754027965}
+  - component: {fileID: 930542250473253188}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4534880848114758260
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6510083600123788025}
+  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: 6373320624650887012}
+  - {fileID: 2026120209031705840}
+  m_Father: {fileID: 9037135992368401232}
+  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: 588, y: 543}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6624760465754027965
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6510083600123788025}
+  m_CullTransparentMesh: 1
+--- !u!114 &930542250473253188
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6510083600123788025}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8d96542ecf477fd4fbb6eb4b0acdcb98, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_sm_db
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
+  imageH: 646.9775
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8138505767949350989
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3639433108728201481}
+  - component: {fileID: 4844271896244405093}
+  - component: {fileID: 2295405278494417419}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_PlacesName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3639433108728201481
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8138505767949350989}
+  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: []
+  m_Father: {fileID: 2026120209031705840}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -21.5096, y: 7.7972}
+  m_SizeDelta: {x: -97.8689, y: -31.7268}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4844271896244405093
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8138505767949350989}
+  m_CullTransparentMesh: 1
+--- !u!114 &2295405278494417419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8138505767949350989}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9686275, g: 0.9568628, b: 0.8941177, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 44
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 57
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6D77\u8FB9"
+--- !u!1 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  - component: {fileID: 1794225696576374838}
+  - component: {fileID: 1477944205841979278}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: PlacesChangeInfoPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  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: 7354664618027818273}
+  - {fileID: 4534880848114758260}
+  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_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_Close
+    gameObject: {fileID: 4119980142080941945}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_PlacesName
+    gameObject: {fileID: 2295405278494417419}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!225 &1794225696576374838
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!95 &1477944205841979278
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 497239a8d5fe4f84eb17a2d46596f013, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &9136876709440108573
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2026120209031705840}
+  - component: {fileID: 8674864630299326250}
+  - component: {fileID: 1632646371018719656}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2026120209031705840
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9136876709440108573}
+  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: 3639433108728201481}
+  m_Father: {fileID: 4534880848114758260}
+  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: 182, y: 328}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8674864630299326250
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9136876709440108573}
+  m_CullTransparentMesh: 1
+--- !u!114 &1632646371018719656
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9136876709440108573}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 01bd2cac73313bc4b9028cab583d5740, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_sm_db2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
+  imageH: 646.9775
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

+ 7 - 0
Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WX9L4SKlBXnuGxBE2jgYgxM4aBYWR7ZsiaTkDjmkPZlJJlKXUj7GqhlWiunp
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: placesinfopanel
+  assetBundleVariant: 

+ 127 - 0
Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanelOpen.anim

@@ -0,0 +1,127 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: PlacesChangeInfoPanelOpen
+  serializedVersion: 9
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.8333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 1574349066
+      script: {fileID: 0}
+      typeID: 225
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.8333334
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1.8333334
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_Alpha
+    path: 
+    classID: 225
+    script: {fileID: 0}
+    flags: 0
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
+  m_ACLContext:
+    m_RootBone: {fileID: 0}
+    ACLCompressionLevel: 0
+    ACLCurvePrecision: 0.01
+    UseACLCurve: 0

+ 8 - 0
Assets/Res/UI/LevelChoosePanel/PlacesChangeInfoPanelOpen.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: XnwfvS+vVC+0JDW5LyXZV14GIILr6CanUkf9Z1gWxNBUUHlwValcb8xbqxQu
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 648 - 7
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -1,5 +1,94 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &267844642322349411
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8010219124151300276}
+  - component: {fileID: 4829760602679532235}
+  - component: {fileID: 8027710173212846871}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8010219124151300276
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267844642322349411}
+  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: []
+  m_Father: {fileID: 86604009502899239}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 328, y: 41}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4829760602679532235
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267844642322349411}
+  m_CullTransparentMesh: 1
+--- !u!114 &8027710173212846871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267844642322349411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_renw_db1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 214c89e2c78332ad9b5a02fccaecc26e
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &423032053834936686
 GameObject:
   m_ObjectHideFlags: 0
@@ -109,6 +198,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7242877048583604540}
   - {fileID: 8048570897024190138}
   - {fileID: 2175225039670005603}
   m_Father: {fileID: 86604009502899239}
@@ -2765,6 +2855,10 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2394298463810824802}
+  - {fileID: 8010219124151300276}
+  - {fileID: 1713729240865209901}
+  - {fileID: 7440752129834858667}
   - {fileID: 8258499293957039645}
   - {fileID: 8728580503868501898}
   - {fileID: 1194356122697894574}
@@ -2796,7 +2890,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2813,14 +2907,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_renwu_diban
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: mainUI
-    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
-    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
-    lasetJsonGUID: 84621fa40ca51eb52cde8b5d36f124e5
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
   imageH: 100
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
@@ -3306,6 +3400,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7811668771085897324
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2394298463810824802}
+  - component: {fileID: 5012491853445144891}
+  - component: {fileID: 9215601903000794814}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2394298463810824802
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7811668771085897324}
+  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: []
+  m_Father: {fileID: 86604009502899239}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 330, y: 130}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5012491853445144891
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7811668771085897324}
+  m_CullTransparentMesh: 1
+--- !u!114 &9215601903000794814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7811668771085897324}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  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
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_renw_db2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: 214c89e2c78332ad9b5a02fccaecc26e
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &8048350266640076490
 GameObject:
   m_ObjectHideFlags: 0
@@ -4441,7 +4624,175 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: fx_ui_renwu_wancheng_loop
+    gameObject: {fileID: 8128765917665622823}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: fx_ui_renwu_chuxian
+    gameObject: {fileID: 3269764053996185141}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: fx_ui_fengling_loop
+    gameObject: {fileID: 1284629548629742072}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
+--- !u!1001 &3138801776349823333
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 86604009502899239}
+    m_Modifications:
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 36.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7227907902282158874, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7227907902282158874, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7708796182496633298, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_renwu_wancheng_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 7708796182496633298, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8751265460450608351, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8751265460450608351, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8771004271906671140, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8771004271906671140, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+--- !u!224 &1713729240865209901 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4343475824088465224, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+  m_PrefabInstance: {fileID: 3138801776349823333}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8128765917665622823 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6575376528328145474, guid: 072f6d7b32db03146a68fdd8b847200d, type: 3}
+  m_PrefabInstance: {fileID: 3138801776349823333}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &5278104223100402329
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4552,3 +4903,293 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 2409437247996614116, guid: a7b4e0b7d50d5e34d98e74c6d3098741, type: 3}
   m_PrefabInstance: {fileID: 5278104223100402329}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5462578363888426548
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1194356122697894574}
+    m_Modifications:
+    - target: {fileID: 775948486671169824, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 775948486671169824, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2849248009424179347, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2849248009424179347, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5480339610297055522, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_fengling_loop
+      objectReference: {fileID: 0}
+    - target: {fileID: 5480339610297055522, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+--- !u!114 &1284629548629742072 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6493365826333577164, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+  m_PrefabInstance: {fileID: 5462578363888426548}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &7242877048583604540 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 3408420459168536328, guid: 633a63fc5ef1f3844bf3fdd814627de1, type: 3}
+  m_PrefabInstance: {fileID: 5462578363888426548}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &6850002921673445621
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 86604009502899239}
+    m_Modifications:
+    - target: {fileID: 507171982171638083, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Name
+      value: fx_ui_renwu_chuxian
+      objectReference: {fileID: 0}
+    - target: {fileID: 507171982171638083, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 36.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -8
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4122540452922128776, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5487483250641198662, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_RaycastTarget
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6240171663678730031, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6240171663678730031, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+--- !u!114 &3269764053996185141 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8246249556651767488, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+  m_PrefabInstance: {fileID: 6850002921673445621}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &7440752129834858667 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4058523912688003166, guid: 3917380ead000e44294d31bbde2f7932, type: 3}
+  m_PrefabInstance: {fileID: 6850002921673445621}
+  m_PrefabAsset: {fileID: 0}

+ 1 - 1
Assets/Res/UI/RewardsPanel/RewardsPanel.prefab

@@ -777,7 +777,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

+ 2 - 0
Assets/Res/UIAtlas/mainUI.spriteatlasv2

@@ -32,6 +32,8 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 19448b5e8c48ae748b181fc098a42ebd, type: 3}
     - {fileID: 2800000, guid: 4d4fd799a5a9a7d428a39eb4bbd60b15, type: 3}
     - {fileID: 2800000, guid: 57e52cb3eeb03a942a554f60db0db782, type: 3}
+    - {fileID: 2800000, guid: e331aa9696aa95442afd1c99be6ebdf1, type: 3}
+    - {fileID: 2800000, guid: 35e03d0aa90e64240913ca8c32f3e877, type: 3}
     - {fileID: 2800000, guid: f82d1b4984be31a4bbcd212e7d42374e, type: 3}
     - {fileID: 2800000, guid: 1db9d86baf4548f449f6aec203999ca0, type: 3}
     - {fileID: 2800000, guid: bfcfc5758571af94a87e12b34550e4d4, type: 3}

+ 1 - 0
Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -85,6 +85,7 @@ namespace Fort23.Core
       /// 完成事件
       /// </summary>
       CompleteEvent,
+      CompleteUpdate,
       /// <summary>
       /// 移除事件
       /// </summary>

+ 2 - 2
Assets/Scripts/Core/UI/Core/UIManager.cs

@@ -305,7 +305,7 @@ namespace Fort23.Mono
             UIPanel[] allShowPanel = GetComponentAll<UIPanel>();
             for (int i = 0; i < allShowPanel.Length; i++)
             {
-                if (allShowPanel[i].GObjectPoolInterface.activeSelf)
+                if (!allShowPanel[i].IsClose && allShowPanel[i].GObjectPoolInterface.activeSelf)
                 {
                     allShowPanel[i].GObjectPoolInterface.SetActive(false);
                     _lastShowPanel.Add(allShowPanel[i]);
@@ -1050,7 +1050,7 @@ namespace Fort23.Mono
 
             if (uiPanel.IsShowCustomBGPanel) //如果是开了背景的界面关闭的时候将背景一起关闭
             {
-                await HideUIUIPanel(GetComponent(BackgroundPanelType) as UIPanel);
+                await HideUIUIPanel(GetComponent(BackgroundPanelType) as UIPanel, UIDestroyType.NotDestroy);
             }
             // CloseTopUI();
             // OpenTopUI();

+ 3 - 1
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -1195,6 +1195,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
         onCompleteCallback?.Invoke();
         onCompleteCallback = null;
     }
@@ -1215,7 +1216,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
         LogTool.Log($"取消事件{eventList.eventID}");
         isTriggerEvent = false;
-        EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
+        EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
+        // EventManager.Instance.Dispatch(CustomEventType.CompleteEvent, null);
         CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
         onCompleteCallback?.Invoke();
         onCompleteCallback = null;

+ 2 - 0
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredWidget.cs

@@ -112,6 +112,7 @@ namespace Fort23.Mono
                 Text_Price.text = ShopItemConfig.price.ToString();
             }
 
+            Icon_Itemicon.icon_name = itemConfig.icon;
             Text_Count.text = $"x{itemConfig.associateVlaue[0]}";
             Text_Tip.text = LanguageManager.Instance.Text(10369, ShopItemConfig.buyCount - shopItem.buyCount);
         }
@@ -120,6 +121,7 @@ namespace Fort23.Mono
         {
             openType = 2;
             itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);
+            Icon_Itemicon.icon_name = itemConfig.icon;
             Text_Count.text = $"x{itemConfig.associateVlaue[0]}";
 
             Text_Tip.text =

+ 48 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanel.cs

@@ -0,0 +1,48 @@
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "PlacesChangeInfoPanel")]
+    public partial class PlacesChangeInfoPanel : UIPanel
+    {
+        private TimerEntity timerEntity;
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public override CTask<bool> AsyncInit(object[] uiData)
+        {
+            timerEntity?.Dispose();
+            timerEntity = null;
+            int placeId = int.Parse(uiData[0].ToString());
+            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(placeId);
+            Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
+            timerEntity = TimerComponent.Instance.AddTimer(1500, () => { UIManager.Instance.HideUIUIPanel(this); });
+            return base.AsyncInit(uiData);
+        }
+
+        public static async CTask<PlacesChangeInfoPanel> OpenPanel(int placeId)
+        {
+            PlacesChangeInfoPanel placesChangeInfoPanel =
+                await UIManager.Instance.LoadAndOpenPanel<PlacesChangeInfoPanel>(null, UILayer.Top,
+                    uiData: new object[] { placeId });
+            return placesChangeInfoPanel;
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CX8XvC6vBiow2DlZ7qkpoFzvgkQPle6WNWyKPHNaqI0dO74D6M9a40re29kY
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 40 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanelData.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class PlacesChangeInfoPanel 
+	{
+	  #region 自定义数据 
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Text _Text_PlacesName;
+	  public Text Text_PlacesName
+	   {
+	   get{
+	      if (_Text_PlacesName == null)
+	       {
+	         _Text_PlacesName  = GetUIUnit<Text>("Text_PlacesName"); 
+	       }
+	      return _Text_PlacesName;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesChangeInfoPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WiwXtHmuU3y984OFO76W5FHfoyxbGMrBRCE3fC3mFhis1lPbp/HZPz1x/pbu
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -215,7 +215,11 @@ namespace Fort23.Mono
                 //切换下一个地图
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID + 1);
 
+                // PlacesChangeInfoPanel.OpenPanel(smallPlacesConfig.PlacesId);
 
+                PlacesChangeInfoPanel placesChangeInfoPanel =
+                    await PlacesChangeInfoPanel.OpenPanel(smallPlacesConfig.ID + 1);
+                await placesChangeInfoPanel.UIClosed();
                 // CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 // CombatController.currActiveCombat.CombatHeroController.Flight(2, -90, 10);
                 // UIManager.Instance.SetEventSystemEnable(false);
@@ -270,6 +274,9 @@ namespace Fort23.Mono
                 await UIManager.Instance.HideUIUIPanel(this);
                 await PlayerManager.Instance.ChangeMap(smallPlacesConfig.ID);
 
+                PlacesChangeInfoPanel placesChangeInfoPanel =
+                    await PlacesChangeInfoPanel.OpenPanel(smallPlacesConfig.ID);
+                await placesChangeInfoPanel.UIClosed();
                 callBack?.Invoke(true);
                 callBack = null;
             }

+ 51 - 5
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -33,8 +33,9 @@ namespace Fort23.Mono
         {
             EventManager.Instance.AddEventListener(CustomEventType.ShengShiOnClick, ShengShiOnClick);
             EventManager.Instance.AddEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+            EventManager.Instance.AddEventListener(CustomEventType.CompleteUpdate, CompleteUpdate);
             EventManager.Instance.AddEventListener(CustomEventType.RemoveEvent, RemoveEvent);
-            EventManager.Instance.AddEventListener(CustomEventType.ChangeMap, ChangeMap);
+            EventManager.Instance.AddEventListener(CustomEventType.ChangeMap, ChangeMapEvent);
             EventManager.Instance.AddEventListener(CustomEventType.DaoYouCounUpdate, DaoYouCounUpdate);
             EventManager.Instance.AddEventListener(CustomEventType.AlterName, AlterName);
         }
@@ -85,10 +86,12 @@ namespace Fort23.Mono
             ChagneShenshiBtnActive();
         }
 
-        private void CompleteEvent(IEventData e)
+        private void CompleteUpdate(IEventData e)
         {
             ChangeMap(null);
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
+            // fx_ui_renwu_chuxian.gameObject.SetActive(true);
+            // fx_ui_renwu_chuxian.Play();
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
             Slider_SmallJD.value = PlayerManager.Instance.CurrentsmallPlaces.completionEventCount;
@@ -100,6 +103,15 @@ namespace Fort23.Mono
             {
                 AudioManager.Instance.PlayAudio("ui_jinduwancheng");
             }
+
+            PlayEventCompletedEfx();
+        }
+
+        private void CompleteEvent(IEventData e)
+        {
+            PlayEventCompletedEfx();
+            fx_ui_renwu_chuxian.gameObject.SetActive(true);
+            fx_ui_renwu_chuxian.Play();
         }
 
         public void UpdateDaoYouCoun()
@@ -130,9 +142,10 @@ namespace Fort23.Mono
         protected override void DelEvent()
         {
             EventManager.Instance.RemoveEventListener(CustomEventType.CompleteEvent, CompleteEvent);
+            EventManager.Instance.RemoveEventListener(CustomEventType.CompleteUpdate, CompleteUpdate);
             EventManager.Instance.RemoveEventListener(CustomEventType.RemoveEvent, RemoveEvent);
             EventManager.Instance.RemoveEventListener(CustomEventType.ShengShiOnClick, ShengShiOnClick);
-            EventManager.Instance.RemoveEventListener(CustomEventType.ChangeMap, ChangeMap);
+            EventManager.Instance.RemoveEventListener(CustomEventType.ChangeMap, ChangeMapEvent);
             EventManager.Instance.RemoveEventListener(CustomEventType.DaoYouCounUpdate, DaoYouCounUpdate);
         }
 
@@ -166,7 +179,7 @@ namespace Fort23.Mono
             // Btn_Tower.onClick.AddListener(() => { TowerPanel.OpenPanel(1); });
             Btn_QianKunDai.onClick.AddListener(() => { QiankundaiPanel.OpenPanel(); });
 
-            Btn_StartEvent.onClick.AddListener(() =>
+            Btn_StartEvent.onClick.AddListener(async () =>
             {
                 if (PlayerGuideManager.Instance.curPhase == 3)
                 {
@@ -201,7 +214,7 @@ namespace Fort23.Mono
                     if (eventList.isCompleted)
                         return;
 
-                    EventSystemManager.Instance.TriggerEvent(eventList);
+                    await EventSystemManager.Instance.TriggerEvent(eventList);
                 }
             });
 
@@ -291,15 +304,48 @@ namespace Fort23.Mono
                 widgets.Add(energyWidget);
             }
 
+
+            PlayEventCompletedEfx();
+
             // UpdateTaskInfo();
         }
 
+        private void PlayEventCompletedEfx()
+        {
+            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.eventList.FirstOrDefault(e =>
+                e.guid == AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId);
+            if (eventList != null)
+            {
+                var eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                if (eventConfig.EventTriggerType == 4)
+                {
+                    if (eventList.isCompleted1)
+                    {
+                        fx_ui_renwu_wancheng_loop.gameObject.SetActive(true);
+                        fx_ui_renwu_wancheng_loop.Play();
+                    }
+                }
+            }
+        }
+
 
         private void AlterName(IEventData e)
         {
             Text_PlayerName.text = PlayerManager.Instance.PlayerName;
         }
 
+        public async void ChangeMapEvent(IEventData e)
+        {
+            ChangeMap(e);
+            // SmallPlacesConfig smallPlacesConfig =
+            //     ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+            //
+            // PlacesConfig placesConfig =
+            //     ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
+            // await TimerComponent.Instance.WaitAsync(500);
+            // PlacesChangeInfoPanel.OpenPanel(smallPlacesConfig.PlacesId);
+        }
+
         public void ChangeMap(IEventData e)
         {
             SmallPlacesConfig smallPlacesConfig =

+ 35 - 0
Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -3,6 +3,8 @@ using Fort23.UTool;
 using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
+using Coffee.UIExtensions;
+
 namespace Fort23.Mono
 {
 	public partial class MainPanel 
@@ -294,6 +296,39 @@ namespace Fort23.Mono
 	      return _Btn_PlayerName;
 	     }
 	   }
+	  private UIParticle _fx_ui_renwu_wancheng_loop;
+	  public UIParticle fx_ui_renwu_wancheng_loop
+	   {
+	   get{
+	      if (_fx_ui_renwu_wancheng_loop == null)
+	       {
+	         _fx_ui_renwu_wancheng_loop  = GetUIUnit<UIParticle>("fx_ui_renwu_wancheng_loop"); 
+	       }
+	      return _fx_ui_renwu_wancheng_loop;
+	     }
+	   }
+	  private UIParticle _fx_ui_renwu_chuxian;
+	  public UIParticle fx_ui_renwu_chuxian
+	   {
+	   get{
+	      if (_fx_ui_renwu_chuxian == null)
+	       {
+	         _fx_ui_renwu_chuxian  = GetUIUnit<UIParticle>("fx_ui_renwu_chuxian"); 
+	       }
+	      return _fx_ui_renwu_chuxian;
+	     }
+	   }
+	  private UIParticle _fx_ui_fengling_loop;
+	  public UIParticle fx_ui_fengling_loop
+	   {
+	   get{
+	      if (_fx_ui_fengling_loop == null)
+	       {
+	         _fx_ui_fengling_loop  = GetUIUnit<UIParticle>("fx_ui_fengling_loop"); 
+	       }
+	      return _fx_ui_fengling_loop;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Maps.xlsx


File diff suppressed because it is too large
+ 0 - 0
UGUIPack/uguiconfig.db


Some files were not shown because too many files changed in this diff