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

Assets/Res/Config/EventConfig.json

@@ -961,6 +961,7 @@
       "EventLinksId": [
         1401,
         1402,
+        1403,
         100,
         102
       ],
@@ -989,6 +990,37 @@
       "EventLinksId": [
         1501,
         1502,
+        1503,
+        1504,
+        100,
+        102
+      ],
+      "EventTriggerType": 2,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        10
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": null,
+      "Description": null
+    },
+    {
+      "ID": 16,
+      "EventLinksId": [
+        1601,
+        1602,
+        1603,
         100,
         102
       ],

Assets/Res/Config/EventLinkConfig.json

@@ -434,7 +434,7 @@
     },
     {
       "ID": 1030,
-      "conciseEventMessage": 221,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -455,7 +455,7 @@
     },
     {
       "ID": 1040,
-      "conciseEventMessage": 222,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -476,7 +476,7 @@
     },
     {
       "ID": 1050,
-      "conciseEventMessage": 223,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -499,7 +499,7 @@
     },
     {
       "ID": 1060,
-      "conciseEventMessage": 224,
+      "conciseEventMessage": null,
       "EventConditionMessage": null,
       "PreShow": null,
       "PreShowPar": null,
@@ -542,14 +542,11 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        3000
-      ],
-      "ResultType": null
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1103
+      ]
     },
     {
       "ID": 1103,
@@ -563,13 +560,7 @@
       ],
       "DialogueType": null,
       "EventID": 11,
-      "optionType": 3,
-      "PrizeIDs": [
-        1003
-      ],
-      "PrizeNums": [
-        3000
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -620,13 +611,7 @@
       ],
       "DialogueType": null,
       "EventID": 12,
-      "optionType": 3,
-      "PrizeIDs": [
-        1005
-      ],
-      "PrizeNums": [
-        500
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -637,7 +622,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        212
+        3220
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -655,7 +640,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        213
+        3221
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -673,7 +658,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        214
+        3222
       ],
       "DialogueType": null,
       "EventID": 13,
@@ -691,17 +676,11 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        215
+        3223
       ],
       "DialogueType": null,
       "EventID": 13,
-      "optionType": 3,
-      "PrizeIDs": [
-        1006
-      ],
-      "PrizeNums": [
-        500
-      ],
+      "optionType": null,
       "ResultType": null
     },
     {
@@ -712,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
       ]
     },
     {
@@ -734,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
     },
     {
@@ -755,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
       ]
     },
     {
@@ -777,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/FabaoConfig.json

@@ -62,6 +62,14 @@
       "magicAttribute": 2,
       "model": "fb_3203",
       "fragmentID": 11005,
+      "ShuxingIDs": [
+        2,
+        3
+      ],
+      "ShuxingPara": [
+        50,
+        50
+      ],
       "SkillGroupID": 3203
     },
     {
@@ -90,6 +98,14 @@
       "magicAttribute": 4,
       "model": "fb_3302",
       "fragmentID": 11007,
+      "ShuxingIDs": [
+        1,
+        2
+      ],
+      "ShuxingPara": [
+        75,
+        25
+      ],
       "SkillGroupID": 3302
     },
     {

Assets/Res/Config/GameConstantConfig.json

@@ -39,6 +39,10 @@
       "shenshiRecoverSpeed": [
         12.0,
         1.0
+      ],
+      "GuajiCD": [
+        6,
+        12
       ]
     }
   ]

Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -104,6 +104,12 @@ public int RefreshRelevanceEventProbability;
 public float[] shenshiRecoverSpeed;
 
 
+		/// <summary>
+		///挂机事件结束后下个挂机事件出现的时间间隔（最小和最大秒）
+		/// </summary>
+public int[] GuajiCD;
+
+
 	}
 
 }

Assets/Scripts/GameLogic/Combat/CombatState/CombatUpdateState.cs

@@ -60,7 +60,7 @@ namespace GameLogic.Combat.CombatState
                 if (_nextMonsterTime < 0)
                 {   _nextMonsterTime = Random.Range(5, 10);
                    // EventSystemManager.Instance.DetectRandomEvents();
-                   EventManager.Instance.Dispatch(CustomEventType.DetectRandomEvent,null);
+                   // EventManager.Instance.Dispatch(CustomEventType.DetectRandomEvent,null);
                 }
             }