神识修改

Assets/Res/Config/EventConfig.json

@@ -15,6 +15,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 3,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventValue": [
@@ -41,6 +47,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -64,6 +76,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventValue": [
@@ -84,6 +102,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 7,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventValue": [
@@ -104,6 +128,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -121,6 +151,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -138,6 +174,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -155,6 +197,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -172,6 +220,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -189,6 +243,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -206,6 +266,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -223,6 +289,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -240,6 +312,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -257,6 +335,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -274,6 +358,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -291,6 +381,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -312,6 +408,12 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -333,6 +435,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -356,6 +464,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -377,6 +491,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -398,6 +518,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -421,6 +547,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -443,6 +575,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "EventCount": null,
@@ -455,11 +593,11 @@
         9025,
         9026
       ],
-      "EventTriggerType": 99,
+      "EventTriggerType": 1,
       "EventTag": 3,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "EventConditionId": null,
       "PrizeIDs": [
         1001
@@ -480,9 +618,9 @@
       ],
       "EventTriggerType": 99,
       "EventTag": 3,
-      "EventType": null,
-      "Score": null,
-      "EventQuality": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
       "EventConditionId": null,
       "PrizeIDs": [
         1001
@@ -510,6 +648,12 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
       "EventCount": null,

Assets/Res/Config/EventLinkConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 100,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 216,
       "EventConditionMessage": null,
       "LanID": [
         216
@@ -13,7 +13,7 @@
     },
     {
       "ID": 1001,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 177,
       "EventConditionMessage": null,
       "LanID": [
         177
@@ -32,7 +32,7 @@
     },
     {
       "ID": 1002,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 178,
       "EventConditionMessage": null,
       "LanID": [
         178
@@ -50,7 +50,7 @@
     },
     {
       "ID": 1003,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 179,
       "EventConditionMessage": null,
       "LanID": [
         179
@@ -67,7 +67,7 @@
     },
     {
       "ID": 1004,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 180,
       "EventConditionMessage": null,
       "LanID": [
         180
@@ -84,7 +84,7 @@
     },
     {
       "ID": 1005,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 181,
       "EventConditionMessage": null,
       "LanID": [
         181
@@ -101,7 +101,7 @@
     },
     {
       "ID": 1010,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 182,
       "EventConditionMessage": null,
       "LanID": [
         182
@@ -120,7 +120,7 @@
     },
     {
       "ID": 1011,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 183,
       "EventConditionMessage": null,
       "LanID": [
         183
@@ -139,7 +139,7 @@
     },
     {
       "ID": 1012,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 184,
       "EventConditionMessage": null,
       "LanID": [
         184,
@@ -157,7 +157,7 @@
     },
     {
       "ID": 1014,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 185,
       "EventConditionMessage": null,
       "LanID": [
         185
@@ -175,7 +175,7 @@
     },
     {
       "ID": 1015,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 186,
       "EventConditionMessage": null,
       "LanID": [
         186,
@@ -193,7 +193,7 @@
     },
     {
       "ID": 1016,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 188,
       "EventConditionMessage": null,
       "LanID": [
         188
@@ -210,7 +210,7 @@
     },
     {
       "ID": 1020,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 190,
       "EventConditionMessage": null,
       "LanID": [
         190
@@ -229,7 +229,7 @@
     },
     {
       "ID": 1021,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 191,
       "EventConditionMessage": null,
       "LanID": [
         191
@@ -253,7 +253,7 @@
     },
     {
       "ID": 1022,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 192,
       "EventConditionMessage": null,
       "LanID": [
         192
@@ -270,7 +270,7 @@
     },
     {
       "ID": 1024,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 193,
       "EventConditionMessage": null,
       "LanID": [
         193,
@@ -295,7 +295,7 @@
     },
     {
       "ID": 1025,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 194,
       "EventConditionMessage": null,
       "LanID": [
         194,
@@ -313,7 +313,7 @@
     },
     {
       "ID": 1026,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 207,
       "EventConditionMessage": null,
       "LanID": [
         207
@@ -332,7 +332,7 @@
     },
     {
       "ID": 1030,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 221,
       "EventConditionMessage": null,
       "LanID": [
         221
@@ -349,7 +349,7 @@
     },
     {
       "ID": 1040,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 222,
       "EventConditionMessage": null,
       "LanID": [
         222
@@ -366,7 +366,7 @@
     },
     {
       "ID": 1050,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 223,
       "EventConditionMessage": null,
       "LanID": [
         223
@@ -385,7 +385,7 @@
     },
     {
       "ID": 1060,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 224,
       "EventConditionMessage": null,
       "LanID": [
         224
@@ -396,7 +396,7 @@
     },
     {
       "ID": 10001,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 208,
       "EventConditionMessage": null,
       "LanID": [
         208
@@ -414,7 +414,7 @@
     },
     {
       "ID": 10002,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 209,
       "EventConditionMessage": null,
       "LanID": [
         209
@@ -431,7 +431,7 @@
     },
     {
       "ID": 10003,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 210,
       "EventConditionMessage": null,
       "LanID": [
         210,
@@ -450,7 +450,7 @@
     },
     {
       "ID": 10004,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 212,
       "EventConditionMessage": null,
       "LanID": [
         212,
@@ -470,7 +470,7 @@
     },
     {
       "ID": 10005,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 1901,
       "EventConditionMessage": null,
       "LanID": [
         1901
@@ -488,7 +488,7 @@
     },
     {
       "ID": 10006,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 1902,
       "EventConditionMessage": null,
       "LanID": [
         1902
@@ -557,7 +557,7 @@
     },
     {
       "ID": 9003,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2036,
       "EventConditionMessage": null,
       "LanID": [
         2036
@@ -576,7 +576,7 @@
     },
     {
       "ID": 9004,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2037,
       "EventConditionMessage": null,
       "LanID": [
         2037
@@ -594,7 +594,7 @@
     },
     {
       "ID": 9005,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2038,
       "EventConditionMessage": null,
       "LanID": [
         2038
@@ -605,7 +605,7 @@
     },
     {
       "ID": 9006,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2039,
       "EventConditionMessage": null,
       "LanID": [
         2039
@@ -616,7 +616,7 @@
     },
     {
       "ID": 9007,
-      "conciseEventMessage": null,
+      "conciseEventMessage": 2040,
       "EventConditionMessage": null,
       "LanID": [
         2040

Assets/Res/Config/GameConstantConfig.json

@@ -34,7 +34,8 @@
       "DaoyouguajiDuration": [
         120,
         240
-      ]
+      ],
+      "RefreshRelevanceEventProbability": 50
     }
   ]
 }

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -33,8 +33,12 @@ RectTransform:
   m_Children:
   - {fileID: 2896655462721008753}
   - {fileID: 2569128129379278262}
-  - {fileID: 3581464887972855309}
   - {fileID: 9037408276187403176}
+  - {fileID: 3450703639607992522}
+  - {fileID: 3581464887972855309}
+  - {fileID: 1442258019244538206}
+  - {fileID: 3009876021119576725}
+  - {fileID: 1239183305622828816}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -60,11 +64,6 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Massge
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: bg
     gameObject: {fileID: 8488195482551738332}
     isAssetBundle: 0
@@ -80,8 +79,23 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: ShengShiEventWidgetType2Root
+    gameObject: {fileID: 3450703639607992522}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ShenShi
+    gameObject: {fileID: 8570571649648203346}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_DaoYou
+    gameObject: {fileID: 6979297239242806004}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   - key: Btn_Close
-    gameObject: {fileID: 3651346582420827263}
+    gameObject: {fileID: 442163555227076089}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
@@ -163,10 +177,10 @@ 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: 46.5656}
-  m_SizeDelta: {x: 475.8763, y: 777.9515}
+  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 &9156533754913033698
 CanvasRenderer:
@@ -206,14 +220,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_dadi_01
+  _icon_name: dec_diban
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 3c03c9ef85decb2db50053e08067fb5c
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -314,7 +328,7 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 444.0557, y: 143.8421}
+  sizeData: {x: 655, y: 260}
   isCustomizeHeight: 0
   posOff: {x: 13, y: 0}
   isDelay: 0
@@ -322,6 +336,86 @@ MonoBehaviour:
   isAdaptationWidth: 0
   layoutType: 0
   overflowDistance: 0
+--- !u!1 &2956971840661338161
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1324601193716944019}
+  - component: {fileID: 7481924549330058311}
+  - component: {fileID: 722102803301892971}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1324601193716944019
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2956971840661338161}
+  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: 3009876021119576725}
+  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 &7481924549330058311
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2956971840661338161}
+  m_CullTransparentMesh: 1
+--- !u!114 &722102803301892971
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2956971840661338161}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 33
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9053\u53CB\u4E8B\u4EF6"
 --- !u!1 &3651587731235081858
 GameObject:
   m_ObjectHideFlags: 0
@@ -357,7 +451,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: -2.9302979, y: 367.5232}
+  m_AnchoredPosition: {x: -2.9302979, y: 702}
   m_SizeDelta: {x: 450.1394, y: 78.9535}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3637005864510300227
@@ -381,7 +475,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  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
@@ -389,12 +483,12 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 34
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 44
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
-    m_MaxSize: 40
+    m_MaxSize: 44
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -439,8 +533,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2.147, y: -5.5664}
-  m_SizeDelta: {x: 471.58, y: 652.1576}
+  m_AnchoredPosition: {x: -1.5, y: -102.55858}
+  m_SizeDelta: {x: 663.9488, y: 925.5284}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5904849993517078433
 CanvasRenderer:
@@ -510,6 +604,202 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &5889784868559573260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3450703639607992522}
+  - component: {fileID: 2699421981411980314}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiEventWidgetType2Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3450703639607992522
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5889784868559573260}
+  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: 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: -2.147, y: 528}
+  m_SizeDelta: {x: 655, y: 250}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2699421981411980314
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5889784868559573260}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &6833021426073465471
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1239183305622828816}
+  - component: {fileID: 7461148173800663615}
+  - component: {fileID: 3563681708230613544}
+  - component: {fileID: 442163555227076089}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1239183305622828816
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  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: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 37, y: 22}
+  m_SizeDelta: {x: 79, y: 84}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &7461148173800663615
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  m_CullTransparentMesh: 1
+--- !u!114 &3563681708230613544
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fanhui2
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &442163555227076089
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6833021426073465471}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3563681708230613544}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6864546897549033815
 GameObject:
   m_ObjectHideFlags: 0
@@ -631,6 +921,354 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7098872407542959521
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1549299383501015935}
+  - component: {fileID: 7790443248632903804}
+  - component: {fileID: 8733058899712714278}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1549299383501015935
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7098872407542959521}
+  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: 1442258019244538206}
+  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 &7790443248632903804
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7098872407542959521}
+  m_CullTransparentMesh: 1
+--- !u!114 &8733058899712714278
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7098872407542959521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 33
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u795E\u8BC6(2/10)"
+--- !u!1 &7244836889075663130
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3009876021119576725}
+  - component: {fileID: 7120957080262225261}
+  - component: {fileID: 7872949651746918913}
+  - component: {fileID: 6979297239242806004}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_DaoYou
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3009876021119576725
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  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: 1324601193716944019}
+  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: 179, y: -642}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7120957080262225261
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  m_CullTransparentMesh: 1
+--- !u!114 &7872949651746918913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_shengji
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &6979297239242806004
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7244836889075663130}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7872949651746918913}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &7638606920926905235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1442258019244538206}
+  - component: {fileID: 803569073275056124}
+  - component: {fileID: 501046924026959756}
+  - component: {fileID: 8570571649648203346}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_ShenShi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1442258019244538206
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  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: 1549299383501015935}
+  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: -170.15, y: -642}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &803569073275056124
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_CullTransparentMesh: 1
+--- !u!114 &501046924026959756
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_lingwu
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &8570571649648203346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7638606920926905235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 501046924026959756}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &9135198254365544974
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/DivineSence/DivineSenceEventResultPanel.prefab

@@ -266,7 +266,7 @@ MonoBehaviour:
   Page: {x: 1, y: 1}
   bottom: 0
   wdiget: {fileID: 0}
-  sizeData: {x: 444.0557, y: 143.8421}
+  sizeData: {x: 444.0557, y: 218}
   isCustomizeHeight: 0
   posOff: {x: 13, y: 0}
   isDelay: 0

Assets/Res/UI/DivineSence/ShengShiConditionWidget.prefab

@@ -0,0 +1,376 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &4314931744859409028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2059370578134625917}
+  - component: {fileID: 8829860962623938134}
+  - component: {fileID: 418351672045357513}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2059370578134625917
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  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: 417798913070878350}
+  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 &8829860962623938134
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  m_CullTransparentMesh: 1
+--- !u!114 &418351672045357513
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4314931744859409028}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.45098042, g: 0.43529415, b: 0.39607847, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9493\u9C7C\u7FC1"
+--- !u!1 &7999435953416995087
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5851165397762221054}
+  - component: {fileID: 974582271661454250}
+  - component: {fileID: 529387738808672660}
+  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 &5851165397762221054
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7999435953416995087}
+  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: 417798913070878350}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.0000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &974582271661454250
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7999435953416995087}
+  m_CullTransparentMesh: 1
+--- !u!114 &529387738808672660
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7999435953416995087}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 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_renwu_dise
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: bec1e4479c1593746876da07861f4d67, type: 3}
+  packInfo:
+    packName: mainUI
+    packgJsonPath: /Art/UIAssets/TextrueJson\mainUI.txt
+    packgSpritePath: Assets/Res/UIAtlas/mainUI.spriteatlasv2
+    lasetJsonGUID: bb67f442413bd755b03774cb7d5a173d
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8904660351945015112
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 417798913070878350}
+  - component: {fileID: 4216496371977979539}
+  - component: {fileID: 2237901092907678635}
+  - component: {fileID: 4508944208514706016}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShengShiConditionWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &417798913070878350
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  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: 5851165397762221054}
+  - {fileID: 2059370578134625917}
+  m_Father: {fileID: 0}
+  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: 217.8006, y: 27.5663}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &4216496371977979539
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  maxDuration: 0.3
+  isUpdate: 0
+  currTime: 0.30510476
+  GrpupInfos:
+  - Foldout: 1
+    isActive: 1
+    animName: 
+    isLoop: 0
+    allTargets:
+    - {fileID: 8904660351945015112}
+    TweenAssetInfo: {fileID: 11400000, guid: 45a33638e1bf2e040a04be1042aa2f06, type: 2}
+    TargetFoldout: 1
+    maxDuration: 0.3
+    isUpdate: 1
+    currTime: 0
+  MinMaxGradient:
+    m_Mode: 0
+    m_GradientMin:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_GradientMax:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
+    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
+--- !u!114 &2237901092907678635
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: myButton
+    gameObject: {fileID: 4508944208514706016}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg
+    gameObject: {fileID: 529387738808672660}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 418351672045357513}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &4508944208514706016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8904660351945015112}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  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_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Res/UI/DivineSence/ShengShiConditionWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: Cy9KtnypVy/fifv629zDp8HgurQpQXbzrif2VZ5shn39CbBzACjGeHmBl6YZ
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -1,5 +1,101 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &533257899024031940
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2781605243884814213}
+  - component: {fileID: 6940629244054234312}
+  - component: {fileID: 3935838372477410148}
+  - component: {fileID: 7273584258005758506}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Eventcondition
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2781605243884814213
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  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: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -15.991, y: -70.2}
+  m_SizeDelta: {x: 629.59, y: 50.0941}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6940629244054234312
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  m_CullTransparentMesh: 1
+--- !u!114 &3935838372477410148
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.7294118, g: 0.70980394, b: 0.70980394, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FD9\u662F\u4E00\u6BB5\u63CF\u8FF0"
+--- !u!114 &7273584258005758506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533257899024031940}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &869698564475441709
 GameObject:
   m_ObjectHideFlags: 0
@@ -36,8 +132,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0, y: 2.9}
-  m_SizeDelta: {x: 433.7711, y: 36.0552}
+  m_AnchoredPosition: {x: -15.9906, y: -9.3396}
+  m_SizeDelta: {x: 629.5898, y: 60.5345}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2062974483703860703
 CanvasRenderer:
@@ -60,7 +156,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,9 +164,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -96,6 +192,227 @@ MonoBehaviour:
   m_EffectColor: {r: 0.4811321, g: 0.43347278, b: 0.43347278, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &1576553285643352763
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 145896444123704845}
+  - component: {fileID: 6941784822579017943}
+  - component: {fileID: 7607584696188344000}
+  - component: {fileID: 2765815625611829555}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &145896444123704845
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: -269.8, y: -126.69992}
+  m_SizeDelta: {x: 0, y: 86.8594}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &6941784822579017943
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_CullTransparentMesh: 1
+--- !u!114 &7607584696188344000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 6.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &2765815625611829555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1576553285643352763}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &1773075558923197189
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7551747957602520090}
+  - component: {fileID: 8044263114105609004}
+  - component: {fileID: 1571941360682940458}
+  - component: {fileID: 8048933075909396369}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Go
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7551747957602520090
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  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: 1357364587688641971}
+  m_Father: {fileID: 3764721290890148754}
+  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: 240.7, y: -137.4}
+  m_SizeDelta: {x: 102.5871, y: 32.4386}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8044263114105609004
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_CullTransparentMesh: 1
+--- !u!114 &1571941360682940458
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_shengji
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &8048933075909396369
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1773075558923197189}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1571941360682940458}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1904131733610652650
 GameObject:
   m_ObjectHideFlags: 0
@@ -130,49 +447,262 @@ RectTransform:
   - {fileID: 9098093879968300551}
   m_Father: {fileID: 3764721290890148754}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -165.22783, y: 10.86892}
-  m_SizeDelta: {x: 64.56799, y: 28.462402}
-  m_Pivot: {x: 0, y: 1}
---- !u!222 &5479443627435669674
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: -285.5, y: 22.6}
+  m_SizeDelta: {x: 68.4992, y: 42.713}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5479443627435669674
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904131733610652650}
+  m_CullTransparentMesh: 1
+--- !u!114 &5514984282659310211
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1904131733610652650}
+  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: 0.9622642, g: 0.5582948, b: 0.5582948, 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
+--- !u!1 &2987942260868545690
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7325153162450915011}
+  - component: {fileID: 4485080243282319686}
+  - component: {fileID: 5018190062906650215}
+  - component: {fileID: 1530431928590719805}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_ZuiZhong
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7325153162450915011
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  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: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 241.05, y: -55.577}
+  m_SizeDelta: {x: 79.339, y: 79.3394}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &4485080243282319686
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_CullTransparentMesh: 1
+--- !u!114 &5018190062906650215
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_wenhao
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1530431928590719805
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2987942260868545690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5018190062906650215}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3348088768749406642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1357364587688641971}
+  - component: {fileID: 570113842003181522}
+  - component: {fileID: 7694624349492924708}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1357364587688641971
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3348088768749406642}
+  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: 7551747957602520090}
+  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.0007658005, y: 0}
+  m_SizeDelta: {x: 102.59, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &570113842003181522
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904131733610652650}
+  m_GameObject: {fileID: 3348088768749406642}
   m_CullTransparentMesh: 1
---- !u!114 &5514984282659310211
+--- !u!114 &7694624349492924708
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1904131733610652650}
+  m_GameObject: {fileID: 3348088768749406642}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9622642, g: 0.5582948, b: 0.5582948, a: 1}
+  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
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u524D\u5F80"
 --- !u!1 &4038213450023413557
 GameObject:
   m_ObjectHideFlags: 0
@@ -207,14 +737,20 @@ RectTransform:
   - {fileID: 1357522047238736597}
   - {fileID: 3650536308811846443}
   - {fileID: 712579681456886399}
+  - {fileID: 2781605243884814213}
   - {fileID: 6760469126628422357}
   - {fileID: 3042280114302172752}
+  - {fileID: 145896444123704845}
+  - {fileID: 7551747957602520090}
+  - {fileID: 7325153162450915011}
+  - {fileID: 8173313993394265504}
+  - {fileID: 6639653483637829207}
   m_Father: {fileID: 3370061335406075943}
   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.0000052452087, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_AnchorMax: {x: 0.509, y: 0.56666046}
+  m_AnchoredPosition: {x: 10, y: 35.5}
+  m_SizeDelta: {x: 96, y: 85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4166089039989576680
 CanvasRenderer:
@@ -260,8 +796,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 37.3, y: 46.638}
-  m_SizeDelta: {x: 348.9613, y: 30}
+  m_AnchoredPosition: {x: -0.1495, y: 50.676}
+  m_SizeDelta: {x: 523.6624, y: 42.713}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6912937265734038597
 CanvasRenderer:
@@ -284,7 +820,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  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
@@ -292,9 +828,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -355,8 +891,8 @@ 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, y: 16.92102}
-  m_SizeDelta: {x: 444, y: 133.84}
+  m_AnchoredPosition: {x: -12.1711, y: 28.15601}
+  m_SizeDelta: {x: 655, y: 250}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2778409128145198339
 CanvasRenderer:
@@ -443,8 +979,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.9154, y: 247.47897}
-  m_SizeDelta: {x: 444.0557, y: 133.8421}
+  m_AnchoredPosition: {x: 0.9154, y: 210.23947}
+  m_SizeDelta: {x: 655, y: 250}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3748703702239827202
 MonoBehaviour:
@@ -459,11 +995,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   data:
-  - key: myButton
-    gameObject: {fileID: 0}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_EventDesc
     gameObject: {fileID: 690487615239233780}
     isAssetBundle: 0
@@ -479,6 +1010,36 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Eventcondition
+    gameObject: {fileID: 3935838372477410148}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ItemRoot
+    gameObject: {fileID: 145896444123704845}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Go
+    gameObject: {fileID: 8048933075909396369}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ZuiZhong
+    gameObject: {fileID: 1530431928590719805}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ZuiZhongRoot
+    gameObject: {fileID: 8193172811373753691}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Marsk
+    gameObject: {fileID: 6639653483637829207}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &6161269103075097772
 GameObject:
@@ -516,7 +1077,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 168.92786, y: 13.821144}
+  m_AnchoredPosition: {x: 253.39993, y: 20.807}
   m_SizeDelta: {x: 36.4424, y: 35.969}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &8916865937304356244
@@ -557,7 +1118,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_close_01
+  _icon_name: dec_fanhui1
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -744,8 +1305,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 46.637783}
-  m_SizeDelta: {x: 344, y: -59.433495}
+  m_AnchoredPosition: {x: -12.17, y: 52.255}
+  m_SizeDelta: {x: 553.1, y: -48.199}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8013943971233128026
 CanvasRenderer:
@@ -797,3 +1358,260 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &7455267306585598975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1132527634272378842}
+  - component: {fileID: 6867107770330957799}
+  - component: {fileID: 521768857768353200}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1132527634272378842
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  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: 8173313993394265504}
+  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: -2.3615}
+  m_SizeDelta: {x: 160, y: 46.8687}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6867107770330957799
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  m_CullTransparentMesh: 1
+--- !u!114 &521768857768353200
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7455267306585598975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8FFD\u8E2A\u4E2D"
+--- !u!1 &8193172811373753691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8173313993394265504}
+  - component: {fileID: 3700033355154013030}
+  - component: {fileID: 429128512067996824}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ZuiZhongRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8173313993394265504
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8193172811373753691}
+  m_LocalRotation: {x: -0, y: -0, z: 0.09949822, w: 0.9950378}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1132527634272378842}
+  m_Father: {fileID: 3764721290890148754}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.421}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 141.7, y: 57.1}
+  m_SizeDelta: {x: 172.7552, y: 65.7585}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3700033355154013030
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8193172811373753691}
+  m_CullTransparentMesh: 1
+--- !u!114 &429128512067996824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8193172811373753691}
+  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.32941177, g: 0.654902, b: 0.6509804, 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: btn_23
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8848809442754795059
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6639653483637829207}
+  - component: {fileID: 3169785772497008671}
+  - component: {fileID: 6725735528704137599}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Marsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6639653483637829207
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848809442754795059}
+  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: 3764721290890148754}
+  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: -12.171082, y: 28.15599}
+  m_SizeDelta: {x: 655, y: 250}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3169785772497008671
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848809442754795059}
+  m_CullTransparentMesh: 1
+--- !u!114 &6725735528704137599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8848809442754795059}
+  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: 0.49019608}
+  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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0

Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -328,11 +328,12 @@ RectTransform:
   m_Children:
   - {fileID: 5171746521320677542}
   - {fileID: 6634741294730613967}
+  - {fileID: 8111297521971765792}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 13.299988, y: -213.20001}
+  m_AnchoredPosition: {x: 13.299988, y: -288}
   m_SizeDelta: {x: 76, y: 74}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &76856068010717943
@@ -939,6 +940,93 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!1 &3233637757483136916
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8111297521971765792}
+  - component: {fileID: 5038450651613138194}
+  - component: {fileID: 6960660248127154089}
+  - component: {fileID: 6619368622079106145}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: EventConditionRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8111297521971765792
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  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: 3695676087259227986}
+  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: 170, y: -81.6}
+  m_SizeDelta: {x: 242.4876, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5038450651613138194
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  m_CullTransparentMesh: 1
+--- !u!114 &6960660248127154089
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_Spacing: 8.18
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6619368622079106145
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3233637757483136916}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &3348075033185530517
 GameObject:
   m_ObjectHideFlags: 0
@@ -2554,6 +2642,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: EventConditionRoot
+    gameObject: {fileID: 8111297521971765792}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:

Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -34,8 +34,9 @@ RectTransform:
   - {fileID: 2569128129379278262}
   - {fileID: 4688522053669353716}
   - {fileID: 8515100903656146540}
-  - {fileID: 3203492498983292032}
   - {fileID: 3220702368838562604}
+  - {fileID: 112700476894147953}
+  - {fileID: 708683880219238892}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -71,17 +72,12 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_Name
-    gameObject: {fileID: 9048041755528718903}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   - key: Text_desc
     gameObject: {fileID: 1040938809657299556}
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: Text_Title
+  - key: Text_Name
     gameObject: {fileID: 1087322108478024986}
     isAssetBundle: 0
     isList: 0
@@ -91,6 +87,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_Condition
+    gameObject: {fileID: 8902432584562006073}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &1408015899473625068
 GameObject:
@@ -125,11 +126,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4038523271141183626}
-  m_Father: {fileID: 3220702368838562604}
+  m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -287.1}
+  m_AnchoredPosition: {x: 0, y: 666.9}
   m_SizeDelta: {x: 410.77, y: 248.4609}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4283077157061789222
@@ -309,8 +310,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -9, y: -288.69}
-  m_SizeDelta: {x: 132.3538, y: 50.3799}
+  m_AnchoredPosition: {x: -9, y: -276.2}
+  m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2934276402299459566
 CanvasRenderer:
@@ -333,7 +334,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.27792454, g: 1, b: 0, a: 1}
+  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
@@ -350,7 +351,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_23
+  _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -465,7 +466,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.9490197, g: 0.94117653, b: 0.94117653, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -473,9 +474,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 21
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 33
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -485,7 +486,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6311\u6218"
+  m_Text: "\u4EFB\u52A1\u5B8C\u6210"
 --- !u!1 &3627747089450203247
 GameObject:
   m_ObjectHideFlags: 0
@@ -517,13 +518,12 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 708683880219238892}
+  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, y: -506}
+  m_AnchoredPosition: {x: 0, y: -467.9}
   m_SizeDelta: {x: 410.77, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9047568930966635103
@@ -582,86 +582,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &5056397833504547694
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3203492498983292032}
-  - component: {fileID: 7191667401234808033}
-  - component: {fileID: 9048041755528718903}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: Text_Name
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &3203492498983292032
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5056397833504547694}
-  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: 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: -121.43, y: 339.6}
-  m_SizeDelta: {x: 167.8958, y: 40.0044}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7191667401234808033
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5056397833504547694}
-  m_CullTransparentMesh: 1
---- !u!114 &9048041755528718903
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5056397833504547694}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 3
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u4EFB\u52A1\u4FE1\u606F"
 --- !u!1 &6488653642591306706
 GameObject:
   m_ObjectHideFlags: 0
@@ -884,6 +804,101 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7852697166483862012
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 112700476894147953}
+  - component: {fileID: 3214678112079635339}
+  - component: {fileID: 8902432584562006073}
+  - component: {fileID: 8492955492561521038}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Condition
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &112700476894147953
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  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: 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, y: -575.3}
+  m_SizeDelta: {x: 410.77, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &3214678112079635339
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  m_CullTransparentMesh: 1
+--- !u!114 &8902432584562006073
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.61960787, g: 0.6117647, b: 0.1764706, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1.3
+  m_Text: "\u51FB\u8D25\u540E\u5C71\u5C0F\u59960/6\n\u51FB\u8D25\u540E\u5C71\u5C0F\u59960/6"
+--- !u!114 &8492955492561521038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7852697166483862012}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &8794085188831228050
 GameObject:
   m_ObjectHideFlags: 0
@@ -897,7 +912,7 @@ GameObject:
   - component: {fileID: 1087322108478024986}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text_Title
+  m_Name: Text_Name
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -919,7 +934,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.0000038147, y: 380}
+  m_AnchoredPosition: {x: -0.0000038147, y: 390.8}
   m_SizeDelta: {x: 410.7655, y: 55.7865}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &126500885704442088

Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -115,7 +115,8 @@ namespace Fort23.Core
       /// 获得道具
       /// </summary>
       AddItem,
-      DaoYouCounUpdate
+      DaoYouCounUpdate,
+      UpdateZuiZhongEvent
       
     }
 }

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -92,6 +92,12 @@ public int Daoyoushowuptime;
 public int[] DaoyouguajiDuration;
 
 
+		/// <summary>
+		///刷新关联事件概率 （100=100%）
+		/// </summary>
+public int RefreshRelevanceEventProbability;
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -60,6 +60,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public HeroData heroData;
 
+        public EventList CurrentZuiZhongEventList;
+
         public List<DaoYouData> daoYouDatas = new List<DaoYouData>();
 
 
@@ -92,7 +94,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // /// 事件链数据
         // /// </summary>
         // public List<EventLinkData> eventLinkDatas = new List<EventLinkData>();
-        
+
         // /// <summary>
         // /// 
         // /// </summary>
@@ -241,7 +243,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// 事件监听列表
         /// </summary>
         public List<EventConditionData> eventConditions = new List<EventConditionData>();
-
     }
 
 
@@ -251,9 +252,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class EventConditionData
     {
-     
-     
-
         public int eventId;
         public int eventCondition;
 
@@ -267,11 +265,15 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class EventList
     {
+        public int guid;
+        
         public int eventID;
 
-       public List<EventLinkData> eventLinks = new List<EventLinkData>();
+        public List<EventLinkData> eventLinks = new List<EventLinkData>();
 
         public int curStep;
+
+        public bool isCompleted;
     }
 
 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -86,6 +86,26 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     public List<AccountFileInfo.EventList> UseDivinesense()
     {
+        //使用神识先移除完成的事件
+        List<AccountFileInfo.EventList> removeEvents = new List<AccountFileInfo.EventList>();
+        foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+        {
+            if (eventList.isCompleted)
+            {
+                removeEvents.Add(eventList);
+               
+            }
+        }
+        
+        foreach (var removeEvent in removeEvents)
+        {
+            AccountFileInfo.Instance.playerData.completeEvents.Add(removeEvent);
+            AccountFileInfo.Instance.playerData.eventList.Remove(removeEvent);
+        }
+
+        AccountFileInfo.Instance.SavePlayerData();
+
+
         HeroPowerUpConfig heroPowerUpConfig = PlayerManager.Instance.myHero.powerUpConfig;
         int count = AccountFileInfo.Instance.playerData.divineSensePoint / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         if (count <= 0)
@@ -111,11 +131,29 @@ public class EventSystemManager : Singleton<EventSystemManager>
         AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
         AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
 
+
         AccountFileInfo.Instance.playerData.eventList.AddRange(eventConfigs);
+        UpdateZuizhongEventData();
         AccountFileInfo.Instance.SavePlayerData();
         return eventConfigs;
     }
 
+    public void UpdateZuizhongEventData()
+    {
+        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList == null || AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == 0)
+        {
+            var mainEventData = GetMainEventDta();
+            if (mainEventData != null)
+            {
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = mainEventData;
+            }
+            else
+            {
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = AccountFileInfo.Instance.playerData.eventList[0];
+            }
+        }
+    }
+
     private void UpDivinesense()
     {
         for (var i = AccountFileInfo.Instance.playerData.divineSenseLevel - 1; i < divineSenseConfigs.Count; i++)
@@ -128,7 +166,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
 
         AccountFileInfo.Instance.SavePlayerData();
-    }
+    } 
 
 
     public bool BagIsEvent(int eventID)
@@ -144,6 +182,20 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return false;
     }
 
+    public int GetBagEventCount(int eventID)
+    {
+        int count = 0;
+        foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+        {
+            if (eventList.eventID == eventID)
+            {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
     public bool IsEventTrigger(int eventID)
     {
         foreach (var eventList in AccountFileInfo.Instance.playerData.completeEvents)
@@ -202,6 +254,47 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         for (int i = 0; i < eventCount; i++)
         {
+            int randomValue3 = Random.Range(0, 101);
+
+            //先刷事件关联的事件
+            if (randomValue3 >= 50)
+            {
+                bool isRefence = false;
+                foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+                {
+                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                    for (var i1 = 0; i1 < eventConfig.RelatedEvents?.Length; i1++)
+                    {
+                        EventConfig eventConfig1 = ConfigComponent.Instance.Get<EventConfig>(eventConfig.RelatedEvents[i1]);
+                        int count = 0;
+                        foreach (var list in eventLists)
+                        {
+                            if (list.eventID == eventConfig1.ID)
+                            {
+                                count++;
+                            }
+                        }
+
+                        if (GetBagEventCount(eventConfig1.ID) + count >= eventConfig1.RefreshCount)
+                        {
+                            continue;
+                        }
+
+                        int randomValue4 = Random.Range(0, 101);
+                        if (randomValue4 >= eventConfig1.RefreshProbability)
+                        {
+                            eventLists.Add(AddEvent(eventConfig1.ID));
+                            isRefence = true;
+                            break;
+                        }
+                    }
+                }
+
+                if (isRefence)
+                    continue;
+            }
+
+
             //先掉落出品质
             int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
 
@@ -268,6 +361,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 eventList = new AccountFileInfo.EventList();
                 eventList.eventID = eventID;
             }
+
+            eventList.guid = IdGenerater.GenerateIdInt();
+            eventList.curStep = eventConfig.EventLinksId[0];
         }
 
         //初始化神识链条，用于监听条件是否完成
@@ -413,6 +509,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
         bool isUlock = true;
+        //分组检测 其中一个组绑定成功就可以执行
         foreach (var keyValuePair in eventConditionDataGroup)
         {
             isUlock = true;
@@ -428,11 +525,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
             {
                 return isUlock;
             }
-
-         
         }
 
-        return false;
+        return isUlock;
     }
 
     public void CeekEventCompletes(int type, int[] value)
@@ -617,18 +712,26 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-        AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+        //先不移除 下次探索神识移除
+        eventList.isCompleted = true;
 
-        // if (PlayerManager.Instance.CurrentPlaces.progress < 100)
-        //    
+        // AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
+        //
+        //
+        //
+        // AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
 
+        if (AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
+        {
+            AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = null;
+            UpdateZuizhongEventData();
+        }
 
-        AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
         AccountFileInfo.Instance.SavePlayerData();
 
         if (eventConfig.EventTriggerType == 4)
         {
-            TaskInfoPanel.OpenPanel(eventList.eventID, "任务完成");
+            TaskInfoPanel.OpenPanel(eventList);
         }
 
 

Assets/Scripts/GameUI/GameApplction.cs

@@ -115,7 +115,7 @@ public class GameApplction : IGameStart
         //     LogTool.Error("登陆失败");
         //     return;
         // }
-        
+
         EventSystemManager.Instance.CustomInit();
         PlayerManager.Instance.Init();
         // SkillConfig[] skillConfigs= ConfigComponent.Instance.GetAll<SkillConfig>();
@@ -137,7 +137,7 @@ public class GameApplction : IGameStart
             FaBaoInfo faBaoInfo = new FaBaoInfo(playerDataAllSkillData);
             PlayerManager.Instance.FaBaoControl.AddFaBao(faBaoInfo);
         }
-        
+
         // for (int i = 1; i < 4; i++)
         // {
         //     PlayerManager.Instance.FaBaoControl.FightFaBao[i] = PlayerManager.Instance.FaBaoControl.myAllFaBao[i];
@@ -161,12 +161,14 @@ public class GameApplction : IGameStart
         CombatDrive.Instance.AddCombatController(new CombatController());
         gameStartUIPanel.ShowMassge("loadCombat");
         gameStartUIPanel.SetSlider(0.95f);
-        var eventList =EventSystemManager.Instance.AddEvent(10001);
+        var eventList = EventSystemManager.Instance.AddEvent(10001);
+        EventSystemManager.Instance.UpdateZuizhongEventData();
         if (eventList != null)
         {
             AccountFileInfo.Instance.playerData.eventList.Add(eventList);
             AccountFileInfo.Instance.SavePlayerData();
         }
+
         await CombatDrive.Instance.StartCombat(startCombatInfo);
         PlayerManager.Instance.GongFaControl.SaveUseSkill();
         PlayerManager.Instance.GongFaControl.SetTaoismSkillIndex(AccountFileInfo.Instance.playerData.heroData

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -140,12 +140,14 @@ namespace Fort23.Mono
 
             if (eventLists != null && eventLists.Count > 0)
             {
-                EventSystemManager.Instance.isOpenUi = true;
+                // EventSystemManager.Instance.isOpenUi = true;
 
-                DivineSenceEventResultPanel divineSenceEventResultPanel =
-                    await DivineSenceEventResultPanel.OpenPanel(eventLists);
-                await divineSenceEventResultPanel.UIClosed();
-                EventSystemManager.Instance.isOpenUi = false;
+                // DivineSenceEventResultPanel divineSenceEventResultPanel =
+                //     await DivineSenceEventResultPanel.OpenPanel(eventLists);
+                
+                await DivineSenceEventPreviewPanel.OpenPanel();
+                // await divineSenceEventResultPanel.UIClosed();
+                // EventSystemManager.Instance.isOpenUi = false;
             }
 
 

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

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -8,11 +9,18 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DivineSenceEventPreviewPanel")]
     public partial class DivineSenceEventPreviewPanel : UIPanel, IScrollListContent
     {
+        public List<AccountFileInfo.EventList> showEventList = new List<AccountFileInfo.EventList>();
+
+        List<ShengShiEventWidgetType2> shengShiEventWidgetTypeList = new List<ShengShiEventWidgetType2>();
+
+        private int saixuanType = 1;
+
+
         private void Init()
         {
-            isPopUi = true;
-            // isAddStack = true;
-            // IsShowAppBar = false;
+            // isPopUi = true;
+            isAddStack = true;
+            IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -34,75 +42,122 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+
+            Btn_ShenShi.onClick.AddListener(async () =>
+            {
+                if (saixuanType == 1)
+                    return;
+                saixuanType = 1;
+                SaiXuan(1);
+                foreach (var shengShiEventWidgetType2 in shengShiEventWidgetTypeList)
+                {
+                    UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
+                }
+
+                shengShiEventWidgetTypeList.Clear();
+                await Content.Init(this, showEventList.Count);
+            });
+
+            Btn_DaoYou.onClick.AddListener(async () =>
+            {
+                if (saixuanType == 2)
+                    return;
+                saixuanType = 2;
+                SaiXuan(2);
+                foreach (var shengShiEventWidgetType2 in shengShiEventWidgetTypeList)
+                {
+                    UIManager.Instance.DormancyGComponent(shengShiEventWidgetType2);
+                }
+                shengShiEventWidgetTypeList.Clear();
+                await Content.Init(this, showEventList.Count);
+            });
         }
 
         private void RemoveEvent(IEventData e)
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
-            Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
+            Content.Init(this, showEventList.Count);
         }
 
-        public override CTask<bool> AsyncInit(object[] uiData)
+        public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
-            return base.AsyncInit(uiData);
+            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ShengShiEventWidgetType2Root);
+            shengShiEventWidgetType2.CustomInit(eventList, GoOnClick);
+            shengShiEventWidgetType2.OnClick = OnClick;
+            SaiXuan(1);
+            await Content.Init(this, showEventList.Count);
+            return await base.AsyncInit(uiData);
         }
 
 
-        public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+        public void SaiXuan(int type)
         {
-            if (index < 0 || index >= AccountFileInfo.Instance.playerData.eventList.Count)
+            showEventList.Clear();
+            if (type == 1)
             {
-                return null;
+                foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+                {
+                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                    if (eventConfig.EventTriggerType != 5 && eventConfig.EventTriggerType != 4)
+                    {
+                        showEventList.Add(eventList);
+                    }
+                }
             }
-
-            EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(AccountFileInfo.Instance.playerData.eventList[index].eventID);
-            if (eventConfig.EventType == 2)
+            else
             {
-                ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
-                shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
-                return shengShiEventWidgetType2;
+                foreach (var eventList in AccountFileInfo.Instance.playerData.eventList)
+                {
+                    EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+                    if (eventConfig.EventTriggerType == 5 && eventConfig.EventTriggerType != 4)
+                    {
+                        showEventList.Add(eventList);
+                    }
+                }
             }
-            else
+        }
+
+
+        public async CTask<IScorllListWidget> GetIScorllListWidget(int index, RectTransform root)
+        {
+            if (index < 0 || index >= showEventList.Count)
             {
-                ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(AccountFileInfo.Instance.playerData.eventList[index]);
-                shengShiEventWidgetType2.OnClick = OnClick;
-                return shengShiEventWidgetType2;
+                return null;
             }
+
+
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
+            shengShiEventWidgetType2.CustomInit(showEventList[index], GoOnClick);
+            shengShiEventWidgetType2.OnClick = OnClick;
+            shengShiEventWidgetTypeList.Add(shengShiEventWidgetType2);
+            return shengShiEventWidgetType2;
         }
 
-        private void ShengShiEventWidgetType3OnClick(ItemWidgetBasic obj)
+        private void GoOnClick(ItemWidgetBasic obj)
         {
-            ShengShiEventWidgetType3 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType3;
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
+
+
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
-
             this.GObjectPoolInterface.SetActive(false);
             EventSystemManager.Instance.isOpenUi = false;
+
             EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
             {
-                Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
+                Content.Init(this, showEventList.Count);
                 this.GObjectPoolInterface.SetActive(true);
                 EventSystemManager.Instance.isOpenUi = true;
             });
         }
 
+
         private void OnClick(ItemWidgetBasic obj)
         {
             ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
-            if (EventSystemManager.Instance.isTriggerEvent)
-                return;
-            this.GObjectPoolInterface.SetActive(false);
-            EventSystemManager.Instance.isOpenUi = false;
-        
-            EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
-            {
-                Content.Init(this, AccountFileInfo.Instance.playerData.eventList.Count);
-                this.GObjectPoolInterface.SetActive(true);
-                EventSystemManager.Instance.isOpenUi = true;
-            });
+
+            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList);
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)
@@ -119,6 +174,7 @@ namespace Fort23.Mono
         public override void Close()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidgetType2>();
+            shengShiEventWidgetTypeList.Clear();
             EventSystemManager.Instance.isOpenUi = false;
             base.Close();
         }

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

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _myButton;
 	     }
 	   }
-	  private Object _Massge;
-	  public Object Massge
-	   {
-	   get{
-	      if (_Massge == null)
-	       {
-	         _Massge  = GetUIUnit<Object>("Massge"); 
-	       }
-	      return _Massge;
-	     }
-	   }
 	  private MyImage _bg;
 	  public MyImage bg
 	   {
@@ -74,6 +63,39 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
+	  private RectTransform _ShengShiEventWidgetType2Root;
+	  public RectTransform ShengShiEventWidgetType2Root
+	   {
+	   get{
+	      if (_ShengShiEventWidgetType2Root == null)
+	       {
+	         _ShengShiEventWidgetType2Root  = GetUIUnit<RectTransform>("ShengShiEventWidgetType2Root"); 
+	       }
+	      return _ShengShiEventWidgetType2Root;
+	     }
+	   }
+	  private Button _Btn_ShenShi;
+	  public Button Btn_ShenShi
+	   {
+	   get{
+	      if (_Btn_ShenShi == null)
+	       {
+	         _Btn_ShenShi  = GetUIUnit<Button>("Btn_ShenShi"); 
+	       }
+	      return _Btn_ShenShi;
+	     }
+	   }
+	  private Button _Btn_DaoYou;
+	  public Button Btn_DaoYou
+	   {
+	   get{
+	      if (_Btn_DaoYou == null)
+	       {
+	         _Btn_DaoYou  = GetUIUnit<Button>("Btn_DaoYou"); 
+	       }
+	      return _Btn_DaoYou;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -60,17 +60,17 @@ namespace Fort23.Mono
             }
 
             EventConfig eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList[index].eventID);
-            if (eventConfig.EventType == 2)
-            {
-                ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index]);
-                shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
-                return shengShiEventWidgetType2;
-            }
-            else
+            // if (eventConfig.EventType == 2)
+            // {
+            //     ShengShiEventWidgetType3 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType3>(null, ContentRoot);
+            //     shengShiEventWidgetType2.CustomInit(eventList[index]);
+            //     shengShiEventWidgetType2.OnClick = ShengShiEventWidgetType3OnClick;
+            //     return shengShiEventWidgetType2;
+            // }
+            // else
             {
                 ShengShiEventWidgetType2 shengShiEventWidgetType2 = await UIManager.Instance.CreateGComponent<ShengShiEventWidgetType2>(null, ContentRoot);
-                shengShiEventWidgetType2.CustomInit(eventList[index]);
+                shengShiEventWidgetType2.CustomInit(eventList[index],GoOnClick);
                 shengShiEventWidgetType2.OnClick = OnClick;
                 return shengShiEventWidgetType2;
             }
@@ -92,8 +92,30 @@ namespace Fort23.Mono
                 this.GObjectPoolInterface.SetActive(true);
             });
         }
-
+        
         private void OnClick(ItemWidgetBasic obj)
+        {
+            ShengShiEventWidgetType2 shengShiEventWidgetType2 = obj as ShengShiEventWidgetType2;
+            
+            TaskInfoPanel.OpenPanel(shengShiEventWidgetType2.eventList);
+            
+            // if (EventSystemManager.Instance.isTriggerEvent)
+            //     return;
+            //
+        
+            // this.GObjectPoolInterface.SetActive(false);
+            // EventSystemManager.Instance.isOpenUi = false;
+            // EventSystemManager.Instance.TriggerEvent(shengShiEventWidgetType2.eventList, () =>
+            // {
+            //     eventList.Remove(shengShiEventWidgetType2.eventList);
+            //     Content.Init(this, eventList.Count);
+            //     EventSystemManager.Instance.isOpenUi = true;
+            //     this.GObjectPoolInterface.SetActive(true);
+            //
+            // });
+        }
+
+       private void GoOnClick(ItemWidgetBasic obj)
         {
             if (EventSystemManager.Instance.isTriggerEvent)
                 return;
@@ -111,7 +133,7 @@ namespace Fort23.Mono
             });
         }
 
-
+ 
         public void HindIScorllListWidget(IScorllListWidget widget)
         {
             UIManager.Instance.DormancyGComponent(widget as UIComponent);

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

@@ -0,0 +1,35 @@
+using System.Linq;
+using Excel2Json;
+using Fort23.UTool;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "ShengShiConditionWidget"  )]
+	public partial class ShengShiConditionWidget : UIComponent
+	{
+		private void Init()
+		{
+
+		}
+		public override void AddEvent()
+		{
+
+		}
+		public override void DelEvent()
+		{
+
+		}
+		public override void AddButtonEvent()
+		{
+
+		}
+
+		public void CustomInit(AccountFileInfo.EventConditionData eventConditionData)
+		{
+			
+			Text_Name.text = EventHelper.GetTaskMessage(eventConditionData) ;
+			
+		}
+
+	}
+}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiConditionWidget.cs.meta

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

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

@@ -0,0 +1,51 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class ShengShiConditionWidget 
+	{
+	  #region 自定义数据 
+	  private Button _myButton;
+	  public Button myButton
+	   {
+	   get{
+	      if (_myButton == null)
+	       {
+	         _myButton  = GetUIUnit<Button>("myButton"); 
+	       }
+	      return _myButton;
+	     }
+	   }
+	  private MyImage _bg;
+	  public MyImage bg
+	   {
+	   get{
+	      if (_bg == null)
+	       {
+	         _bg  = GetUIUnit<MyImage>("bg"); 
+	       }
+	      return _bg;
+	     }
+	   }
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

Assets/Scripts/GameUI/UI/DivineSence/ShengShiConditionWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DS5Kty/4Unp/JmdJHO/a2rWrHNNvIUdy0NBQ7Otnox1A8MhjZGjYFLmnn8cG
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1,48 +1,139 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
+using GameLogic.Player;
 using UnityEngine;
 
 namespace Fort23.Mono
 {
-[UIBinding(prefab = "ShengShiEventWidgetType2"  )]
-	public partial class ShengShiEventWidgetType2 : ItemWidgetBasic
-	{
-		private void Init()
-		{
-		}
-		public override void AddEvent()
-		{
-		}
-		public override void DelEvent()
-		{
-		}
-		public override void AddButtonEvent()
-		{
-			base.AddButtonEvent();
-			Btn_RemoveEvent.onClick.AddListener(() =>
-			{
-				EventSystemManager.Instance.RemoveEvent(eventList);
-			});
-		}
-
-		private void Button_onClick()
-		{
-
-		}
-
-		private EventConfig randomEventConfig;
-		public AccountFileInfo.EventList eventList;
-
-		public void CustomInit(AccountFileInfo.EventList eventList)
-		{
-			this.eventList = eventList;
-			randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
-			Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
-			EventLinkConfig conditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(randomEventConfig.EventLinksId[0]);
-			Text_EventDesc.text = LanguageManager.Instance.Text(randomEventConfig.Description);
-
-		}
-		
-	}
-}
+    [UIBinding(prefab = "ShengShiEventWidgetType2")]
+    public partial class ShengShiEventWidgetType2 : ItemWidgetBasic
+    {
+        List<WidgetItem> widgetList = new List<WidgetItem>();
+        private Action<ItemWidgetBasic> goCallBack;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+            EventManager.Instance.AddEventListener(CustomEventType.UpdateZuiZhongEvent,UpdateZuiZhongEvent);
+        }
+
+     
+
+        public override void DelEvent()
+        {
+            EventManager.Instance.RemoveEventListener(CustomEventType.UpdateZuiZhongEvent,UpdateZuiZhongEvent);
+        }
+
+        public override void AddButtonEvent()
+        {
+            base.AddButtonEvent();
+            Btn_RemoveEvent.onClick.AddListener(() => { EventSystemManager.Instance.RemoveEvent(eventList); });
+            Btn_Go.onClick.AddListener(() =>
+            {
+                goCallBack?.Invoke(this);
+            });
+            
+            Btn_ZuiZhong.onClick.AddListener(() =>
+            {
+                AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList = eventList;
+                
+                EventManager.Instance.Dispatch(CustomEventType.UpdateZuiZhongEvent,null);
+            });
+        }
+
+        private void Button_onClick()
+        {
+        }
+
+        private EventConfig randomEventConfig;
+        public AccountFileInfo.EventList eventList;
+
+        private void UpdateZuiZhongEvent(IEventData e)
+        {
+            // if(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid)
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid != eventList.guid);
+            
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid);
+        }
+        public async void CustomInit(AccountFileInfo.EventList eventList,Action<ItemWidgetBasic> goCallBack)
+        {
+            this.eventList = eventList;
+            this.goCallBack = goCallBack;
+            randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
+            EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
+
+            AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
+
+
+            Text_EventName.text = LanguageManager.Instance.Text(randomEventConfig.EventName);
+
+            Text_EventDesc.text = LanguageManager.Instance.Text(evenkConfig.conciseEventMessage);
+
+            if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
+            {
+                Text_Eventcondition.text = LanguageManager.Instance.Text(evenkConfig.EventConditionMessage);
+            }
+            else
+            {
+                string desc = "";
+                foreach (var eventConditionData in eventLinkData.eventConditions)
+                {
+                    desc += EventHelper.GetTaskMessage(eventConditionData) + "\n";
+                }
+
+                Text_Eventcondition.text = desc;
+            }
+            
+            Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid != eventList.guid);
+            
+            ZuiZhongRoot.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList.guid == eventList.guid);
+            Icon_Marsk.gameObject.SetActive(eventList.isCompleted);
+
+
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
+            for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
+            {
+                DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
+                if (dropConfig.dropType == 3)
+                {
+                    ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], randomEventConfig.PrizeNums[i]);
+                    itemInfos.Add(itemInfo);
+                }
+                else
+                {
+                    List<ItemInfo> items = DropManager.Instance.DropItem(randomEventConfig.PrizeIDs[i]);
+                    itemInfos.AddRange(items);
+                }
+            }
+
+            for (var i = 0; i < itemInfos.Count; i++)
+            {
+                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                widgetItem.InitWidget(itemInfos[i]);
+                widgetList.Add(widgetItem);
+            }
+        }
+
+
+        public override void DormancyObj()
+        {
+            foreach (var widgetItem in widgetList)
+            {
+                UIManager.Instance.DormancyGComponent(widgetItem);
+            }
+
+            widgetList.Clear();
+
+            base.DormancyObj();
+        }
+    }
+}

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

@@ -8,17 +8,6 @@ namespace Fort23.Mono
 	public partial class ShengShiEventWidgetType2 
 	{
 	  #region 自定义数据 
-	  private Object _myButton;
-	  public Object myButton
-	   {
-	   get{
-	      if (_myButton == null)
-	       {
-	         _myButton  = GetUIUnit<Object>("myButton"); 
-	       }
-	      return _myButton;
-	     }
-	   }
 	  private Text _Text_EventDesc;
 	  public Text Text_EventDesc
 	   {
@@ -52,6 +41,72 @@ namespace Fort23.Mono
 	      return _Btn_RemoveEvent;
 	     }
 	   }
+	  private Text _Text_Eventcondition;
+	  public Text Text_Eventcondition
+	   {
+	   get{
+	      if (_Text_Eventcondition == null)
+	       {
+	         _Text_Eventcondition  = GetUIUnit<Text>("Text_Eventcondition"); 
+	       }
+	      return _Text_Eventcondition;
+	     }
+	   }
+	  private RectTransform _ItemRoot;
+	  public RectTransform ItemRoot
+	   {
+	   get{
+	      if (_ItemRoot == null)
+	       {
+	         _ItemRoot  = GetUIUnit<RectTransform>("ItemRoot"); 
+	       }
+	      return _ItemRoot;
+	     }
+	   }
+	  private Button _Btn_Go;
+	  public Button Btn_Go
+	   {
+	   get{
+	      if (_Btn_Go == null)
+	       {
+	         _Btn_Go  = GetUIUnit<Button>("Btn_Go"); 
+	       }
+	      return _Btn_Go;
+	     }
+	   }
+	  private Button _Btn_ZuiZhong;
+	  public Button Btn_ZuiZhong
+	   {
+	   get{
+	      if (_Btn_ZuiZhong == null)
+	       {
+	         _Btn_ZuiZhong  = GetUIUnit<Button>("Btn_ZuiZhong"); 
+	       }
+	      return _Btn_ZuiZhong;
+	     }
+	   }
+	  private GameObject _ZuiZhongRoot;
+	  public GameObject ZuiZhongRoot
+	   {
+	   get{
+	      if (_ZuiZhongRoot == null)
+	       {
+	         _ZuiZhongRoot  = GetUIUnit<GameObject>("ZuiZhongRoot"); 
+	       }
+	      return _ZuiZhongRoot;
+	     }
+	   }
+	  private RectTransform _Icon_Marsk;
+	  public RectTransform Icon_Marsk
+	   {
+	   get{
+	      if (_Icon_Marsk == null)
+	       {
+	         _Icon_Marsk  = GetUIUnit<RectTransform>("Icon_Marsk"); 
+	       }
+	      return _Icon_Marsk;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -11,6 +11,7 @@ namespace Fort23.Mono
     [UIBinding(prefab = "ShengShiEventWidgetType3")]
     public partial class ShengShiEventWidgetType3 : ItemWidgetBasic
     {
+        List<WidgetItem> widgetList = new List<WidgetItem>();
         private void Init()
         {
         }
@@ -28,7 +29,7 @@ namespace Fort23.Mono
             base.AddButtonEvent();
         }
 
-        List<WidgetItem> widgetList = new List<WidgetItem>();
+        // List<WidgetItem> widgetList = new List<WidgetItem>();
 
         private void Button_onClick()
         {

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

@@ -17,6 +17,8 @@ namespace Fort23.Mono
 
         private ShengShiEventWidget shengShiEventWidget;
 
+        List<ShengShiConditionWidget> _shengShiConditionWidgets = new List<ShengShiConditionWidget>();
+
         private void Init()
         {
             isAddStack = true;
@@ -190,9 +192,17 @@ namespace Fort23.Mono
 
         public async void CreatShengShiEvent()
         {
-            AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
-            if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
-                eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
+            // AccountFileInfo.EventList eventList = EventSystemManager.Instance.GetMainEventDta();
+            // if (AccountFileInfo.Instance.playerData.eventList.Count > 0)
+            //     eventList = eventList == null ? AccountFileInfo.Instance.playerData.eventList[0] : eventList;
+            foreach (var shengShiConditionWidget in _shengShiConditionWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(shengShiConditionWidget);
+            }
+
+            _shengShiConditionWidgets.Clear();
+
+            AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.CurrentZuiZhongEventList;
             if (eventList != null)
             {
                 if (shengShiEventWidget == null)
@@ -202,6 +212,19 @@ namespace Fort23.Mono
                 }
 
                 shengShiEventWidget.InitShengShiEventWidget(eventList);
+                // EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
+
+                AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
+
+                if (eventLinkData != null && eventLinkData.eventConditions != null && eventLinkData.eventConditions.Count >= 0)
+                {
+                    foreach (var eventConditionData in eventLinkData.eventConditions)
+                    {
+                        ShengShiConditionWidget shengShiConditionWidget = await UIManager.Instance.CreateGComponent<ShengShiConditionWidget>(null, EventConditionRoot);
+                        shengShiConditionWidget.CustomInit(eventConditionData);
+                        _shengShiConditionWidgets.Add(shengShiConditionWidget);
+                    }
+                }
             }
             else
             {
@@ -237,6 +260,13 @@ namespace Fort23.Mono
         {
             UIManager.Instance.DormancyGComponent(shengShiEventWidget);
             shengShiEventWidget = null;
+
+            foreach (var shengShiConditionWidget in _shengShiConditionWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(shengShiConditionWidget);
+            }
+
+            _shengShiConditionWidgets.Clear();
             base.Close();
         }
     }

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

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

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Excel2Json;
 using Fort23.Core;
@@ -31,43 +32,60 @@ namespace Fort23.Mono
             Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 
-        public async void CustomInit(int taskId, string title)
+        public async void CustomInit(AccountFileInfo.EventList eventList)
         {
-            EventConfig taskConfig = ConfigComponent.Instance.Get<EventConfig>(taskId);
-            Text_Title.text = title;
+            EventConfig taskConfig = ConfigComponent.Instance.Get<EventConfig>(eventList.eventID);
             Text_Name.text = LanguageManager.Instance.Text(taskConfig.EventName);
             Text_desc.text = LanguageManager.Instance.Text(taskConfig.Description);
-            // if (taskConfig.awardItemId != null)
-            // {
-            //     List<ItemInfo> itemInfos = new List<ItemInfo>();
-            //     for (var i = 0; i < taskConfig.awardItemId.Length; i++)
-            //     {
-            //         DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(taskConfig.awardItemId[i]);
-            //         if (dropConfig.dropType == 3)
-            //         {
-            //             ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], taskConfig.awardItemCount[i]);
-            //             itemInfos.Add(itemInfo);
-            //         }
-            //         else
-            //         {
-            //             List<ItemInfo> items = DropManager.Instance.DropItem(taskConfig.awardItemCount[i]);
-            //             itemInfos.AddRange(items);
-            //         }
-            //     }
-                //
-                // foreach (var itemInfo in itemInfos)
-                // {
-                //     WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, root: ItemRoot);
-                //     widgetItem.InitWidget(itemInfo);
-                //     widgetItems.Add(widgetItem);
-                // }
-            // }
+            EventLinkConfig evenkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventList.curStep);
+            AccountFileInfo.EventLinkData eventLinkData = eventList.eventLinks.FirstOrDefault(el => el.eventLinkId == eventList.curStep);
+            if (eventLinkData == null || eventLinkData.eventConditions == null || eventLinkData.eventConditions.Count == 0)
+            {
+                Text_Condition.text = LanguageManager.Instance.Text(evenkConfig.EventConditionMessage);
+            }
+            else
+            {
+                string desc = "";
+                foreach (var eventConditionData in eventLinkData.eventConditions)
+                {
+                    desc += EventHelper.GetTaskMessage(eventConditionData) + "\n";
+                }
+
+                Text_Condition.text = desc;
+            }
+
+
+            if (taskConfig.PrizeIDs != null)
+            {
+                List<ItemInfo> itemInfos = new List<ItemInfo>();
+                for (var i = 0; i < taskConfig.PrizeIDs.Length; i++)
+                {
+                    DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(taskConfig.PrizeIDs[i]);
+                    if (dropConfig.dropType == 3)
+                    {
+                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], taskConfig.PrizeNums[i]);
+                        itemInfos.Add(itemInfo);
+                    }
+                    else
+                    {
+                        List<ItemInfo> items = DropManager.Instance.DropItem(taskConfig.PrizeNums[i]);
+                        itemInfos.AddRange(items);
+                    }
+                }
+
+                foreach (var itemInfo in itemInfos)
+                {
+                    WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, root: ItemRoot);
+                    widgetItem.InitWidget(itemInfo);
+                    widgetItems.Add(widgetItem);
+                }
+            }
         }
 
-        public async static CTask<TaskInfoPanel> OpenPanel(int taskId,string title)
+        public async static CTask<TaskInfoPanel> OpenPanel(AccountFileInfo.EventList eventList)
         {
-            TaskInfoPanel taskInfoPanel = await UIManager.Instance.LoadAndOpenPanel<TaskInfoPanel>(null,UILayer.Top);
-            taskInfoPanel.CustomInit(taskId, title);
+            TaskInfoPanel taskInfoPanel = await UIManager.Instance.LoadAndOpenPanel<TaskInfoPanel>(null, UILayer.Top);
+            taskInfoPanel.CustomInit(eventList);
             return taskInfoPanel;
         }
 

Assets/Scripts/GameUI/UI/Task/TaskInfoPanelData.cs

@@ -41,17 +41,6 @@ namespace Fort23.Mono
 	      return _Btn_Ok;
 	     }
 	   }
-	  private Text _Text_Name;
-	  public Text Text_Name
-	   {
-	   get{
-	      if (_Text_Name == null)
-	       {
-	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
-	       }
-	      return _Text_Name;
-	     }
-	   }
 	  private Text _Text_desc;
 	  public Text Text_desc
 	   {
@@ -63,15 +52,15 @@ namespace Fort23.Mono
 	      return _Text_desc;
 	     }
 	   }
-	  private Text _Text_Title;
-	  public Text Text_Title
+	  private Text _Text_Name;
+	  public Text Text_Name
 	   {
 	   get{
-	      if (_Text_Title == null)
+	      if (_Text_Name == null)
 	       {
-	         _Text_Title  = GetUIUnit<Text>("Text_Title"); 
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
 	       }
-	      return _Text_Title;
+	      return _Text_Name;
 	     }
 	   }
 	  private RectTransform _ItemRoot;
@@ -85,6 +74,17 @@ namespace Fort23.Mono
 	      return _ItemRoot;
 	     }
 	   }
+	  private Text _Text_Condition;
+	  public Text Text_Condition
+	   {
+	   get{
+	      if (_Text_Condition == null)
+	       {
+	         _Text_Condition  = GetUIUnit<Text>("Text_Condition"); 
+	       }
+	      return _Text_Condition;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{