From b894da4660557c00b812e7471d3d475f0d72faad Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期五, 28 九月 2018 11:30:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0
db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 20 ++++++++++
db/PyMongoDataServer/PySysDB/tagPetClassCost.txt | 20 ++++++++++
db/PyMongoDataServer/PySysDB/tagHorse.txt | 5 +-
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 3 +
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 8 ++--
db/PyMongoDataServer/SysDB/tagChinItem.txt | 10 +++--
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 +-
CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt | 2
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
11 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 2ab47b2..3102c9d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,2 +1,2 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd Multiple LimitLV
-1 opensever [] 7 8 1 {} {} 2 110
+1 opensever [] 7 8 1 {0:["MultipleXXDOpen", []]} {} 2 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 5218911..ef62d7c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -43,7 +43,7 @@
MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110
DropRecordValue 4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078
DropRecordNum 40 1
-KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
+KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'DogzDungeonPL'} {1:27} {0:[21,'WorldBossNoHarm']}
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'60',20,20,20], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'7200',8,8,8], (161,162,163,164,165,166,167):[20302003,8,'7200',56,56,56]} 20303001 [20302002, 20302003]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
index 30c0527..9780668 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index d1bea02..9552825 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -34,7 +34,7 @@
41110 23 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103010,1,1,1,1,0]]
41110 24 41110 0 0 0 0 0 0 0 0 0 [49,16] [0,5,300,10] [[101,31103011,1,1,1,1,0]]
31080 0 31080 82 500 0 4001 1 30 0 0 0 [20,18] [10,180,10]
-31140 0 31140 180 500 0 4004 1 20 330 956 1 [16,14] [5,300,50,10] [[101,31401001,42,12],[102,31403001,7,2]]
+31140 0 31140 180 500 0 4004 1 20 330 956 1 [16,14] [5,300,30,10] [[101,31401001,42,12],[102,31403001,7,2]]
31150 0 31150 0 0 0 4007 1|2|2|3|3|4 80 0 0 0 [132,45] [30,12]
31170 0 31170 110 0 0 0 0 0 0 0 0 [76,15] [(26,33000,33000)]
31180 0 31180 110 500 0 0 0 0 0 0 0 [112,24] [10,600,15, [340,260,200,150]]
@@ -55,9 +55,9 @@
51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [10,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [150,38,38,38,38] [1666080, [143,18], [144,9]]
51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [10,360,10] [{5101071:1, 5101072:0}] [150,38,38,38,38] [1953360, [144,15]]
51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [10,360,10] [{5101081:1}] [150,38,38,38,38] [2265840, [153,15]]
-60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,50,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
-60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [10,1800,50,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
-60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,50,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
+60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
+60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [10,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
+60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
31160 0 31160 110 250 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31160 1 31160 251 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1800 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 79f562e..85c4a26 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -217,7 +217,7 @@
DropRecordBossID 10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007
PKConfig [[22,00], [8,00]] 50 10 10 110
FamilyKilledNotify {1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}
-KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'WB_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
+KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2} 0_3|1_0|2_3 {0:'WB_Limit',1:'BossHome_Limit',2:'DogzDungeonPL'} {1:27} {0:[21,'WorldBossNoHarm']}
BossHurtValue 30 0 0 0 0
FamilyInvadeCfg [180,1500,10,31170, [84,85,86,87], [101,31704003], {102:31704002,103:31704001}] {1:0.5,3:0.6,4:0.8,5:1} int(48000*reExp*starPer*min(passWheel/8.0,1)) [21010,21011] [31704001,31704002,31704003]
SwrhMonsterExp reExp*baseExp
@@ -294,4 +294,4 @@
FairyGrabBossID [50103001,50103002,50103003,50103004,50103005,50103006,50103007] [[26,14000,1]] -60
FairyGrabBoss {50103001:{1:[[2352,1,1]],2:[[2353,1,1]],3:[[2354,1,1]]},50103002:{1:[[2356,1,1]],2:[[2357,1,1]],3:[[2358,1,1]]},50103003:{1:[[2360,1,1]],2:[[2361,1,1]],3:[[2362,1,1]]},50103004:{1:[[2364,1,1]],2:[[2365,1,1]],3:[[2366,1,1]]},50103005:{1:[[2368,1,1]],2:[[2369,1,1]],3:[[2370,1,1]]},50103006:{1:[[2372,1,1]],2:[[2373,1,1]],3:[[2374,1,1]]},50103007:{1:[[2376,1,1]],2:[[2377,1,1]],3:[[2378,1,1]]}} 2 {50103001:[[2351,1,1]],50103002:[[2355,1,1]],50103003:[[2359,1,1]],50103004:[[2363,1,1]],50103005:[[2367,1,1]],50103006:[[2371,1,1]],50103007:[[2375,1,1]]} [[10, "FairyGrabBossWillKill"]]
SamboSpecialUnlock 6601|6602|6603|6604|6605|6606|6607|6608|6609|6610|6611|6612|6613|6614|6615|6616|6617|6618
-BindJadeWheelCfg 50 {"1":100,"2":150,"3":200,"4":300,"5":200,"6":250,"7":100,"8":300,"9":400} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(10000,9)] {1:[(6000,5),(9000,8),(10000,9)]}
+BindJadeWheelCfg 50 {"1":100,"2":150,"3":200,"4":300,"5":200,"6":250,"7":100,"8":300,"9":400} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(10000,9)] {1:[(6000,5),(9000,8),(10000,9)]} [[0,20],[20,40],[40,60],[60,80],[80,100],[100,120],[120,140],[140,200],[200,360]]
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index a48cb35..9ca9f7a 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -11,6 +11,7 @@
305 290 260 1 1 40 1 4 13968 GetMount7
306 288 258 1 1 50 1 5 21168 GetMount8
307 291 261 1 1 30 1 3 2116 GetMount11
-308 292 262 1 1 50 1 5 13968 GetMount12
+308 292 262 1 1 40 1 4 13968 GetMount12
309 293 263 1 1 30 1 3 21168 GetMount13
-310 294 264 1 1 50 1 5 2116 GetMount14
+310 294 264 1 1 40 1 4 2116 GetMount14
+311 295 265 1 1 20 1 2 2116 GetMount15
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index cd45f76..8a9c545 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -589,3 +589,23 @@
310 48 24677 6|7|23 203605|10180|80 0
310 49 25511 6|7|23 211008|10550|80 0
310 50 0 6|7|23 218656|10932|80 0
+311 1 1945 6|7|23 10584|529|80 0
+311 2 2111 6|7|23 12140|607|80 0
+311 3 2291 6|7|23 13776|688|80 0
+311 4 2486 6|7|23 15495|774|80 49150
+311 5 2694 6|7|23 17297|864|80 0
+311 6 2915 6|7|23 19183|959|80 0
+311 7 3151 6|7|23 21204|1060|80 0
+311 8 3400 6|7|23 23366|1168|80 0
+311 9 3663 6|7|23 25675|1283|80 0
+311 10 3940 6|7|23 28137|1406|80 49155
+311 11 4231 6|7|23 30757|1537|80 0
+311 12 4535 6|7|23 33501|1675|80 0
+311 13 4853 6|7|23 36368|1818|80 0
+311 14 5185 6|7|23 39355|1967|80 0
+311 15 5531 6|7|23 42462|2123|80 0
+311 16 5891 6|7|23 45684|2284|80 0
+311 17 6264 6|7|23 49018|2450|80 0
+311 18 6651 6|7|23 52461|2623|80 0
+311 19 7052 6|7|23 56006|2800|80 0
+311 20 7467 6|7|23 59649|2982|80 49160
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index c8ef5e2..1d8f97e 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -769,3 +769,23 @@
50106315 48 31316 51334
50106315 49 32392 53213
50106315 50 0 55154
+50106308 1 2468 1440
+50106308 2 2679 1785
+50106308 3 2908 2154
+50106308 4 3154 2546
+50106308 5 3418 2964
+50106308 6 3700 3409
+50106308 7 3999 3882
+50106308 8 4315 4386
+50106308 9 4649 4921
+50106308 10 5000 5489
+50106308 11 5369 6089
+50106308 12 5755 6728
+50106308 13 6159 7407
+50106308 14 6581 8127
+50106308 15 7019 8891
+50106308 16 7476 9698
+50106308 17 7950 10551
+50106308 18 8441 11449
+50106308 19 8950 12394
+50106308 20 9476 13388
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index e189fe9..31293b7 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -13,10 +13,11 @@
50106305 3 GetPet11 4213 1 1000 1 30 6 48380|48385|48390 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2476
50106306 4 GetPet12 4214 1 1000 1 40 6 48410|48415|48420 4|10|20 ['PetUpLv','PetUpLv','PetUpLv8'] 4608
50106307 2 GetPet1 4215 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
+50106308 2 GetPet13 4216 1 1000 1 20 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
50106309 5 GetPet14 4217 1 1000 1 50 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
50106310 4 GetPet15 4218 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
50106311 3 GetPet16 4219 1 1000 1 30 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
50106312 3 GetPet17 4220 1 1000 1 30 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
50106313 4 GetPet18 4221 1 1000 1 40 6 48440|48445|48450 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 14400
50106314 4 GetPet19 4222 1 1000 1 40 6 48425|48430|48435 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 7200
-50106315 5 GetPet20 4223 1 1000 1 50 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
+50106315 4 GetPet20 4223 1 1000 1 40 6 48455|48460|48465 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 267efa0..cc5a406 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -11,4 +11,4 @@
10 7 0 50 0 {"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]} 167000 {"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*634828+max(min(2,extraData)-1,0)*665472+max(min(3,extraData)-2,0)*814080+max(min(4,extraData)-3,0)*935424+max(min(5,extraData)-4,0)*1123776+max(min(6,extraData)-5,0)*1332864+max(min(7,extraData)-6,0)*1562688+max(min(8,extraData)-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*20+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*3+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*12+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*4+max(min(5,extraData)-4,0)*8+max(min(6,extraData)-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*4+max(min(7,extraData)-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*8"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*436444+max(min(2,extraData)-1,0)*457512+max(min(3,extraData)-2,0)*559680+max(min(4,extraData)-3,0)*643104+max(min(5,extraData)-4,0)*772596+max(min(6,extraData)-5,0)*916344+max(min(7,extraData)-6,0)*1074348+max(min(8,extraData)-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*17+max(min(2,extraData)-1,0)*13+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*6+max(min(4,extraData)-3,0)*8+max(min(5,extraData)-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,extraData)-2,0)*1+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*5+max(min(6,extraData)-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)*3+max(min(7,extraData)-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*5"}]}
12 9 0 25 0 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]} 200000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(4,dataEx)-3,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
-13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}
+13 12 0 20 0 {"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"} 200000 {"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index ce11c3e..dc8aae9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -114,9 +114,10 @@
258 1 0 坐骑：八宝葫芦 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
260 1 0 坐骑：地狱冥虎 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
261 1 0 坐骑：小黄鸭 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-262 1 0 坐骑：白玉兽 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+262 1 0 坐骑：白玉兽 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
263 1 0 坐骑：筋斗云 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-264 1 0 坐骑：福源猫 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+264 1 0 坐骑：福源猫 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+265 1 0 坐骑：森之灵 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 5 0 1 0 0 7 11014 0 0 6 220281 0 0 23 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
289 1 0 追风 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 288 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
280 1 0 觉灵鹿 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
281 1 0 皓月狼 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 588 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -132,6 +133,7 @@
292 1 0 白玉兽 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 6000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
293 1 0 筋斗云 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
294 1 0 福源猫 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+295 1 0 森之灵 42 19 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 2000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
600 1 0 时装1 91 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
601 1 0 时装2 92 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 220 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 220 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -588,14 +590,14 @@
4213 1 0 灵宠：球球 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4214 1 0 灵宠：荒漠梦魇 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4215 1 0 灵宠：灵狐仙 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-4216 1 0 灵宠：灵鲛刺客 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4216 1 0 灵宠：灵鲛刺客 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4217 1 0 灵宠：荒古巨兽 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4218 1 0 灵宠：熊猫斗士 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4219 1 0 灵宠：海牛侍卫 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4220 1 0 灵宠：雷震子 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1000 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4221 1 0 灵宠：极炎剑客 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4222 1 0 灵宠：阴雷之狼 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1288 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-4223 1 0 灵宠：雷蛟 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4223 1 0 灵宠：雷蛟 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 388 0 100 0 1 0 0 77 27200 0 0 78 27200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4250 1 0 冰火冥魂碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4209 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4251 1 0 九黎妖虎碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4210 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
4252 1 0 球球碎片 125 0 1 0 0 999 1 0 1 0 1 0 0 0 0 0 1 200 0 100 0 0 0 0 0 4213 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0