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

Assets/Res/Config/EventConditionConfig.json

@@ -128,7 +128,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1003
+        1004
       ],
       "finishCount": 3,
       "RelatedEvents": [
@@ -258,7 +258,7 @@
       "Operation": 0,
       "ConditionType": 5,
       "ConditionPara": [
-        1008
+        1009
       ],
       "finishCount": 1,
       "RelatedEvents": [

Assets/Res/Config/GroupConfig.json

@@ -91,7 +91,7 @@
     {
       "ID": 1002,
       "GroupMonsterLevel": [
-        5
+        9
       ],
       "GroupMonster": [
         9002
@@ -100,7 +100,7 @@
     {
       "ID": 1003,
       "GroupMonsterLevel": [
-        15
+        16
       ],
       "GroupMonster": [
         9001
@@ -118,7 +118,7 @@
     {
       "ID": 1005,
       "GroupMonsterLevel": [
-        45
+        46
       ],
       "GroupMonster": [
         1008
@@ -127,7 +127,7 @@
     {
       "ID": 1006,
       "GroupMonsterLevel": [
-        50
+        51
       ],
       "GroupMonster": [
         5006
@@ -136,7 +136,7 @@
     {
       "ID": 1007,
       "GroupMonsterLevel": [
-        55
+        56
       ],
       "GroupMonster": [
         5007
@@ -145,13 +145,13 @@
     {
       "ID": 1008,
       "GroupMonsterLevel": [
-        85
+        86
       ]
     },
     {
       "ID": 1009,
       "GroupMonsterLevel": [
-        95
+        101
       ],
       "GroupMonster": [
         9002
@@ -160,7 +160,7 @@
     {
       "ID": 1010,
       "GroupMonsterLevel": [
-        100
+        121
       ],
       "GroupMonster": [
         9002
@@ -169,7 +169,7 @@
     {
       "ID": 1011,
       "GroupMonsterLevel": [
-        110
+        121
       ],
       "GroupMonster": [
         9001
@@ -178,7 +178,7 @@
     {
       "ID": 1012,
       "GroupMonsterLevel": [
-        120
+        121
       ],
       "GroupMonster": [
         9004
@@ -187,7 +187,7 @@
     {
       "ID": 1013,
       "GroupMonsterLevel": [
-        140
+        141
       ],
       "GroupMonster": [
         5007
@@ -196,7 +196,7 @@
     {
       "ID": 1014,
       "GroupMonsterLevel": [
-        150
+        151
       ],
       "GroupMonster": [
         1008,
@@ -248,7 +248,7 @@
     {
       "ID": 1016,
       "GroupMonsterLevel": [
-        65
+        69
       ],
       "GroupMonster": [
         9004
@@ -622,7 +622,7 @@
     {
       "ID": 3001,
       "GroupMonsterLevel": [
-        40
+        15
       ],
       "GroupMonster": [
         1005
@@ -631,7 +631,7 @@
     {
       "ID": 3002,
       "GroupMonsterLevel": [
-        60
+        25
       ],
       "GroupMonster": [
         9006
@@ -640,7 +640,7 @@
     {
       "ID": 3003,
       "GroupMonsterLevel": [
-        40
+        20
       ],
       "GroupMonster": [
         1005
@@ -649,7 +649,7 @@
     {
       "ID": 3004,
       "GroupMonsterLevel": [
-        50
+        30
       ],
       "GroupMonster": [
         1005
@@ -658,7 +658,7 @@
     {
       "ID": 3005,
       "GroupMonsterLevel": [
-        60
+        30
       ],
       "GroupMonster": [
         5003
@@ -667,7 +667,7 @@
     {
       "ID": 3006,
       "GroupMonsterLevel": [
-        70
+        40
       ],
       "GroupMonster": [
         5003
@@ -676,7 +676,7 @@
     {
       "ID": 3007,
       "GroupMonsterLevel": [
-        80
+        60
       ],
       "GroupMonster": [
         5003
@@ -685,7 +685,7 @@
     {
       "ID": 3008,
       "GroupMonsterLevel": [
-        90
+        60
       ],
       "GroupMonster": [
         9002
@@ -694,7 +694,7 @@
     {
       "ID": 3009,
       "GroupMonsterLevel": [
-        100
+        120
       ],
       "GroupMonster": [
         5003
@@ -703,7 +703,7 @@
     {
       "ID": 3010,
       "GroupMonsterLevel": [
-        120
+        130
       ],
       "GroupMonster": [
         5002
@@ -712,7 +712,7 @@
     {
       "ID": 3011,
       "GroupMonsterLevel": [
-        80
+        130
       ],
       "GroupMonster": [
         1006
@@ -721,7 +721,7 @@
     {
       "ID": 3012,
       "GroupMonsterLevel": [
-        100
+        150
       ],
       "GroupMonster": [
         5005
@@ -730,7 +730,7 @@
     {
       "ID": 3013,
       "GroupMonsterLevel": [
-        140
+        160
       ],
       "GroupMonster": [
         5001
@@ -739,7 +739,7 @@
     {
       "ID": 3014,
       "GroupMonsterLevel": [
-        150
+        170
       ],
       "GroupMonster": [
         5004
@@ -748,7 +748,7 @@
     {
       "ID": 3015,
       "GroupMonsterLevel": [
-        151
+        190
       ],
       "GroupMonster": [
         9001
@@ -766,7 +766,7 @@
     {
       "ID": 4001,
       "GroupMonsterLevel": [
-        30
+        1
       ],
       "GroupMonster": [
         1005
@@ -775,7 +775,7 @@
     {
       "ID": 4002,
       "GroupMonsterLevel": [
-        60
+        1
       ],
       "GroupMonster": [
         1006
@@ -784,7 +784,7 @@
     {
       "ID": 4003,
       "GroupMonsterLevel": [
-        90
+        5
       ],
       "GroupMonster": [
         1007
@@ -793,7 +793,7 @@
     {
       "ID": 4004,
       "GroupMonsterLevel": [
-        110
+        5
       ],
       "GroupMonster": [
         1008
@@ -802,7 +802,7 @@
     {
       "ID": 4005,
       "GroupMonsterLevel": [
-        120
+        5
       ],
       "GroupMonster": [
         1001
@@ -811,7 +811,7 @@
     {
       "ID": 4006,
       "GroupMonsterLevel": [
-        130
+        11
       ],
       "GroupMonster": [
         1005
@@ -820,7 +820,7 @@
     {
       "ID": 4007,
       "GroupMonsterLevel": [
-        140
+        11
       ],
       "GroupMonster": [
         1006
@@ -829,7 +829,7 @@
     {
       "ID": 4008,
       "GroupMonsterLevel": [
-        150
+        11
       ],
       "GroupMonster": [
         1007
@@ -838,7 +838,7 @@
     {
       "ID": 4009,
       "GroupMonsterLevel": [
-        160
+        21
       ],
       "GroupMonster": [
         1008
@@ -847,7 +847,7 @@
     {
       "ID": 4010,
       "GroupMonsterLevel": [
-        170
+        21
       ],
       "GroupMonster": [
         1001
@@ -856,7 +856,7 @@
     {
       "ID": 4011,
       "GroupMonsterLevel": [
-        180
+        31
       ],
       "GroupMonster": [
         1005
@@ -865,7 +865,7 @@
     {
       "ID": 4012,
       "GroupMonsterLevel": [
-        190
+        31
       ],
       "GroupMonster": [
         1006
@@ -874,7 +874,7 @@
     {
       "ID": 4013,
       "GroupMonsterLevel": [
-        200
+        31
       ],
       "GroupMonster": [
         1007
@@ -883,7 +883,7 @@
     {
       "ID": 4014,
       "GroupMonsterLevel": [
-        210
+        31
       ],
       "GroupMonster": [
         1008
@@ -892,7 +892,7 @@
     {
       "ID": 4015,
       "GroupMonsterLevel": [
-        220
+        41
       ],
       "GroupMonster": [
         1001
@@ -901,7 +901,7 @@
     {
       "ID": 4016,
       "GroupMonsterLevel": [
-        230
+        41
       ],
       "GroupMonster": [
         1005
@@ -910,7 +910,7 @@
     {
       "ID": 4017,
       "GroupMonsterLevel": [
-        240
+        41
       ],
       "GroupMonster": [
         1006
@@ -919,7 +919,7 @@
     {
       "ID": 4018,
       "GroupMonsterLevel": [
-        250
+        41
       ],
       "GroupMonster": [
         1007
@@ -928,7 +928,7 @@
     {
       "ID": 4019,
       "GroupMonsterLevel": [
-        260
+        41
       ],
       "GroupMonster": [
         1008
@@ -937,7 +937,7 @@
     {
       "ID": 4020,
       "GroupMonsterLevel": [
-        270
+        61
       ],
       "GroupMonster": [
         1001
@@ -946,7 +946,7 @@
     {
       "ID": 4021,
       "GroupMonsterLevel": [
-        280
+        61
       ],
       "GroupMonster": [
         1005
@@ -955,7 +955,7 @@
     {
       "ID": 4022,
       "GroupMonsterLevel": [
-        290
+        61
       ],
       "GroupMonster": [
         1006
@@ -964,7 +964,7 @@
     {
       "ID": 4023,
       "GroupMonsterLevel": [
-        300
+        81
       ],
       "GroupMonster": [
         1007
@@ -973,7 +973,7 @@
     {
       "ID": 4024,
       "GroupMonsterLevel": [
-        300
+        111
       ],
       "GroupMonster": [
         1008
@@ -982,7 +982,7 @@
     {
       "ID": 4025,
       "GroupMonsterLevel": [
-        300
+        131
       ],
       "GroupMonster": [
         1001

Assets/Res/Config/ItemConfig.json

@@ -775,7 +775,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        3000
+        4000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -803,7 +803,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        7000
+        8000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -831,7 +831,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        13000
+        12000
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -859,7 +859,7 @@
       "stack_1": 0,
       "associateID": 2,
       "associateVlaue": [
-        25000
+        20000
       ],
       "sort": 0,
       "itemDesc2": 0