From 985d2782f25dc5f05f31a344ca62052e2ea7c7e6 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 31 八月 2018 14:39:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 4 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 4 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 30 +++++++-------
/dev/null | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 6 ++-
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 16 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt | 12 +++--
15 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
index f1a71f2..43f353b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagDailyAction.txt
@@ -15,4 +15,4 @@
14 0 {} 0 {}
15 0 {} 0 {}
16 0 {} 0 {}
-17 0 {"1":[[20,30]],"3":[[20,30]],"5":[[20,30]],"7":[[20,30]]} 30 {}
+17 0 {"1":[[20,30]],"3":[[20,30]],"5":[[20,30]],"7":[[20,30]]} 30 {-10:["FairyGrabBossTime", []], -5:["FairyGrabBossTime", []], -1:["FairyGrabBossTime", []]}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 3a2a9c5..fd438e0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -43,6 +43,7 @@
# aIceAtkSuperHit 真实伤害暴击倍值 倍值, 默认1
# FinalHurtPer 最终伤害百分比 万分率
# aOnlyFinalHurt 附加伤害 固定值
+# aReFightPower 等级表参考战力 固定值
#
# 防守方：
# dMinAtk 最低攻击
@@ -127,6 +128,9 @@
"PVE_1_31190" :"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
"EVP_1_31190" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+ #抢boss
+ "PVE_1_5" :"int(aReFightPower/15.0+SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
+
}
)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 7db555f..8f01fff 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index 907d230..4360844 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
index 9fd1550..400e6a7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc
index da44c78..2c97c14 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillModule_16.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 3925cea..52f3d39 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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_1.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_1.pyc
deleted file mode 100644
index a1f4a30..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_1.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_2.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_2.pyc
deleted file mode 100644
index fe513d2..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_2.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_3.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_3.pyc
deleted file mode 100644
index 766fe98..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_3.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_5.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_5.pyc
deleted file mode 100644
index 690177c..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_5.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_6.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_6.pyc
deleted file mode 100644
index b28dcb4..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_6.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_7.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_7.pyc
deleted file mode 100644
index 1f090cf..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillBoost_7.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillChange_4000.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillChange_4000.pyc
deleted file mode 100644
index 3d3ab08..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillChange_4000.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillWeaken_103.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillWeaken_103.pyc
deleted file mode 100644
index 4d3ec92..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/SkillWeaken_103.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/__init__.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/__init__.pyc
deleted file mode 100644
index a6caf51..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillBoosts/__init__.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillDataBoost.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillDataBoost.pyc
deleted file mode 100644
index c8a6809..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillDataBoost.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index a3a1e41..ef45998 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
index 42734a3..6a95f9b 100644
--- a/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAlchemySpec.txt
@@ -1,8 +1,10 @@
ID SpecialMaterialD SpecialMateriaNUM AlchemyEXP AlchemyItem BlastFurnaceLV
1 4609 1 134 [[9000,4655,1],[1000,1128,1]] 2
+2 4609 1 194 [[9000,4691,1],[1000,1128,1]] 3
11 4610 1 244 [[9000,4687,1],[1000,4681,1]] 3
-21 4608 1 509 [[9000,200,1],[1000,4680,1]] 4
-22 4608 1 665 [[9000,201,1],[1000,4680,1]] 5
-31 4606 1 759 [[10000,4183,1],[0,4206,1]] 4
-32 4606 1 915 [[10000,4185,1],[0,253,1]] 5
-41 4607 1 1622 [[7000,4688,1],[1500,4676,1],[1500,4677,1]] 6
+12 4610 1 359 [[9000,4692,1],[1000,4681,1]] 4
+21 4608 1 509 [[6500,4660,1],[2000,200,1],[1500,4680,1]] 4
+22 4608 1 665 [[7000,4661,1],[1500,201,1],[1500,4680,1]] 5
+31 4606 1 759 [[9200,4183,1],[800,4206,1]] 4
+32 4606 1 915 [[9500,4185,1],[500,253,1]] 5
+41 4607 1 1622 [[8400,4688,1],[800,4676,1],[800,4677,1]] 6
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 0bcd34e..cc1e494 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -133,8 +133,8 @@
2346 0 [[5000,[3504,1]],[10000,[3514,1]]] 1
2347 0 [[5000,[3505,1]],[10000,[3515,1]]] 1
2348 0 [[5000,[3506,1]],[10000,[3516,1]]] 1
-2349 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
-2350 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
+2349 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
+2350 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
2351 0 4151_5 [[10000,[4253,1]]] [[9900,0],[10000,1]]
2352 0 4151_10 [[10000,[4253,1]]] 1
2353 0 4151_10 [[10000,[4253,1]]] [[5000,0],[10000,1]]
@@ -163,3 +163,5 @@
2376 0 4151_10 [[10000,[4251,1]]] 1
2377 0 4151_10 [[10000,[4251,1]]] [[5000,0],[10000,1]]
2378 0 4151_10 [[10000,[4251,1]]] [[7500,0],[10000,1]]
+2379 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1
+2380 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 032f213..bfb51ea 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -131,7 +131,7 @@
PetFoodExchange 1130 1 50 999 0
PartyReward 12800 [200,0] ["PartyKing",1,[(28,25,1)]] 1
FamilyPartyAreaAward {"Exp":"int(reExp*300)"} 5 60
-FamilyPartyDesk 3200 10
+FamilyPartyDesk 3200 10 [(3901,150,1)]
FamilyActive 40|80|120|160|220 10|10|15|25|30
FamilyMatchSpawnPoint [[18,74,4],[216,74,4]] [[40,66,40,83], [190,66,190,81]]
FamilyMatchResourcePoint [[(170,18,5)],[(56,131,5)],[(170,132,5)],[(111,74,5)],[(56,18,5)]] [30909001,30909002,30909003,30909004,30909005] [[2,5,4,3,1],[1,3,4,5,2]] 0 6000
@@ -194,7 +194,7 @@
XjmjMonsterExp baseExp*expMulti*min((hurtValue*1.0/npcMaxHP),2.8)*reExp*(1+max(min(playerCnt-1,1),0)*0.06+max(min(playerCnt-2,1),0)*0.02-max(min(playerCnt-3,1),0)*0.03)*0.8 2 0 0 0
XjmjFirstEnter [5000, 25, 911] 350000
AlchemyNotify 3 4716 4712|4708|4721|4713|4709|4722|4714|4710|4723|4728|4715|4724|4729
-SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}} {1:{2:[[1,1128,1]]},11:{2:[[1,4681,1]]},31:{3:[[1,4206,1]]},21:{2:[[1,4680,1]]},32:{5:[[1,253,1]]},22:{2:[[1,4680,1]]}} {4206:1,253:1}
+SpecialAlchemy {102:{1:[[1,4707,1]],2:[[1,4716,1]]},103:{3:[[1,4717,1]],6:[[1,4740,1]]},104:{8:[[1,4730,1]]}} {1:{2:[[1,1128,1]]},2:{3:[[1,1128,1]]},11:{2:[[1,4681,1]]},12:{5:[[1,4681,1]]},21:{1:[[1,200,1]],2:[[1,4680,1]],4:[[1,200,1]],8:[[1,200,1]]},22:{1:[[1,4680,1]],2:[[1,201,1]],5:[[1,201,1]],10:[[1,201,1]]},41:{1:[[1,4677,1]],3:[[1,4676,1]],5:[[1,4677,1]],8:[[1,4676,1]],12:[[1,4677,1]],20:[[1,4676,1]]}} {4206:1,253:1}
TreasureUpRateItem 101|105|106|107|104|102|109|110 4601|4602|4603|4604|4605
ClientFightEnable 1 0 0 0 0
GodAreaExpAward {"Exp":"int(reExp*10)"} 5 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index c206dba..0f211fc 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -94,8 +94,8 @@
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):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7500,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
20103002 210 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(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] [] {3801:300000,2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
-20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(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:[(6000,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,2339:166666,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
-20103004 210 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)]} [] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,5202:420000,2320:100000,2339:166666,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
+20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(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:[(6000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,2320:100000,2339:166666,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
+20103004 210 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,2339:166666,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
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,2339:166666,2340:166666} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
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,2339:166666,2340:166666} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
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,2339:166666,2340:166666} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
@@ -108,8 +108,8 @@
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,2339:166666,2340:166666} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
20103001 1000 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7500,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1077 1615 [] [999,3904]
20103002 1000 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(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] [] {3801:300000,2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1077 1615 [] [999,3904]
-20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(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:[(6000,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,2339:83333,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
-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)]} [] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,5202:420000,2320:100000,2339:83333,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
+20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(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:[(6000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,2320:100000,2339:83333,2340:166666} {} {} {} {} 25 800 1115 1673 [] [999,3904]
+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,2339:83333,2340:166666} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
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,2339:83333,2340:166666} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
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,2339:83333,2340:166666} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
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,2339:83333,2340:166666} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
@@ -164,10 +164,10 @@
60203001 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1009,10112,20112,30112,10114,20114,30114]] []
60203002 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1010,10211,20211,30211,10213,20213,30213]] []
60203003 0 0 0 1 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[1011,10222,20222,30222,10211,20211,30211]] []
-60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 7 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2322:1000000} {} {} {} {} 0 0 0 0 [] []
-60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 10 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2323:1000000} {} {} {} {5:1} 0 0 0 0 [] []
+60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [2,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
+60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [2,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
+60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 7 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [1,3,3,[(10000,0)],107] {987:1000000,2322:1000000} {} {} {} {} 0 0 0 0 [] []
+60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 10 {(3,3,107):1000000} 1 {} {3:[(10000,0)]} [] [1,3,3,[(10000,0)],107] {987:1000000,2323:1000000} {} {} {} {5:1} 0 0 0 0 [] []
60203008 0 255 0 0 [(500000,0),(1000000,(4,2,107))] 7 {(4,3,107):1200000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {} {} {} {5:1} 0 0 0 0 [] []
60203009 0 280 0 0 [(500000,0),(1000000,(4,2,107))] 5 {(4,3,107):1400000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:20000,3801:60000,2324:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
60203010 0 305 0 0 [(500000,0),(1000000,(5,2,107))] 5 {(5,3,107):1600000} 1 {} {3:[(10000,0)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2324:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
@@ -222,10 +222,10 @@
20303005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:1800000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:600000,4002:120000,4003:24000,5002:80000} {} {} 25 800 1129 1694 [] [958]
20303006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:650000,4002:130000,4003:26000,5002:100000} {} {} 25 800 1356 1824 [] [958]
20303007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:5000000,2000:2000000,2001:200000,2002:40000,3001:1000000,3002:200000,3003:40000,4001:700000,4002:140000,4003:28000,5002:120000} {} {} 25 800 1356 1824 [] [958]
-50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2349:1000000} {4253:5,4151:50} {} {} {} 0 0 0 0 [] [1023]
-50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2350:1000000} {224:5,181:60} {} {} {} 0 0 0 0 [] [1023]
-50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2349:1000000} {4252:5,4151:60} {} {} {} 0 0 0 0 [] [1023]
-50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2350:1000000} {222:5,181:70,2350:2} {} {} {} 0 0 0 0 [] [1023]
-50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2349:1000000} {4250:5,4151:70,2349:2} {} {} {} 0 0 0 0 [] [1023]
-50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2350:1000000} {223:5,181:80,2350:2} {} {} {} 0 0 0 0 [] [1023]
-50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2349:1000000} {4251:5,4151:80,2349:2} {} {} {} 0 0 0 0 [] [1023]
+50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:250000,4253:1000000,4151:1000000,2349:1000000,2379:1000000} {4253:5,4151:38,2379:4} {} {} {} 0 0 0 0 [] [1023]
+50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:125000,224:1000000,181:1000000,2350:1000000,2380:1000000} {224:5,181:45,2380:5} {} {} {} 0 0 0 0 [] [1023]
+50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:125000,4252:1000000,4151:1000000,2349:1000000,2379:1000000} {4252:5,4151:45,2379:5} {} {} {} 0 0 0 0 [] [1023]
+50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:83333,222:1000000,181:1000000,2350:1000000,2380:1000000} {222:5,181:52,2350:2,2380:6} {} {} {} 0 0 0 0 [] [1023]
+50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:83333,4250:1000000,4151:1000000,2349:1000000,2379:1000000} {4250:5,4151:52,2349:2,2379:6} {} {} {} 0 0 0 0 [] [1023]
+50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:62500,223:1000000,181:1000000,2350:1000000,2380:1000000} {223:5,181:56,2350:2,2380:8} {} {} {} 0 0 0 0 [] [1023]
+50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:62500,4251:1000000,4151:1000000,2349:1000000,2379:1000000} {4251:5,4151:56,2349:2,2379:8} {} {} {} 0 0 0 0 [] [1023]
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 2fcba47..0990af6 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -403,7 +403,7 @@
20102005 2 0 精英海斗士 210 0 2508 2508 0 4 0 0 0 818 0 0 0 0 0 0 0 3 3000 951846 28 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 2358193 0 0 0 0 1 872021 0 1 1 1
20102006 2 0 精英地龙 230 0 2903 2903 0 4 0 0 0 865 0 0 0 0 0 0 0 3 3000 1105585 31 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 4271978 0 0 0 0 1 1332263 0 1 1 1
20102007 2 0 精英冰骨妖 260 0 3994 3994 0 7 0 0 0 1040 0 0 0 0 0 0 0 3 3000 1353274 34 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8807991 0 0 0 0 1 2526516 0 1 1 1
-20103001 2 0 蜘蛛女皇 125 0 1184 1184 0 3 0 0 10000 1430 0 1 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 1742024 0 10000 0 0 5 0 0 186 1 1
+20103001 2 0 蜘蛛女皇 125 0 1967 1967 0 3 0 0 10000 2930 0 1 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 1742024 0 10000 0 0 5 0 0 186 1 1
20103002 2 0 嗜海狂鲨 145 0 2863 2863 0 4 0 0 10000 4148 0 1 0 0 0 0 0 3 3000 556113 20 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5087089 0 10000 0 0 5 0 0 186 1 1
20103003 2 0 古墓石巨人 160 0 3046 3046 0 4 0 0 10000 4235 0 1 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7079698 0 10000 0 0 5 0 0 186 1 1
20103004 2 0 残暴海怪 180 0 3599 3599 0 5 0 0 10000 4474 0 1 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9937882 0 10000 0 0 5 0 0 186 1 1
@@ -810,13 +810,13 @@
30601014 2 0 魂灵 260 0 4811 4811 0 8 0 0 0 1400 0 0 0 0 0 0 0 0 2000 370110 34 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8032498 0 0 0 0 1 0 0 1 1 1
30601015 2 0 魔剑 265 0 4970 4970 0 8 0 0 0 1400 0 0 0 0 0 0 0 0 2000 376753 35 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 8607219 0 0 0 0 1 0 0 1 1 1
30603006 2 0 玄界冰魔 320 0 10459 10459 7847 8 0 0 10000 3290 0 0 0 0 0 0 0 0 2000 455520 41 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 90414255 1 0 0 0 5 0 0 186 1 1
-50103001 2 0 道士鼠 125 0 1184 1184 0 2 0 0 10000 1430 0 7 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
-50103002 2 0 觉灵鹿 145 0 2863 2863 0 3 0 0 10000 4148 0 7 0 0 0 0 0 3 3000 556113 20 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 5087089 0 0 0 0 5 0 0 186 1 1
-50103003 2 0 球球 160 0 3046 3046 0 4 0 0 10000 4235 0 7 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 7079698 0 0 0 0 5 0 0 186 1 1
-50103004 2 0 地狱冥虎 180 0 3599 3599 0 5 0 0 10000 4474 0 7 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 9937882 0 0 0 0 5 0 0 186 1 1
-50103005 2 0 冰火冥魂 215 0 6059 6059 0 6 0 0 10000 7005 0 7 0 0 0 0 0 3 3000 1023022 29 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 45127197 0 0 0 0 5 0 0 186 1 1
-50103006 2 0 八宝葫芦 235 0 7098 7098 0 9 0 0 10000 7780 0 7 0 0 0 0 0 3 3000 1188148 32 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 79667846 0 0 0 0 5 0 0 186 1 1
-50103007 2 0 九黎妖虎 235 0 7098 7098 0 13 0 0 10000 7780 0 7 0 0 0 0 0 3 3000 1188148 32 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 79667846 0 0 0 0 5 0 0 186 1 1
+50103001 2 0 道士鼠 125 0 1184 1184 0 2 0 0 10000 1430 0 7 0 0 0 0 0 5 3000 453622 18 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
+50103002 2 0 觉灵鹿 145 0 2863 2863 0 3 0 0 10000 4148 0 7 0 0 0 0 0 5 3000 556113 20 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 5087089 0 0 0 0 5 0 0 186 1 1
+50103003 2 0 球球 160 0 3046 3046 0 4 0 0 10000 4235 0 7 0 0 0 0 0 5 3000 634880 22 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 7079698 0 0 0 0 5 0 0 186 1 1
+50103004 2 0 地狱冥虎 180 0 3599 3599 0 5 0 0 10000 4474 0 7 0 0 0 0 0 5 3000 738321 25 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 9937882 0 0 0 0 5 0 0 186 1 1
+50103005 2 0 冰火冥魂 215 0 6059 6059 0 6 0 0 10000 7005 0 7 0 0 0 0 0 5 3000 1023022 29 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 45127197 0 0 0 0 5 0 0 186 1 1
+50103006 2 0 八宝葫芦 235 0 7098 7098 0 9 0 0 10000 7780 0 7 0 0 0 0 0 5 3000 1188148 32 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 79667846 0 0 0 0 5 0 0 186 1 1
+50103007 2 0 九黎妖虎 235 0 7098 7098 0 13 0 0 10000 7780 0 7 0 0 0 0 0 5 3000 1188148 32 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 79667846 0 0 0 0 5 0 0 186 1 1
50104001 0 1 乾坤熊猫 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
50104002 0 1 暗裔暴君 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
50104003 0 1 龙血武姬 100 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 8ff389e..0170800 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -759,7 +759,7 @@
50600 紫气东来 50600 1 1 2 1 0 2 0 0 8 1 10 0 0 60000 0 0 0 0 0 1000 3000 500 1 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 4995 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50700 麒麟佑身 50700 1 1 2 1 0 5 0 0 0 0 10 0 0 40000 0 0 0 0 0 801 4000 0 0 0 0 0 0 1200 5 0 0 4012 4 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 7037 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50701 吸收后爆炸 50701 1 1 2 0 0 1 0 0 2 3 40 0 0 40000 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 10000 3000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-50800 嗜天风暴 50800 1 1 2 1 0 15 0 0 2 4 40 4 0 90000 0 0 0 0 0 1010 30000 0 0 1314 5 0 0 9999 800 1 0 1200 6 0 0 0 0 0 0 0 0 0 0 10000 4000 0 0 0 0 0 0 0 0 0 0 0 0 2 8195 0 0 0 0 0 0 0 2 0 0 0 0 0 0
+50800 嗜天风暴 50800 1 1 2 1 0 15 0 0 2 4 40 4 0 90000 0 0 0 0 0 1314 5 0 0 1010 30000 0 0 9999 800 1 0 1200 6 0 0 0 0 0 0 0 0 0 0 10000 4000 0 0 0 0 0 0 0 0 0 0 0 0 2 8195 0 0 0 0 0 0 0 2 0 0 0 0 0 0
50005 旋枪 50005 1 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 640 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 50000 0 0 0 0 0 0 2 149 0 0 0 0 0 0 0 4 0 50000 0 0 0 0
50006 旋枪 50005 2 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 830 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 50000 0 0 0 0 0 0 2 317 0 0 0 0 0 0 0 4 0 50000 0 0 0 0
50007 旋枪 50005 3 25 2 3 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4005 1020 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 50000 0 0 0 0 0 0 2 504 0 0 0 0 0 0 0 4 0 50000 0 0 0 0
--
Gitblit v1.8.0