From c878c00130170a08624628b1f42c514b5d8ae504 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 22 八月 2018 18:10:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagBossReborn.txt | 48 ++++++++--------
db/PyMongoDataServer/PySysDB/tagTreasure.txt | 2
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 10 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 74 ++++++++++++------------
11 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index e9f61da..6c8ae66 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -60,7 +60,7 @@
OpenServerRedPacketRain 200
GeTuiOffLine 您关注的封魔坛BOSS[%s LV.%s]已经复活，快前往挑战 您关注的%s的BOSS[%s LV.%s]即将复活刷新，赶快上线前往挑战 您收到来自[%s]的私聊消息，快上线回复对方 升到60级就开启离线挂机啦，角色下线也可以挂机，经验和装备一点也不落下！[再玩一会]
BillBoardPlayerLoginNotify [[0, {1:'GeRen_liubo_232930'}],[4, {1:'GeRen_liubo_148706'}],] 100 300
-BossRebornTotalPoint 1744|2616|3488|4360 26|51|101|9999
+BossRebornTotalPoint 2200|3300|4400|5500 26|51|101|9999
BossRebornNotify [50,80] [0,20,40]
ServerActivePlayerCnt 100 max(20,min(yesterdayPlayerCnt,150))
CeremonyWorldLv {"1":[[0,100],[101,200],[201,900]],"2":[[0,100],[101,200],[201,900]],"3":[[0,100],[101,200],[201,900]],"4":[[0,100],[101,200],[201,900]]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 5669c23..30fb099 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 310a908..ac9403e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index 19c2b8a..d8b9e17 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc
new file mode 100644
index 0000000..5559139
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4515.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index 3b5c153..c1d9d41 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
index 6939fb6..eb173b7 100644
--- a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
@@ -1,25 +1,25 @@
TemplateID Id TotalTimes SingleTimes Reward
-1 1 3 1 [(21,20,1),(11,1,1)]
-1 2 4 1 [(21,20,1),(11,1,1)]
-1 3 10 1 [(21,10,1),(11,1,1)]
-1 4 10 1 [(21,10,1),(11,1,1)]
-1 5 20 1 [(21,20,1),(11,1,1)]
-1 6 3 3 [(21,50,1),(1128,1,1)]
-1 7 3 1 [(21,20,1),(11,1,1)]
-1 8 30 2 [(21,10,1),(11,1,1)]
-1 9 20 10 [(21,10,1),(11,1,1)]
-1 10 5 1 [(21,10,1),(11,1,1)]
-1 12 3 1 [(21,10,1),(11,1,1)]
-1 13 20 1 [(21,15,1),(11,1,1)]
-2 1 3 1 [(21,20,1),(11,1,1)]
-2 2 4 1 [(21,20,1),(11,1,1)]
-2 3 10 1 [(21,10,1),(11,1,1)]
-2 4 10 1 [(21,10,1),(11,1,1)]
-2 5 20 1 [(21,20,1),(11,1,1)]
-2 6 3 3 [(21,50,1),(1128,1,1)]
-2 7 3 1 [(21,20,1),(11,1,1)]
-2 8 30 2 [(21,10,1),(11,1,1)]
-2 9 20 10 [(21,10,1),(11,1,1)]
-2 10 5 1 [(21,10,1),(11,1,1)]
-2 12 3 1 [(21,10,1),(11,1,1)]
-2 13 20 1 [(21,15,1),(11,1,1)]
+1 1 3 1 [(21,10,1),(2341,1,1)]
+1 2 5 1 [(21,10,1),(2341,1,1)]
+1 3 10 1 [(21,10,1),(2341,1,1)]
+1 4 10 1 [(21,10,1),(2341,1,1)]
+1 5 20 1 [(21,20,1),(2341,1,1)]
+1 6 3 3 [(21,100,1),(1128,1,1)]
+1 7 6 1 [(21,10,1),(2341,1,1,1)]
+1 8 28 2 [(21,10,1),(2341,1,1)]
+1 9 20 10 [(21,20,1),(2341,1,1)]
+1 10 5 1 [(21,20,1),(2341,1,1)]
+1 12 3 1 [(21,10,1),(2341,1,1)]
+1 13 20 1 [(21,20,1),(2341,1,1)]
+2 1 3 1 [(21,10,1),(2341,1,1)]
+2 2 5 1 [(21,10,1),(2341,1,1)]
+2 3 10 1 [(21,10,1),(2341,1,1)]
+2 4 10 1 [(21,10,1),(2341,1,1)]
+2 5 20 1 [(21,20,1),(2341,1,1)]
+2 6 3 3 [(21,100,1),(1128,1,1)]
+2 7 6 1 [(21,10,1),(2341,1,1,1)]
+2 8 28 2 [(21,10,1),(2341,1,1)]
+2 9 20 10 [(21,20,1),(2341,1,1)]
+2 10 5 1 [(21,20,1),(2341,1,1)]
+2 12 3 1 [(21,10,1),(2341,1,1)]
+2 13 20 1 [(21,20,1),(2341,1,1)]
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 218e337..7e3c412 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -124,6 +124,6 @@
2337 0 [[1428,[10551,1]],[2856,[10552,1]],[4284,[10553,1]],[5712,[10554,1]],[7140,[10555,1]],[8568,[10556,1]],[10000,[10557,1]]] 1 [[10551,20551,30551],[10552,20552,30552],[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557]] [10551,10552,10553,10554,10555,10556,10557]
2338 0 [[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]] 1 [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]
2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1
-2340 0 [[5000,[181,5]],[6000,[181,6]],[7000,[181,7]],[8000,[181,8]],[9000,[181,9]],[10000,[181,10]]] 1
+2340 0 [[2000,[181,10]],[4000,[181,11]],[6000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1
2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index b6cd16d..c2d7bba 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -154,13 +154,13 @@
Strengthen2 3|4|5|6|7 0 0 0 0
StrengthenLevelLimit 1_1|2_1|3_1|4_1|5_1|6_1|7_1|8_2|9_3|10_3 1_1|2_1|8_1|9_1|10_1|3_2|4_2|5_2|6_2|7_2
StrengthenLevelBroadCast 20|35|50|70|90|110|130|150|170|190
-LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} 0 0 0 0
+LegendAttrCount {(3,0):[1,0,0],(3,1):[0,1,0],(4,0):[2,0,0],(4,1):[1,1,0],(4,2):[0,2,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} {(1,0):[3,0,0],(2,0):[3,0,0],(2,1):[2,1,0],(2,2):[1,2,0],(3,0):[3,0,0],(3,1):[2,1,0],(3,2):[1,2,0],(3,3):[0,3,0],(4,0):[3,0,0],(4,1):[2,1,0],(4,2):[1,2,0],(4,3):[0,3,0],(5,0):[3,0,0],(5,1):[2,1,0],(5,2):[1,2,0],(5,3):[0,3,0],(6,3):[0,3,1]} 0 0 0
LegendAttrRule {1:[[15,25,44,52,54,55],[11,51,19],0],2:[[15,25,44,52,54,55],[11,51,19],0],3:[[22,45,44,53,54,55],[20,50,69],18],4:[[22,45,44,53,54,55],[20,50,69],30],5:[[22,45,44,53,54,55],[20,50,11],29],6:[[22,45,44,53,54,55],[20,50,69],14],7:[[22,45,44,53,54,55],[20,50,69],71],8:[[15,25,44,52,54,55],[11,12,70],0],9:[[15,25,44,52,54,55],[20,12,70],0],10:[[15,25,44,52,54,55],[20,12,70],0],101:[[15,25,44,52,54,55],[11,51,19],0],102:[[15,25,44,52,54,55],[11,51,19],0],103:[[22,45,44,53,54,55],[20,50,69],18],104:[[22,45,44,53,54,55],[20,50,69],30],105:[[22,45,44,53,54,55],[20,50,11],29]} 0 0 0 0
LegendAttrValueByColor {51:{3:200,4:320,5:400,6:400},19:{3:200,4:320,5:400,6:400},11:{3:625,4:1000,5:1250,6:1250},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},69:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:250,4:400,5:500,6:500},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}} 0 0 0 0
LegendAttrValueByColor2 {51:{3:200,4:320,5:400,6:400},19:{3:200,4:320,5:400,6:400},11:{3:625,4:1000,5:1250,6:1250},12:{3:250,4:400,5:500,6:500},70:{3:1000,4:1600,5:2000,6:2000},20:{3:200,4:320,5:400,6:400},50:{3:200,4:320,5:400,6:400},69:{3:250,4:400,5:500,6:500},15:{3:500,4:800,5:1000,6:1000},25:{3:500,4:800,5:1000,6:1000},52:{3:20,4:25,5:33,6:33},45:{3:500,4:800,5:1000,6:1000},44:{3:500,4:800,5:1000,6:1000},22:{3:250,4:400,5:500,6:500},53:{3:3,4:4,5:5,6:5},54:{3:250,4:400,5:500,6:500},55:{3:250,4:400,5:500,6:500}}
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 0 0 0 0
-EquipGSFormula int(((MinAtk+MaxAtk)*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)) [67,68,6,8,11,20,19,23] 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)*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)) [67,68,6,8,11,20,19,23] int(((MinAtk+MaxAtk)*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)) 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)}
@@ -237,11 +237,11 @@
DiceFreeNum 5
DiceRandomList {0:[[1600,1],[3200,2],[4800,3],[6400,4],[8000,5],[10000,6]],1:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],2:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],3:[[1300,1],[2600,2],[3900,3],[5200,4],[6500,5],[10000,6]],4:[[1200,1],[2400,2],[3600,3],[4800,4],[6000,5],[10000,6]],5:[[1000,1],[2000,2],[3000,3],[4000,4],[5000,5],[10000,6]]}
TJG int(min((min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(attackEff/10000.0)/(npcMaxHP*1.0),1)*2.9*0.320833333333333+min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(150000/10000.0)/(npcMaxHP*1.0),1)*15*0.0166666666666667+skill2*min(((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(50000/10000.0)/(npcMaxHP*1.0),1)*2.1*0.041667+min((((aMinAtk+aMaxAtk)/2.0*(1-aLuckyHitRate/10000.0+aLuckyHitRate/10000.0*(1.2+aLuckyHit/10000.0))+aSuperHitRate*aSuperHit/10000.0+aIceAtk)*(1+aDamagePer/10000.0)*(10000.0/10000.0)+(petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25))/(npcMaxHP*1.0),0.78)*2.06*(60*math.sqrt(atkSpeed/10000)-(4+60/8+60/12+60/16+60/20))/60*1)+max(min((petMinAtk+petMaxAtk)/2.0*(1+petDamPer/10000.0)*(petSkillPer/10000.0+PetSkill1*0.1+PetSkill2*0.15+PetSkill3*0.15+PetSkill4*0.2+PetSkill5*0.2+PetSkill6*0.2+PetSkill7*0.25)/(npcMaxHP*1.0),1)-0.5,0)*0.47*math.sqrt(atkSpeed/10000),5*math.sqrt(atkSpeed/10000.0))*npcExp*(1+max(min(0.14*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.9),0.12),0)+max(min((0.15*max(aFightPower-npcCommendFightPower,0)/(npcCommendFightPower+max(aFightPower-npcCommendFightPower,0)*0.95)-0.12),0),0)))*times 300 72000 {1:[50900, 50902],2:[55900,55902]} 48215|48235|48245|48260|48275|48320|48290
-AutoUseGuardian 4101
+AutoUseGuardian 4101 300
ItemTimeOut {"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688]}
OutOfPrintValue int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))
BossStoneDelayTime 1500
-DogzAssist 3|10 3511 2|3|4|5 1_10|2_20|3_30|4_40|5_50
+DogzAssist 3|10 3511 2|3|4|5 1_10|2_20|3_30|4_40|5_50 8351
DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001 [20302001, 20302003]
DogzFBCollect {20302001:1,20302002:1} {20302001:1,20302002:1}
XMZZBetCfg {}
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index cf42360..8a9d41c 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -50,15 +50,15 @@
10103001 0 70 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[8011,1007]] []
10203001 0 85 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[8021,1008]] []
10303001 210 190 2 0 [] 0 {} 0 {} {} [1,3,3,[(10000,1)],107] [] {} {} {} {} {} 25 800 915 1372 [1,1,1,[1014]] []
-10403001 210 205 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [1005]
-10503001 210 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1495000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:20833,2320:100000,2339:166666,2340:1000000} {} {} {} {} 25 800 1115 1673 [] [999]
-10603001 210 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,9051:3472,2320:100000,222:8000,2339:166666,2340:1000000} {} {} {} {} 25 800 1123 1685 [] [999]
-10303001 1000 190 2 0 [] 0 {} 0 {} {} [1,3,3,[(10000,1)],107] [] {} {} {} {} {} 25 800 915 1372 [1,1,1,[1014]] []
-10403001 1000 205 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [999]
-10503001 1000 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1330000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:20833,2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1115 1673 [] [999]
-10603001 1000 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,9051:3472,2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1123 1685 [] [999]
-10703001 1000 400 2 0 [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:55556,3803:1173,9051:6173,2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1129 1694 [] [999]
-10803001 1000 450 2 0 [(397839,0),(541172,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1420000,(7,5,107):106667,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:65972,3803:1330,9051:7330,2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1129 1694 [] [999]
+10403001 210 205 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(10000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,1)],107] [3,3,4,[(10000,1)],107] {2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1077 1615 [] [1005]
+10503001 210 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1495000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:20833,2320:100000,2339:166666,2340:300000} {} {} {} {} 25 800 1115 1673 [] [999]
+10603001 210 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,9051:3472,2320:100000,222:8000,2339:166666,2340:300000} {} {} {} {} 25 800 1123 1685 [] [999]
+10303001 1000 190 2 0 [] 0 {} 0 {} {} [1,3,3,[(10000,1)],107] [3,3,4,[(10000,1)],107] {} {} {} {} {} 25 800 915 1372 [1,1,1,[1014]] []
+10403001 1000 205 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1077 1615 [] [999]
+10503001 1000 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1330000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:20833,2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1115 1673 [] [999]
+10603001 1000 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,9051:3472,2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1123 1685 [] [999]
+10703001 1000 400 2 0 [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:55556,3803:1173,9051:6173,2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1129 1694 [] [999]
+10803001 1000 450 2 0 [(397839,0),(541172,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1420000,(7,5,107):106667,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:65972,3803:1330,9051:7330,2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1129 1694 [] [999]
30201000 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30201001 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30201002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
@@ -93,34 +93,34 @@
20202005 0 410 1 0 [(967006,0),(976216,(7,1,107)),(995834,(7,2,107)),(1000000,(7,3,107))] 1 {} 0 {} {3:[(9600,0),(10000,1)]} [] [] {951:260,4002:729,4003:729,4501:0,4008:191,4009:191,4005:417,4006:417,4502:0,956:590} {} {2:360000} {} {2:1} 1 800 1356 1824 [] []
20202006 0 420 1 0 [(928882,0),(936250,(7,1,107)),(991250,(7,2,107)),(1000000,(7,3,107))] 1 {} 0 {} {3:[(9600,0),(10000,1)]} [] [] {951:208,4002:583,4003:583,4501:0,4008:153,4009:153,4005:333,4006:333,4502:0,956:500} {} {2:400000} {} {2:1} 1 800 1356 1824 [] []
20202007 0 460 1 0 [(974945,0),(981945,(8,1,107)),(996667,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(9600,0),(10000,1)]} [] [] {951:208,4002:583,4003:583,4501:0,4008:208,4009:208,4005:417,4006:417,4502:0,956:528} {} {2:500000} {} {2:1} 1 800 1588 1962 [] []
-20103001 210 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:166666,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [1005]
-20103002 210 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1450000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:166666,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [1005]
-20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1495000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,4209:8680,4250:23148,2339:166666,2340:1000000} {} {} {} {} 25 800 1115 1673 [] [999]
-20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1540000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,4209:8680,4250:23148,2339:166666,2340:1000000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999]
-20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:15625,4250:41666,2339:166666,2340:1000000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999]
-20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1585000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:15625,4250:41666,2339:166666,2340:1000000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999]
-20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:41667,9051:4630,5202:480000,2320:100000,4209:10416,4250:27777,260:10416,222:27777,2339:166666,2340:1000000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999]
-20203001 210 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
-20203002 210 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
-20203003 210 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
-20203004 210 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
-20203005 210 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
-20203006 210 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
-20203007 210 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999]
-20103001 1000 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [999]
-20103002 1000 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [999]
-20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1300000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,4209:1736,4250:6944,2339:83333,2340:1000000} {} {} {} {} 25 800 1115 1673 [] [999]
-20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,4209:1736,4250:8680,2339:83333,2340:1000000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999]
-20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:3125,4250:8680,2339:83333,2340:1000000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999]
-20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1390000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:3125,4250:15625,2339:83333,2340:1000000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999]
-20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:41667,9051:4630,5202:480000,2320:100000,4209:2083,260:2083,4250:10416,222:10416,2339:83333,2340:1000000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999]
-20203001 1000 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1360000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
-20203002 1000 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
-20203003 1000 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
-20203004 1000 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
-20203005 1000 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
-20203006 1000 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
-20203007 1000 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999]
+20103001 210 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:166666,2340:300000} {} {} {} {} 25 800 1077 1615 [] [1005]
+20103002 210 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1450000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:166666,2340:300000} {} {} {} {} 25 800 1077 1615 [] [1005]
+20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1495000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,4209:8680,4250:23148,2339:166666,2340:300000} {} {} {} {} 25 800 1115 1673 [] [999]
+20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1540000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,4209:8680,4250:23148,2339:166666,2340:300000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999]
+20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:15625,4250:41666,2339:166666,2340:300000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999]
+20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1585000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:15625,4250:41666,2339:166666,2340:300000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999]
+20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:41667,9051:4630,5202:480000,2320:100000,4209:10416,4250:27777,260:10416,222:27777,2339:166666,2340:300000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999]
+20203001 210 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203002 210 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203003 210 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203004 210 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203005 210 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203006 210 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203007 210 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:166666,2340:300000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999]
+20103001 1000 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1077 1615 [] [999]
+20103002 1000 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:83333,2340:300000} {} {} {} {} 25 800 1077 1615 [] [999]
+20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1300000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,4209:1736,4250:6944,2339:83333,2340:300000} {} {} {} {} 25 800 1115 1673 [] [999]
+20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,4209:1736,4250:8680,2339:83333,2340:300000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999]
+20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:3125,4250:8680,2339:83333,2340:300000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999]
+20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1390000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:3125,4250:15625,2339:83333,2340:300000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999]
+20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:41667,9051:4630,5202:480000,2320:100000,4209:2083,260:2083,4250:10416,222:10416,2339:83333,2340:300000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999]
+20203001 1000 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1360000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203002 1000 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203003 1000 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203004 1000 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203005 1000 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203006 1000 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203007 1000 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:83333,2340:300000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999]
30303001 210 255 0 0 [(628431,0),(728431,(4,2,107)),(998431,(4,3,107)),(999974,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1596000,(4,5,107):80000} 1 {4:2,5:1} {3:[(8000,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,2320:100000} {} {} {} {} 20 800 1123 1685 [] [1004]
30303002 210 280 0 0 [(627646,0),(727646,(4,2,107)),(997646,(4,3,107)),(999961,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1596000,(4,5,107):80000} 1 {4:2,5:1} {3:[(8000,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
30303003 210 310 0 0 [(627646,0),(727646,(5,2,107)),(997646,(5,3,107)),(999961,(5,2,108)),(1000000,(5,3,108))] 30 {(5,4,107):1632000,(5,5,107):146667} 1 {4:2,5:1} {3:[(8000,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:6944,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasure.txt b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
index b7d6817..f187aaa 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasure.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
@@ -23,7 +23,7 @@
212 2 211 712|842
213 2 212 713|843
214 2 213 714|844
-301 3 0 752|753|754|755|756
+301 3 0
302 3 0 761
303 3 0 762
304 3 0 763
--
Gitblit v1.8.0