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

# Conflicts:
#	Excel2Json/Excel/Maps.xlsx   resolved by origin/master(远端) version

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

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

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

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

Assets/Res/Config/SmallPlacesConfig.json

@@ -34,7 +34,7 @@
       "ID": 4,
       "placeName": 10040,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10040",
       "PlacesId": 1,
       "CompletionEventCount": 8,
       "UnlockEnvetid": 0,
@@ -44,7 +44,7 @@
       "ID": 5,
       "placeName": 10041,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10041",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -54,7 +54,7 @@
       "ID": 6,
       "placeName": 10042,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10042",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -64,7 +64,7 @@
       "ID": 7,
       "placeName": 10043,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10043",
       "PlacesId": 2,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -74,7 +74,7 @@
       "ID": 8,
       "placeName": 10044,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10044",
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -84,7 +84,7 @@
       "ID": 9,
       "placeName": 10045,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10045",
       "PlacesId": 3,
       "CompletionEventCount": 10,
       "UnlockEnvetid": 0,
@@ -94,7 +94,7 @@
       "ID": 10,
       "placeName": 10046,
       "placeDesc": 0,
-      "placeIcon": "bg_map_xdd_fudao",
+      "placeIcon": "bg_10046",
       "PlacesId": 3,
       "CompletionEventCount": -1,
       "UnlockEnvetid": 0,

Assets/Res/UI/AppBarPanel/TitlePanel.prefab

@@ -72,7 +72,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: -193.1, y: 21.954}
+  m_AnchoredPosition: {x: -193.1, y: 20}
   m_SizeDelta: {x: 220.1661, y: 50.1693}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8974566408459148074
@@ -402,7 +402,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -15.9, y: 41.2}
+  m_AnchoredPosition: {x: -15.900024, y: 41.199997}
   m_SizeDelta: {x: 0, y: 56}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &7928542766183595868
@@ -648,7 +648,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: 750, y: 1624}
+  m_SizeDelta: {x: 1500, y: 3248}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7203008914783957009
 CanvasRenderer:

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -2246,7 +2246,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.000061035156}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3925115245566125737
@@ -3035,7 +3035,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0
@@ -3202,10 +3202,10 @@ RectTransform:
   - {fileID: 3975152748973005260}
   m_Father: {fileID: 3275273584098972649}
   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: 184, y: -495.5}
-  m_SizeDelta: {x: 379.7488, y: 61.396}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: -191, y: 316.5}
+  m_SizeDelta: {x: 379.74878, y: 61.395996}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2253655063094105127
 CanvasRenderer:
@@ -3291,11 +3291,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3275273584098972649}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7774198419232979247
 CanvasRenderer:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/CaveMainPanel.prefab

@@ -513,6 +513,95 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   id: 10223
+--- !u!1 &2982119556634525415
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7635835174510739831}
+  - component: {fileID: 4149286377509563690}
+  - component: {fileID: 3174834520961549602}
+  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 &7635835174510739831
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2982119556634525415}
+  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, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4149286377509563690
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2982119556634525415}
+  m_CullTransparentMesh: 1
+--- !u!114 &3174834520961549602
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2982119556634525415}
+  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, g: 0, b: 0, 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_juxing_fang
+  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: 6f525d051e27c33e0699a302ce6a4b3d
+  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 &3427245093439295002
 GameObject:
   m_ObjectHideFlags: 0
@@ -748,7 +837,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0022888184, y: 0}
+  m_AnchoredPosition: {x: 0.002319336, y: 0}
   m_SizeDelta: {x: 2205.539, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8994874510214016950
@@ -781,6 +870,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7635835174510739831}
   - {fileID: 4438962577033244578}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -6387,13 +6387,25 @@ PrefabInstance:
       propertyPath: m_SortingLayer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 431064081871231763, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 431064081871231763, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 431064081871231763, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 195
+      objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0.5
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
@@ -6401,7 +6413,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
@@ -6411,6 +6423,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 1624
       objectReference: {fileID: 0}
+    - target: {fileID: 795566806128681732, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 195
+      objectReference: {fileID: 0}
     - target: {fileID: 1168641042236661909, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
@@ -6465,7 +6481,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
@@ -6473,7 +6489,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
@@ -6483,6 +6499,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 2850
       objectReference: {fileID: 0}
+    - target: {fileID: 2192126879010274111, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 170
+      objectReference: {fileID: 0}
     - target: {fileID: 2733326372389011073, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -6585,7 +6605,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.x
@@ -6593,7 +6613,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SizeDelta.x
@@ -6603,6 +6623,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 2850
       objectReference: {fileID: 0}
+    - target: {fileID: 8012369844007230167, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 178
+      objectReference: {fileID: 0}
     - target: {fileID: 8032426126026463688, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5

Assets/Res/UI/LevelChoosePanel/Places/PengLaiDaoPlacesPanel.prefab

@@ -31,6 +31,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 8577276363370351875}
   - {fileID: 5795167107488113912}
   - {fileID: 642166502082881739}
   - {fileID: 7275756716955270112}
@@ -120,9 +121,9 @@ 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_AnchoredPosition: {x: 0, y: -812}
   m_SizeDelta: {x: 750, y: 1624}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5874766811546312704
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -174,6 +175,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6327424094990172026
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8577276363370351875}
+  - component: {fileID: 5826178889770156698}
+  - component: {fileID: 4702132385557477891}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8577276363370351875
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6327424094990172026}
+  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: 7590336990808084973}
+  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!222 &5826178889770156698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6327424094990172026}
+  m_CullTransparentMesh: 1
+--- !u!114 &4702132385557477891
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6327424094990172026}
+  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: 6a2ee0bf33b19d445a58350dfcd4c21d, 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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  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!1001 &873875294402921142
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -244,11 +334,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 155
+      value: -49
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -457
+      value: 626
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -262,10 +352,42 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1667248125055319908, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2429166920704539017, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 67
+      objectReference: {fileID: 0}
+    - target: {fileID: 2429166920704539017, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 80.133
+      objectReference: {fileID: 0}
+    - target: {fileID: 2782272256760292644, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Text
+      value: "\u5317\u6D77"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Color.a
+      value: 0.003921569
+      objectReference: {fileID: 0}
+    - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6200425982828528602, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Name
       value: pllaces_1
       objectReference: {fileID: 0}
+    - target: {fileID: 6488691639410434499, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -1.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 6488691639410434499, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 99.5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -466,11 +588,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 158
+      value: -110
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 273
+      value: -577
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -484,14 +606,46 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1667248125055319908, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2429166920704539017, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 49
+      objectReference: {fileID: 0}
+    - target: {fileID: 2429166920704539017, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 216
+      objectReference: {fileID: 0}
+    - target: {fileID: 2782272256760292644, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Text
+      value: "\u85D0\u59D1\u5C04\u5C71"
+      objectReference: {fileID: 0}
     - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: imageH
       value: 149.7444
       objectReference: {fileID: 0}
+    - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Color.a
+      value: 0.003921569
+      objectReference: {fileID: 0}
+    - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6200425982828528602, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Name
       value: pllaces_3
       objectReference: {fileID: 0}
+    - target: {fileID: 6488691639410434499, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 6.9
+      objectReference: {fileID: 0}
+    - target: {fileID: 6488691639410434499, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 182
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -577,11 +731,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -159
+      value: 90
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -114
+      value: -21
       objectReference: {fileID: 0}
     - target: {fileID: 345035524616907389, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -597,15 +751,47 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2429166920704539017, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -159
+      value: 53
+      objectReference: {fileID: 0}
+    - target: {fileID: 2429166920704539017, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 239
+      objectReference: {fileID: 0}
+    - target: {fileID: 2782272256760292644, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Text
+      value: "\u5C27\u90FD"
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697852115885395126, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 253.6896
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697852115885395126, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 220.3246
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697852115885395126, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 21
+      objectReference: {fileID: 0}
+    - target: {fileID: 3697852115885395126, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: imageH
       value: 149.7444
       objectReference: {fileID: 0}
+    - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Color.a
+      value: 0.003921569
+      objectReference: {fileID: 0}
+    - target: {fileID: 5214990695545658385, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_SizeDelta.x
-      value: -175.6729
+      value: -233.4448
       objectReference: {fileID: 0}
     - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_SizeDelta.y
@@ -613,16 +799,24 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0.548996
+      value: 0.54901123
       objectReference: {fileID: 0}
     - target: {fileID: 5226224395191220938, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 1.0979004
+      value: -1.2442017
       objectReference: {fileID: 0}
     - target: {fileID: 6200425982828528602, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
       propertyPath: m_Name
       value: pllaces_2
       objectReference: {fileID: 0}
+    - target: {fileID: 6488691639410434499, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 15.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6488691639410434499, guid: b8df6768cacc8c443a4a60070bb81be9, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 157.3
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/LevelChoosePanel/Places/地图.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CSsd4H+tAS3Q7HPjhde13RnagSF15EnlvZrkF8CSfSDi2ISId2oOZR1zhsTv
+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: 
+  assetBundleVariant: 

Assets/Res/UI/LevelChoosePanel/PlacesWidget.prefab

@@ -54,7 +54,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1667248125055319908}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -144,7 +144,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 67.7, y: -44.7}
-  m_SizeDelta: {x: 42.661, y: 42.661}
+  m_SizeDelta: {x: 74, y: 96}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6650662536028993560
 CanvasRenderer:
@@ -261,8 +261,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 67.5, y: 201.7}
-  m_SizeDelta: {x: 228.8132, y: 48.9831}
+  m_AnchoredPosition: {x: 62, y: 262.45056}
+  m_SizeDelta: {x: 304.2637, y: 80.1326}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &2933906186252051803
 CanvasRenderer:
@@ -285,7 +285,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.20000002, g: 0.18431373, b: 0.15294118, a: 1}
+  m_Color: {r: 0.3137255, g: 0.47450984, b: 0.41960788, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -398,8 +398,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: -3.1065369, y: 1.9915314}
-  m_SizeDelta: {x: -168.8082, y: 160.64761}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -240.9054, y: 182.4444}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3969516470942122061
 CanvasRenderer:
@@ -422,7 +422,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.65882355, g: 0.6627451, b: 0.6666667, a: 1}
+  m_Color: {r: 0.8588236, g: 0.90196085, b: 0.8862746, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -431,7 +431,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 42
+    m_FontSize: 46
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0

Assets/Res/UI/ShopPanel/EnergyWidget.prefab

@@ -201,9 +201,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40

Assets/Res/UI/XianTuLogPanel/XianTuLogPanel.prefab

@@ -187,9 +187,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
   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_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -812}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4642743923766498100
@@ -263,11 +263,10 @@ RectTransform:
   - {fileID: 5545518394005214355}
   - {fileID: 650471420867651992}
   - {fileID: 930165116866783181}
-  - {fileID: 6352458157530052881}
   - {fileID: 4739378095024639026}
+  - {fileID: 6352458157530052881}
   - {fileID: 9037408276187403176}
   - {fileID: 4230966754887618893}
-  - {fileID: 438881006348347736}
   - {fileID: 2738520516351410424}
   - {fileID: 6795257728327854590}
   - {fileID: 1014077760537991407}
@@ -403,7 +402,7 @@ GameObject:
   - component: {fileID: 5663735608059393018}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (3)
+  m_Name: tt
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -423,11 +422,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.0012817, y: -386}
-  m_SizeDelta: {x: 750, y: 1238}
-  m_Pivot: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -177.38635}
+  m_SizeDelta: {x: 0, y: -354.7727}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1467102737304571141
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -739,7 +738,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 438881006348347736}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
@@ -1261,11 +1261,11 @@ RectTransform:
   m_Children:
   - {fileID: 4389887259738624222}
   - {fileID: 3717419306532235287}
-  m_Father: {fileID: 8599819629026832582}
+  m_Father: {fileID: 6352458157530052881}
   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.0012741, y: 465.6}
+  m_AnchoredPosition: {x: 0, y: 0.4975891}
   m_SizeDelta: {x: 750, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2409805748406759842
@@ -2607,7 +2607,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.0012817, y: 41.2}
+  m_AnchoredPosition: {x: -0.0012817, y: 41.19995}
   m_SizeDelta: {x: 750, y: 349}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &8097696157492160637

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -183,19 +183,18 @@ namespace Fort23.Mono
             }
             else
             {
-               EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
-               if (eventNpc.isNpc)
-               {
-                   DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
-                   PLayerNameRoot.SetActive(true);
-            
-                   Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
-               }
-               else
-               {
-                   PLayerNameRoot.SetActive(false);
-               }
-           
+                EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
+                if (eventNpc.isNpc)
+                {
+                    DialgueType1.GetComponent<CustomStateController>().ChangeState(1);
+                    PLayerNameRoot.SetActive(true);
+
+                    Text_Name2.text = LanguageManager.Instance.Text(eventNpc.name);
+                }
+                else
+                {
+                    PLayerNameRoot.SetActive(false);
+                }
             }
 
 
@@ -233,7 +232,7 @@ namespace Fort23.Mono
         {
             if (isOver)
                 return;
-            icon.gameObject.SetActive(false);
+
             icon.onSpriteAlter = () =>
             {
                 icon.SetNativeSize();
@@ -241,14 +240,16 @@ namespace Fort23.Mono
             };
             if (eventConditionConfig.NPCID != 100 && eventConditionConfig.NPCID != 0)
             {
+                icon.gameObject.SetActive(false);
                 EventNPC eventNpc = ConfigComponent.Instance.Get<EventNPC>(eventConditionConfig.NPCID);
 
-           
+
                 icon.icon_name = eventNpc.icon;
             }
             else
             {
-                icon.icon_name = "bg_lh_di1";
+                icon.gameObject.SetActive(true);
+                // icon.icon_name = "bg_lh_di1";
             }
 
             if (eventConditionConfig.EventID == 10000)

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

@@ -156,7 +156,7 @@ namespace Fort23.Mono
             currentSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
 
             Btn_Qianwang.gameObject.SetActive(PlayerManager.Instance.CurrentsmallPlaces.id != smallPlacesConfig.ID);
-            Icon_DIdian.gameObject.SetActive(PlayerManager.Instance.CurrentsmallPlaces.id != smallPlacesConfig.ID);
+            Icon_DIdian.gameObject.SetActive(PlayerManager.Instance.CurrentsmallPlaces.id == smallPlacesConfig.ID);
 
             Icon_Places.icon_name = smallPlacesConfig.placeIcon;
 
@@ -186,7 +186,13 @@ namespace Fort23.Mono
         {
             SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(id);
 
-
+            AccountFileInfo.SmallPlacesData currentSmallPlacesData =
+                PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID-1);
+            if (currentSmallPlacesData == null)
+            {
+                return LanguageManager.Instance.Text(10377);
+            }
+            
             AccountFileInfo.SmallPlacesData lastSmallPlacesData =
                 PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
             SmallPlacesConfig lastSmallPlacesConfig =
@@ -211,12 +217,7 @@ namespace Fort23.Mono
                 }
             }
 
-            AccountFileInfo.SmallPlacesData currentSmallPlacesData =
-                PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
-            if (currentSmallPlacesData == null)
-            {
-                return LanguageManager.Instance.Text(10377);
-            }
+         
 
             return "";
         }

UserSettings/EditorUserSettings.asset

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