From 442267b95aa86ad229dc6d26a3f1877db1cd5919 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期五, 28 九月 2018 21:01:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 4
db/PyMongoDataServer/PySysDB/tagActBossReborn.txt | 3
db/PyMongoDataServer/PySysDB/tagHorseUp.txt | 150 +++++++++++-------------
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 2
CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt | 3
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0
db/PyMongoDataServer/SysDB/tagChinItem.txt | 10
webbottle/Config.ini | 8
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 7
db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt | 20 +-
db/PyMongoDataServer/PySysDB/tagActCostRebate.txt | 8
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc | 0
db/PyMongoDataServer/PySysDB/tagChests.txt | 7
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 9 +
db/PyMongoDataServer/PySysDB/tagPetClassCost.txt | 60 +++++-----
db/PyMongoDataServer/PySysDB/tagHorse.txt | 2
db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 1
CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt | 8
20 files changed, 152 insertions(+), 152 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index 933f06c..9dbef24 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,2 +1,3 @@
CfgID ActMark ServerIDList StartDate EndDate ResetType NotifyInfoStart NotifyInfoEnd LimitLV TemplateID
-1 OpenSever [] 9 10 1 {0:["BossFHOpen", []]} {} 110 1
+1 OpenSever [] 3 4 1 {0:["BossFHOpen", []]} {} 110 1
+2 OpenSever [] 9 10 1 {0:["BossFHOpen", []]} {} 110 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index d5bcdd2..4f06916 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate NotifyInfoStart NotifyInfoEnd NotifyInfoLoop IsDayReset
-1 test1 [] 2018-8-30 2018-8-31 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-2 test2 [24,30] 2018-7-13 2018-7-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-3 NationalDay [] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 1
-4 NationalDay1 [24] 2018-9-13 2018-9-15 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
-5 test3 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+1 test1 [] 2 3 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+2 test2 [] 5 6 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
+3 test3 [] 8 9 {0:["ConsumptionRebate1", []]} {0:["ConsumptionRebate4", [2]]} [120, "ConsumptionRebate1"] 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index a6f9dbf..c1e3bd5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,2 +1,2 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
-1 OpenServer [] 8 8 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index ec79bf5..ede57ea 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
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 9780668..ce5d80a 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
index 07f1ce6..620b7d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index d0cc53a..a335753 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,2 +1,3 @@
CfgID StartDate EndDate ResetType LimitLV TemplateID
-1 9 10 1 110 1
+1 3 4 1 110 1
+2 9 10 1 110 1
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index ce5528a..769a613 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,4 @@
CfgID StartDate EndDate LimitLV IsDayReset TemplateIDList
-1 2018-8-30 2018-8-31 50 0 1
-2 2018-7-13 2018-7-15 50 0 3
-3 2018-9-13 2018-9-15 50 1 1|2|3
-4 2018-9-13 2018-9-15 50 0 1
-5 5 6 50 0 1
+1 2 3 50 0 2
+2 5 6 50 0 3
+3 8 9 50 0 3
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index dbaf807..effb3d2 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -174,6 +174,7 @@
2384 0 0 0 1 0
2385 0 0 0 1 0
2386 0 0 0 1 0
-2387 0 0 0 1 1
-2388 0 0 0 1 1
-2389 0 0 0 1 1
+2387 0 0 0 1 0
+2388 0 0 0 1 0
+2389 0 0 0 1 0
+2390 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index f084751..45731ef 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -1,15 +1,13 @@
TemplateID NeedCostGold AwardIndex AwardItemList NotifyKey
1 128 0 [(141,130,1)] ConsumptionRebate3
-1 588 1 [(4215,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
+1 588 1 [(199,1,1),(14,2,1),(3807,1,1)] ConsumptionRebate3
1 1588 2 [(51,1,1),(143,50,1),(4151,30,1)] ConsumptionRebate3
1 5000 3 [(3515,1,1),(3505,1,1),(106,8,1),(103,8,1)] ConsumptionRebate2
-2 500 0 [(4651,10,1),(4652,10,1)]
-2 1000 1 [(4651,20,1),(4652,20,1)]
-2 2000 2 [(4651,30,1),(4652,30,1)] ConsumptionRebate3
-2 5000 3 [(4651,40,1),(4652,40,1)] ConsumptionRebate3
-2 10000 4 [(4651,50,1),(4652,50,1)] ConsumptionRebate2
-3 500 0 [(921,10,1),(922,10,1)]
-3 1000 1 [(921,20,1),(922,20,1)]
-3 2000 2 [(921,30,1),(922,30,1)] ConsumptionRebate3
-3 5000 3 [(921,40,1),(922,40,1)] ConsumptionRebate3
-3 10000 4 [(921,50,1),(922,50,1)] ConsumptionRebate2
+2 60 0 [(4181,1,1),(181,10,1),(4151,10,1),(2211,10,1)] ConsumptionRebate3
+2 150 1 [(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)] ConsumptionRebate3
+2 300 2 [(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)] ConsumptionRebate3
+2 1500 3 [(51,1,1),(4182,1,1),(181,30,1),(4151,30,1)] ConsumptionRebate2
+3 60 0 [(4181,1,1),(181,10,1),(4151,10,1),(2211,10,1)] ConsumptionRebate3
+3 150 1 [(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)] ConsumptionRebate3
+3 300 2 [(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)] ConsumptionRebate3
+3 1500 3 [(4610,1,1),(4182,1,1),(181,30,1),(4151,30,1)] ConsumptionRebate2
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 4286bc6..de3bcf3 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -165,7 +165,7 @@
LegendAttrValueByColor2 {30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}
LegendAttrValueByClassLV {29:{9:600,10:900,11:1200,12:1320,13:1425,14:1500,15:1575},30:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},14:{9:1600,10:2400,11:3200,12:3520,13:3800,14:4000,15:4200},18:{9:2000,10:3000,11:4000,12:4400,13:4750,14:5000,15:5250},71:{9:800,10:1200,11:1600,12:1760,13:1900,14:2000,15:2100}} 0 0 0 0
EquipGSTypeForSort 101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123 0 0 0 0
-EquipGSFormula int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0)) [67,68,6,7,8,11,20,19,23] int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+MaxHPPer/10000.0+PerLVAtk/100.0+Hit/10000.0+Miss/10000.0) 0 0
+EquipGSFormula int(((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SkillAtkRateReduce/10000.0)) [67,68,6,7,8,11,20,19,23] int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0) 0 0
HorseUpItem 181 20 0 0 0
HorseSuperRate {} 0 0 0 0
NeedSysHorseLV {100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}
@@ -213,8 +213,8 @@
FBEncourageBuff {31080:20051,52010:20081} 31080_10|52010_10 31080_10|52010_10
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
DropRecordEquipment {(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0]}
-DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251|8206|8219|8232|8245|8258|8207|8220|8233|8246|8259
-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
+DropRecordNormal 2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251|8205|8206|8207|8218|8219|8220|8231|8232|8233|8244|8245|8246|8257|8258|8259
+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|20303001|20303002|20303003|20303004|20303005|20303006|20303007
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:'DogzDungeonPL'} {1:27} {0:[21,'WorldBossNoHarm']}
@@ -295,3 +295,4 @@
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 9001|9002|9003|9004|9005|9006|9007|9008|9009|9010|9011|9012|9013|9014|9015|9016|9017|9018
BindJadeWheelCfg 88 {"1":110,"2":130,"3":150,"4":150,"5":200,"6":200,"7":300,"8":300,"9":588} [(3879,1),(7379,2),(8379,3),(9379,4),(9679,5),(9979,6),(9989,7),(9999,8),(10000)] {1:[(6000,3),(10000,5)]} [[0,20],[20,40],[40,60],[60,80],[80,100],[100,120],[120,140],[140,200],[200,360]]
+BindJadeWheelNotice 150
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index f28c72f..930e290 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -11,3 +11,5 @@
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 40 1 4 6048 GetMount12
+309 293 263 1 1 30 1 3 3528 GetMount13
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 8a9c545..983b695 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -459,86 +459,76 @@
307 28 2505 6|7|23 37076|1853|40 0
307 29 2705 6|7|23 39080|1954|40 0
307 30 0 6|7|23 41115|2055|40 0
-308 1 1945 6|7|23 10584|529|80 0
-308 2 2111 6|7|23 12140|607|80 0
-308 3 2291 6|7|23 13776|688|80 0
-308 4 2486 6|7|23 15495|774|80 49150
-308 5 2694 6|7|23 17297|864|80 0
-308 6 2915 6|7|23 19183|959|80 0
-308 7 3151 6|7|23 21204|1060|80 0
-308 8 3400 6|7|23 23366|1168|80 0
-308 9 3663 6|7|23 25675|1283|80 0
-308 10 3940 6|7|23 28137|1406|80 49155
-308 11 4231 6|7|23 30757|1537|80 0
-308 12 4535 6|7|23 33501|1675|80 0
-308 13 4853 6|7|23 36368|1818|80 0
-308 14 5185 6|7|23 39355|1967|80 0
-308 15 5531 6|7|23 42462|2123|80 0
-308 16 5891 6|7|23 45684|2284|80 0
-308 17 6264 6|7|23 49018|2450|80 0
-308 18 6651 6|7|23 52461|2623|80 0
-308 19 7052 6|7|23 56006|2800|80 0
-308 20 7467 6|7|23 59649|2982|80 49160
-308 21 7896 6|7|23 63383|3169|80 0
-308 22 8338 6|7|23 67232|3361|80 0
-308 23 8794 6|7|23 71193|3559|80 0
-308 24 9264 6|7|23 75260|3763|80 0
-308 25 9748 6|7|23 79429|3971|80 0
-308 26 10245 6|7|23 83694|4184|80 0
-308 27 10756 6|7|23 88048|4402|80 0
-308 28 11281 6|7|23 92486|4624|80 0
-308 29 11820 6|7|23 96998|4849|80 0
-308 30 12373 6|7|23 101579|5078|80 0
-308 31 12939 6|7|23 106219|5310|80 0
-308 32 13519 6|7|23 110974|5548|80 0
-308 33 14113 6|7|23 115841|5792|80 0
-308 34 14721 6|7|23 120816|6040|80 0
-308 35 15342 6|7|23 125895|6294|80 0
-308 36 15978 6|7|23 131073|6553|80 0
-308 37 16627 6|7|23 136346|6817|80 0
-308 38 17290 6|7|23 141709|7085|80 0
-308 39 17966 6|7|23 147155|7357|80 0
-308 40 18657 6|7|23 152680|7634|80 0
-308 41 19361 6|7|23 158277|7913|80 0
-308 42 20079 6|7|23 164086|8204|80 0
-308 43 20811 6|7|23 170109|8505|80 0
-308 44 21557 6|7|23 176353|8817|80 0
-308 45 22316 6|7|23 182820|9141|80 0
-308 46 23089 6|7|23 189515|9475|80 0
-308 47 23876 6|7|23 196442|9822|80 0
-308 48 24677 6|7|23 203605|10180|80 0
-308 49 25511 6|7|23 211008|10550|80 0
-308 50 0 6|7|23 218656|10932|80 0
-309 1 1945 6|7|23 10584|529|80 0
-309 2 2111 6|7|23 12140|607|80 0
-309 3 2291 6|7|23 13776|688|80 0
-309 4 2486 6|7|23 15495|774|80 49150
-309 5 2694 6|7|23 17297|864|80 0
-309 6 2915 6|7|23 19183|959|80 0
-309 7 3151 6|7|23 21204|1060|80 0
-309 8 3400 6|7|23 23366|1168|80 0
-309 9 3663 6|7|23 25675|1283|80 0
-309 10 3940 6|7|23 28137|1406|80 49155
-309 11 4231 6|7|23 30757|1537|80 0
-309 12 4535 6|7|23 33501|1675|80 0
-309 13 4853 6|7|23 36368|1818|80 0
-309 14 5185 6|7|23 39355|1967|80 0
-309 15 5531 6|7|23 42462|2123|80 0
-309 16 5891 6|7|23 45684|2284|80 0
-309 17 6264 6|7|23 49018|2450|80 0
-309 18 6651 6|7|23 52461|2623|80 0
-309 19 7052 6|7|23 56006|2800|80 0
-309 20 7467 6|7|23 59649|2982|80 49160
-309 21 7896 6|7|23 63383|3169|80 0
-309 22 8338 6|7|23 67232|3361|80 0
-309 23 8794 6|7|23 71193|3559|80 0
-309 24 9264 6|7|23 75260|3763|80 0
-309 25 9748 6|7|23 79429|3971|80 0
-309 26 10245 6|7|23 83694|4184|80 0
-309 27 10756 6|7|23 88048|4402|80 0
-309 28 11281 6|7|23 92486|4624|80 0
-309 29 11820 6|7|23 96998|4849|80 0
-309 30 12373 6|7|23 101579|5078|80 0
+308 1 617 6|7|24 3024|151|60 0
+308 2 669 6|7|25 4011|200|60 0
+308 3 727 6|7|26 5049|252|60 0
+308 4 788 6|7|27 6140|307|60 49210
+308 5 854 6|7|28 7284|364|60 0
+308 6 925 6|7|29 8480|424|60 0
+308 7 999 6|7|30 9762|488|60 0
+308 8 1078 6|7|31 11134|556|60 0
+308 9 1162 6|7|32 12599|629|60 0
+308 10 1250 6|7|33 14161|708|60 49215
+308 11 1342 6|7|34 15824|791|60 0
+308 12 1438 6|7|35 17565|878|60 0
+308 13 1539 6|7|36 19384|969|60 0
+308 14 1645 6|7|37 21280|1064|60 0
+308 15 1754 6|7|38 23251|1162|60 0
+308 16 1869 6|7|39 25295|1264|60 0
+308 17 1987 6|7|40 27411|1370|60 0
+308 18 2110 6|7|41 29595|1479|60 0
+308 19 2237 6|7|42 31845|1592|60 0
+308 20 2369 6|7|43 34156|1707|60 49220
+308 21 2505 6|7|44 36526|1826|60 0
+308 22 2645 6|7|45 38968|1948|60 0
+308 23 2790 6|7|46 41481|2074|60 0
+308 24 2939 6|7|47 44062|2203|60 0
+308 25 3092 6|7|48 46707|2335|60 0
+308 26 3250 6|7|49 49413|2470|60 0
+308 27 3412 6|7|50 52176|2608|60 0
+308 28 3579 6|7|51 54992|2749|60 0
+308 29 3750 6|7|52 57855|2892|60 0
+308 30 3925 6|7|53 60762|3038|60 0
+308 31 4105 6|7|54 63706|3185|60 0
+308 32 4289 6|7|55 66723|3336|60 0
+308 33 4477 6|7|56 69811|3490|60 0
+308 34 4670 6|7|57 72968|3648|60 0
+308 35 4867 6|7|58 76191|3809|60 0
+308 36 5069 6|7|59 79476|3973|60 0
+308 37 5275 6|7|60 82822|4141|60 0
+308 38 5485 6|7|61 86225|4311|60 0
+308 39 5717 6|7|62 89681|4484|60 0
+308 40 0 6|7|63 93186|4659|60 0
+309 1 493 6|7|64 1764|88|40 0
+309 2 535 6|7|65 2553|127|40 0
+309 3 581 6|7|66 3384|169|40 0
+309 4 630 6|7|67 4257|212|40 49195
+309 5 683 6|7|68 5172|258|40 0
+309 6 740 6|7|69 6129|306|40 0
+309 7 799 6|7|70 7155|357|40 0
+309 8 863 6|7|71 8252|412|40 0
+309 9 929 6|7|72 9424|471|40 0
+309 10 1000 6|7|73 10674|533|40 49200
+309 11 1073 6|7|74 12004|600|40 0
+309 12 1151 6|7|75 13397|669|40 0
+309 13 1231 6|7|76 14852|742|40 0
+309 14 1316 6|7|77 16368|818|40 0
+309 15 1403 6|7|78 17945|897|40 0
+309 16 1495 6|7|79 19581|979|40 0
+309 17 1590 6|7|80 21274|1063|40 0
+309 18 1688 6|7|81 23021|1151|40 0
+309 19 1790 6|7|82 24821|1241|40 0
+309 20 1895 6|7|83 26670|1333|40 49205
+309 21 2004 6|7|84 28565|1428|40 0
+309 22 2116 6|7|85 30519|1525|40 0
+309 23 2232 6|7|86 32530|1626|40 0
+309 24 2351 6|7|87 34594|1729|40 0
+309 25 2474 6|7|88 36711|1835|40 0
+309 26 2600 6|7|89 38875|1943|40 0
+309 27 2730 6|7|90 41086|2054|40 0
+309 28 2863 6|7|91 43338|2166|40 0
+309 29 3045 6|7|92 45629|2281|40 0
+309 30 0 6|7|93 47954|2397|40 0
310 1 1945 6|7|23 10584|529|80 0
310 2 2111 6|7|23 12140|607|80 0
310 3 2291 6|7|23 13776|688|80 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index f970bbc..9c783ca 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -66,8 +66,8 @@
31704002 0 1 0 12000 100000 0 0 2 9990 50 1 0 0 0 0
31704003 0 1 0 40000 150000 0 0 2 9990 50 1 0 0 0 0
30403001 0 1 0 1000 10000 0 8000 2 9900 50 12 0 0 0 0
-30403002 0 1 0 1000 10000 0 8000 2 9900 50 12 0 0 0 8000
-30403003 0 1 0 1200 10000 0 8000 2 9900 50 2 0 0 0 20000
+30403002 0 1 0 1000 10000 0 8000 2 9900 50 12 0 0 0 6000
+30403003 0 1 0 1200 10000 0 8000 2 9900 50 2 0 0 0 16000
30903001 1 3 0 48000 10000 0 8000 2 9900 50 1 0 0 120 0
30601001 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
30601002 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
index 1d8f97e..d29e46a 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetClassCost.txt
@@ -609,36 +609,36 @@
50106311 28 5726 8551
50106311 29 5980 9043
50106311 30 0 9541
-50106312 1 987 139
-50106312 2 1071 277
-50106312 3 1163 425
-50106312 4 1261 582
-50106312 5 1367 749
-50106312 6 1480 927
-50106312 7 1599 1116
-50106312 8 1726 1318
-50106312 9 1859 1532
-50106312 10 2000 1759
-50106312 11 2147 1999
-50106312 12 2302 2254
-50106312 13 2463 2526
-50106312 14 2632 2814
-50106312 15 2807 3120
-50106312 16 2990 3443
-50106312 17 3180 3784
-50106312 18 3376 4143
-50106312 19 3580 4521
-50106312 20 3790 4918
-50106312 21 4008 5335
-50106312 22 4232 5764
-50106312 23 4464 6205
-50106312 24 4702 6655
-50106312 25 4948 7116
-50106312 26 5200 7586
-50106312 27 5460 8065
-50106312 28 5726 8551
-50106312 29 5980 9043
-50106312 30 0 9541
+50106312 1 937 244
+50106312 2 1018 376
+50106312 3 1105 516
+50106312 4 1198 665
+50106312 5 1299 824
+50106312 6 1406 993
+50106312 7 1519 1173
+50106312 8 1639 1364
+50106312 9 1766 1567
+50106312 10 1900 1783
+50106312 11 2040 2011
+50106312 12 2187 2254
+50106312 13 2340 2512
+50106312 14 2500 2786
+50106312 15 2667 3076
+50106312 16 2840 3383
+50106312 17 3021 3706
+50106312 18 3207 4048
+50106312 19 3401 4407
+50106312 20 3601 4785
+50106312 21 3807 5181
+50106312 22 4021 5588
+50106312 23 4240 6006
+50106312 24 4467 6435
+50106312 25 4700 6873
+50106312 26 4940 7319
+50106312 27 5187 7774
+50106312 28 5440 8235
+50106312 29 5707 8703
+50106312 30 0 9176
50106313 1 2468 1440
50106313 2 2679 1785
50106313 3 2908 2154
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index ae3ded2..510c50f 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -16,3 +16,4 @@
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 48470|48475|48480 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1440
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 5b8a552..3867918 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
8 14 0 8 0 {"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]} 50000 {"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
9 8 0 25 0 {"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]} 150000 {"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"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"}]}
+11 11 0 25 50 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]} 33000 {"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-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)+2*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)+2*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)+2*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(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":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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))"}]} 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(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":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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))"}]}
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 46a6dc8..eb3ceee 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -114,8 +114,8 @@
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 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
+262 1 0 坐骑：白玉兽 41 19 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 1680 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 980 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 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
@@ -276,7 +276,7 @@
1501 1 0 宗门令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 10 0 1 0 0 233 60010 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
1502 1 0 封魔令牌 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 52010 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
1503 1 0 娲皇卷轴 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 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
-1504 1 0 矿脉地图 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 51010 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
+1504 1 0 矿脉钥匙 76 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 20 0 10 0 1 0 0 233 31140 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
2050 1 0 世界喇叭 48 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 50 0 5 0 0 0 0 2700 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2100 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2101 1 0 铜钱 43 0 0 0 0 1 1 1 1 0 1 0 0 1 0 0 1 1 0 5 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 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -591,12 +591,12 @@
4212 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
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
+4215 1 0 灵宠：灵狐仙 26 0 0 0 0 1 1 0 1 0 1 0 0 0 0 0 1 400 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 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
+4220 1 0 灵宠：雷震子 26 0 1 0 0 1 1 0 1 0 1 0 0 0 0 0 1 690 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index c4cbe7f..3c6342c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -762,6 +762,9 @@
48455 海牛之力 48455 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1500 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2951 0 0 0 0 0 0 0 0 0 48200 0 0 0 0
48460 海牛幻体 48460 1 1 0 6 0 17 0 0 0 0 91 8 0 25000 0 0 0 0 0 4004 10000 0 0 9 1500 4 0 10 1500 4 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 7377 0 0 0 0 0 0 0 0 0 0 0 0 0 0
48465 海牛狂化 48465 1 1 0 6 0 16 0 0 0 0 111 0 0 25000 0 0 0 0 0 4004 10000 0 0 4503 1000 0 0 4508 0 0 0 1011 1 1 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 25819 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48470 雷震之力 48470 1 1 0 6 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1500 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2871 0 0 0 0 0 0 0 0 0 48200 0 0 0 0
+48475 雷震之心 48475 1 1 0 6 0 17 0 0 0 0 91 8 0 25000 0 0 0 0 0 4004 10000 0 0 13 1000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 7177 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48480 雷震蛮力 48480 1 1 0 6 0 7 0 0 0 0 91 0 0 20000 0 0 0 0 0 4051 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 25119 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49000 固本 49000 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 100 6 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 1242 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49005 精准 49005 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 14 800 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3105 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49010 培元 49010 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 2 6 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 10867 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -805,6 +808,12 @@
49180 旺盛 49180 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 307 6 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3598 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49185 强攻 49185 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 3 7 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 8995 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49190 必杀 49190 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4051 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 31482 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49195 霸天 49195 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 309 7 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5920 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49200 游龙 49200 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 3 6 300 511 3 7 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 5920 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49205 云痕 49205 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4051 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 31482 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49210 浩瀚 49210 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 307 6 1000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 3598 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49215 玄翎 49215 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 3 7 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 8995 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49220 烨火 49220 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4051 1500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 31482 0 0 0 0 0 0 0 0 0 0 0 0 0 0
50000 金箍幻灭 50000 1 1 2 1 0 1 0 0 2 8 40 4 0 8000 0 0 0 0 0 1010 25000 0 0 1200 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 692 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50100 皓月腾空 50100 1 1 2 1 0 1 0 0 2 6 41 10 0 16000 0 0 0 0 0 1010 30000 0 0 1200 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 50101 0 0 0 0 0 0 0 0 0 0 2 879 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50101 加速 50101 1 1 0 0 0 5 0 0 0 0 10 0 0 0 0 0 0 0 0 16 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 50100 0 0 0 0
diff --git a/webbottle/Config.ini b/webbottle/Config.ini
index cf5c66b..f62ac04 100644
--- a/webbottle/Config.ini
+++ b/webbottle/Config.ini
@@ -1,10 +1,10 @@
[GeTuiConfig]
# 一个自由APPID对应一对app_key和master_secret为极光推送应用生成
-app_key_822055139 = 1c060648058afe0b5faf72ca
-master_secret_822055139 = 568ae9f1a2a7650220af3921
+app_key_8220539 = 1c060658ab5faf72ca
+master_secret_825139 = 568ae50220af3921
-app_key_828115704 = 1c060648058afe0b5faf72ca
-master_secret_828115704 = 568ae9f1a2a7650220af3921
+app_key_828704 = 1c06064805b5faf72ca
+master_secret_828104 = 568aef1650220af3921
--
Gitblit v1.8.0