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

Assets/Res/CombatScenes/CombatRoot.prefab

@@ -335,7 +335,7 @@ AudioListener:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8735217549368148119}
-  m_Enabled: 1
+  m_Enabled: 0
 --- !u!114 &231374772603165284
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Res/Config/HeroModelConfig.json

@@ -977,7 +977,7 @@
         -1
       ],
       "fabaoActiveLv": [
-        1,
+        30,
         -1,
         1,
         -1

Assets/Res/Config/OpenBoxConfig.json

@@ -5,8 +5,8 @@
       "CostItemID": 1007,
       "oneConsume": 1,
       "oneConsumeFreePara": [
-        300,
-        10
+        10,
+        300
       ],
       "oneConsumeChargePara": [
         0,
@@ -14,25 +14,26 @@
       ],
       "tenConsume": 1,
       "oneConsumeFreePara_1": [
-        0,
-        1
+        10,
+        300
       ],
       "oneConsumeChargePara_1": [
         0,
         5000
       ],
+      "rewardType": 1,
       "reward": 999004,
       "reward1": 999005,
       "reward2": 999006,
-      "reward2para1": 100
+      "reward2para1": -1
     },
     {
       "ID": 2,
       "CostItemID": 1002,
       "oneConsume": 300,
       "oneConsumeFreePara": [
-        0,
-        1
+        10,
+        300
       ],
       "oneConsumeChargePara": [
         0,
@@ -40,16 +41,17 @@
       ],
       "tenConsume": 2700,
       "oneConsumeFreePara_1": [
-        0,
-        0
+        10,
+        300
       ],
       "oneConsumeChargePara_1": [
         0,
         5000
       ],
-      "reward": 999004,
-      "reward1": 999005,
-      "reward2": 999006,
+      "rewardType": 2,
+      "reward": 101,
+      "reward1": 102,
+      "reward2": 103,
       "reward2para1": 100
     }
   ]

Assets/Res/Config/SmallPlacesConfig.json

@@ -3,46 +3,64 @@
     {
       "ID": 1,
       "placeName": 0,
+      "PlacesId": 1,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 2,
       "placeName": 0,
+      "PlacesId": 1,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 3,
       "placeName": 0,
+      "PlacesId": 1,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 4,
       "placeName": 0,
+      "PlacesId": 2,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 5,
       "placeName": 0,
+      "PlacesId": 2,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 6,
       "placeName": 0,
+      "PlacesId": 2,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 7,
       "placeName": 0,
+      "PlacesId": 3,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 8,
       "placeName": 0,
+      "PlacesId": 3,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     },
     {
       "ID": 9,
       "placeName": 0,
+      "PlacesId": 3,
+      "CompletionEventCount": 5,
       "UnlockEnvetid": 0
     }
   ]

Assets/Res/UI/BattleSettlementPanel.prefab

@@ -1794,7 +1794,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0.69803923}
+  m_Color: {r: 0.05660379, g: 0.05660379, b: 0.05660379, a: 0.007843138}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1

Assets/Res/UI/HeroInformainPanel/DaoYouInvitePanel.prefab

@@ -499,7 +499,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3329502686765928556
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughFailPanel.prefab

@@ -84,6 +84,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 149
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -263,7 +264,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8212670971040085124
 RectTransform:
   m_ObjectHideFlags: 0
@@ -449,6 +450,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -2792,7 +2792,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8212670971040085124
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughSuccessPanel.prefab

@@ -84,6 +84,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 189
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -249,6 +250,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 32
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -365,6 +367,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 200
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -529,7 +532,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8212670971040085124
 RectTransform:
   m_ObjectHideFlags: 0
@@ -715,6 +718,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -804,6 +808,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1101,6 +1106,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
     packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
     lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Res/UI/LevelChoosePanel/PlacesInfoPanel.prefab

@@ -133,7 +133,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: -11.5489, y: -241.1}
+  m_AnchoredPosition: {x: -11.5489, y: -305.1}
   m_SizeDelta: {x: 451.1251, y: 34.2721}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7336380052441854382
@@ -529,6 +529,205 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!1 &4638185721033320038
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4925105276589191232}
+  - component: {fileID: 3262226892665346059}
+  - component: {fileID: 2716981368053276398}
+  - component: {fileID: 4286730454088178374}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4925105276589191232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4638185721033320038}
+  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: 8688761776621079411}
+  m_Father: {fileID: 116889275732161449}
+  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, y: 1}
+--- !u!222 &3262226892665346059
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4638185721033320038}
+  m_CullTransparentMesh: 1
+--- !u!114 &2716981368053276398
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4638185721033320038}
+  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: 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: 10917, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &4286730454088178374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4638185721033320038}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &4981839340645751319
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 116889275732161449}
+  - component: {fileID: 1408737160681650111}
+  - component: {fileID: 2812476212785340228}
+  - component: {fileID: 1693484268893770808}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &116889275732161449
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4981839340645751319}
+  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: 4925105276589191232}
+  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: -1.3, y: 111.24746}
+  m_SizeDelta: {x: 493.6785, y: 74.059}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1408737160681650111
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4981839340645751319}
+  m_CullTransparentMesh: 1
+--- !u!114 &2812476212785340228
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4981839340645751319}
+  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.392}
+  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: 10907, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &1693484268893770808
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4981839340645751319}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 8688761776621079411}
+  m_Horizontal: 1
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 4925105276589191232}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5188785653245930354
 GameObject:
   m_ObjectHideFlags: 0
@@ -609,6 +808,103 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6545\u4E8B"
+--- !u!1 &5454807471879841032
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8688761776621079411}
+  - component: {fileID: 8497111536695238727}
+  - component: {fileID: 3754465717368421511}
+  - component: {fileID: 7868410861331927910}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8688761776621079411
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454807471879841032}
+  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: 4925105276589191232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &8497111536695238727
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454807471879841032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 1
+    m_Right: 0
+    m_Top: 1
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 4.17
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &3754465717368421511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454807471879841032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!114 &7868410861331927910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5454807471879841032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: eb5ebcd40411455c96935cb00dbfcf1e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lastSelectObj: {fileID: 0}
+  isRepeatHind: 0
+  isRDefaultShow: 0
+  index: -1
+  childObj: []
+  _allChildObj: []
 --- !u!1 &5936847983662490449
 GameObject:
   m_ObjectHideFlags: 0
@@ -628,7 +924,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7354664618027818273
 RectTransform:
   m_ObjectHideFlags: 0
@@ -763,6 +1059,7 @@ RectTransform:
   m_Children:
   - {fileID: 5996218483595023549}
   - {fileID: 3448986095428033778}
+  - {fileID: 116889275732161449}
   - {fileID: 6578784403621460593}
   - {fileID: 3035646753122329493}
   - {fileID: 7892632760807934045}
@@ -861,7 +1158,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 267.3, y: -293}
+  m_AnchoredPosition: {x: 267.3, y: -357}
   m_SizeDelta: {x: 428.11, y: 220.5094}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6166222951810868570
@@ -1365,6 +1662,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Content
+    gameObject: {fileID: 8688761776621079411}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: toggleList
+    gameObject: {fileID: 7868410861331927910}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9018767446768610637
 GameObject:

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -457,6 +457,95 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1596755864837973714
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5085692056603096109}
+  - component: {fileID: 2784892672222206417}
+  - component: {fileID: 3410375753001444849}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5085692056603096109
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1596755864837973714}
+  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: 7903220756377678726}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2784892672222206417
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1596755864837973714}
+  m_CullTransparentMesh: 1
+--- !u!114 &3410375753001444849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1596755864837973714}
+  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.68235296, g: 0.8078432, b: 0.8000001, 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_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: de4a477140878ce911aa37d161cbf014
+  imageH: 20.902199
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1603581646805343573
 GameObject:
   m_ObjectHideFlags: 0
@@ -943,6 +1032,95 @@ RectTransform:
   m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &2160792378449170315
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5033065218055982205}
+  - component: {fileID: 4464259768520234361}
+  - component: {fileID: 7324433092258490021}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5033065218055982205
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2160792378449170315}
+  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: 2730559256035634015}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.25}
+  m_AnchorMax: {x: 1, y: 0.75}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4464259768520234361
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2160792378449170315}
+  m_CullTransparentMesh: 1
+--- !u!114 &7324433092258490021
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2160792378449170315}
+  m_Enabled: 0
+  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: 
+  isNotLoadDeftIcon: 1
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: de4a477140878ce911aa37d161cbf014
+  imageH: 20.902199
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2484980549804746481
 GameObject:
   m_ObjectHideFlags: 0
@@ -1178,6 +1356,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2730559256035634015}
   - {fileID: 6506910486868409184}
   m_Father: {fileID: 6895274337125899519}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1543,6 +1722,117 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0.28527856, g: 1, b: 0, a: 1}
   direction: 1
+--- !u!1 &3287106839797508778
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2730559256035634015}
+  - component: {fileID: 4780618238888509038}
+  - component: {fileID: 8673248979319081615}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Slider_SmallJD
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2730559256035634015
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3287106839797508778}
+  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: 5033065218055982205}
+  - {fileID: 7903220756377678726}
+  m_Father: {fileID: 6508395234197773420}
+  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!114 &4780618238888509038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3287106839797508778}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, 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: 0}
+  m_FillRect: {fileID: 5085692056603096109}
+  m_HandleRect: {fileID: 0}
+  m_Direction: 0
+  m_MinValue: 0
+  m_MaxValue: 1
+  m_WholeNumbers: 0
+  m_Value: 1
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8673248979319081615
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3287106839797508778}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &3348075033185530517
 GameObject:
   m_ObjectHideFlags: 0
@@ -2056,6 +2346,43 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5606936299874180742
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7903220756377678726}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Fill Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7903220756377678726
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5606936299874180742}
+  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: 5085692056603096109}
+  m_Father: {fileID: 2730559256035634015}
+  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!1 &5678225597687261677
 GameObject:
   m_ObjectHideFlags: 0
@@ -4094,4 +4421,9 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Slider_SmallJD
+    gameObject: {fileID: 4780618238888509038}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0

Assets/Res/UI/ShopPanel/ShopBtnWidget.prefab

@@ -208,6 +208,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: uiToggle
+    gameObject: {fileID: 4461412605857524956}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &3624944491826870057
 GameObject:

Assets/Res/UI/XianTuLogPanel/EventLogInfoWidget.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 252.36674, y: -63.5}
+  m_AnchoredPosition: {x: 252.36674, y: -45}
   m_SizeDelta: {x: 334.7335, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8146511189872025584

Assets/Res/UI/XianTuLogPanel/EventLogMessageWidget.prefab

@@ -144,7 +144,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 373.62665, y: -43}
+  m_AnchoredPosition: {x: 373.62665, y: -0}
   m_SizeDelta: {x: 635.2533, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1334102890352701418

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -144,6 +144,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///属于哪张小地图
+		/// </summary>
+#if !COMBAT_SERVER
+		public int SmallPlacesId;
+#else
+		public int SmallPlacesId{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///仙途日志ID
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs

@@ -94,6 +94,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///1=掉落组 2=DropList
+		/// </summary>
+#if !COMBAT_SERVER
+		public int rewardType;
+#else
+		public int rewardType{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///基础池子
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -34,6 +34,26 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///属于哪个大地点
+		/// </summary>
+#if !COMBAT_SERVER
+		public int PlacesId;
+#else
+		public int PlacesId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///完成事件数量
+		/// </summary>
+#if !COMBAT_SERVER
+		public int CompletionEventCount;
+#else
+		public int CompletionEventCount{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///解锁当前地点事件Id
 		/// </summary>

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -80,6 +80,9 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         //地图区域数据
         public List<PlacesData> placesDatas = new List<PlacesData>();
 
+        //小地图数据
+        public List<SmallPlacesData> smallPlacesDatas = new List<SmallPlacesData>();
+
         /// <summary>
         /// 商店数据
         /// </summary>
@@ -97,16 +100,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public List<FaBaoData> AllFaBaoDatas = new List<FaBaoData>();
 
 
-        // /// <summary>
-        // /// 事件链数据
-        // /// </summary>
-        // public List<EventLinkData> eventLinkDatas = new List<EventLinkData>();
-
-        // /// <summary>
-        // /// 
-        // /// </summary>
-        // public List<EventConditionData> eventConditionDatas = new List<EventConditionData>();
-
         /// <summary>
         /// 完成的事件
         /// </summary>
@@ -145,6 +138,9 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         public long ExitTime;
         public bool boxFree;
+
+        public bool isTiggerPlot;
+
     }
 
 
@@ -294,6 +290,17 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public int progress;
     }
 
+    /// <summary>
+    /// 小地图数据
+    /// </summary>
+   [System.Serializable]
+    public class SmallPlacesData
+    {
+        public int id;
+
+        public int completionEventCount;
+    }
+
 
     /// <summary>
     /// 商店数据
@@ -706,6 +713,10 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         placesData.id = 1;
         playerData.placesDatas.Add(placesData);
 
+        SmallPlacesData smallPlacesData = new SmallPlacesData();
+        smallPlacesData.id = 1;
+        playerData.smallPlacesDatas.Add(smallPlacesData);
+
         SavePlayerData();
     }
 

Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -37,15 +37,15 @@ public class PlayerManager : Singleton<PlayerManager>
     public HeroInfo myHero;
 
     public long serverTime => TimeHelper.ServerNow();
-    private AccountFileInfo.PlacesData currentPlaces;
+    private AccountFileInfo.SmallPlacesData currentPlaces;
 
-    public AccountFileInfo.PlacesData CurrentPlaces
+    public AccountFileInfo.SmallPlacesData CurrentsmallPlaces
     {
         get { return currentPlaces; }
         set { currentPlaces = value; }
     }
 
-    public float PlacesBl => GetMapBl(CurrentPlaces.id);
+    public float PlacesBl => GetMapBl(CurrentsmallPlaces.id);
 
     private TimerEntity _timerEntity;
 
@@ -286,7 +286,7 @@ public class PlayerManager : Singleton<PlayerManager>
         BagController.Init();
 
         //初始化关卡
-        CurrentPlaces = GetPlacesData(GetMaxPlacesId());
+        CurrentsmallPlaces = GetSmallPlacesData(GetMaxSmallPlacesId());
 
         StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
@@ -294,9 +294,9 @@ public class PlayerManager : Singleton<PlayerManager>
 
     private float timer;
 
-    public int GetMaxPlacesId()
+    public int GetMaxSmallPlacesId()
     {
-        int placesId = AccountFileInfo.Instance.playerData.placesDatas.Max(p => p.id);
+        int placesId = AccountFileInfo.Instance.playerData.smallPlacesDatas.Max(p => p.id);
         return placesId;
     }
 
@@ -305,12 +305,18 @@ public class PlayerManager : Singleton<PlayerManager>
         return AccountFileInfo.Instance.playerData.placesDatas.FirstOrDefault(p => p.id == placesId);
     }
 
+    public AccountFileInfo.SmallPlacesData GetSmallPlacesData(int smallPlacesId)
+    {
+        return AccountFileInfo.Instance.playerData.smallPlacesDatas.FirstOrDefault(p => p.id == smallPlacesId);
+    }
+
     public float GetMapBl(int map)
     {
-        AccountFileInfo.PlacesData placesData = GetPlacesData(map);
+        SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(map);
+        AccountFileInfo.PlacesData placesData = GetPlacesData(smallPlacesConfig.PlacesId);
         if (placesData == null)
             return 0;
-        PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(map);
+        PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
         if (placesConfig.TotalScore == 0)
         {
             return 0;

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -255,10 +255,14 @@ public class DialogueManager : Singleton<DialogueManager>
                 await OpenRewardsPanel(eventConfig.ID, itemInfos);
                 LogTool.Log("对话结束，获得奖励");
                 break;
-            // //扣除道具
-            // case 4:
-            //     PlayerManager.Instance.BagController.DeductItem(dialogueConfig.ConditionPara[0], dialogueConfig.finishCount);
-            //     break;
+            //扣除道具
+            case 4:
+                for (var i = 0; i < dialogueConfig.optionPara1.Length; i++)
+                {
+                    PlayerManager.Instance.BagController.DeductItem(dialogueConfig.optionPara1[i], dialogueConfig.optionPara2[i]);
+                }
+
+                break;
 
             //关闭任务
             case 5:

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -283,7 +283,10 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     private List<AccountFileInfo.EventList> DetectEvents(int eventCount, List<ItemInfo> useItems)
     {
-        PlacesConfig bigMap = ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
+        
+        
+        SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+        PlacesConfig bigMap = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
 
 
@@ -603,10 +606,29 @@ public class EventSystemManager : Singleton<EventSystemManager>
         // ChancleEvent();
         if (isTriggerEvent)
             return;
+        EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(evt.eventID);
+        SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+        if (eventConfig.SmallPlacesId > 0)
+        {
+            if (eventConfig.SmallPlacesId != PlayerManager.Instance.CurrentsmallPlaces.id)
+            {
+                TipMessagePanel.OpenTipMessagePanel("需要到对应位置触发");
+                return;
+            }
+        }
+        else if (eventConfig.placeID > 0)
+        {
+            if (eventConfig.placeID != smallPlacesConfig.PlacesId)
+            {
+                TipMessagePanel.OpenTipMessagePanel("需要到对应位置触发");
+                return;
+            }
+        }
+
         CTask cTask = CTask.Create();
         this.onCompleteCallback = oncompleteCallBack;
         isTriggerEvent = true;
-        EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(evt.eventID);
+
         LogTool.Log($"触发事件: {LanguageManager.Instance.Text(eventConfig.EventName)} (ID: {eventConfig.ID}, 品质: {eventConfig.EventQuality})");
 
         int dialogueID = 0;
@@ -857,8 +879,12 @@ public class EventSystemManager : Singleton<EventSystemManager>
         eventList.eventID = evtId;
         AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
 
-        if (PlayerManager.Instance.CurrentPlaces.progress < 100)
-            PlayerManager.Instance.CurrentPlaces.progress += eventConfig.Score;
+        PlayerManager.Instance.CurrentsmallPlaces.completionEventCount++;
+        SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+        AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
+
+        if (placesData.progress < 100)
+            placesData.progress += eventConfig.Score;
 
 
         AccountFileInfo.Instance.SavePlayerData();
@@ -878,6 +904,8 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
         AccountFileInfo.EventList ceventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == eventList.eventID);
 
+        PlayerManager.Instance.CurrentsmallPlaces.completionEventCount++;
+
         if (ceventList == null)
         {
             PlacesConfig[] placesConfigs = ConfigComponent.Instance.GetAll<PlacesConfig>();
@@ -896,7 +924,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             if (pId == 0)
             {
-                PlayerManager.Instance.CurrentPlaces.progress += eventConfig.Score;
+                SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+                AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
+                placesData.progress += eventConfig.Score;
             }
             else
             {
@@ -919,7 +949,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 else
                 {
                     List<ItemInfo> items = DropManager.Instance.DropItem(eventConfig.PrizeIDs[i]);
-                    if(items != null)
+                    if (items != null)
                         itemInfos.AddRange(items);
                 }
                 // itemInfos.Add(new ItemInfo(eventConfig.PrizeIDs[i], eventConfig.PrizeNums[i]));

Assets/Scripts/GameUI/GameApplction.cs

@@ -171,11 +171,40 @@ public class GameApplction : IGameStart
             .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
-            await MainPanel.OpenPanel();
+            // if (AccountFileInfo.Instance.playerData.isTiggerPlot)
+            {
+                await MainPanel.OpenPanel();
+            }
         }
 
 
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);
+
+        // XinShouYinDao();
+    }
+
+    public async void XinShouYinDao()
+    {
+        if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
+        {
+            CTask cTask = CTask.Create();
+            CombatDrive.Instance.LoadLevelBattleCombat(1002, false,
+                delegate(bool isWin)
+                {
+                    LogTool.Log("战斗完成" + isWin);
+                    cTask.SetResult();
+                });
+
+            await cTask;
+
+            AccountFileInfo.EventList eventList1 = EventSystemManager.Instance.AddEvent(1);
+            await EventSystemManager.Instance.TriggerEvent(eventList1);
+            AccountFileInfo.Instance.playerData.isTiggerPlot = true;
+
+            AccountFileInfo.Instance.SavePlayerData();
+
+            // await MainPanel.OpenPanel();
+        }
     }
 }

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -70,7 +70,7 @@ namespace Fort23.Mono
 
         public static async CTask<BattleSettlementPanel> OpenPanel(bool isWin, System.Action callBack)
         {
-            BattleSettlementPanel battleSettlementPanel = await UIManager.Instance.LoadAndOpenPanel<BattleSettlementPanel>(null);
+            BattleSettlementPanel battleSettlementPanel = await UIManager.Instance.LoadAndOpenPanel<BattleSettlementPanel>(null,isShowBG:true);
             battleSettlementPanel.CustomInit(isWin, callBack);
 
             return battleSettlementPanel;

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -329,6 +329,9 @@ namespace Fort23.Mono
                 isAlter = true;
                 UpdateSkillWidget();
                 CloseSelect();
+                BaoChun();
+                showSkillInfo.Sort(Sort);
+                Content.Init(this, showSkillInfo.Count);
             });
 
             Sv.onValueChanged.AddListener((s) =>
@@ -395,11 +398,11 @@ namespace Fort23.Mono
 
         List<List<int>> indexList = new List<List<int>>()
         {
-            new List<int>() { 0, 1, 9 },
-            new List<int>() { 6, 7, 5 },
-            new List<int>() { 8, 9, 7 },
-            new List<int>() { 4, 5, 3 },
-            new List<int>() { 2, 3, 1 },
+            new List<int>() { 0, 1, 9 }, //金
+            new List<int>() { 4, 5, 3 }, //木
+            new List<int>() { 2, 3, 1 }, //水
+            new List<int>() { 6, 7, 5 }, //火
+            new List<int>() { 8, 9, 7 }, //土
         };
 
         private void Sort(int type1, int type2)
@@ -473,9 +476,26 @@ namespace Fort23.Mono
             }
 
             CloseSelect();
+            showSkillInfo.Sort(Sort);
             Content.Init(this, showSkillInfo.Count);
         }
 
+        private int Sort(SkillInfo type1, SkillInfo type2)
+        {
+            if (allUseSkill.Contains(type1) && !allUseSkill.Contains(type2))
+            {
+                return -1;
+            }
+
+
+            if (!allUseSkill.Contains(type1) && allUseSkill.Contains(type2))
+            {
+                return 1;
+            }
+
+            return 0;
+        }
+
 
         public override async CTask Open()
         {
@@ -588,6 +608,9 @@ namespace Fort23.Mono
                 allUseSkill[skillKongWidget.index] = selectSkillConfig;
                 CloseSelect();
                 BaoChun();
+                
+                showSkillInfo.Sort(Sort);
+                Content.Init(this, showSkillInfo.Count);
             }
             //替换功法
             else if (skillKongWidget.SkillInfo != null && dianjiSkillKongWidget == null && selectSkillConfig != null)
@@ -653,6 +676,8 @@ namespace Fort23.Mono
                 skillKongWidget.SetSKill(selectSkillConfig);
                 CloseSelect();
                 BaoChun();
+                showSkillInfo.Sort(Sort);
+                Content.Init(this, showSkillInfo.Count);
             }
             else
             {
@@ -777,6 +802,8 @@ namespace Fort23.Mono
                         BaoChun();
                         ChangeFuZhuYingXiang();
                         UpdateSkillWidget();
+                        showSkillInfo.Sort(Sort);
+                        Content.Init(this, showSkillInfo.Count);
                     }
                     else
                     {
@@ -804,7 +831,7 @@ namespace Fort23.Mono
                 {
                     if (allKongSkill[i].SkillInfo != null)
                     {
-                        if(selectSkillConfig.skillConfig.SkillType == allKongSkill[i].SkillInfo.skillConfig.SkillType)
+                        if (selectSkillConfig.skillConfig.SkillType == allKongSkill[i].SkillInfo.skillConfig.SkillType)
                             allKongSkill[i].SelectState(true);
                     }
                 }

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInvitePanel.cs

@@ -106,7 +106,7 @@ namespace Fort23.Mono
 
         public async static CTask OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<DaoYouInvitePanel>(null, UILayer.Top);
+            await UIManager.Instance.LoadAndOpenPanel<DaoYouInvitePanel>(null, UILayer.Top,isShowBG:true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -154,7 +154,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel(ItemInfo selectItemInit, List<int> selectType, Action<int> itemId, Action cancelCallBack)
         {
-            await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, selectType,itemId, cancelCallBack });
+            await UIManager.Instance.LoadAndOpenPanel<DivineSenceItemPanel>(null, UILayer.Top, uiData: new object[] { selectItemInit, selectType,itemId, cancelCallBack },isShowBG:true);
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -161,11 +161,11 @@ namespace Fort23.Mono
             if (eventList.isCompleted)
             {
                 Text_Go.text = "已完成";
-                Btn_Go.image.color = new Color32(200,199,199,255);
+                Btn_Go.image.color = new Color32(200, 199, 199, 255);
             }
             else
             {
-                Btn_Go.image.color = new Color32(206,168,105,255);
+                Btn_Go.image.color = new Color32(206, 168, 105, 255);
             }
 
 
@@ -173,9 +173,14 @@ namespace Fort23.Mono
 
             ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId == eventList.guid);
             Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
-
-
-            if (randomEventConfig.placeID != 0)
+            if (randomEventConfig.SmallPlacesId != 0)
+            {
+                SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(randomEventConfig.SmallPlacesId);
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
+                Text_Mapname.text = $"{LanguageManager.Instance.Text(placesConfig.placeName)}-{LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
+                Text_Mapname.gameObject.SetActive(true);
+            }
+            else if (randomEventConfig.placeID != 0)
             {
                 PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(randomEventConfig.placeID);
                 Text_Mapname.text = LanguageManager.Instance.Text(placesConfig.placeName);

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughFailPanel.cs

@@ -40,7 +40,7 @@ namespace Fort23.Mono
 
         public static async CTask<HeroBreakthroughFailPanel> OpenPanel(int type, int xw)
         {
-            HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top);
+            HeroBreakthroughFailPanel heroBreakthroughFailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughFailPanel>(null, UILayer.Top,isShowBG:true);
             heroBreakthroughFailPanel.CustomInit(type, xw);
             return heroBreakthroughFailPanel;
         }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -447,7 +447,7 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughPanel> OpenPanel()
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
             heroBreakthroughPanel.CustomInit();
             return heroBreakthroughPanel;
         }
@@ -456,7 +456,7 @@ namespace Fort23.Mono
         //渡劫预览
         public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
             heroBreakthroughPanel.CustomInit(heroInfo1);
             return heroBreakthroughPanel;
         }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughSuccessPanel.cs

@@ -33,7 +33,7 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughSuccessPanel> OpenPanel(int type, List<HeroAttributeData> heroAttributes)
         {
-            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top, isFocus: false);
+            HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughSuccessPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
             heroBreakthroughSuccessPanel.CustomInit(type, heroAttributes);
             return heroBreakthroughSuccessPanel;
         }

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

@@ -125,8 +125,12 @@ namespace Fort23.Mono
                 }
             }
 
+     
+            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+            // AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
+            
             PlacesConfig placesConfig =
-                ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
+                ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
 
             Text_PlacesComplteProgress.text =
                 $"{LanguageManager.Instance.Text(placesConfig.placeName)}完成度：{PlayerManager.Instance.PlacesBl}%";
@@ -142,7 +146,7 @@ namespace Fort23.Mono
 
         public async void CustomInit()
         {
-            int PlacesId = PlayerManager.Instance.GetMaxPlacesId();
+            int PlacesId = PlayerManager.Instance.GetMaxSmallPlacesId();
             PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlacesId);
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
 
@@ -150,10 +154,14 @@ namespace Fort23.Mono
             // await ChangeMap(bigMapConfig.ID);
             Sv2.gameObject.SetActive(true);
             LayoutRebuilder.ForceRebuildLayoutImmediate(PlacesRoot);
+            
+         
+            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+            // AccountFileInfo.PlacesData placesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.PlacesId);
 
             foreach (var placesItemPlacesWidget in placesItem.PlacesWidgets)
             {
-                if (placesItemPlacesWidget.placesConfig.ID == PlayerManager.Instance.CurrentPlaces.id)
+                if (placesItemPlacesWidget.placesConfig.ID ==smallPlacesConfig.PlacesId)
                 {
                     // Rect_BiaoJi.anchoredPosition = transform.worldToLocalMatrix * placesItemPlacesWidget.Pos.position;
                     Rect_BiaoJi.position =  placesItemPlacesWidget.Pos.position;

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

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -8,7 +10,11 @@ namespace Fort23.Mono
     [UIBinding(prefab = "PlacesInfoPanel")]
     public partial class PlacesInfoPanel : UIPanel
     {
-        private int placesId;
+        private int PlacesId;
+        private SmallPlacesConfig smallPlacesConfig;
+        private PlacesConfig placesConfig;
+
+        List<ShopBtnWidget> _shopBtnWidgets = new List<ShopBtnWidget>();
 
         private void Init()
         {
@@ -30,34 +36,79 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public override CTask<bool> AsyncInit(object[] uiData)
+        public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            placesId = (int)(uiData[0]);
-            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(placesId);
+            PlacesId = (int)(uiData[0]);
+            // smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlacesId);
+            placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlacesId);
+
+            foreach (var placesConfigSmallPlacersId in placesConfig.SmallPlacersIds)
+            {
+                ShopBtnWidget shopBtnWidget = await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, Content);
+                shopBtnWidget.CustomInit(placesConfigSmallPlacersId);
+                shopBtnWidget.OnClick = OnClick;
+                _shopBtnWidgets.Add(shopBtnWidget);
+            }
+
+
+            toggleList.GetChildObj();
+            _shopBtnWidgets[0].OnPointerClick();
             BigMapConfig bigMapConfig = ConfigComponent.Instance.Get<BigMapConfig>(placesConfig.bigMapID);
             Text_BigMapName.text = LanguageManager.Instance.Text(bigMapConfig.mapName);
             Text_PlacesName.text = LanguageManager.Instance.Text(placesConfig.placeName);
-            Text_PlacesComplteProgress.text = $"完成度：{PlayerManager.Instance.GetMapBl(placesId)}%";
-            return base.AsyncInit(uiData);
+            Text_PlacesComplteProgress.text = $"完成度：{PlayerManager.Instance.GetMapBl(placesConfig.ID)}%";
+            return await base.AsyncInit(uiData);
+        }
+
+        private void OnClick(ItemWidgetBasic obj)
+        {
+            ShopBtnWidget shopBtnWidget = obj as ShopBtnWidget;
+            toggleList.ClickWidget(shopBtnWidget.uiToggle);
+
+            smallPlacesConfig = shopBtnWidget.SmallPlacesConfig;
         }
 
         private async void Click_Go()
         {
-            if (placesId > 1 && PlayerManager.Instance.GetMapBl(placesId - 1) < 100)
+            if (smallPlacesConfig.ID == 0)
+                return;
+            AccountFileInfo.SmallPlacesData lastSmallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID - 1);
+            SmallPlacesConfig lastSmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesConfig.ID - 1);
+            if (smallPlacesConfig.ID > 1 && (lastSmallPlacesData == null || lastSmallPlacesData.completionEventCount < lastSmallPlacesConfig.CompletionEventCount))
             {
-                TipMessagePanel.OpenTipMessagePanel("上一个关卡没有解锁");
+                TipMessagePanel.OpenTipMessagePanel("上一个关卡事件完成度不足");
                 return;
             }
 
-            AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(placesId);
+            if (smallPlacesConfig.UnlockEnvetid != 0)
+            {
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == smallPlacesConfig.UnlockEnvetid);
+                if (eventList == null || !eventList.isCompleted)
+                {
+                    TipMessagePanel.OpenTipMessagePanel("主线任务没有完成");
+                    return;
+                }
+            }
+
+            AccountFileInfo.SmallPlacesData smallPlacesData = PlayerManager.Instance.GetSmallPlacesData(smallPlacesConfig.ID);
+
+            if (smallPlacesData == null)
+            {
+                smallPlacesData = new AccountFileInfo.SmallPlacesData();
+                smallPlacesData.id = smallPlacesConfig.ID;
+                AccountFileInfo.Instance.playerData.smallPlacesDatas.Add(smallPlacesData);
+            }
+
+
+            AccountFileInfo.PlacesData currentPlacesData = PlayerManager.Instance.GetPlacesData(smallPlacesConfig.ID);
             if (currentPlacesData == null)
             {
                 currentPlacesData = new AccountFileInfo.PlacesData();
-                currentPlacesData.id = placesId;
+                currentPlacesData.id = placesConfig.ID;
                 AccountFileInfo.Instance.playerData.placesDatas.Add(currentPlacesData);
             }
 
-            PlayerManager.Instance.CurrentPlaces = currentPlacesData;
+            PlayerManager.Instance.CurrentsmallPlaces = smallPlacesData;
 
             UIManager.Instance.HideUIUIPanel<LevelChoosePanel>();
             UIManager.Instance.HideUIUIPanel(this);
@@ -66,7 +117,21 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel(int placesId)
         {
-            await UIManager.Instance.LoadAndOpenPanel<PlacesInfoPanel>(null, UILayer.Top, uiData: new object[] { placesId });
+            await UIManager.Instance.LoadAndOpenPanel<PlacesInfoPanel>(null, UILayer.Top, uiData: new object[] { placesId }, isShowBG: true);
+        }
+
+        public override void Close()
+        {
+            foreach (var shopBtnWidget in _shopBtnWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(shopBtnWidget);
+            }
+
+            _shopBtnWidgets.Clear();
+
+            smallPlacesConfig = default;
+
+            base.Close();
         }
     }
 }

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

@@ -74,6 +74,28 @@ namespace Fort23.Mono
 	      return _Btn_Go;
 	     }
 	   }
+	  private RectTransform _Content;
+	  public RectTransform Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<RectTransform>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  private UIToggleList _toggleList;
+	  public UIToggleList toggleList
+	   {
+	   get{
+	      if (_toggleList == null)
+	       {
+	         _toggleList  = GetUIUnit<UIToggleList>("toggleList"); 
+	       }
+	      return _toggleList;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -62,6 +62,7 @@ namespace Fort23.Mono
             Text_EventNum.text = EventSystemManager.Instance.GetShenShiCount().ToString();
             CreatShengShiEvent();
             ChagneShenshiBtnActive();
+            Slider_SmallJD.value = PlayerManager.Instance.CurrentsmallPlaces.completionEventCount;
         }
 
         public void UpdateDaoYouCoun()
@@ -131,16 +132,10 @@ namespace Fort23.Mono
                     EventSystemManager.Instance.TriggerEvent(eventList);
                 }
             });
-            
-            Btn_Daoyou.onClick.AddListener(() =>
-            {
-                DaoYouGuaJiPanel.OpenPanel();
-            });
-            
-            Btn_Box.onClick.AddListener(() =>
-            {
-                BoxPanel.OpenBoxPanel();
-            });
+
+            Btn_Daoyou.onClick.AddListener(() => { DaoYouGuaJiPanel.OpenPanel(); });
+
+            Btn_Box.onClick.AddListener(() => { BoxPanel.OpenBoxPanel(); });
         }
 
         public override CTask<bool> AsyncInit(object[] uiData)
@@ -152,8 +147,9 @@ namespace Fort23.Mono
         {
             await base.Show();
 
-            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
-            Slider_Map.maxValue = placesConfig.TotalScore;
+            SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+            Slider_SmallJD.maxValue = smallPlacesConfig.CompletionEventCount;
+            Slider_SmallJD.value = PlayerManager.Instance.CurrentsmallPlaces.completionEventCount;
 
             ChagneShenshiBtnActive();
             CreatShengShiEvent();
@@ -193,12 +189,17 @@ namespace Fort23.Mono
 
         public void ChangeMap(IEventData e)
         {
+            SmallPlacesConfig smallPlacesConfig =
+                ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
+
             PlacesConfig placesConfig =
-                ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
+                ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
+
 
             Text_ExplorationProgress.text =
-                $"{LanguageManager.Instance.Text(placesConfig.placeName)}{PlayerManager.Instance.PlacesBl}%";
-            Slider_Map.value = PlayerManager.Instance.PlacesBl;
+                $"{LanguageManager.Instance.Text(placesConfig.placeName)} - {LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
+            Slider_SmallJD.maxValue = smallPlacesConfig.CompletionEventCount;
+            Slider_SmallJD.value = PlayerManager.Instance.CurrentsmallPlaces.completionEventCount;
         }
 
 

Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -228,6 +228,17 @@ namespace Fort23.Mono
 	      return _Btn_Box;
 	     }
 	   }
+	  private Slider _Slider_SmallJD;
+	  public Slider Slider_SmallJD
+	   {
+	   get{
+	      if (_Slider_SmallJD == null)
+	       {
+	         _Slider_SmallJD  = GetUIUnit<Slider>("Slider_SmallJD"); 
+	       }
+	      return _Slider_SmallJD;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidget.cs

@@ -1,5 +1,6 @@
 using Core.Language;
 using Excel2Json;
+using Fort23.UTool;
 
 namespace Fort23.Mono
 {
@@ -8,6 +9,8 @@ namespace Fort23.Mono
     {
         public ShopGroupConfig ShopGroupConfig;
 
+        public SmallPlacesConfig SmallPlacesConfig;
+
         private void Init()
         {
         }
@@ -30,5 +33,11 @@ namespace Fort23.Mono
             this.ShopGroupConfig = shopGroupConfig;
             Text_Name.text = LanguageManager.Instance.Text(ShopGroupConfig.shopName);
         }
+        
+        public void CustomInit(int smallPlacesId)
+        {
+            this.SmallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(smallPlacesId);
+            Text_Name.text = LanguageManager.Instance.Text(SmallPlacesConfig.placeName);
+        }
     }
 }

Assets/Scripts/GameUI/UI/ShopPanel/ShopBtnWidgetData.cs

@@ -30,6 +30,17 @@ namespace Fort23.Mono
 	      return _Text_Name;
 	     }
 	   }
+	  private UIToggleObjectCustomStateWidget _uiToggle;
+	  public UIToggleObjectCustomStateWidget uiToggle
+	   {
+	   get{
+	      if (_uiToggle == null)
+	       {
+	         _uiToggle  = GetUIUnit<UIToggleObjectCustomStateWidget>("uiToggle"); 
+	       }
+	      return _uiToggle;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/TipsPanel/TipsPanle.cs

@@ -62,7 +62,7 @@ namespace Fort23.Mono
         public async static CTask<bool> OpenPnael(string title, string tips,int showButCount = 2)
         {
             CTask<bool> cTask = CTask<bool>.Create();
-            TipsPanle tipsPanle = await UIManager.Instance.LoadAndOpenPanel<TipsPanle>(null,UILayer.Top);
+            TipsPanle tipsPanle = await UIManager.Instance.LoadAndOpenPanel<TipsPanle>(null,UILayer.Top,isShowBG:true);
             tipsPanle.CustomInit(title,tips, cTask,showButCount);
             return await cTask;
         }
@@ -70,7 +70,7 @@ namespace Fort23.Mono
         public async static CTask<bool> OpenPnael(int tips,int showButCount = 2)
         {
             CTask<bool> cTask = CTask<bool>.Create();
-            TipsPanle tipsPanle = await UIManager.Instance.LoadAndOpenPanel<TipsPanle>(null,UILayer.Top);
+            TipsPanle tipsPanle = await UIManager.Instance.LoadAndOpenPanel<TipsPanle>(null,UILayer.Top,isShowBG:true);
             tipsPanle.CustomInit("",LanguageManager.Instance.Text(tips), cTask,showButCount);
             return await cTask;
         }

Assets/Scripts/GameUI/UI/XianTuLogPanel/EventMinLogWidget.cs

@@ -29,8 +29,25 @@ namespace Fort23.Mono
         public void CustomInit(int id, AccountFileInfo.EventList eventList, List<int> places)
         {
             eventConfig = ConfigComponent.Instance.Get<EventConfig>(id);
-            PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
-            Text_MapName.text = LanguageManager.Instance.Text(placesConfig.placeName);
+
+            if (eventConfig.SmallPlacesId != 0)
+            {
+                SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(eventConfig.SmallPlacesId);
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
+                Text_MapName.text = $"{LanguageManager.Instance.Text(placesConfig.placeName)}-{LanguageManager.Instance.Text(smallPlacesConfig.placeName)}";
+                Text_MapName.gameObject.SetActive(true);
+            }
+            else if (eventConfig.placeID != 0)
+            {
+                PlacesConfig placesConfig = ConfigComponent.Instance.Get<PlacesConfig>(eventConfig.placeID);
+                Text_MapName.text = LanguageManager.Instance.Text(placesConfig.placeName);
+                Text_MapName.gameObject.SetActive(true);
+            }
+            else
+            {
+                Text_MapName.gameObject.SetActive(false);
+            }
+
             if (eventList == null)
             {
                 Text_Name.text = "???";