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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by master version

Assets/Art/VFX/Materials/UIMat/ui fb kuang glow3 mask uv.mat

@@ -139,7 +139,7 @@ Material:
     - _MainSpeedU: 0
     - _MainSpeedV: 0
     - _MainTexOffsetU: 0
-    - _MainTexOffsetV: -0.010939717
+    - _MainTexOffsetV: -0.3
     - _MainTilingU: 1
     - _MainTilingV: 0.78
     - _MaskSpeedU: 0.5

Assets/Res/Config/EventLinkConfig.json

@@ -56,7 +56,7 @@
         177
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -79,7 +79,7 @@
         178
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -101,7 +101,7 @@
         179
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -122,7 +122,7 @@
         180
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -143,7 +143,7 @@
         181
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -164,7 +164,7 @@
         182
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -187,7 +187,7 @@
         183
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -211,7 +211,7 @@
         187
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -232,7 +232,7 @@
         185
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -255,7 +255,7 @@
         189
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -276,7 +276,7 @@
         188
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 2,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -434,7 +434,7 @@
     },
     {
       "ID": 1030,
-      "conciseEventMessage": 221,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -443,7 +443,7 @@
         221
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 4,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -455,7 +455,7 @@
     },
     {
       "ID": 1040,
-      "conciseEventMessage": 222,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -464,7 +464,7 @@
         222
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 5,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -476,7 +476,7 @@
     },
     {
       "ID": 1050,
-      "conciseEventMessage": 223,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -485,7 +485,7 @@
         223
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 6,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -499,7 +499,7 @@
     },
     {
       "ID": 1060,
-      "conciseEventMessage": 224,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -508,7 +508,7 @@
         224
       ],
       "DialogueType": null,
-      "EventID": null,
+      "EventID": 7,
       "optionType": null,
       "ResultType": null
     },
@@ -524,14 +524,10 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1102,
-        100
+        1102
       ]
     },
     {
@@ -546,13 +542,25 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        3000
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1103
+      ]
+    },
+    {
+      "ID": 1103,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        209
       ],
+      "DialogueType": null,
+      "EventID": 11,
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -603,13 +611,7 @@
       ],
       "DialogueType": null,
       "EventID": 12,
-      "optionType": 3,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        500
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -620,7 +622,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        212
+        3220
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -638,7 +640,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        213
+        3221
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -656,7 +658,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        214
+        3222
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -674,17 +676,11 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        215
+        3223
       ],
       "DialogueType": null,
       "EventID": 13,
-      "optionType": 3,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        500
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -695,18 +691,14 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        1901
+        3225
       ],
       "DialogueType": null,
       "EventID": 14,
-      "optionType": 2,
-      "optionPara1": [
-        100002
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1402,
-        100
+        1402
       ]
     },
     {
@@ -717,17 +709,29 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        209
+        3226
       ],
       "DialogueType": null,
       "EventID": 14,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        3000
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1403
+      ]
+    },
+    {
+      "ID": 1403,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3227
       ],
+      "DialogueType": null,
+      "EventID": 14,
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -738,18 +742,14 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        1902
+        3229
       ],
       "DialogueType": null,
       "EventID": 15,
-      "optionType": 2,
-      "optionPara1": [
-        100003
-      ],
-      "ResultType": 2,
+      "optionType": null,
+      "ResultType": 1,
       "ResultOptions": [
-        1502,
-        100
+        1502
       ]
     },
     {
@@ -760,17 +760,98 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        209
+        3230
       ],
       "DialogueType": null,
       "EventID": 15,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1503
+      ]
+    },
+    {
+      "ID": 1503,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3231
       ],
-      "PrizeNums": [
-        3000
+      "DialogueType": null,
+      "EventID": 15,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1504
+      ]
+    },
+    {
+      "ID": 1504,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3232
       ],
+      "DialogueType": null,
+      "EventID": 15,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 1601,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3234
+      ],
+      "DialogueType": null,
+      "EventID": 16,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1602
+      ]
+    },
+    {
+      "ID": 1602,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3235
+      ],
+      "DialogueType": null,
+      "EventID": 16,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1603
+      ]
+    },
+    {
+      "ID": 1603,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        3236
+      ],
+      "DialogueType": null,
+      "EventID": 16,
+      "optionType": null,
       "ResultType": null
     },
     {

Assets/Res/Config/GameConstantConfig.json

@@ -35,7 +35,15 @@
         120,
         240
       ],
-      "RefreshRelevanceEventProbability": 50
+      "RefreshRelevanceEventProbability": 50,
+      "shenshiRecoverSpeed": [
+        12.0,
+        1.0
+      ],
+      "GuajiCD": [
+        6,
+        12
+      ]
     }
   ]
 }

Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -33,12 +33,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1511940799475884827}
+  - {fileID: 2574349217801000201}
   m_Father: {fileID: 2094779113935113657}
   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.000005364418, y: 8.2}
-  m_SizeDelta: {x: 159.8153, y: 50.5345}
+  m_SizeDelta: {x: 221.2968, y: 69.9753}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1355547739017730002
 CanvasRenderer:
@@ -86,6 +87,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 50.5345
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -169,8 +171,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 36, y: -59.2}
-  m_SizeDelta: {x: 582.1475, y: 77.5977}
+  m_AnchoredPosition: {x: 36, y: -70.17882}
+  m_SizeDelta: {x: 582.1475, y: 106.8746}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6960150362253834155
 CanvasRenderer:
@@ -223,8 +225,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 5355338081498464365}
-  - component: {fileID: 5189416393149688706}
-  - component: {fileID: 8108906799740063584}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Content
@@ -244,52 +244,18 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3651673096014695874}
+  - {fileID: 4730272705645730995}
+  - {fileID: 5901101323936336534}
+  - {fileID: 6685742129767991100}
   m_Father: {fileID: 4796745246236082143}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -570.3065, y: 0}
   m_Pivot: {x: 0, y: 1}
---- !u!114 &5189416393149688706
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1535957553623792835}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 2
---- !u!114 &8108906799740063584
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1535957553623792835}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_StartCorner: 0
-  m_StartAxis: 0
-  m_CellSize: {x: 141, y: 134}
-  m_Spacing: {x: 73.63, y: 73.63}
-  m_Constraint: 1
-  m_ConstraintCount: 3
 --- !u!1 &1979970940742213357
 GameObject:
   m_ObjectHideFlags: 0
@@ -322,13 +288,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 4907962957060369598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 18, y: 20.900024}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 79, y: 84}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7281062056641532775
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -375,6 +341,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -458,8 +425,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: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 14.2725}
+  m_SizeDelta: {x: 0, y: -28.5449}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4283190306314896791
 CanvasRenderer:
@@ -616,8 +583,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: 20}
-  m_SizeDelta: {x: 570.3065, y: 528.4978}
+  m_AnchoredPosition: {x: 1.1899, y: 139.84741}
+  m_SizeDelta: {x: 689.3018, y: 768.1926}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1879486292270132546
 CanvasRenderer:
@@ -722,7 +689,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 94.700005}
+  m_AnchoredPosition: {x: 0, y: 213.3}
   m_SizeDelta: {x: 282.5201, y: 32.4054}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8262373986634322139
@@ -766,7 +733,97 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5F53\u524D\u5C42 \uFF1A1/5"
+  m_Text: "1\u7EA7 -> 2\u7EA7"
+--- !u!1 &3671808302749710314
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4907962957060369598}
+  - component: {fileID: 5164346420062509069}
+  - component: {fileID: 2948892080402834950}
+  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 &4907962957060369598
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3671808302749710314}
+  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: 7708995079025734974}
+  m_Father: {fileID: 9037135992368401232}
+  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: 67}
+  m_SizeDelta: {x: 750, y: 100}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &5164346420062509069
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3671808302749710314}
+  m_CullTransparentMesh: 1
+--- !u!114 &2948892080402834950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3671808302749710314}
+  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.14901961, g: 0.121568635, b: 0.09019608, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4898189022425983401
 GameObject:
   m_ObjectHideFlags: 0
@@ -822,7 +879,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4898189022425983401}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -853,6 +910,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1089.9884
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -916,7 +974,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_Color: {r: 0.2627451, g: 0.21176472, b: 0.16078432, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -941,6 +999,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -979,7 +1038,6 @@ RectTransform:
   - {fileID: 1207732784696938437}
   - {fileID: 1555521516844959039}
   - {fileID: 6381722401322679321}
-  - {fileID: 2574349217801000201}
   - {fileID: 8702795168959758065}
   m_Father: {fileID: 2042784205301195018}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1034,10 +1092,272 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 266.6316
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6901206084516032637
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4730272705645730995}
+  - component: {fileID: 6450963123599502301}
+  - component: {fileID: 5440543341865339941}
+  - component: {fileID: 7321256549119073876}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Root1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4730272705645730995
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6901206084516032637}
+  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: 5355338081498464365}
+  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: 270, y: -344}
+  m_SizeDelta: {x: 0, y: 120.181}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6450963123599502301
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6901206084516032637}
+  m_CullTransparentMesh: 1
+--- !u!114 &5440543341865339941
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6901206084516032637}
+  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!114 &7321256549119073876
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6901206084516032637}
+  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: 89.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &7111277064813612592
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6685742129767991100}
+  - component: {fileID: 25202101362294680}
+  - component: {fileID: 3851171568439300906}
+  - component: {fileID: 7838019019951094565}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Root3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6685742129767991100
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7111277064813612592}
+  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: 5355338081498464365}
+  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: 270, y: -842}
+  m_SizeDelta: {x: 0, y: 120.181}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &25202101362294680
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7111277064813612592}
+  m_CullTransparentMesh: 1
+--- !u!114 &3851171568439300906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7111277064813612592}
+  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!114 &7838019019951094565
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7111277064813612592}
+  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: 89.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &7881913867437123834
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5901101323936336534}
+  - component: {fileID: 8662975098024751473}
+  - component: {fileID: 5018905428272382041}
+  - component: {fileID: 4049258922655219337}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Root2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5901101323936336534
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7881913867437123834}
+  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: 5355338081498464365}
+  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: 270, y: -593}
+  m_SizeDelta: {x: 0, y: 120.181}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8662975098024751473
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7881913867437123834}
+  m_CullTransparentMesh: 1
+--- !u!114 &5018905428272382041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7881913867437123834}
+  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!114 &4049258922655219337
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7881913867437123834}
+  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: 89.26
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &7893248989412750683
 GameObject:
   m_ObjectHideFlags: 0
@@ -1242,8 +1562,7 @@ RectTransform:
   - {fileID: 8245128900902318849}
   - {fileID: 4014844787387584513}
   - {fileID: 2042784205301195018}
-  - {fileID: 3651673096014695874}
-  - {fileID: 7708995079025734974}
+  - {fileID: 4907962957060369598}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1353,6 +1672,14 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: Root
+    gameObject: {fileID: 4730272705645730995}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 4730272705645730995}
+    - gameObject: {fileID: 5901101323936336534}
+    - gameObject: {fileID: 6685742129767991100}
   isAssetBundle: 1
 --- !u!1001 &6883880457042837264
 PrefabInstance:
@@ -1360,8 +1687,12 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 9037135992368401232}
+    m_TransformParent: {fileID: 5355338081498464365}
     m_Modifications:
+    - target: {fileID: 2841686786122167157, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
+      propertyPath: imageH
+      value: 236
+      objectReference: {fileID: 0}
     - target: {fileID: 3694727049325856288, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_Name
       value: SentimentEffectWidget
@@ -1428,11 +1759,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -7
+      value: 276.66006
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 408
+      value: -109.97095
       objectReference: {fileID: 0}
     - target: {fileID: 7864742459384017618, guid: e41fc6b5b20252b4eb670adb51b0dd87, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1467,8 +1798,12 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 2094779113935113657}
+    m_TransformParent: {fileID: 8702795168959758065}
     m_Modifications:
+    - target: {fileID: 1497465469377369551, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
+      propertyPath: imageH
+      value: 26.404785
+      objectReference: {fileID: 0}
     - target: {fileID: 4218159833380005404, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_Name
       value: ItemWidgetType1
@@ -1535,23 +1870,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 65.4
+      value: 3.8
       objectReference: {fileID: 0}
     - target: {fileID: 6132543138199057944, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -98,6 +98,18 @@ public int[] DaoyouguajiDuration;
 public int RefreshRelevanceEventProbability;
 
 
+		/// <summary>
+		///神识恢复速率 每{0}秒恢复{1}点
+		/// </summary>
+public float[] shenshiRecoverSpeed;
+
+
+		/// <summary>
+		///挂机事件结束后下个挂机事件出现的时间间隔（最小和最大秒）
+		/// </summary>
+public int[] GuajiCD;
+
+
 	}
 
 }

Assets/Scripts/GameData/ExcelConfig/SentimentEffectConfig.cs

@@ -50,6 +50,12 @@ public string icon;
 public int massge;
 
 
+		/// <summary>
+		///位置
+		/// </summary>
+public int pos;
+
+
 		/// <summary>
 		///见条件类型表
 		/// </summary>

Assets/Scripts/GameLogic/Hero/FaBaoInfo.cs

@@ -94,7 +94,7 @@ namespace GameLogic.Hero
             attriButedIC.Clear();
 
             //计算加得属性
-            for (var i = 0; i < FabaoConfig.ShuxingIDs.Length; i++)
+            for (var i = 0; i < FabaoConfig.ShuxingIDs?.Length; i++)
             {
                 float attribute = GetAttriBute(FabaoConfig.ShuxingIDs[i]);
 

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -580,6 +580,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         
         playerData.ItemListData.Add(new ItemData(21012, 10));
         playerData.ItemListData.Add(new ItemData(21013, 10));
+        
+        
+        
+        playerData.ItemListData.Add(new ItemData(21001, 10));
+        playerData.ItemListData.Add(new ItemData(21002, 10));
+        playerData.ItemListData.Add(new ItemData(21003, 10));
 
         // var allSkill = new[] { 1101};
         // foreach (var i in allSkill)

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -109,7 +109,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         }
     }
 
-    public List<AccountFileInfo.EventList> UseDivinesense(int useCount)
+    public List<AccountFileInfo.EventList> UseDivinesense(int useCount, List<ItemInfo> useItems)
     {
         //使用神识先移除完成的事件
         List<AccountFileInfo.EventList> removeEvents = new List<AccountFileInfo.EventList>();
@@ -150,7 +150,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
 
 
-        var eventConfigs = DetectEvents(useCount);
+        var eventConfigs = DetectEvents(useCount, useItems);
         if (eventConfigs == null || eventConfigs.Count == 0)
             return default;
 
@@ -272,7 +272,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         return false;
     }
 
-    private List<AccountFileInfo.EventList> DetectEvents(int eventCount)
+    private List<AccountFileInfo.EventList> DetectEvents(int eventCount, List<ItemInfo> useItems)
     {
         PlacesConfig bigMap = ConfigComponent.Instance.Get<PlacesConfig>(PlayerManager.Instance.CurrentPlaces.id);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
@@ -375,8 +375,33 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
 
 
+            //概率
+            ItemInfo itemInfoType1 = null;
+            //类型
+            ItemInfo itemInfoType2 = null;
+
+            foreach (var itemInfo in useItems)
+            {
+                if (itemInfo.config.associateID == 6)
+                {
+                    itemInfoType1 = itemInfo;
+                }
+                else if (itemInfo.config.associateID == 7)
+                {
+                    itemInfoType2 = itemInfo;
+                }
+            }
+
+
+            float[] QualityBonusChance = divineSenseConfig.QualityBonusChance.ToArray();
+            if (itemInfoType1 != null)
+            {
+                QualityBonusChance[itemInfoType1.config.associateVlaue[0] - 1] *= itemInfoType1.config.associateVlaue[1];
+            }
+
+
             //先掉落出品质
-            int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
+            int quality = UtilTools.GetRandomByWeight(qualitys, QualityBonusChance);
 
 
             // // 获取通用事件
@@ -387,11 +412,11 @@ public class EventSystemManager : Singleton<EventSystemManager>
             // List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality && !BagIsEvent(e.ID) && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null).ToList();
 
             // 获取通用事件
-            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
+            List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 1 && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID) && CanEventType(e.ID, itemInfoType2)).ToList();
 
 
             //场景特定事件
-            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID)).ToList();
+            List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.SpecialTaskID.Contains(e.ID) && e.EventQuality == quality && eventLists.FirstOrDefault(el => el.eventID == e.ID) == null && CanTriggerEvent(e.ID) && CanEventType(e.ID, itemInfoType2)).ToList();
 
             if (candidateEvents.Count == 0 && globalEvents.Count == 0)
             {
@@ -757,6 +782,24 @@ public class EventSystemManager : Singleton<EventSystemManager>
     {
     }
 
+    //指定type事件
+    private bool CanEventType(int eventID, ItemInfo itemInfo)
+    {
+        if (itemInfo == null)
+        {
+            return true;
+        }
+
+        var evt = eventConfigs.Find(e => e.ID == eventID);
+        if (evt.PrizeType != null && evt.PrizeType.Contains(itemInfo.config.associateVlaue[0]))
+        {
+            return true;
+        }
+
+
+        return false;
+    }
+
 
     /// <summary>
     /// 检查事件是否满足触发条件。

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

@@ -3,6 +3,7 @@ using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 
@@ -54,7 +55,7 @@ namespace Fort23.Mono
                 CombatDrive.Instance.CombatController.isUpdate = true;
             });
 
-            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count) => { Bnt_shengShi_onClick(count); }); });
+            bnt_shengShi.onClick.AddListener(() => { DivineSenceInfoPanel.OpenPanel((count,useItems) => { Bnt_shengShi_onClick(count,useItems); }); });
             Btn_GongFa.onClick.AddListener(async () =>
             {
                 if (currentOpenUIPanel is SkillSelectPanel)
@@ -111,7 +112,7 @@ namespace Fort23.Mono
         {
         }
 
-        private async void Bnt_shengShi_onClick(int count)
+        private async void Bnt_shengShi_onClick(int count,List<ItemInfo> useItems)
         {
             // EventSystemManager.Instance.DetectRandomEvents();
 
@@ -119,6 +120,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.gameConstantConfig.DetectEventCount)
             {
                 TipMessagePanel.OpenTipMessagePanel("神识值不够！");
+                
                 return;
             }
             EventSystemManager.Instance.CancelEvent();
@@ -129,7 +131,7 @@ namespace Fort23.Mono
             CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
             CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .playerHeroEntity.GameObject.transform);
-            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count);
+            List<AccountFileInfo.EventList> eventLists = EventSystemManager.Instance.UseDivinesense(count,useItems);
             await TimerComponent.Instance.WaitAsync(800);
             EventSystemManager.Instance.isTriggerEvent = false;
             if (eventLists == null || eventLists.Count == 0)

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

@@ -22,9 +22,9 @@ namespace Fort23.Mono
 
         private void Init()
         {
-            // isPopUi = true;
-            isAddStack = true;
-            IsShowAppBar = false;
+            isPopUi = true;
+            // isAddStack = true;
+            // IsShowAppBar = false;
         }
 
         protected override void AddEvent()
@@ -192,7 +192,7 @@ namespace Fort23.Mono
 
         public async static CTask<DivineSenceEventPreviewPanel> OpenPanel()
         {
-            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null);
+            DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceEventPreviewPanel>(null,UILayer.Top);
             return divineSenceEventPreviewPanel;
         }
 

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

@@ -4,6 +4,7 @@ using System.Linq;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
+using GameLogic.Bag;
 using UnityEngine;
 using Utility;
 
@@ -12,9 +13,12 @@ namespace Fort23.Mono
     [UIBinding(prefab = "DivineSenceInfoPanel")]
     public partial class DivineSenceInfoPanel : UIPanel
     {
-        private Action<int> callback;
+        private Action<int,List<ItemInfo>> callback;
 
         private int useCount = 0;
+        
+        
+        List<ItemInfo> useItems = new List<ItemInfo>();
 
         List<DivineSenceInfoBtnWidget> _divineSenceInfoBtnWidgets = new List<DivineSenceInfoBtnWidget>();
         private int maxCount;
@@ -37,7 +41,15 @@ namespace Fort23.Mono
         {
             Btn_Ok.onClick.AddListener(() =>
             {
-                callback?.Invoke(useCount);
+                useItems.Clear();
+                foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
+                {
+                    if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null )
+                    {
+                        useItems.Add(senceInfoBtnWidget.ItemInfo);
+                    }
+                }
+                callback?.Invoke(useCount,useItems);
                 UIManager.Instance.HideUIUIPanel(this);
             });
             Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
@@ -54,9 +66,15 @@ namespace Fort23.Mono
             });
 
             Btn_Tip.onClick.AddListener(() => { DivineSenceLevelPreviewPanel.OpenPanel(); });
+            
+            
+            Btn_Event.onClick.AddListener(() =>
+            {
+                DivineSenceEventPreviewPanel.OpenPanel();
+            });
         }
 
-        public async void CustomInit(Action<int> callback)
+        public async void CustomInit(Action<int,List<ItemInfo>> callback)
         {
             _divineSenceInfoBtnWidgets.Clear();
             divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
@@ -90,7 +108,7 @@ namespace Fort23.Mono
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
             divineSenceInfoBtnWidget = await UIManager.Instance.CreateGComponentForObject<DivineSenceInfoBtnWidget>(DivineSenceInfoBtnWidgetGam2, null);
-            divineSenceInfoBtnWidget.CustomInit(-1, 3);
+            divineSenceInfoBtnWidget.CustomInit(-1, 2);
             divineSenceInfoBtnWidget.OnClick = OnClick;
             _divineSenceInfoBtnWidgets.Add(divineSenceInfoBtnWidget);
 
@@ -121,7 +139,7 @@ namespace Fort23.Mono
             Map<int, int> probabilitiesMap = new Map<int, int>();
             foreach (var senceInfoBtnWidget in _divineSenceInfoBtnWidgets)
             {
-                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
+                if (senceInfoBtnWidget.type == 2 && senceInfoBtnWidget.ItemInfo != null && senceInfoBtnWidget.ItemInfo.config.associateID == 6)
                 {
                     if (!probabilitiesMap.ContainsKey(senceInfoBtnWidget.ItemInfo.config.associateVlaue[0]))
                     {
@@ -151,7 +169,7 @@ namespace Fort23.Mono
             }
         }
 
-        public async static CTask OpenPanel(Action<int> callback)
+        public async static CTask OpenPanel(Action<int,List<ItemInfo>> callback)
         {
             DivineSenceInfoPanel divineSenceInfoPanel = await UIManager.Instance.LoadAndOpenPanel<DivineSenceInfoPanel>(null, UILayer.Top);
             divineSenceInfoPanel.CustomInit(callback);

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

@@ -38,7 +38,7 @@ namespace Fort23.Mono
             List<ItemInfo> itemInfos = new List<ItemInfo>();
             foreach (var keyValuePair in PlayerManager.Instance.BagController.allBagDic)
             {
-                if (keyValuePair.Value.config.associateID == 6)
+                if (keyValuePair.Value.config.associateID == 6 || keyValuePair.Value.config.associateID == 7)
                 {
                     itemInfos.Add(keyValuePair.Value);
                 }

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -67,7 +67,7 @@ namespace Fort23.Mono
 
         public static async CTask OpenPanel(ItemInfo itemInfo)
         {
-            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null, uiData: new object[] { itemInfo });
+            await UIManager.Instance.LoadAndOpenPanel<ItemDetailsPanel>(null,UILayer.Top, uiData: new object[] { itemInfo });
         }
 
         public override void Close()

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -32,7 +32,7 @@ namespace Fort23.Mono
         {
             this.sentimentProperty = sentimentProperty;
             int level = sentimentProperty.level <= 0 ? 1 : sentimentProperty.level;
-            int conFigId = sentimentProperty.groupId * 100 + level;
+            int conFigId = sentimentProperty.groupId * 10 + level;
             sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);
             if (sentimentProperty.level == 0)

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -78,7 +78,12 @@ namespace Fort23.Mono
             sentimentEffectWidget.OnClick = OnClick;
             foreach (var sentimentDataSentimentProperty in sentimentData.sentimentProperties)
             {
-                SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Content);
+                int level = sentimentDataSentimentProperty.level <= 0 ? 1 : sentimentDataSentimentProperty.level;
+                int conFigId = sentimentDataSentimentProperty.groupId * 100 + level;
+                var sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
+                int index =  sentimentEffectConfig.pos % 3;
+                
+                SentimentEffectWidget sentimentEffectWidget1 = await UIManager.Instance.CreateGComponent<SentimentEffectWidget>(null, Root[index]);
                 sentimentEffectWidget1.CustomInit(sentimentDataSentimentProperty);
                 sentimentEffectWidget1.OnClick = OnClick;
                 sentimentEffectWidgets.Add(sentimentEffectWidget1);
@@ -94,7 +99,7 @@ namespace Fort23.Mono
         private void UpdateUi()
         {
             int level = curretnSentimentProperty.level <= 0 ? 1 : curretnSentimentProperty.level;
-            int conFigId = curretnSentimentProperty.groupId * 100 + level;
+            int conFigId = curretnSentimentProperty.groupId * 10 + level;
             SentimentEffectConfig sentimentEffectConfig = ConfigComponent.Instance.Get<SentimentEffectConfig>(conFigId);
             currentGroupSentimentEffectConfigs = _sentimentEffectConfigs.Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
             Text_Name.text = LanguageManager.Instance.Text(sentimentEffectConfig.name);

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanelData.cs

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