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

# Conflicts:
#	Excel2Json/Excel/LevelBattle.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/EventConditionConfig.json

@@ -595,7 +595,89 @@
       "ConditionPara": [
         20005
       ],
-      "finishCount": 3
+      "finishCount": 3,
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 38,
+      "message": 9037,
+      "Operation": 0,
+      "ConditionType": 5,
+      "ConditionPara": [
+        3003
+      ],
+      "finishCount": 3,
+      "RelatedEvents": [
+        30014
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 39,
+      "message": 9038,
+      "Operation": 0,
+      "ConditionType": 1,
+      "ConditionPara": [
+        20006
+      ],
+      "finishCount": 3,
+      "RelatedEvents": [
+        30015
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 40,
+      "message": 9039,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30016
+      ],
+      "finishCount": 1,
+      "RelatedEvents": [
+        30016
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
+    },
+    {
+      "ID": 41,
+      "message": 9040,
+      "Operation": 0,
+      "ConditionType": 10,
+      "ConditionPara": [
+        30016
+      ],
+      "finishCount": 1,
+      "RelatedEvents": [
+        30016
+      ],
+      "SkiptoIds": [
+        1,
+        2,
+        3,
+        4
+      ]
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -2058,8 +2058,8 @@
       "XiantuID": 1,
       "EventConditionId": 0,
       "EventCount": 0,
-      "EventName": 4057,
-      "Description": 4132
+      "EventName": 4191,
+      "Description": 4192
     },
     {
       "ID": 20001,
@@ -2953,6 +2953,87 @@
       "EventName": 4163,
       "Description": 4164
     },
+    {
+      "ID": 30014,
+      "EventLinksId": [
+        3001401,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4177,
+      "Description": 4178
+    },
+    {
+      "ID": 30015,
+      "EventLinksId": [
+        3001501,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        20006
+      ],
+      "PrizeNums": [
+        1
+      ],
+      "RefreshProbability": 33,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4193,
+      "Description": 4194
+    },
+    {
+      "ID": 30016,
+      "EventLinksId": [
+        3001601,
+        3001602,
+        3001603,
+        3001604,
+        102
+      ],
+      "EventTriggerType": 98,
+      "EventTag": 6,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        100
+      ],
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 3,
+      "EventName": 4195,
+      "Description": 4196
+    },
     {
       "ID": 5001,
       "EventLinksId": [
@@ -3408,6 +3489,13 @@
     {
       "ID": 6011,
       "EventLinksId": [
+        601101,
+        601102,
+        601103,
+        601104,
+        601105,
+        601106,
+        601107,
         102
       ],
       "EventTriggerType": 7,
@@ -3430,6 +3518,14 @@
     {
       "ID": 6012,
       "EventLinksId": [
+        601201,
+        601202,
+        601203,
+        601204,
+        601205,
+        601206,
+        601207,
+        601208,
         102
       ],
       "EventTriggerType": 7,
@@ -3452,6 +3548,16 @@
     {
       "ID": 6013,
       "EventLinksId": [
+        601301,
+        601302,
+        601303,
+        601304,
+        601305,
+        601306,
+        601307,
+        601308,
+        601309,
+        601310,
         102
       ],
       "EventTriggerType": 7,
@@ -3474,6 +3580,16 @@
     {
       "ID": 6014,
       "EventLinksId": [
+        601401,
+        601402,
+        601403,
+        601404,
+        601405,
+        601406,
+        601407,
+        601408,
+        601409,
+        601410,
         102
       ],
       "EventTriggerType": 7,
@@ -3496,6 +3612,17 @@
     {
       "ID": 6015,
       "EventLinksId": [
+        601501,
+        601502,
+        601503,
+        601504,
+        601505,
+        601506,
+        601507,
+        601508,
+        601509,
+        601510,
+        601511,
         102
       ],
       "EventTriggerType": 7,
@@ -3518,6 +3645,11 @@
     {
       "ID": 6016,
       "EventLinksId": [
+        601601,
+        601602,
+        601603,
+        601604,
+        601605,
         102
       ],
       "EventTriggerType": 7,
@@ -3536,6 +3668,154 @@
       "EventCount": 0,
       "EventName": 4170,
       "Description": 4176
+    },
+    {
+      "ID": 6021,
+      "EventLinksId": [
+        602101,
+        602102,
+        602103,
+        602104,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 35,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 3,
+      "EventValue": [
+        61
+      ],
+      "EventCount": 0,
+      "EventName": 4179,
+      "Description": 4185
+    },
+    {
+      "ID": 6022,
+      "EventLinksId": [
+        602201,
+        602202,
+        602203,
+        602204,
+        602205,
+        602206,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 30,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6021
+      ],
+      "EventCount": 0,
+      "EventName": 4180,
+      "Description": 4186
+    },
+    {
+      "ID": 6023,
+      "EventLinksId": [
+        602301,
+        602302,
+        602303,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 25,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6022
+      ],
+      "EventCount": 0,
+      "EventName": 4181,
+      "Description": 4187
+    },
+    {
+      "ID": 6024,
+      "EventLinksId": [
+        602401,
+        602402,
+        602403,
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 20,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6023
+      ],
+      "EventCount": 0,
+      "EventName": 4182,
+      "Description": 4188
+    },
+    {
+      "ID": 6025,
+      "EventLinksId": [
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 15,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6024
+      ],
+      "EventCount": 0,
+      "EventName": 4183,
+      "Description": 4189
+    },
+    {
+      "ID": 6026,
+      "EventLinksId": [
+        102
+      ],
+      "EventTriggerType": 7,
+      "EventTag": 5,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "RefreshProbability": 10,
+      "RefreshCount": 1,
+      "placeID": 1,
+      "XiantuID": 0,
+      "EventConditionId": 10,
+      "EventValue": [
+        6025
+      ],
+      "EventCount": 0,
+      "EventName": 4184,
+      "Description": 4190
     }
   ]
 }

Assets/Res/Config/EventNPC.json

@@ -197,6 +197,30 @@
       "name": 0,
       "ID_1": 0,
       "DaoyouID": 0
+    },
+    {
+      "ID": 122,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
+    },
+    {
+      "ID": 123,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
+    },
+    {
+      "ID": 124,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
+    },
+    {
+      "ID": 125,
+      "name": 0,
+      "ID_1": 0,
+      "DaoyouID": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -211,6 +211,15 @@
         0
       ]
     },
+    {
+      "ID": 1016,
+      "GroupMonsterLevel": [
+        65
+      ],
+      "GroupMonster": [
+        9004
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [
@@ -593,6 +602,60 @@
       "GroupMonster": [
         9006
       ]
+    },
+    {
+      "ID": 3003,
+      "GroupMonsterLevel": [
+        45
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 3004,
+      "GroupMonsterLevel": [
+        55
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 3005,
+      "GroupMonsterLevel": [
+        65
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3006,
+      "GroupMonsterLevel": [
+        75
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3007,
+      "GroupMonsterLevel": [
+        85
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3008,
+      "GroupMonsterLevel": [
+        91
+      ],
+      "GroupMonster": [
+        9002
+      ]
     }
   ]
 }

Assets/Res/Config/ItemConfig.json

@@ -3924,6 +3924,31 @@
       "sort": 0,
       "itemDesc2": 0
     },
+    {
+      "ID": 20006,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_20006",
+      "itemTag": 21,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 0,
+      "sort": 0,
+      "itemDesc2": 0
+    },
     {
       "ID": 21001,
       "itemName": 3194,

Assets/Res/Config/LevelbattleConfig.json

@@ -180,6 +180,16 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
+    {
+      "ID": 1016,
+      "Group": [
+        1016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
     {
       "ID": 2001,
       "Group": [
@@ -399,6 +409,66 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3003,
+      "Group": [
+        3003
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3004,
+      "Group": [
+        3004
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3005,
+      "Group": [
+        3005
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3006,
+      "Group": [
+        3006
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3007,
+      "Group": [
+        3007
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 3008,
+      "Group": [
+        3008
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }