From 7f6499ae6174b22bf867ea2985072d33532ea1d4 Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期一, 26 十一月 2018 11:01:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FBHelpBattle.pyc | 0
CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 6
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 20 ++++
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 13 +-
db/PyMongoDataServer/PySysDB/tagGodWeapon.txt | 18 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 7 +
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc | 0
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2
CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt | 11 +
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 16 +-
db/PyMongoDataServer/SysDB/tagChinItem.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt | 26 ++--
db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt | 13 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 2
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCShow.txt | 26 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc | 0
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 24 ++--
CoreServerGroup/GameServer/PySysDB/tagStore.txt | 9 +
CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt | 12 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 31 ++++--
db/PyMongoDataServer/PySysDB/tagResourcesBack.txt | 2
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc | 0
CoreServerGroup/GameServer/Script/Player/PlayerViewCache.pyc | 0
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 24 ++--
56 files changed, 163 insertions(+), 105 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
index a86343f..6a91964 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBHelpBattle.txt
@@ -1,10 +1,10 @@
DataMapID LineID FightPowerMin FightPowerMax LVLimit DayFreeHelpCount
-51010 0 10000 30000 155 [5, 1]
-51010 1 20000 40000 155 [5, 1]
-51010 2 30000 50000 155 [5, 1]
-51010 3 40000 60000 155 [5, 1]
-51010 4 50000 70000 155 [5, 1]
-51010 5 60000 80000 155 [5, 1]
+51010 0 10000 0 155 [5, 1]
+51010 1 20000 0 155 [5, 1]
+51010 2 30000 0 155 [5, 1]
+51010 3 40000 0 155 [5, 1]
+51010 4 50000 0 155 [5, 1]
+51010 5 60000 0 155 [5, 1]
60010 0 10000 0 105 [5, 0]
60010 1 50000 0 165 [5, 0]
60010 2 100000 0 200 [5, 0]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index f0b051c..ad13f3a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -120,9 +120,17 @@
552 12 0 0
553 12 0 0
554 12 0 0
+555 12 0 0
+556 12 0 0
+557 12 0 0
+558 12 0 0
+559 12 0 0
+560 12 0 0
561 13 0 0
562 13 0 0
563 13 0 0
+581 12 0 0
+582 12 0 0
651 14 0 0
652 14 0 0
653 14 0 0
@@ -251,3 +259,4 @@
1061 16 0 0
1062 16 0 0
1063 16 0 0
+1064 16 0 0
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index 3505c27..d61f729 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index bf78a5d..d684950 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
index f176e2e..5f3ef03 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index af2b201..12c8cb3 100644
--- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
index 7d8011b..237de65 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc
new file mode 100644
index 0000000..6752fd6
--- /dev/null
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFBHelpBattle.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index e9c037a..2fc11f7 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc
index 76edf00..96265c9 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFriend.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
index e1ae61f..624ee68 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerQuery.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.pyc
index 10956ad..d7e0abb 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerViewCache.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index f439c77..f35bab6 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index c42591c..5c0d518 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index ef734df..cd92533 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -108,7 +108,7 @@
#_100 前2座塔，等级碾压
"EVP_1_100" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(suppressLV,1)*0.2*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#_101 后10座塔，战力压制
- "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+(suppressFightPower*1.0/suppressNPCFightPower*(4+int(min(suppressNPCFightPower/20000000.0,1)))*dMaxHP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+ "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)+(suppressFightPower*1.0/suppressNPCFightPower*(1+int(min(suppressNPCFightPower/900000.0,3))+int(min(suppressNPCFightPower/20000000.0,1)))*dMaxHP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
#BOSS境界压制公式
@@ -118,7 +118,10 @@
#抢boss
"PVE_1_5" :"int((wReFightPower/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)+aNPCHurtAddPer/10000.0*(aMinAtk+aMaxAtk)/2.0,(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))*(1+aFinalHurtPer/10000.0))",
-
+
+ #助战机器人：参数: suppressNPCFightPower-助战玩家战力; fbFightPower-副本战力; fbBaseHurt-保底伤害
+ "HelpRobot_Atk" :"fbBaseHurt*suppressNPCFightPower/(fbFightPower if fbFightPower else suppressNPCFightPower)",
+ "HelpRobot_Def" :"fbBaseHurt*fbFightPower/(suppressNPCFightPower if suppressNPCFightPower else fbFightPower)",
}
)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index a164022..ebf8152 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1131,6 +1131,26 @@
PacketSubCMD_1=0x75
PacketCallFunc_1=BuyFBEnterCount
+;副本助战
+[FBHelpBattle]
+ScriptName = GameWorldLogic\FBProcess\FBHelpBattle.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 3
+
+PacketCMD_1=0xB1
+PacketSubCMD_1=0x5
+PacketCallFunc_1=OnHelpBattleCheckIn
+
+PacketCMD_2=0xB1
+PacketSubCMD_2=0x6
+PacketCallFunc_2=OnHelpBattleCall
+
+PacketCMD_3=0xB1
+PacketSubCMD_3=0x7
+PacketCallFunc_3=OnHelpBattleRefresh
+
;组队
[PlayerTeam]
ScriptName = Player\PlayerTeam.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index b5a1a52..be51093 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 1c361f6..22dc8d3 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/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc
index d52e834..4cc713d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
index c53c179..55c82d3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
index fb9a14d..536231e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc
index b8fc39f..fc16b7e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 7453de8..20db0dc 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 90ba154..0419004 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
index 52ca97f..8f7c92c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
new file mode 100644
index 0000000..97cc468
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBHelpBattle.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
index 7046c39..8f0dc01 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_QueenRelics.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
index b232734..3646d59 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldProcess.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index a0f9fa4..108fc0b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
index 0aea2d4..5e8d7fb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc
index 1982b07..96e2f5d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_186.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
new file mode 100644
index 0000000..669c0cc
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AIType_20.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 6d7e9eb..14332cd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 42b69ee..96107d7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index c507129..3cbc4d5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
index b7c90fb..0c43ef1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index 105bf46..2a95e7f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FBHelpBattle.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FBHelpBattle.pyc
new file mode 100644
index 0000000..b82017a
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_FBHelpBattle.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
index a77f0dd..5af7c2c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 2f6d0a8..72924cf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 3654a30..3e8fe86 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -4,7 +4,7 @@
2202 0 4305_8 0 0
2203 0 5303_100 0 0
2204 0 153_15|144_30|143_45|142_60|141_80 147_1 0 0
-2205 0 5011_1|5012_1|5013_1|5014_1|5015_1 [[5011,5021,5031],[5012,5022,5032],[5013,5023,5033],[5014,5024,5034],[5015,5025,5035]] 0 0
+2205 0 5012_20 [[5012,5022]] 0 0
2206 0 6_1 0 0
2301 0 4151_10 0 0
2207 0 101_3 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index e400734..5cf8991 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -6,7 +6,7 @@
31080 2 2 0 0 75|60|45|30|21 21 0 0 1 0 0 0 0
31110 0 0 0 0 75|60|45|30|17 0 0 0 1 0 100 50 0
31130 0 0 0 0 75|60|45|30|16 0 0 0 1 0 0 0 0
-31140 10 2 0 0 0 0 0 0 1 0 0 0 0
+31140 0 2 0 0 0 0 0 0 1 0 0 0 0
31150 1 2 0 0 0 0 19 0 1 180 0 0 0
31170 1 2 0 0 75|60|45|30|20 0 0 0 1 0 0 0 0
31180 1 2 0 0 100|90|80|70|60 0 0 0 1 0 120 120 1
diff --git a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
index 4e9ae30..bf6a532 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBHelpBattle.txt
@@ -1,13 +1,13 @@
-DataMapID LineID RobotFightPower RobotLV RobotSkill
-51010 0 10000 155 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 1 20000 165 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 2 30000 175 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 3 40000 185 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 4 50000 195 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-51010 5 60000 205 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 0 10000 105 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 1 50000 165 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-60010 2 100000 200 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 2 10000 80 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 5 50000 100 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
-31110 7 100000 150 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+DataMapID LineID FightPowerMin RobotFightPower RobotLV RobotBaseHurt RobotHPCoefficient RobotSkill
+51010 0 10000 10000 155 10000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 1 20000 20000 165 15000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 2 30000 30000 175 20000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 3 40000 40000 185 25000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 4 50000 50000 195 30000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+51010 5 60000 60000 205 35000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 0 10000 10000 105 40000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 1 50000 50000 165 45000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+60010 2 100000 100000 200 50000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 2 10000 10000 80 55000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 5 50000 50000 100 60000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
+31110 7 100000 100000 150 65000 50 {1:{(12000, 12001, 12002, 12003):1, 12011:7, 12012:15, 12013:30, 12014:80, 12015:140}, 2:{(12100, 12101, 12102, 12103):1, 12111:7, 12112:15, 12114:80, 12115:140}}
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index a91bd14..c9933c1 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -55,17 +55,17 @@
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [3,1800,15,101]
-51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [5,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,30,30,30,30] [793536, [141,45]]
-51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [5,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,30,30,30,30] [831840, [141,36], [142,6]]
-51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [5,360,10] [{5101031:1, 5101032:1}] [60,30,30,30,30] [1017600, [141,13], [142,18], [143,5]]
-51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [5,360,10] [{5101041:0, 5101042:1}] [60,30,30,30,30] [1169280, [142,24], [143,8]]
-51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [5,360,10] [{5101051:1, 5101052:0}] [60,30,30,30,30] [1404720, [142,9], [143,15], [144,6]]
-51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [5,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [60,30,30,30,30] [1666080, [143,18], [144,9]]
-51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [5,360,10] [{5101071:1, 5101072:0}] [60,30,30,30,30] [1953360, [144,15]]
-51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [5,360,10] [{5101081:1}] [60,30,30,30,30] [2265840, [153,15]]
-60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [5,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
-60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [5,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
-60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [5,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
+51010 0 51010 155 500 0 0 0 0 0 0 0 [24,20,3] [3,360,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [60,30,30,30,30] [793536, [141,45]]
+51010 1 51010 155 500 0 0 0 0 0 0 0 [70,19,3] [3,360,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [60,30,30,30,30] [831840, [141,36], [142,6]]
+51010 2 51010 155 500 0 0 0 0 0 0 0 [126,9,3] [3,360,10] [{5101031:1, 5101032:1}] [60,30,30,30,30] [1017600, [141,13], [142,18], [143,5]]
+51010 3 51010 155 500 0 0 0 0 0 0 0 [30,62,3] [3,360,10] [{5101041:0, 5101042:1}] [60,30,30,30,30] [1169280, [142,24], [143,8]]
+51010 4 51010 155 500 0 0 0 0 0 0 0 [84,63,3] [3,360,10] [{5101051:1, 5101052:0}] [60,30,30,30,30] [1404720, [142,9], [143,15], [144,6]]
+51010 5 51010 155 500 0 0 0 0 0 0 0 [137,73,3] [3,360,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [60,30,30,30,30] [1666080, [143,18], [144,9]]
+51010 6 51010 155 500 0 0 0 0 0 0 0 [14,114,3] [3,360,10] [{5101071:1, 5101072:0}] [60,30,30,30,30] [1953360, [144,15]]
+51010 7 51010 155 500 0 0 0 0 0 0 0 [71,111,3] [3,360,10] [{5101081:1}] [60,30,30,30,30] [2265840, [153,15]]
+60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [3,1800,30,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
+60010 1 60010 165 500 0 0 0 0 0 0 0 [208,24] [3,1800,30,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
+60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [3,1800,30,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
31160 0 31160 110 230 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311601,311603] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31160 1 31160 231 300 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311604,311605] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
31160 2 31160 301 500 0 0 0 0 0 0 0 [[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]] 1200 [311606,311607] {1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
@@ -92,5 +92,5 @@
52010 19 52010 455 0 0 0 0 0 0 0 0 [17,19,8] 10
31130 0 31130 0 500 0 0 0 0 0 0 0 [29,12] [3,180,10,10] 101
31110 0 31110 80 500 0 0 0 0 0 0 0 [19,13,3] [3, 180, 10, [210, 180, 150, 120], [51,13]] 101
-31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [5, 180, 10, [360, 245, 185, 125], [51,13]] 102
+31110 1 31110 80 500 0 0 0 0 0 0 0 [59,13,3] [3, 180, 10, [360, 245, 185, 125], [51,13]] 102
31210 0 31210 0 500 0 0 0 0 0 0 0 [12,6,3] [10, 3600, 60, [1800, 900, 600, 300]] [101,30903001]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 8f85f9f..f09d9a1 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -101,10 +101,9 @@
GodWeapon3 107|108|109 0 0 0 0
GodWeapon4 110|111|112 0 0 0 0
GodWeaponActive 1 {"2":[[1,100]], "4":[[2,100]]} 0 0 0
-GodWeaponSys {1:'GetGodWeapon',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon2'}
-GodLv {1:[50,150,200,250,325,500,650],2:[50,150,200,250,325,500,650],3:[50,150,200,250,325,500,650]}
+GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
GodMagicExp {"1":[10,10],"2":[15,15],"4":[25,25]}
-MagicExterior {"1":4399,"2":43999,"3":439999,"4":436999}
+MagicExterior {"1":0,"2":0,"3":0,"4":100386}
WorldLvExpRate int((max(min((worldLv-playerLv)*0.0075,0.15)-max(worldLv-playerLv-20,0),0)+min((max((worldLv-playerLv-20),0)/200.0),0.5)+min((math.sqrt(max((worldLv-playerLv-20),0)/100.0)*1.5),1.5))*10000) 0 0 0 0
EquipSuitLimit 4 2 3 0 0
EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
@@ -285,10 +284,10 @@
GoldInvestLVLimit 300
OfflinePostItem 181|4151|4002|4003|4008|4009|4005|4006|4011|951|956|4501|4502
TreasureSet {0:10,1:10} {2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}
-TreasureSet11 [1, 10] [250, 2000] [[982,1], [982, 10]] [0, 0] [10, 100]
-TreasureSet21 max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10)) [1, 10] 1000
+TreasureSet11 [1, 10] [80, 640] [[982,1], [982, 10]] [0, 0] [4, 40]
+TreasureSet21 max(baseRate,min(int(min(curLuck,300)*0.2+min(max(curLuck-300,0),100)*0.4+min(max(curLuck-400,0),200)*1)+max(curLuck-999,0),10000)) [10, 100] 1000
TreasureSet12 [1, 10] [30, 240] [[983,1], [983, 10]] [1440, 0] [2, 20]
-TreasureSet22 min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0))) [1, 10] 1000
+TreasureSet22 min(min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))+max(curLuck-999,0),10000) [3, 30] 1000
OpenServerRedPacketType 5
OSRAllMoneySys [100,300,500,800,1000,1200,1500,1800]
OpenServerRedPacketCfg 3 10 3600 50 5
@@ -316,6 +315,6 @@
BindJadeWheelNotice 150
WishingWellCfg 14400 10 8 5
HelpBattleCall 5 3 2 10 5
-HelpBattleRefresh 5 5 5
+HelpBattleRefresh 5 5 5 5
HelpBattlePoint 1500 {"1":[20, 10], "2":[10, 5]} 1|2
HelpBattleRobot 50105026
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
index 1e13615..d7d290d 100644
--- a/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeapon.txt
@@ -48,7 +48,7 @@
1 47 15 6 60395 0
1 48 15 6 61681 0
1 49 15 6 62975 0
-1 50 16 6 64276 48040
+1 50 16 6 64276 48040 GetMagicSkill5
1 51 16 6 65584 0
1 52 16 6 66899 0
1 53 16 6 68221 0
@@ -198,7 +198,7 @@
1 197 50 6 291413 0
1 198 50 6 293059 0
1 199 50 6 294706 0
-1 200 50 6 296353 48045
+1 200 50 6 296353 48045 GetMagicSkill6
1 201 54 6 298002 0
1 202 58 6 299652 0
1 203 62 6 301303 0
@@ -323,7 +323,7 @@
1 322 251 6 604138 0
1 323 251 6 607044 0
1 324 251 6 609951 0
-1 325 251 6 612859 48050
+1 325 251 6 612859 48050 GetMagicSkill7
1 326 253 6 615767 0
1 327 255 6 618677 0
1 328 256 6 621588 0
@@ -698,7 +698,7 @@
2 47 25 7 4130 0
2 48 25 7 4193 0
2 49 25 7 4257 0
-2 50 25 7 4320 48055
+2 50 25 7 4320 48055 GetMagicSkill8
2 51 25 7 4384 0
2 52 25 7 4448 0
2 53 25 7 4512 0
@@ -848,7 +848,7 @@
2 197 79 7 14269 0
2 198 80 7 14341 0
2 199 80 7 14413 0
-2 200 80 7 14484 48060
+2 200 80 7 14484 48060 GetMagicSkill9
2 201 86 7 14556 0
2 202 91 7 14628 0
2 203 97 7 14700 0
@@ -973,7 +973,7 @@
2 322 380 7 33101 0
2 323 381 7 33279 0
2 324 381 7 33458 0
-2 325 381 7 33637 48065
+2 325 381 7 33637 48065 GetMagicSkill10
2 326 384 7 33815 0
2 327 386 7 33994 0
2 328 389 7 34173 0
@@ -1749,7 +1749,7 @@
4 47 39 73|74 243|8000 0
4 48 40 73|74 247|8000 0
4 49 40 73|74 251|8000 0
-4 50 40 73|74 255|8000 48070
+4 50 40 73|74 255|8000 48070 GetMagicSkill11
4 51 40 73|74 260|8000 0
4 52 40 73|74 264|8000 0
4 53 41 73|74 268|8000 0
@@ -1899,7 +1899,7 @@
4 197 134 73|74 955|8000 0
4 198 135 73|74 960|8000 0
4 199 136 73|74 966|8000 0
-4 200 136 73|74 971|8000 48075
+4 200 136 73|74 971|8000 48075 GetMagicSkill12
4 201 145 73|74 976|8000 0
4 202 154 73|74 982|8000 0
4 203 163 73|74 988|8000 0
@@ -2024,7 +2024,7 @@
4 322 636 73|74 3053|8000 0
4 323 637 73|74 3073|8000 0
4 324 638 73|74 3093|8000 0
-4 325 638 73|74 3113|8000 48080
+4 325 638 73|74 3113|8000 48080 GetMagicSkill13
4 326 642 73|74 3133|8000 0
4 327 646 73|74 3153|8000 0
4 328 651 73|74 3174|8000 0
diff --git a/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
new file mode 100644
index 0000000..fbff04f
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagGodWeaponEffect.txt
@@ -0,0 +1,13 @@
+type level notifycode
+1 150 GetMagicEffect4
+1 250 GetMagicEffect5
+1 500 GetMagicEffect6
+2 150 GetMagicEffect7
+2 250 GetMagicEffect8
+2 500 GetMagicEffect9
+3 150 GetMagicEffect1
+3 250 GetMagicEffect2
+3 500 GetMagicEffect3
+4 150 GetMagicEffect10
+4 250 GetMagicEffect11
+4 500 GetMagicEffect12
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCShow.txt b/db/PyMongoDataServer/PySysDB/tagNPCShow.txt
index 720e749..cada177 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCShow.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCShow.txt
@@ -18,22 +18,22 @@
31103004 41110 4 9300 0 2
30902001 41110 0 6500 0 2
31103005 41110 5 8750 0 2
-31203011 41110 19 6200 0 2
-31203009 41110 17 7200 0 2
+31203079 41110 19 6200 0 2
+31203061 41110 17 7200 0 2
31103008 41110 8 7500 0 2
31103006 41110 6 7000 0 2
-31203006 41110 14 7150 0 2
-31203004 41110 12 7200 0 2
-31203005 41110 13 8150 0 2
+31203034 41110 14 7150 0 2
+31203016 41110 12 7200 0 2
+31203025 41110 13 8150 0 2
31103007 41110 7 8000 0 2
31203001 41110 9 7200 0 2
-31203002 41110 10 10250 0 2
-31203003 41110 11 9150 0 2
-31203007 41110 15 7000 0 2
-31203008 41110 16 6500 0 2
-31203010 41110 18 7500 0 2
-31203014 41110 22 8000 0 2
-31203012 41110 20 6150 0 2
-31203013 41110 21 6020 0 2
+31203004 41110 10 10250 0 2
+31203009 41110 11 9150 0 2
+31203043 41110 15 7000 0 2
+31203052 41110 16 6500 0 2
+31203070 41110 18 7500 0 2
+31203106 41110 22 8000 0 2
+31203088 41110 20 6150 0 2
+31203097 41110 21 6020 0 2
31103010 41110 23 9100 0 2
31103011 41110 24 8100 0 2
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index c87a941..66a5f91 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -110,7 +110,7 @@
31401006 0 2 0 600 10000 0 8000 3 9900 50 12 0 0 0 0
31403006 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0
31401007 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0
-31403007 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0
+31403007 0 2 0 5000 10000 0 8000 3 9900 50 1 0 0 50 0
31401008 0 2 0 500 10000 0 8000 3 9900 50 12 0 0 0 0
-31403008 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0
-31401009 0 2 0 1500 10000 0 8000 3 9900 50 12 0 0 0 0
+31403008 0 2 0 2000 10000 0 8000 3 9900 50 1 0 0 50 0
+31401009 0 2 0 3000 10000 0 8000 3 9900 50 12 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 7c74cb5..848f618 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -1,7 +1,7 @@
ID RelatedID CanBackTimes NormalCostJade VipCostJade JadeReward CostCopper CopperReward
1 0 0 5 0 {"exp":"tjgExp"} 0 {"exp":"tjgExp*80/100"}
2 1 0 2 0 {"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"} 0 {"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
-3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":5412,"ItemCount":"1"},{"ItemID":5303,"ItemCount":"5"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":5303,"ItemCount":"5"}]}
+3 2 0 10 0 {"exp":"1440*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5412,"ItemCount":"1"},{"ItemID":5303,"ItemCount":"5"}]} 0 {"exp":"1152*reExp","item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":5303,"ItemCount":"5"}]}
4 3 0 15 0 {"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"16000"}]} 0 {"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
5 5 0 15 30 {"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]} 0 {"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
6 6 1 15 50 {"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]} 0 {"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 96f3226..a008eb0 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -27,7 +27,7 @@
62 0 0 4004 1 0 [] 0 0 0 180 0 0 1 20 0 0
63 2 0 957 1 0 [] 0 0 0 0 0 0 1 50 0 0
64 2 0 2050 1 0 [] 0 0 0 0 0 0 1 50 0 0
-65 2 0 982 1 0 [] 0 0 0 0 0 0 1 250 0 0
+65 2 0 982 1 0 [] 0 0 0 0 0 0 1 80 0 0
66 2 0 983 1 0 [] 0 0 0 0 0 0 1 30 0 0
67 2 0 953 1 0 [] 0 0 0 0 0 0 1 500 0 0
68 2 0 947 1 0 [] 0 0 0 0 0 0 1 1000 0 0
@@ -120,14 +120,22 @@
552 12 0 4389 1 1 [] 0 0 0 0 0 0 25 120 0 0 ShopBuyBroadcast_2
553 12 0 4379 1 1 [] 0 0 0 0 0 0 25 120 0 0 ShopBuyBroadcast_2
554 12 0 4374 1 1 [] 0 0 0 0 0 0 25 120 0 0 ShopBuyBroadcast_2
+555 12 0 4430 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+556 12 0 4435 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+557 12 0 4440 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+558 12 0 4445 1 1 [] 0 0 0 0 0 0 25 1600 0 0 ShopBuyBroadcast_2
+559 12 0 4429 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
+560 12 0 4434 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
561 13 0 4606 1 0 [] 0 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2
562 13 0 4608 1 0 [] 0 0 0 0 0 0 25 5000 0 0 ShopBuyBroadcast_2
563 13 0 912 1 0 [] 0 0 0 0 0 0 25 100 0 0 ShopBuyBroadcast_2
+581 12 0 4439 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
+582 12 0 4444 1 1 [] 0 0 0 0 0 0 25 240 0 0 ShopBuyBroadcast_2
651 14 0 58 1 1 [[194,1,1],[5,1,1],[912,1,1]] 58 0 0 0 1 0 1 188 500 0 Bargaingift1
652 14 0 4208 1 1 [[4151,50,1],[5,1,1],[913,1,1]] 4208 0 0 0 1 0 1 388 1200 0 Bargaingift2
653 14 0 255 1 1 [[196,1,1],[181,80,1],[913,1,1]] 255 0 0 0 1 0 1 1088 2780 0 Bargaingift3
701 15 0 1128 2 1 [[2213,30,1]] 1128 0 0 106 1 0 1 38 575 1 OpenTakePreferential1
-702 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 1 OpenTakePreferential2
+702 15 0 982 20 1 [] 982 0 0 106 1 0 1 588 2500 1 OpenTakePreferential2
703 15 0 2343 1 1 [] 2343 0 0 106 1 0 1 38 500 2 OpenTakePreferential1
704 15 0 2411 1 1 [] 2411 0 0 106 1 0 1 688 3000 2 OpenTakePreferential2
705 15 0 1128 2 1 [[2213,30,1]] 1128 0 0 106 1 0 1 38 575 3 OpenTakePreferential1
@@ -141,7 +149,7 @@
713 15 0 195 1 1 [[5303,150,1]] 195 0 0 106 1 0 1 38 450 7 OpenTakePreferential1
714 15 0 4186 1 1 [[5006,5,1]] 4186 0 0 106 1 0 1 688 3200 7 OpenTakePreferential2
715 15 0 4608 1 1 [[2213,15,1]] 4608 0 0 106 1 0 1 38 680 8 OpenTakePreferential1
-716 15 0 982 10 1 [] 982 0 0 106 1 0 1 888 2500 8 OpenTakePreferential2
+716 15 0 982 20 1 [] 982 0 0 106 1 0 1 588 2500 8 OpenTakePreferential2
717 15 0 153 80 1 [[147,6,1]] 153 0 0 106 1 0 1 38 630 9 OpenTakePreferential1
718 15 0 2213 150 1 [[4606,1,1]] 4606 0 0 106 1 0 1 688 2875 9 OpenTakePreferential2
719 15 0 2389 3 1 [] 2389 0 0 106 1 0 1 38 540 10 OpenTakePreferential1
@@ -243,11 +251,12 @@
1053 207 2 2213 100 1 [] 2213 0 0 0 1 999 1 200 1250 0 FlashRushToBuy2 FlashToSnapUp
1054 207 2 4608 2 1 [] 4608 0 0 0 1 999 1 200 1000 0 FlashRushToBuy2 FlashToSnapUp
1055 207 2 198 3 1 [] 198 0 0 0 1 999 1 88 900 0 FlashRushToBuy2 FlashToSnapUp
-1056 16 0 4681 1 1 [[4010,24,1]] 4681 0 0 100 1 0 1 588 2170 86400 LimitGift6
-1057 16 0 1128 1 1 [[4657,1,1]] 1128 0 0 105 1 0 1 58 350 86400 LimitGift6
-1058 16 0 983 10 1 [] 983 0 0 110 1 0 1 58 300 86400 LimitGift6
-1059 16 0 4306 2000 1 [] 4306 0 0 115 1 0 1 588 2000 86400 LimitGift7
-1060 16 0 4151 40 1 [[912,2,1]] 912 0 0 120 1 0 1 188 700 86400 LimitGift6
-1061 16 0 2213 10 1 [[4610,1,1]] 4610 0 0 125 1 0 1 58 325 86400 LimitGift6
-1062 16 0 982 10 1 [] 983 0 0 130 1 0 1 888 2500 86400 LimitGift7
-1063 16 0 4007 6 1 [[144,100,1]] 4007 0 0 135 1 0 1 188 780 86400 LimitGift6
+1056 16 0 3513 1 1 [[3503,1,1]] 4681 0 0 58 1 0 1 18 180 86400
+1057 16 0 4151 20 1 [] 4151 0 0 65 1 0 1 18 200 86400
+1058 16 0 181 20 1 [] 181 0 0 80 1 0 1 18 200 86400
+1059 16 0 101 20 1 [] 101 0 0 110 1 0 1 28 200 86400
+1060 16 0 4334 1 1 [] 4334 0 0 115 1 0 1 18 100 86400
+1061 16 0 142 100 1 [[29,5000000,1]] 142 0 0 155 1 0 1 18 175 86400
+1062 16 0 5303 200 1 [[5412,5,1]] 5303 0 0 180 1 0 1 28 225 86400
+1063 16 0 2205 1 1 [] 2205 0 0 200 1 0 1 18 200 86400
+1064 16 0 2389 1 1 [] 2389 0 0 240 1 0 1 28 180 86400
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 56d2679..4cf12bc 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -1,13 +1,16 @@
TemplateID NeedRechargeGold AwardIndex AwardItem NotifyKey
1 60 0 {"1":[[986,1,1],[181,10,1],[3,2,1]],"2":[[986,1,1],[181,10,1],[3,2,1]],"3":[[986,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
1 300 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]} AccumulatedTopUp2
-1 3000 2 {"1":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,5,1],[1502,5,1],[1503,2,1],[1500,2,1]]} AccumulatedTopUp2
+1 3000 2 {"1":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]],"3":[[982,10,1],[1502,5,1],[1503,2,1],[1500,2,1]]} AccumulatedTopUp2
2 60 0 {"1":[[983,1,1],[181,10,1],[3,2,1]],"2":[[983,1,1],[181,10,1],[3,2,1]],"3":[[983,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
2 300 1 {"1":[[881,1,1],[4151,10,1],[5303,50,1]],"2":[[881,1,1],[4151,10,1],[5303,50,1]],"3":[[881,1,1],[4151,10,1],[5303,50,1]]} AccumulatedTopUp2
-2 3000 2 {"1":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[1502,5,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
+2 3000 2 {"1":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]],"3":[[982,10,1],[1502,5,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
3 60 0 {"1":[[1128,1,1],[181,10,1],[3,2,1]],"2":[[1128,1,1],[181,10,1],[3,2,1]],"3":[[1128,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
3 300 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
-3 3000 2 {"1":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
+3 3000 2 {"1":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[1503,2,1],[4007,2,1]]} AccumulatedTopUp2
4 60 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
4 300 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
-4 3000 2 {"1":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,5,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
+4 3000 2 {"1":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[982,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
+5 60 0 {"1":[[5410,1,1],[181,10,1],[3,2,1]],"2":[[5410,1,1],[181,10,1],[3,2,1]],"3":[[5410,1,1],[181,10,1],[3,2,1]]} AccumulatedTopUp2
+5 300 1 {"1":[[881,1,1],[4151,10,1],[5410,1,1]],"2":[[881,1,1],[4151,10,1],[5410,1,1]],"3":[[881,1,1],[4151,10,1],[5410,1,1]]} AccumulatedTopUp2
+5 1000 2 {"1":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"2":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]],"3":[[983,10,1],[5411,3,1],[2389,1,1],[4007,2,1]]} AccumulatedTopUp2
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index aafd394..c3d540c 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,8 +1,10 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-1 0 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-1 180 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[5303,300],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-1 260 {"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[5303,300],"6":[2346,1],"7":[3807,2],"8":[2390,1],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]} [] [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]} 1
-2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(5000,8),(7500,5),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4365,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(5000,8),(7500,5),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 250 {"1":[4425,1],"2":[4359,1],"3":[4335,1],"4":[4369,1],"5":[4360,1],"6":[4303,16],"7":[4349,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,12],"12":[4350,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(5000,8),(7500,5),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
-2 300 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(8000,14),(9500,9),(10000,8)] {1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(5000,8),(7500,7),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+1 0 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1157,2),(2305,3),(3452,4),(3552,5),(4700,6),(5847,7),(5947,8),(7095,9),(7495,10),(8642,11),(8652,12),(9800,13),(10000,14)] [(4000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 180 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[101,10],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1321,2),(2632,3),(3944,4),(4044,5),(5355,6),(5555,7),(5655,8),(6967,9),(7167,10),(8478,11),(8488,12),(9800,13),(10000,14)] [(5000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 230 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(3000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 260 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[104,10],"10":[4609,1],"11":[102,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+1 300 {"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,3],"10":[4609,1],"11":[107,5],"12":[9062,1],"13":[2342,1],"14":[912,1]} [] [(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} [(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)] [(6000,5),(8000,8),(10000,12)] {1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]} 1
+2 0 {"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 200 {"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4360,1],"13":[2331,1],"14":[4305,4]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)] [(2500,5),(7500,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 250 {"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
+2 300 {"1":[4425,1],"2":[4429,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4430,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4440,1],"13":[2331,1],"14":[4305,8]} [] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] [(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)] {} [(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index f8e1ffc..72bd535 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -199,7 +199,7 @@
979 1 0 钻石充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 3000 0 50 0 1 0 0 228 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
980 1 0 白金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 1000 0 50 0 1 0 0 228 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
981 1 0 黄金充值卡 80 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 500 0 50 0 1 0 0 228 50 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
-982 1 0 极品寻宝令 16 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 248 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+982 1 0 极品寻宝令 16 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 80 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
983 1 0 符印寻宝令 16 0 0 0 0 999 1 0 1 0 1 0 0 0 0 0 1 30 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
984 1 0 中型等级经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 3 0 50 0 1 0 0 215 1000 400 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
985 1 0 VIP体验卡 80 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 50 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -543,7 +543,7 @@
2409 1 0 C级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 110 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
2410 1 0 D级妖丹宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 100 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
2411 1 0 坐骑丹奢华礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 3000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-2412 1 0 3级随机宝石 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 2430 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
+2412 1 0 3级随机宝石 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 90 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
3501 1 0 1级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 10 0 0 0 1 225 1 1 3502 6 190 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
3502 1 0 2级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 30 0 10 0 0 0 1 225 1 2 3503 6 465 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
3503 1 0 3级生命翡翠 25 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 90 0 20 0 0 0 1 225 1 3 3504 6 1160 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
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index c202c5e..bdbb9b9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -679,23 +679,23 @@
31203105 2 0 莽荒狼妖 376 0 113064 113064 22602 0 0 0 0 54755 0 0 0 0 0 0 32330138 101 800 168408 130 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 67680895 1 0 0 0 3 0 0 186 1 1
31203106 2 0 招魂幡 380 0 120343 120343 23388 0 0 0 0 57690 0 0 0 0 0 0 33889452 101 800 171260 132 0 300 2 6 11026 11027 10313 0 0 0 0 0 0 40 2 78848073 1 0 0 0 3 0 0 186 1 1
31401001 2 0 冰霜石精 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 1 1 1
-31403001 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 198 1 1
+31403001 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 0 0 0 0 0 1 0 0 198 1 1
31401002 2 0 试炼木人 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
-31401003 2 0 冰霜毒蝎 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
+31401003 2 0 冰霜毒蝎 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401004 2 0 顽固之石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401005 2 0 虾兵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
31401006 2 0 深渊刺客 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
-31401007 2 0 海马勇士 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
+31401007 2 0 海马勇士 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
31401008 2 0 花精灵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 30 23045 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1
-31401009 2 0 毒牙 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1
-31403002 2 0 冰晶巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 198 1 1
-31403003 2 0 巨石之力 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23041 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1
-31403004 2 0 深海龙王 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23042 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1
-31403005 2 0 死亡领主 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23043 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1
-31403006 2 0 恶鲨首领 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23044 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1
-31403007 2 0 食人花妖 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1
-31403008 2 0 摄魂蛛后 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23046 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 186 1 1
-31403009 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 198 1 1
+31401009 2 0 毒牙 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1
+31403002 2 0 冰晶巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 198 1 1
+31403003 2 0 巨石之力 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23041 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 186 1 1
+31403004 2 0 深海龙王 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23042 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 186 1 1
+31403005 2 0 死亡领主 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23043 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 186 1 1
+31403006 2 0 恶鲨首领 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23044 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 3 0 0 186 1 1
+31403007 2 0 食人花妖 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 3 0 0 186 1 1
+31403008 2 0 摄魂蛛后 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23046 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 3 0 0 186 1 1
+31403009 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 3 0 0 198 1 1
31503001 2 0 蜘蛛女皇 190 0 3937 3937 0 5 0 0 10000 5171 0 1 0 0 0 0 0 3 3000 501072 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 1 7674958 0 100 0 0 5 0 0 186 1 1
31503002 2 0 古墓石巨人 205 0 5089 5089 0 6 0 0 10000 6471 0 1 0 0 0 0 0 3 3000 558012 28 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 1 14788140 0 100 0 0 5 0 0 186 1 1
31503003 2 0 残暴海怪 220 0 7237 7237 0 7 0 0 10000 9434 0 1 0 0 0 0 0 3 3000 632755 34 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 1 21720856 0 100 0 0 5 0 0 186 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 3ec3888..79c54f4 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -624,7 +624,7 @@
23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23043 新冰晶矿脉5层减攻 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
23044 新冰晶矿脉6层加攻 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 3 0 10 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0
-23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 500 500 5 2103 31403007 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 1000 200 0 5 2103 31403007 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
23046 新冰晶矿脉8层沉默 23046 1 1 0 0 2000 1 0 0 2 5 41 6 0 60000 0 0 0 0 0 1010 10000 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 23050 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
23050 沉默 23050 1 1 0 5 0 14 0 0 1 0 41 0 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0
23100 复仇之刃（1层） 23100 1 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 1000 3 0 10 1000 3 0 7 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0
--
Gitblit v1.8.0