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

# Conflicts:
#	Assets/Res/Config/GroupConfig.json   resolved by origin/master(远端) version

Assets/Res/Config/DropConfig.json

@@ -1233,6 +1233,213 @@
       "showItemId": [
         12001
       ]
+    },
+    {
+      "ID": 21001,
+      "dropGroupID": [
+        21001
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21001
+      ]
+    },
+    {
+      "ID": 21002,
+      "dropGroupID": [
+        21002
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21002
+      ]
+    },
+    {
+      "ID": 21003,
+      "dropGroupID": [
+        21003
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21003
+      ]
+    },
+    {
+      "ID": 21004,
+      "dropGroupID": [
+        21004
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21004
+      ]
+    },
+    {
+      "ID": 21005,
+      "dropGroupID": [
+        21005
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21005
+      ]
+    },
+    {
+      "ID": 21006,
+      "dropGroupID": [
+        21006
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21006
+      ]
+    },
+    {
+      "ID": 21007,
+      "dropGroupID": [
+        21007
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21007
+      ]
+    },
+    {
+      "ID": 21008,
+      "dropGroupID": [
+        21008
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21008
+      ]
+    },
+    {
+      "ID": 21009,
+      "dropGroupID": [
+        21009
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21009
+      ]
+    },
+    {
+      "ID": 21010,
+      "dropGroupID": [
+        21010
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21010
+      ]
+    },
+    {
+      "ID": 21011,
+      "dropGroupID": [
+        21011
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21011
+      ]
+    },
+    {
+      "ID": 21012,
+      "dropGroupID": [
+        21012
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21012
+      ]
+    },
+    {
+      "ID": 21013,
+      "dropGroupID": [
+        21013
+      ],
+      "dropType": 3,
+      "showItemId": [
+        21013
+      ]
+    },
+    {
+      "ID": 22001,
+      "dropGroupID": [
+        22001
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22001
+      ]
+    },
+    {
+      "ID": 22002,
+      "dropGroupID": [
+        22002
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22002
+      ]
+    },
+    {
+      "ID": 22003,
+      "dropGroupID": [
+        22003
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22003
+      ]
+    },
+    {
+      "ID": 22004,
+      "dropGroupID": [
+        22004
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22004
+      ]
+    },
+    {
+      "ID": 22005,
+      "dropGroupID": [
+        22005
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22005
+      ]
+    },
+    {
+      "ID": 22006,
+      "dropGroupID": [
+        22006
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22006
+      ]
+    },
+    {
+      "ID": 22007,
+      "dropGroupID": [
+        22007
+      ],
+      "dropType": 3,
+      "showItemId": [
+        22007
+      ]
+    },
+    {
+      "ID": 999003,
+      "dropType": 2,
+      "showItemId": [
+        1001
+      ]
     }
   ]
 }

Assets/Res/Config/DropGroupConfig.json

@@ -41,6 +41,13 @@
       "dropItemID": [
         6
       ]
+    },
+    {
+      "ID": 7,
+      "dropRate": 1000,
+      "dropItemID": [
+        7
+      ]
     }
   ]
 }

Assets/Res/Config/DropItemConfig.json

@@ -89,6 +89,18 @@
       "dropMinV": 1,
       "dropMaxV": 1,
       "dropCountGoupID": -1
+    },
+    {
+      "ID": 7,
+      "dropItemType": 1,
+      "itemID": [
+        1001,
+        1005,
+        1006
+      ],
+      "dropMinV": -10,
+      "dropMaxV": -10,
+      "dropCountGoupID": -1
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -2586,7 +2586,7 @@
       "EventTriggerType": 99,
       "EventTag": 2,
       "EventType": 1,
-      "Score": 10,
+      "Score": 0,
       "EventQuality": 1,
       "PrizeType": [
         1
@@ -2605,6 +2605,122 @@
       "EventCount": null,
       "EventName": 3034,
       "Description": 3035
+    },
+    {
+      "ID": 5004,
+      "EventLinksId": [
+        500401,
+        102
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeType": [
+        1
+      ],
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        -5000
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3034,
+      "Description": 3035
+    },
+    {
+      "ID": 5005,
+      "EventLinksId": [
+        500501,
+        102
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeType": [
+        1
+      ],
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        -5000
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3034,
+      "Description": 3035
+    },
+    {
+      "ID": 5006,
+      "EventLinksId": [
+        500601,
+        102
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeType": [
+        1
+      ],
+      "PrizeIDs": [
+        1005
+      ],
+      "PrizeNums": [
+        -5000
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3034,
+      "Description": 3035
+    },
+    {
+      "ID": 5007,
+      "EventLinksId": [
+        500701,
+        102
+      ],
+      "EventTriggerType": 99,
+      "EventTag": 7,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeType": [
+        1
+      ],
+      "PrizeIDs": [
+        1006
+      ],
+      "PrizeNums": [
+        -5000
+      ],
+      "RefreshProbability": null,
+      "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
+      "EventCount": null,
+      "EventName": 3034,
+      "Description": 3035
     }
   ]
 }

Assets/Res/Config/EventLinkConfig.json

@@ -7400,6 +7400,66 @@
       "EventID": 1031,
       "optionType": null,
       "ResultType": null
+    },
+    {
+      "ID": 500401,
+      "conciseEventMessage": 2597,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2598
+      ],
+      "DialogueType": null,
+      "EventID": 5004,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 500501,
+      "conciseEventMessage": 2599,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2600
+      ],
+      "DialogueType": null,
+      "EventID": 5005,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 500601,
+      "conciseEventMessage": 2601,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2602
+      ],
+      "DialogueType": null,
+      "EventID": 5006,
+      "optionType": null,
+      "ResultType": null
+    },
+    {
+      "ID": 500701,
+      "conciseEventMessage": 2603,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "LanID": [
+        2604
+      ],
+      "DialogueType": null,
+      "EventID": 5007,
+      "optionType": null,
+      "ResultType": null
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -64,147 +64,56 @@
       ]
     },
     {
-      "ID": 100010,
+      "ID": 1002,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100011,
+      "ID": 1003,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100012,
+      "ID": 1004,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100013,
+      "ID": 1005,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100014,
+      "ID": 1006,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100015,
+      "ID": 1007,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100016,
+      "ID": 1008,
       "GroupMonster": [
         1001,
         1002
       ]
     },
     {
-      "ID": 100017,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100018,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100019,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100020,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100021,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100022,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100023,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100024,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100025,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100026,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100027,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100028,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100029,
-      "GroupMonster": [
-        1001,
-        1002
-      ]
-    },
-    {
-      "ID": 100030,
+      "ID": 1009,
       "GroupMonster": [
         1001,
         1002

Assets/Res/Config/LevelbattleConfig.json

@@ -41,9 +41,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1001,
+      "ID": 1002,
       "Group": [
-        100001
+        1002
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -51,9 +51,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1002,
+      "ID": 1003,
       "Group": [
-        100002
+        1003
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -61,9 +61,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1003,
+      "ID": 1004,
       "Group": [
-        100003
+        1004
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -71,9 +71,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1004,
+      "ID": 1005,
       "Group": [
-        100001
+        1005
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -81,9 +81,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1005,
+      "ID": 1006,
       "Group": [
-        100002
+        1006
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -91,9 +91,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1006,
+      "ID": 1007,
       "Group": [
-        100004
+        1007
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -101,9 +101,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1007,
+      "ID": 1008,
       "Group": [
-        100001
+        1008
       ],
       "combatTime": 120.0,
       "combatType": 1,
@@ -111,9 +111,9 @@
       "MonsterGroupPower": 100
     },
     {
-      "ID": 1008,
+      "ID": 1009,
       "Group": [
-        100001
+        1009
       ],
       "combatTime": 120.0,
       "combatType": 1,

Assets/Res/Config/QiankundaiConfig.json

@@ -6,15 +6,15 @@
         1,
         300
       ],
-      "dropType": 1,
-      "dropTypePara": 60.0,
-      "dropPara1": 1,
-      "dropPara2": 5,
+      "dropType": 2,
+      "dropTypePara": 0,
+      "dropPara1": 2,
+      "dropPara2": 1,
       "ChoukaID": [
-        1002
+        21001
       ],
       "DropCount": [
-        -100
+        5
       ]
     },
     {
@@ -28,10 +28,61 @@
       "dropPara1": 2,
       "dropPara2": 1,
       "ChoukaID": [
-        1003
+        21002
+      ],
+      "DropCount": [
+        5
+      ]
+    },
+    {
+      "ID": 3,
+      "dropLevel": [
+        1,
+        300
+      ],
+      "dropType": 2,
+      "dropTypePara": 0,
+      "dropPara1": 2,
+      "dropPara2": 1,
+      "ChoukaID": [
+        21003
+      ],
+      "DropCount": [
+        5
+      ]
+    },
+    {
+      "ID": 4,
+      "dropLevel": [
+        1,
+        300
+      ],
+      "dropType": 2,
+      "dropTypePara": 0,
+      "dropPara1": 2,
+      "dropPara2": 1,
+      "ChoukaID": [
+        21004
+      ],
+      "DropCount": [
+        5
+      ]
+    },
+    {
+      "ID": 1001,
+      "dropLevel": [
+        1,
+        300
+      ],
+      "dropType": 1,
+      "dropTypePara": 60.0,
+      "dropPara1": 1,
+      "dropPara2": 5,
+      "ChoukaID": [
+        999003
       ],
       "DropCount": [
-        -200
+        1
       ]
     }
   ]

Assets/Scripts/GameData/ExcelConfig/QiankundaiConfig.cs

@@ -57,7 +57,7 @@ public int[] ChoukaID;
 
 
 		/// <summary>
-		///掉落数量
+		///掉落数量 优先读chouka表的数量
 		/// </summary>
 public int[] DropCount;