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

Assets/Res/Config/EventConfig.json

@@ -283,6 +283,65 @@
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
+    },
+    {
+      "ID": 20001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 174,
+      "Description": 1936
+    },
+    {
+      "ID": 20002,
+      "EventLinksId": [
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 175,
+      "Description": 1937
+    },
+    {
+      "ID": 20003,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
+      "EventTriggerType": 5,
+      "EventTag": null,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 1943,
+      "Description": 1944
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -2,28 +2,24 @@
   "configList": [
     {
       "ID": 100001,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9101
       ]
     },
     {
       "ID": 100002,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9102
       ]
     },
     {
       "ID": 100003,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9103
       ]
     },
     {
       "ID": 100004,
-      "GroupMonsterLevel": -1,
       "GroupMonster": [
         9201
       ]

Assets/Res/Config/LanguageChineseConfig.json

@@ -7778,11 +7778,11 @@
     },
     {
       "ID": 1945,
-      "txt": "0"
+      "txt": "论道大会"
     },
     {
       "ID": 1946,
-      "txt": "0"
+      "txt": "仙山探险"
     },
     {
       "ID": 1947,

Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -27,7 +27,7 @@ public int[] EventLinksId;
 
 
 		/// <summary>
-		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 99.无标记 
+		///事件类型： 1.通用事件 2.挂机事件 4.主线任务 5.仙山探险 99.无标记 
 		/// </summary>
 public int EventTriggerType;
 

Assets/Scripts/GameData/ExcelConfig/GroupConfig.cs

@@ -21,9 +21,9 @@ public int ID;
 
 
 		/// <summary>
-		///具体怪物等级 -1代表跟随玩家等级
+		///具体怪物等级 -1代表跟随玩家等级 -1后面可填动态修正等级
 		/// </summary>
-public int GroupMonsterLevel;
+public int[] GroupMonsterLevel;
 
 
 		/// <summary>