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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version

Assets/Res/Config/EventConditionConfig.json

@@ -0,0 +1,51 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "message": 2078,
+      "Operation": null,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 10
+    },
+    {
+      "ID": 2,
+      "message": 2079,
+      "Operation": null,
+      "ConditionType": 3,
+      "ConditionPara": [
+        10
+      ],
+      "finishCount": 1
+    },
+    {
+      "ID": 3,
+      "message": 2080,
+      "Operation": null,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100001
+      ],
+      "finishCount": 5
+    },
+    {
+      "ID": 4,
+      "message": 2081,
+      "Operation": null,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1002
+      ],
+      "finishCount": 10
+    },
+    {
+      "ID": 5,
+      "message": null,
+      "Operation": null,
+      "ConditionType": null,
+      "finishCount": null
+    }
+  ]
+}

Assets/Res/Config/EventConditionConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CixN53+rAi6ILBA4j60i35WR2TibceB35HQXEOtZkRgxCv1PIpxRFCP235Jq
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/EventConfig.json

@@ -15,6 +15,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 3,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventValue": [
         5
       ],
@@ -39,6 +41,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -60,6 +64,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": 1,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventValue": [
         1004
       ],
@@ -78,6 +84,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": 7,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventValue": [
         500
       ],
@@ -96,6 +104,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 218,
       "Description": 1940
@@ -111,6 +121,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 219,
       "Description": 1941
@@ -126,6 +138,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 220,
       "Description": 1942
@@ -141,6 +155,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -156,6 +172,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -171,6 +189,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -186,6 +206,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -201,6 +223,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -216,6 +240,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1906,
       "Description": 1914
@@ -231,6 +257,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1907,
       "Description": 1915
@@ -246,6 +274,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1908,
       "Description": 1916
@@ -261,6 +291,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1909,
       "Description": 1917
@@ -280,6 +312,8 @@
       "Score": 10,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
@@ -299,6 +333,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 174,
       "Description": 1936
@@ -320,6 +356,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -339,6 +377,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
@@ -358,6 +398,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 174,
       "Description": 1936
@@ -379,6 +421,8 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -399,9 +443,78 @@
       "Score": 0,
       "EventQuality": 1,
       "EventConditionId": null,
+      "RefreshProbability": null,
+      "RefreshCount": null,
       "EventCount": null,
       "EventName": 2035,
       "Description": 2036
+    },
+    {
+      "ID": 9025,
+      "EventLinksId": [
+        9025,
+        9026
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "EventCount": null,
+      "EventName": 2067,
+      "Description": 2068
+    },
+    {
+      "ID": 9014,
+      "EventLinksId": [
+        9014
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": null,
+      "Score": null,
+      "EventQuality": null,
+      "EventConditionId": null,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RelatedEvents": [
+        9031
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "EventCount": null,
+      "EventName": 2069,
+      "Description": 2070
+    },
+    {
+      "ID": 9031,
+      "EventLinksId": [
+        9031
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "RefreshProbability": 30,
+      "RefreshCount": 2,
+      "EventCount": null,
+      "EventName": 2071,
+      "Description": 2072
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -3,24 +3,22 @@
     {
       "ID": 100,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         216
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 1001,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         177
       ],
       "NPCID": 2,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1002,
@@ -35,15 +33,11 @@
     {
       "ID": 1002,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         178
       ],
       "NPCID": null,
-      "ConditionType": 1,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": 10,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -57,15 +51,11 @@
     {
       "ID": 1003,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         179
       ],
       "NPCID": null,
-      "ConditionType": 1,
-      "ConditionPara": [
-        1002
-      ],
-      "finishCount": 10,
       "optionType": 1,
       "optionPara1": [
         1005
@@ -78,12 +68,11 @@
     {
       "ID": 1004,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         180
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -96,15 +85,11 @@
     {
       "ID": 1005,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         181
       ],
       "NPCID": null,
-      "ConditionType": 3,
-      "ConditionPara": [
-        10
-      ],
-      "finishCount": 1,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -117,12 +102,11 @@
     {
       "ID": 1010,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         182
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1011,
@@ -137,12 +121,11 @@
     {
       "ID": 1011,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         183
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1014,
@@ -157,13 +140,12 @@
     {
       "ID": 1012,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         184,
         187
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -176,12 +158,11 @@
     {
       "ID": 1014,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         185
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -195,13 +176,12 @@
     {
       "ID": 1015,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         186,
         189
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -214,12 +194,11 @@
     {
       "ID": 1016,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         188
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "PrizeIDs": [
         1001
@@ -232,12 +211,11 @@
     {
       "ID": 1020,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         190
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1021,
@@ -252,12 +230,11 @@
     {
       "ID": 1021,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         191
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -277,15 +254,11 @@
     {
       "ID": 1022,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         192
       ],
       "NPCID": null,
-      "ConditionType": 1,
-      "ConditionPara": [
-        10007
-      ],
-      "finishCount": 1,
       "optionType": 4,
       "PrizeIDs": [
         1002
@@ -298,13 +271,12 @@
     {
       "ID": 1024,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         193,
         196
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100004
@@ -324,13 +296,12 @@
     {
       "ID": 1025,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         194,
         197
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -343,12 +314,11 @@
     {
       "ID": 1026,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         207
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         1024,
@@ -363,12 +333,11 @@
     {
       "ID": 1030,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         221
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -381,12 +350,11 @@
     {
       "ID": 1040,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         222
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002
@@ -399,12 +367,11 @@
     {
       "ID": 1050,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         223
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1002,
@@ -419,24 +386,22 @@
     {
       "ID": 1060,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         224
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 10001,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         208
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -450,12 +415,11 @@
     {
       "ID": 10002,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         209
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1003
@@ -468,14 +432,13 @@
     {
       "ID": 10003,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         210,
         211,
         1903
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1005
@@ -488,6 +451,7 @@
     {
       "ID": 10004,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         212,
         213,
@@ -495,8 +459,6 @@
         215
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1006
@@ -509,12 +471,11 @@
     {
       "ID": 10005,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         1901
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100002
@@ -528,12 +489,11 @@
     {
       "ID": 10006,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         1902
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100003
@@ -547,12 +507,15 @@
     {
       "ID": 100001,
       "conciseEventMessage": 1910,
+      "EventConditionMessage": null,
       "LanID": [
         1914
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": 1,
+      "ConditionId": [
+        3,
+        4
+      ],
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -562,12 +525,8 @@
     {
       "ID": 100002,
       "conciseEventMessage": 1911,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": 5,
-      "ConditionPara": [
-        100001
-      ],
-      "finishCount": 2,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -580,12 +539,8 @@
     {
       "ID": 100003,
       "conciseEventMessage": 1912,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": 6,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": 1000,
       "optionType": null,
       "ResultType": 3,
       "ResultOptions": [
@@ -595,24 +550,19 @@
     {
       "ID": 100004,
       "conciseEventMessage": 1913,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": 3,
-      "ConditionPara": [
-        10
-      ],
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 9003,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2036
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 1,
       "optionPara1": [
         9004,
@@ -627,12 +577,11 @@
     {
       "ID": 9004,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2037
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 2,
       "optionPara1": [
         100001
@@ -646,42 +595,33 @@
     {
       "ID": 9005,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2038
       ],
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 9006,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2039
       ],
       "NPCID": null,
-      "ConditionType": 6,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": 10,
       "optionType": null,
       "ResultType": null
     },
     {
       "ID": 9007,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "LanID": [
         2040
       ],
       "NPCID": null,
-      "ConditionType": 6,
-      "ConditionPara": [
-        1001
-      ],
-      "finishCount": null,
       "optionType": 4,
       "ResultType": 1,
       "ResultOptions": [
@@ -691,9 +631,8 @@
     {
       "ID": 9008,
       "conciseEventMessage": null,
+      "EventConditionMessage": null,
       "NPCID": null,
-      "ConditionType": null,
-      "finishCount": null,
       "optionType": 3,
       "PrizeIDs": [
         1001
@@ -702,6 +641,56 @@
         999
       ],
       "ResultType": null
+    },
+    {
+      "ID": 9025,
+      "conciseEventMessage": 2074,
+      "EventConditionMessage": 2073,
+      "LanID": [
+        2074
+      ],
+      "NPCID": null,
+      "optionType": 1,
+      "optionPara1": [
+        9026
+      ],
+      "optionPara2": [
+        2075
+      ],
+      "ResultType": null
+    },
+    {
+      "ID": 9026,
+      "conciseEventMessage": null,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        9014
+      ]
+    },
+    {
+      "ID": 9014,
+      "conciseEventMessage": 2070,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "ConditionId": [
+        3
+      ],
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 9031,
+      "conciseEventMessage": 2076,
+      "EventConditionMessage": 2077,
+      "NPCID": null,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -7602,11 +7602,11 @@
     },
     {
       "ID": 1901,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1902,
-      "txt": "0"
+      "txt": ""
     },
     {
       "ID": 1903,
@@ -7742,39 +7742,39 @@
     },
     {
       "ID": 1936,
-      "txt": "你发现一只奄奄一息的狼，决定上前一探究竟。"
+      "txt": ""
     },
     {
       "ID": 1937,
-      "txt": "附近的小树林闹的不可开交，你决定去看看怎么回事。"
+      "txt": ""
     },
     {
       "ID": 1938,
-      "txt": "附近的小树林闹的不可开交，你决定去看看怎么回事。"
+      "txt": ""
     },
     {
       "ID": 1939,
-      "txt": "不远处有一个小红点，走近一看你发现是一个带血的背包。"
+      "txt": ""
     },
     {
       "ID": 1940,
-      "txt": "底下一座矿山甚是磅礴雄伟，走，去看一看。"
+      "txt": ""
     },
     {
       "ID": 1941,
-      "txt": "你被一男一女的吵架声吸引。"
+      "txt": ""
     },
     {
       "ID": 1942,
-      "txt": "远处一座道观仙气缭绕，似有仙人在此。"
+      "txt": ""
     },
     {
       "ID": 1943,
-      "txt": "受伤的鸟"
+      "txt": ""
     },
     {
       "ID": 1944,
-      "txt": "你发现一只奄奄一息的鸟，决定上前一探究竟。"
+      "txt": ""
     },
     {
       "ID": 1945,
@@ -8266,26 +8266,90 @@
     },
     {
       "ID": 2067,
-      "txt": "0"
+      "txt": "惠子.没用的大葫芦"
     },
     {
       "ID": 2068,
-      "txt": "0"
+      "txt": "惠子种的葫芦没用，他非常生气"
     },
     {
       "ID": 2069,
-      "txt": "0"
+      "txt": "发现魔修"
     },
     {
       "ID": 2070,
-      "txt": "0"
+      "txt": "发现一群魔修，正在夺人钱财"
     },
     {
       "ID": 2071,
-      "txt": "0"
+      "txt": "魔修"
     },
     {
       "ID": 2072,
+      "txt": "打败魔休"
+    },
+    {
+      "ID": 2073,
+      "txt": "和惠子交谈"
+    },
+    {
+      "ID": 2074,
+      "txt": "惠子种的葫芦没用，他非常生气，需要打败魔休"
+    },
+    {
+      "ID": 2075,
+      "txt": "接受任务"
+    },
+    {
+      "ID": 2076,
+      "txt": "出现Boss魔修"
+    },
+    {
+      "ID": 2077,
+      "txt": "打败魔修"
+    },
+    {
+      "ID": 2078,
+      "txt": "拥有金币{0}/{1}"
+    },
+    {
+      "ID": 2079,
+      "txt": "达到境界{0}/{1}"
+    },
+    {
+      "ID": 2080,
+      "txt": "击杀魔休{0}/{1}"
+    },
+    {
+      "ID": 2081,
+      "txt": "获得钻石{0}/{1}"
+    },
+    {
+      "ID": 2082,
+      "txt": "0"
+    },
+    {
+      "ID": 2083,
+      "txt": "0"
+    },
+    {
+      "ID": 2084,
+      "txt": "0"
+    },
+    {
+      "ID": 2085,
+      "txt": "0"
+    },
+    {
+      "ID": 2086,
+      "txt": "0"
+    },
+    {
+      "ID": 2087,
+      "txt": "0"
+    },
+    {
+      "ID": 2088,
       "txt": "0"
     }
   ]

Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -893,14 +893,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_Circle118
+  _icon_name: dec_yuanhuan_quse
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs

@@ -0,0 +1,56 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\EventConfig.xlsx. SheetName: EventConditionConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "EventConditionConfig.json")]
+	public partial class EventConditionConfigHolder : ConfigHolder<EventConditionConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct EventConditionConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///描述
+		/// </summary>
+public int message;
+
+
+		/// <summary>
+		///与0 或1
+		/// </summary>
+public int Operation;
+
+
+		/// <summary>
+		///条件判断类型
+		/// </summary>
+public int ConditionType;
+
+
+		/// <summary>
+		///条件判断值
+		/// </summary>
+public int[] ConditionPara;
+
+
+		/// <summary>
+		///条件完成次数or数量
+		/// </summary>
+public int finishCount;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs.meta

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

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -62,6 +62,36 @@ public int EventQuality;
 public int EventConditionId;
 
 
+		/// <summary>
+		///事件结局奖励
+		/// </summary>
+public int[] PrizeIDs;
+
+
+		/// <summary>
+		///事件结局奖励数量
+		/// </summary>
+public int[] PrizeNums;
+
+
+		/// <summary>
+		///关联的事件Id
+		/// </summary>
+public int[] RelatedEvents;
+
+
+		/// <summary>
+		///刷新的概率 （100=100%）
+		/// </summary>
+public int RefreshProbability;
+
+
+		/// <summary>
+		///最大刷新数量
+		/// </summary>
+public int RefreshCount;
+
+
 		/// <summary>
 		///触发效果值
 		/// </summary>

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -21,39 +21,33 @@ public int ID;
 
 
 		/// <summary>
-		///事件描述
+		///事件简介描述
 		/// </summary>
 public int conciseEventMessage;
 
 
 		/// <summary>
-		///文本语言表ID
-		/// </summary>
-public int[] LanID;
-
-
-		/// <summary>
-		///对话NPCID
+		///简介目标描述
 		/// </summary>
-public int NPCID;
+public int EventConditionMessage;
 
 
 		/// <summary>
-		///条件判断类型
+		///文本语言表ID
 		/// </summary>
-public int ConditionType;
+public int[] LanID;
 
 
 		/// <summary>
-		///条件判断值
+		///对话NPCID
 		/// </summary>
-public int[] ConditionPara;
+public int NPCID;
 
 
 		/// <summary>
-		///条件完成次数or数量
+		///条件判断Id
 		/// </summary>
-public int finishCount;
+public int[] ConditionId;
 
 
 		/// <summary>

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -88,10 +88,15 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public List<FaBaoData> AllFaBaoDatas = new List<FaBaoData>();
 
 
-        /// <summary>
-        /// 事件链数据
-        /// </summary>
-        public List<EventLinkData> eventLinkDatas = new List<EventLinkData>();
+        // /// <summary>
+        // /// 事件链数据
+        // /// </summary>
+        // public List<EventLinkData> eventLinkDatas = new List<EventLinkData>();
+        
+        // /// <summary>
+        // /// 
+        // /// </summary>
+        // public List<EventConditionData> eventConditionDatas = new List<EventConditionData>();
 
         /// <summary>
         /// 完成的事件
@@ -232,6 +237,25 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         public int eventId;
 
+        /// <summary>
+        /// 事件监听列表
+        /// </summary>
+        public List<EventConditionData> eventConditions = new List<EventConditionData>();
+
+    }
+
+
+    /// <summary>
+    /// 刷出来的事件列表
+    /// </summary>
+    [System.Serializable]
+    public class EventConditionData
+    {
+     
+     
+
+        public int eventId;
+        public int eventCondition;
 
         public int fishCount;
     }
@@ -245,6 +269,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     {
         public int eventID;
 
+       public List<EventLinkData> eventLinks = new List<EventLinkData>();
+
         public int curStep;
     }
 

Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -11,6 +11,7 @@ using GameLogic.Bag;
 using GameLogic.Combat;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Player;
+using JetBrains.Annotations;
 using UnityEngine;
 using Utility;
 using Random = UnityEngine.Random;
@@ -23,13 +24,15 @@ public class DialogueManager : Singleton<DialogueManager>
     private Action onCancel;
     private EventConfig eventConfig;
 
+    private AccountFileInfo.EventList CurrentEventList;
 
     /// <summary>
     /// 开始对话
     /// </summary>
-    public void StartDialogue(int dialogueID, int eventId, Action onComplete = null, Action onCancel = null)
+    public void StartDialogue(AccountFileInfo.EventList CurrentEventList, int dialogueID, int eventId, Action onComplete = null, Action onCancel = null)
     {
         this.onCancel = onCancel;
+        this.CurrentEventList = CurrentEventList;
         currentDialogueID = dialogueID;
         onDialogueComplete = onComplete;
         eventConfig = ConfigComponent.Instance.Get<EventConfig>(eventId);
@@ -50,14 +53,27 @@ public class DialogueManager : Singleton<DialogueManager>
         currentDialogueID = dialogueID;
         // 找到当前对话组
         var dialogueConfig = ConfigComponent.Instance.Get<EventLinkConfig>(dialogueID);
-
-        if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID) && dialogueConfig.optionType == 2 && !(dialogueConfig.ConditionType == 5 && dialogueConfig.ConditionPara[0] == dialogueConfig.optionPara1[0]))
+        if (CurrentEventList != null)
         {
-            onCancel?.Invoke();
-            return;
+            var eventLinkDatas = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == dialogueID);
+            if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkDatas.eventConditions))
+            {
+                onCancel?.Invoke();
+                return;
+            }
         }
 
 
+        // foreach (var eventConditionData in eventLinkDatas.eventConditions)
+        // {
+        //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
+        //     {
+        //         TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(eventConditionData));
+        //       
+        //     }
+        // }
+
+
         //神识探索的事件记录步骤
         if (EventSystemManager.Instance.CurrentEventList != null)
         {
@@ -83,7 +99,7 @@ public class DialogueManager : Singleton<DialogueManager>
                 if (AccountFileInfo.Instance.playerData.daoYouDatas.FirstOrDefault(dy => dy.id == eventNpc.DaoyouID) == null)
                 {
                     AccountFileInfo.DaoYouData daoYouData = new AccountFileInfo.DaoYouData();
-                    daoYouData.id =eventNpc.DaoyouID;
+                    daoYouData.id = eventNpc.DaoyouID;
                     daoYouData.favorabilityLv = 1;
                     daoYouData.emotion = Random.Range(1, 4);
                     daoYouData.emotionTime = TimeHelper.ClientNow();
@@ -91,8 +107,6 @@ public class DialogueManager : Singleton<DialogueManager>
                     AccountFileInfo.Instance.playerData.daoYouDatas.Add(daoYouData);
                     AccountFileInfo.Instance.SavePlayerData();
                 }
-                
-            
             }
         }
 
@@ -104,7 +118,7 @@ public class DialogueManager : Singleton<DialogueManager>
         {
             if (dialogueConfig.LanID != null)
             {
-                DialoguePanel.OpenDialoguePanel(dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
+                DialoguePanel.OpenDialoguePanel(CurrentEventList, dialogueConfig.ID, null, ShowDialogueEventData.MessageShowType.Verbatim,
                     FishDialogue);
             }
             else
@@ -170,7 +184,7 @@ public class DialogueManager : Singleton<DialogueManager>
                     if (relust)
                     {
                         CTask cTask = CTask.Create();
-                        CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0],true,
+                        CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0], true,
                             delegate(bool isWin)
                             {
                                 LogTool.Log("战斗完成" + isWin);
@@ -189,7 +203,7 @@ public class DialogueManager : Singleton<DialogueManager>
                 else
                 {
                     CTask cTask = CTask.Create();
-                    CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0],false,
+                    CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0], false,
                         delegate(bool isWin)
                         {
                             LogTool.Log("战斗完成" + isWin);
@@ -223,16 +237,29 @@ public class DialogueManager : Singleton<DialogueManager>
                 await OpenRewardsPanel(eventConfig.ID, itemInfos);
                 LogTool.Log("对话结束，获得奖励");
                 break;
-            //扣除道具
-            case 4:
-                PlayerManager.Instance.BagController.DeductItem(dialogueConfig.ConditionPara[0], dialogueConfig.finishCount);
-                break;
+            // //扣除道具
+            // case 4:
+            //     PlayerManager.Instance.BagController.DeductItem(dialogueConfig.ConditionPara[0], dialogueConfig.finishCount);
+            //     break;
         }
 
-        if (!EventSystemManager.Instance.IsEvenkLinkComplete(currentDialogueID))
+        if (CurrentEventList != null)
         {
-            onCancel?.Invoke();
-            return;
+            AccountFileInfo.EventLinkData eventLinkData = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == currentDialogueID);
+
+            if (eventLinkData != null)
+            {
+                foreach (var eventConditionData in eventLinkData?.eventConditions)
+                {
+                    if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
+                    {
+                        onCancel?.Invoke();
+                        return;
+                    }
+                }
+            }
+
+       
         }
 
 

Assets/Scripts/GameUI/EventManager/EventHelper.cs

@@ -7,51 +7,53 @@ using Fort23.UTool;
 
 public static class EventHelper
 {
-    public static string GetTaskMessage(int eventConfigId)
+    public static string GetTaskMessage(AccountFileInfo.EventConditionData eventConditionData)
     {
         string result = String.Empty;
-        EventLinkConfig eventCondition = ConfigComponent.Instance.Get<EventLinkConfig>(eventConfigId);
-        AccountFileInfo.EventLinkData eventLinkData =
-            AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
-
-        int fishCount = eventLinkData == null ? 0 : eventLinkData.fishCount;
-        switch (eventCondition.ConditionType)
-        {
-            case 1:
-                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                result =
-                    $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
-
-                break;
-            case 3:
-                HeroPowerUpConfig heroPowerUpConfig =
-                    ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
-                string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
-                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
-                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-
-                result =
-                    $"需要达到境界{jingjie}";
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
-                break;
-
-            case 5:
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-                result =
-                    $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
-                break;
-            case 6:
-
-                ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
-                // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
-                result =
-                    $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
-                break;
-            default:
-                // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
-                break;
-        }
+        EventConditionConfig eventCondition = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+        // AccountFileInfo.EventLinkData eventLinkData =
+        //     AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(e => e.eventLinkId == eventConfigId);
+
+        // int fishCount = eventCondition == null ? 0 : eventLinkData.fishCount;
+
+        result = LanguageManager.Instance.Text(eventCondition.message, eventConditionData.fishCount, eventCondition.finishCount);
+        // switch (eventCondition.ConditionType)
+        // {
+        //     case 1:
+        //         // ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+        //         // result =
+        //         //     $"需要拥有{LanguageManager.Instance.Text(itemConfig.itemName)} {fishCount}/{eventCondition.finishCount}";
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage,fishCount, eventCondition.finishCount.ToString() + "个");
+        //
+        //         break;
+        //     case 3:
+        //         // HeroPowerUpConfig heroPowerUpConfig =
+        //         //     ConfigComponent.Instance.Get<HeroPowerUpConfig>(eventCondition.ConditionPara[0]);
+        //         // string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+        //         //                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+        //         //                  LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+        //         //
+        //         // result =
+        //         //     $"需要达到境界{jingjie}";
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, jingjie);
+        //         break;
+        //
+        //     case 5:
+        //         // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+        //         // result =
+        //         //     $"需要完成战斗{eventCondition.ConditionPara[0]} {fishCount}/{eventCondition.finishCount}";
+        //         break;
+        //     case 6:
+        //
+        //         // ItemConfig itemConfig1 = ConfigComponent.Instance.Get<ItemConfig>(eventCondition.ConditionPara[0]);
+        //         // // result = LanguageManager.Instance.Text(eventCondition.conciseEventMessage, fishCount.ToString(), eventCondition.finishCount.ToString());
+        //         // result =
+        //         //     $"需要获得{LanguageManager.Instance.Text(itemConfig1.itemName)} {fishCount}/{eventCondition.finishCount}";
+        //         break;
+        //     default:
+        //         // result =LanguageManager.Instance.Text(eventCondition.conciseEventMessage);
+        //         break;
+        // }
 
         return result;
     }

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -31,11 +31,18 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     Action onCompleteCallback;
 
+    // public Map<int, AccountFileInfo.EventConditionData> EventConditionDataMap = new Map<int, AccountFileInfo.EventConditionData>();
+
     public void CustomInit()
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
         divineSenseConfigs = ConfigComponent.Instance.GetAll<DivineSenseConfig>().ToList();
 
+        // foreach (var playerDataEventConditionData in AccountFileInfo.Instance.playerData.eventConditionDatas)
+        // {
+        //     EventConditionDataMap.Add(playerDataEventConditionData.guid, playerDataEventConditionData);
+        // }
+
         StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         EventManager.Instance.AddEventListener(CustomEventType.DetectRandomEvent, RenfenceRandomEvent);
         EventManager.Instance.AddEventListener(CustomEventType.AddItem, ItemUpdate);
@@ -90,7 +97,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         int maxCount = heroPowerUpConfig.ShenshiMax / PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         count = count + AccountFileInfo.Instance.playerData.eventList.Count > maxCount ? maxCount - AccountFileInfo.Instance.playerData.eventList.Count : count;
 
-     
+
         EventManager.Instance.Dispatch(CustomEventType.DivineSensePointChange, null);
         // 神识升级逻辑
         UpDivinesense();
@@ -100,10 +107,10 @@ public class EventSystemManager : Singleton<EventSystemManager>
             return default;
 
         //扣除神识值 增加神识经验
-        int xiaoHao =  eventConfigs.Count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
+        int xiaoHao = eventConfigs.Count * PlayerManager.Instance.gameConstantConfig.DetectEventCount;
         AccountFileInfo.Instance.playerData.divineSenseexp += xiaoHao;
         AccountFileInfo.Instance.playerData.divineSensePoint -= xiaoHao;
-        
+
         AccountFileInfo.Instance.playerData.eventList.AddRange(eventConfigs);
         AccountFileInfo.Instance.SavePlayerData();
         return eventConfigs;
@@ -268,20 +275,28 @@ public class EventSystemManager : Singleton<EventSystemManager>
         {
             foreach (var i in eventConfig.EventLinksId)
             {
-                AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == i);
+                EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(i);
 
-                if (eventLinkData == null)
+                AccountFileInfo.EventLinkData eventLinkData = new AccountFileInfo.EventLinkData();
+                eventLinkData.eventId = eventID;
+                eventLinkData.eventLinkId = i;
+                if (eventLinkConfig.ConditionId != null)
                 {
-                    eventLinkData = new AccountFileInfo.EventLinkData();
-                    eventLinkData.eventId = eventList.eventID;
-                    eventLinkData.eventLinkId = i;
-                    AccountFileInfo.Instance.playerData.eventLinkDatas.Add(eventLinkData);
+                    foreach (var i1 in eventLinkConfig.ConditionId)
+                    {
+                        AccountFileInfo.EventConditionData eventConditionData = new AccountFileInfo.EventConditionData();
+                        eventConditionData.eventId = eventList.eventID;
+                        eventConditionData.eventCondition = i1;
+                        // AccountFileInfo.Instance.playerData.eventConditionDatas.Add(eventConditionData);
+                        eventLinkData.eventConditions.Add(eventConditionData);
+
+                        //初始化先检测一些条件
+                        CeekTaskComplete(eventConditionData, 1, null);
+                        CeekTaskComplete(eventConditionData, 3, null);
+                    }
                 }
 
-                eventLinkData.fishCount = 0;
-                //初始化先检测一些条件
-                CeekTaskComplete(eventLinkData.eventLinkId, 1, null);
-                CeekTaskComplete(eventLinkData.eventLinkId, 3, null);
+                eventList.eventLinks.Add(eventLinkData);
             }
         }
 
@@ -326,7 +341,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         LogTool.Log($"触发事件: {evt.EventName} (ID: {evt.ID}, 品质: {evt.EventQuality})");
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
 
-        DialogueManager.Instance.StartDialogue(evt.EventLinksId[0], evt.ID, () => { CompleteEvent(evt.ID); });
+        DialogueManager.Instance.StartDialogue(null, evt.EventLinksId[0], evt.ID, () => { CompleteEvent(evt.ID); });
     }
 
     /// <summary>
@@ -355,7 +370,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         CurrentEventList = evt;
         CombatDrive.Instance.CombatController.ChangeState(CombatController.idle);
-        DialogueManager.Instance.StartDialogue(dialogueID, eventConfig.ID, () =>
+        DialogueManager.Instance.StartDialogue(CurrentEventList, dialogueID, eventConfig.ID, () =>
         {
             CompleteEvent(CurrentEventList);
             cTask.SetResult();
@@ -369,17 +384,52 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
 
     //任务是否完成
-    public bool IsEvenkLinkComplete(int eventLinkId)
+    public bool IsEvenkLinkComplete(AccountFileInfo.EventConditionData eventCondition)
     {
-        EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLinkId);
-        if (eventLinkConfig.ConditionType == 0)
-            return true;
+        EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(eventCondition.eventCondition);
+
+        if (eventCondition != null)
+        {
+            return eventCondition.fishCount >= eventConditionConfig.finishCount;
+        }
+
+        return false;
+    }
+
+    public bool CeekEventGroupComplete(List<AccountFileInfo.EventConditionData> eventConditions)
+    {
+        Map<int, List<AccountFileInfo.EventConditionData>> eventConditionDataGroup = new Map<int, List<AccountFileInfo.EventConditionData>>();
+
+        foreach (var eventConditionData in eventConditions)
+        {
+            EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(eventConditionData.eventCondition);
+            if (!eventConditionDataGroup.ContainsKey(eventConditionConfig.Operation))
+            {
+                eventConditionDataGroup.Add(eventConditionConfig.Operation, new List<AccountFileInfo.EventConditionData>());
+            }
+
+            eventConditionDataGroup[eventConditionConfig.Operation].Add(eventConditionData);
+        }
 
-        AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == eventLinkId);
 
-        if (eventLinkData != null)
+        bool isUlock = true;
+        foreach (var keyValuePair in eventConditionDataGroup)
         {
-            return eventLinkData.fishCount >= eventLinkConfig.finishCount;
+            isUlock = true;
+            foreach (var eventConditionData in keyValuePair.Value)
+            {
+                if (!IsEvenkLinkComplete(eventConditionData))
+                {
+                    isUlock = false;
+                }
+            }
+
+            if (isUlock)
+            {
+                return isUlock;
+            }
+
+         
         }
 
         return false;
@@ -387,33 +437,39 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     public void CeekEventCompletes(int type, int[] value)
     {
-        foreach (var playerDataEventLinkData in AccountFileInfo.Instance.playerData.eventLinkDatas)
+        foreach (var playerDataEventLinkData in AccountFileInfo.Instance.playerData.eventList)
         {
-            CeekTaskComplete(playerDataEventLinkData.eventLinkId, type, value);
+            foreach (var eventLinkData in playerDataEventLinkData.eventLinks)
+            {
+                foreach (var eventConditionData in eventLinkData.eventConditions)
+                {
+                    CeekTaskComplete(eventConditionData, type, value);
+                }
+            }
         }
 
         EventManager.Instance.Dispatch(CustomEventType.RemoveEvent, null);
     }
 
-    public void CeekTaskComplete(int eventLiknId, int type, int[] value)
+    public void CeekTaskComplete(AccountFileInfo.EventConditionData conditionData, int type, int[] value)
     {
-        //任务完成了跳过检测
-        if (IsEvenkLinkComplete(eventLiknId))
+        EventConditionConfig eventConditionConfig = ConfigComponent.Instance.Get<EventConditionConfig>(conditionData.eventCondition);
+
+
+        if (IsEvenkLinkComplete(conditionData))
             return;
-        AccountFileInfo.EventLinkData eventLinkData = AccountFileInfo.Instance.playerData.eventLinkDatas.FirstOrDefault(el => el.eventLinkId == eventLiknId);
 
-        EventLinkConfig eventLinkConfig = ConfigComponent.Instance.Get<EventLinkConfig>(eventLiknId);
         switch (type)
         {
             //检测背包道具
             case 1:
-                if (eventLinkConfig.ConditionType == 1)
+                if (eventConditionConfig.ConditionType == 1)
                 {
-                    eventLinkData.fishCount += (int)PlayerManager.Instance.BagController.GetItemCount(eventLinkConfig.ConditionPara[0]);
+                    conditionData.fishCount += (int)PlayerManager.Instance.BagController.GetItemCount(eventConditionConfig.ConditionPara[0]);
 
-                    if (IsEvenkLinkComplete(eventLiknId))
+                    if (IsEvenkLinkComplete(conditionData))
                     {
-                        CompleteTask(eventLiknId);
+                        // CompleteTask(conditionData.guid);
                     }
                 }
 
@@ -421,13 +477,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             //境界检测
             case 3:
-                if (eventLinkConfig.ConditionType == 3 && PlayerManager.Instance.myHero.powerUpConfig.ID >= eventLinkConfig.ConditionPara[0])
+                if (eventConditionConfig.ConditionType == 3 && PlayerManager.Instance.myHero.powerUpConfig.ID >= eventConditionConfig.ConditionPara[0])
                 {
-                    eventLinkData.fishCount++;
+                    conditionData.fishCount++;
 
-                    if (IsEvenkLinkComplete(eventLiknId))
+                    if (IsEvenkLinkComplete(conditionData))
                     {
-                        CompleteTask(eventLiknId);
+                        // CompleteTask(conditionData.guid);
                     }
                 }
 
@@ -435,13 +491,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             //战斗胜利
             case 5:
-                if (eventLinkConfig.ConditionType == 5 && eventLinkConfig.ConditionPara[0] == value[0])
+                if (eventConditionConfig.ConditionType == 5 && eventConditionConfig.ConditionPara[0] == value[0])
                 {
-                    eventLinkData.fishCount++;
+                    conditionData.fishCount++;
 
-                    if (IsEvenkLinkComplete(eventLiknId))
+                    if (IsEvenkLinkComplete(conditionData))
                     {
-                        CompleteEvent(eventLiknId);
+                        // CompleteEvent(conditionData.guid);
                     }
                 }
 
@@ -449,13 +505,13 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
             //获得道具
             case 6:
-                if (eventLinkConfig.ConditionType == 6 && eventLinkConfig.ConditionPara[0] == value[0])
+                if (eventConditionConfig.ConditionType == 6 && eventConditionConfig.ConditionPara[0] == value[0])
                 {
-                    eventLinkData.fishCount += value[1];
+                    conditionData.fishCount += value[1];
 
-                    if (IsEvenkLinkComplete(eventLiknId))
+                    if (IsEvenkLinkComplete(conditionData))
                     {
-                        CompleteEvent(eventLinkData);
+                        // CompleteEvent(conditionData.guid);
                     }
                 }
 

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

@@ -33,7 +33,7 @@ namespace Fort23.Mono
         }
 
 
-        public void CustomInit(int id, int mainOpid, Action<DialogueOptionWidget> callback)
+        public void CustomInit(AccountFileInfo.EventLinkData eventLinkData, int id, int mainOpid, Action<DialogueOptionWidget> callback)
         {
             type = 1;
             eventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(id);
@@ -42,7 +42,21 @@ namespace Fort23.Mono
             Text_desc.text = LanguageManager.Instance.Text(mainEventConditionConfig.optionPara2[index]);
             this.callback = callback;
 
-            if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionConfig.ID))
+            // bool isUlock = true;
+            // foreach (var eventConditionData in eventLinkData.eventConditions)
+            // {
+            //     if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
+            //     {
+            //         onCancel?.Invoke();
+            //         return;
+            //     }
+            //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
+            //     {
+            //         isUlock = false;
+            //     }
+            // }
+
+            if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
             {
                 transform.Gray();
             }

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

@@ -5,6 +5,7 @@ using Excel2Json;
 using Fort23.UTool;
 using UnityEngine;
 using System;
+using System.Linq;
 using Fort23.Core;
 using UnityEngine.UI;
 
@@ -29,14 +30,18 @@ namespace Fort23.Mono
         private bool _skipTyping;
         private bool _isShowingOptions;
 
+        private AccountFileInfo.EventList CurrentEventList;
+
+        private AccountFileInfo.EventLinkData _eventLinkData;
+
         private int type;
 
-        public static async void OpenDialoguePanel(int id, string[] icon,
+        public static async void OpenDialoguePanel(AccountFileInfo.EventList CurrentEventList,int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
             DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top);
-            dialoguePanel.ShowPanel(id, icon, messageShowType, finish);
+            dialoguePanel.ShowPanel(CurrentEventList,id, icon, messageShowType, finish);
         }
 
 
@@ -118,11 +123,13 @@ namespace Fort23.Mono
             }
         }
 
-        public void ShowPanel(int id, string[] icon,
+        public void ShowPanel(AccountFileInfo.EventList CurrentEventList,int id, string[] icon,
             ShowDialogueEventData.MessageShowType messageShowType,
             Action<int?> finish)
         {
+            this.CurrentEventList = CurrentEventList;
             eventConditionConfig = ConfigComponent.Instance.Get<EventLinkConfig>(id);
+            _eventLinkData = CurrentEventList.eventLinks.FirstOrDefault(el => el.eventLinkId == id);
             showIconName = icon;
             this.dialogueMessaga = eventConditionConfig.LanID;
             this.messageShowType = messageShowType;
@@ -162,13 +169,18 @@ namespace Fort23.Mono
                 }
                 else
                 {
-                    if (eventConditionConfig.ID != 0 && eventConditionConfig.ConditionType != 0)
+                    if (eventConditionConfig.ID != 0 && _eventLinkData.eventConditions.Count > 0)
                     {
-                        if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionConfig.ID))
+                        foreach (var eventConditionData in _eventLinkData.eventConditions)
                         {
-                            TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(eventConditionConfig.ID));
-                            return;
+                            if (!EventSystemManager.Instance.IsEvenkLinkComplete(eventConditionData))
+                            {
+                                TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(eventConditionData));
+                                return;
+                            }
                         }
+
+                     
                     }
 
 
@@ -223,7 +235,7 @@ namespace Fort23.Mono
 
                     DialogueOptionWidget dialogueOptionWidget =
                         await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-                    dialogueOptionWidget.CustomInit(op, eventConditionConfig.ID, SelectOption);
+                    dialogueOptionWidget.CustomInit(_eventLinkData,op, eventConditionConfig.ID, SelectOption);
                 }
             }
 
@@ -242,14 +254,14 @@ namespace Fort23.Mono
         private void SelectOption(DialogueOptionWidget obj)
         {
             int selectedOptionID = obj.eventConditionConfig.ID;
-            if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
-            {
-                if (!EventSystemManager.Instance.IsEvenkLinkComplete(selectedOptionID))
-                {
-                    TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
-                    return;
-                }
-            }
+            // if (obj.eventConditionConfig.ID != 0 && obj.eventConditionConfig.ConditionType != 0)
+            // {
+            //     if (!EventSystemManager.Instance.IsEvenkLinkComplete(selectedOptionID))
+            //     {
+            //         TipMessagePanel.OpenTipMessagePanel(EventHelper.GetTaskMessage(selectedOptionID));
+            //         return;
+            //     }
+            // }
 
             UIManager.Instance.HideUIUIPanel(this);
             finish?.Invoke(selectedOptionID);
@@ -317,6 +329,8 @@ namespace Fort23.Mono
             _skipTyping = false;
             index = 0;
             eventConditionConfig = default;
+            _eventLinkData = null;
+            CurrentEventList = null;
             _currShowMessage = null;
             dialogueMessaga = null; 
             base.Close();