From e91d790ca11dda2c8361af8e406d49a0dae8d63a Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期二, 08 一月 2019 21:16:14 +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
db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 13
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 43 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt | 2
CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt | 6
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1
db/PyMongoDataServer/SysDB/tagBornRefresh.txt | 2
db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt | 4
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
db/PyMongoDataServer/SysDB/tagChinMap.txt | 3
CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt | 472 ++++++++++++++++++---------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt | 4
db/PyMongoDataServer/PySysDB/tagActWeekParty.txt | 2
db/PyMongoDataServer/PySysDB/tagWeekParty.txt | 14
db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 14
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc | 0
db/PyMongoDataServer/PySysDB/tagCoat.txt | 10
CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 3
db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt | 16
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1
CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc | 0
db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt | 72 ++--
CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 18
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 10
ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 15
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 6
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 30
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt | 3
db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt | 15
db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt | 10
db/PyMongoDataServer/SysDB/tagChinItem.txt | 31 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt | 6
CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc | 0
db/PyMongoDataServer/SysDB/tagNPCRefresh.txt | 13
CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerEventCounter.pyc | 0
db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt | 11
db/PyMongoDataServer/SysDB/tagEffectRefresh.txt | 11
CoreServerGroup/GameServer/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
/dev/null | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 8
CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 79 ++-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0
db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt | 14
CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0
65 files changed, 661 insertions(+), 309 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt b/CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt
new file mode 100644
index 0000000..9a03887
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt
@@ -0,0 +1,2 @@
+CfgID ActMark PlatformList ServerIDList StartDate EndDate IsDayReset ResetType NotifyInfoStart NotifyInfoEnd LimitLV
+1 OpenSever1 [] [] 8 15 1 1 {} {} 110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index 45590d7..29ba17c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -21,13 +21,13 @@
20203007 21100 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [385,415] 40 5 2018 100 世界BOSS
11003001 10100 int(7200*(1-0.027*min(max(yesterdayCnt-5,0),25))) [430,500] 40 5 2047 100 世界BOSS
11103001 10110 int(6600*(1-0.023*min(max(yesterdayCnt-15,0),35))) [430,500] 40 5 2049 100 世界BOSS
-20303001 21110 3000 [1,500] 40 5 2040 100 世界BOSS
-20303002 21110 3600 [1,500] 40 5 2041 100 世界BOSS
-20303003 21110 4200 [1,500] 40 5 2042 100 世界BOSS
-20303004 21110 4800 [1,500] 40 5 2043 100 世界BOSS
-20303005 21110 5400 [1,500] 40 5 2044 100 世界BOSS
-20303006 21110 6000 [1,500] 40 5 2045 100 世界BOSS
-20303007 21110 6600 [1,500] 40 5 2046 100 世界BOSS
+20303001 21110 3000 [1,500] 40 5 2040 100 异兽之地
+20303002 21110 3600 [1,500] 40 5 2041 100 异兽之地
+20303003 21110 4200 [1,500] 40 5 2042 100 异兽之地
+20303004 21110 4800 [1,500] 40 5 2043 100 异兽之地
+20303005 21110 5400 [1,500] 40 5 2044 100 异兽之地
+20303006 21110 6000 [1,500] 40 5 2045 100 异兽之地
+20303007 21110 6600 [1,500] 40 5 2046 100 异兽之地
30303001 31020 900 [1,500] 40 5 2019 100 BOSS之家一层
30303002 31020 1800 [1,500] 40 5 2020 100 BOSS之家一层
30303003 31020 2700 [1,500] 40 5 2021 100 BOSS之家一层
@@ -77,11 +77,11 @@
50103005 21070 0 [] 0 0 0 0 骑宠争夺
50103006 21100 0 [] 0 0 0 0 骑宠争夺
50103007 10080 0 [] 0 0 0 0 骑宠争夺
-40103001 32020 3600 [] 0 0 2040 100 跨服Boss
-40103002 32020 3900 [] 0 0 2041 100 跨服Boss
-40103003 32020 4200 [] 0 0 2042 100 跨服Boss
-40103004 32020 4500 [] 0 0 2043 100 跨服Boss
-40103005 32020 4800 [] 0 0 2044 100 跨服Boss
-40103006 32020 5100 [] 0 0 2045 100 跨服Boss
-40103007 32020 5400 [] 0 0 2046 100 跨服Boss
-40103008 32020 6000 [] 0 0 2047 100 跨服Boss
+40103001 32020 1920 [] 0 0 2040 100 跨服Boss
+40103002 32020 2880 [] 0 0 2041 100 跨服Boss
+40103003 32020 3600 [] 0 0 2042 100 跨服Boss
+40103004 32020 4800 [] 0 0 2043 100 跨服Boss
+40103005 32020 5760 [] 0 0 2044 100 跨服Boss
+40103006 32020 5760 [] 0 0 2045 100 跨服Boss
+40103007 32020 7200 [] 0 0 2046 100 跨服Boss
+40103008 32020 9600 [] 0 0 2047 100 跨服Boss
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index f263085..ed125cb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -27,7 +27,7 @@
31210 仙盟BOSS 3 0
31220 仙盟联赛 4 2
31230 仙盟宴会 3 0
-31240 个人Boss 1 0
+31240 VIPBoss 1 0
31170 守卫人皇 3 0
51010 娲皇遗迹 1 0
41110 法宝副本 1 0
@@ -44,3 +44,4 @@
32014 跨服竞技场 10 0
31340 幽暗迷森 1 0
32020 蓬莱仙境 0 0
+32021 蓬莱仙境 0 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 364efb3..e7d62cb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -93,6 +93,23 @@
2058 墓碑 400
2059 墓碑 400
2060 墓碑 400
+2061 墓碑 1
+2062 墓碑 1
+2063 墓碑 1
+2064 墓碑 1
+2065 墓碑 1
+2066 墓碑 1
+2067 墓碑 1
+2068 墓碑 1
+2069 墓碑 1
+2070 墓碑 1
+2071 墓碑 1
+2072 墓碑 1
+2073 墓碑 1
+2074 墓碑 1
+2075 墓碑 1
+2076 墓碑 1
+2077 墓碑 1
10000 静心灯 1
10104001 若雨 400
10104002 道尘 400
@@ -1132,21 +1149,21 @@
30603006 玄界冰魔 320
40108001 小宝箱 1
40108002 大宝箱 1
-40102001 金甲蛮牛 335
-40102002 食灵鱼 360
-40102003 秘境守卫 385
-40102004 灵鲛斗士 410
-40102005 紫炎灵狮 435
+40102001 幽谷法师 335
+40102002 磐石之灵 360
+40102003 秘境魔鹰 385
+40102004 枯萎树妖 410
+40102005 亚种雷兽 435
40102006 金甲剑士 455
40102007 黄金战将 475
-40103001 残暴古熊王 340
-40103002 魅影蛛皇 365
-40103003 紫金貔貅 390
-40103004 双翼角兽 415
-40103005 金甲蛮狮 440
-40103006 麒麟瑞兽 460
-40103007 金色战神 480
-40103008 金色战神 500
+40103001 仙境守护者 340
+40103002 丛林祭祀 365
+40103003 秘境之吻 390
+40103004 仙湖守卫 415
+40103005 湖中之灵 440
+40103006 岩石守卫 460
+40103007 裂空魅影 480
+40103008 秘境勇士 500
50103001 道士鼠 1
50103002 觉灵鹿 1
50103003 球球 1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
new file mode 100644
index 0000000..6c33363
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt
@@ -0,0 +1,6 @@
+ZoneID ServerGroupIDList
+1 [(1,50)]
+2 [(51,100)]
+3 [(101,150)]
+4 [(151,200)]
+5 [(201,250)]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
index 406f137..14a597b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBStateTimeCustom.txt
@@ -32,162 +32,316 @@
31 1 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
32 1 10 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
33 1 14 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-34 2 4 31170 21 0 21 15 1 1 {}
-35 2 4 31170 21 15 21 30 0 1 {}
-36 2 7 31170 21 0 21 15 1 1 {}
-37 2 7 31170 21 15 21 30 0 1 {}
-38 2 10 31170 21 0 21 15 1 1 {}
-39 2 10 31170 21 15 21 30 0 1 {}
-40 2 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-41 2 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-42 2 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-43 2 12 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-44 2 3 31160 20 30 20 50 1 1 {}
-45 2 5 31160 20 30 20 50 1 1 {}
-46 2 8 31160 20 30 20 50 1 1 {}
-47 2 10 31160 20 30 20 50 1 1 {}
-48 2 12 31160 20 30 20 50 1 1 {}
-49 2 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-50 2 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-51 2 3 31220 21 19 21 20 0 13 {}
-52 2 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-53 2 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-54 2 3 31220 21 49 23 59 0 23 {}
-55 2 11 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-56 2 11 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-57 2 11 31220 21 19 21 20 0 13 {}
-58 2 11 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-59 2 11 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-60 2 11 31220 21 49 23 59 0 23 {}
-61 2 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-62 2 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-63 2 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-64 2 13 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-65 3 4 31170 21 0 21 15 1 1 {}
-66 3 4 31170 21 15 21 30 0 1 {}
-67 3 6 31170 21 0 21 15 1 1 {}
-68 3 6 31170 21 15 21 30 0 1 {}
-69 3 9 31170 21 0 21 15 1 1 {}
-70 3 9 31170 21 15 21 30 0 1 {}
-71 3 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-72 3 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-73 3 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-74 3 11 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-75 3 3 31160 20 30 20 50 1 1 {}
-76 3 5 31160 20 30 20 50 1 1 {}
-77 3 7 31160 20 30 20 50 1 1 {}
-78 3 9 31160 20 30 20 50 1 1 {}
-79 3 11 31160 20 30 20 50 1 1 {}
-80 3 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-81 3 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-82 3 3 31220 21 19 21 20 0 13 {}
-83 3 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-84 3 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-85 3 3 31220 21 49 23 59 0 23 {}
-86 3 10 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-87 3 10 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-88 3 10 31220 21 19 21 20 0 13 {}
-89 3 10 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-90 3 10 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-91 3 10 31220 21 49 23 59 0 23 {}
-92 3 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-93 3 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-94 3 12 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-95 4 4 31170 21 0 21 15 1 1 {}
-96 4 4 31170 21 15 21 30 0 1 {}
-97 4 8 31170 21 0 21 15 1 1 {}
-98 4 8 31170 21 15 21 30 0 1 {}
-99 4 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-100 4 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-101 4 6 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-102 4 10 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-103 4 3 31160 20 30 20 50 1 1 {}
-104 4 6 31160 20 30 20 50 1 1 {}
-105 4 8 31160 20 30 20 50 1 1 {}
-106 4 10 31160 20 30 20 50 1 1 {}
-107 4 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-108 4 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-109 4 3 31220 21 19 21 20 0 13 {}
-110 4 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-111 4 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-112 4 3 31220 21 49 23 59 0 23 {}
-113 4 9 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-114 4 9 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-115 4 9 31220 21 19 21 20 0 13 {}
-116 4 9 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-117 4 9 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-118 4 9 31220 21 49 23 59 0 23 {}
-119 4 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-120 4 7 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-121 4 11 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-122 5 4 31170 21 0 21 15 1 1 {}
-123 5 4 31170 21 15 21 30 0 1 {}
-124 5 7 31170 21 0 21 15 1 1 {}
-125 5 7 31170 21 15 21 30 0 1 {}
-126 5 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-127 5 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-128 5 9 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-129 5 3 31160 20 30 20 50 1 1 {}
-130 5 5 31160 20 30 20 50 1 1 {}
-131 5 7 31160 20 30 20 50 1 1 {}
-132 5 9 31160 20 30 20 50 1 1 {}
-133 5 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-134 5 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-135 5 3 31220 21 19 21 20 0 13 {}
-136 5 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-137 5 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-138 5 3 31220 21 49 23 59 0 23 {}
-139 5 8 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-140 5 8 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-141 5 8 31220 21 19 21 20 0 13 {}
-142 5 8 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-143 5 8 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-144 5 8 31220 21 49 23 59 0 23 {}
-145 5 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-146 5 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-147 5 10 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-148 6 4 31170 21 0 21 15 1 1 {}
-149 6 4 31170 21 15 21 30 0 1 {}
-150 6 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-151 6 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-152 6 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-153 6 3 31160 20 30 20 50 1 1 {}
-154 6 5 31160 20 30 20 50 1 1 {}
-155 6 8 31160 20 30 20 50 1 1 {}
-156 6 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-157 6 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-158 6 3 31220 21 19 21 20 0 13 {}
-159 6 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-160 6 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-161 6 3 31220 21 49 23 59 0 23 {}
-162 6 7 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-163 6 7 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-164 6 7 31220 21 19 21 20 0 13 {}
-165 6 7 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-166 6 7 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-167 6 7 31220 21 49 23 59 0 23 {}
-168 6 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-169 6 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-170 6 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-171 7 4 31170 21 0 21 15 1 1 {}
-172 7 4 31170 21 15 21 30 0 1 {}
-173 7 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-174 7 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-175 7 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
-176 7 3 31160 20 30 20 50 1 1 {}
-177 7 5 31160 20 30 20 50 1 1 {}
-178 7 7 31160 20 30 20 50 1 1 {}
-179 7 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-180 7 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-181 7 3 31220 21 19 21 20 0 13 {}
-182 7 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-183 7 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-184 7 3 31220 21 49 23 59 0 23 {}
-185 7 6 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
-186 7 6 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-187 7 6 31220 21 19 21 20 0 13 {}
-188 7 6 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
-189 7 6 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
-190 7 6 31220 21 49 23 59 0 23 {}
-191 7 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
-192 7 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+34 1 1 31230 20 0 20 3 1 1 {}
+35 1 1 31230 20 3 20 20 1 2 {}
+36 1 2 31230 20 0 20 3 1 1 {}
+37 1 2 31230 20 3 20 20 1 2 {}
+38 1 3 31230 20 0 20 3 1 1 {}
+39 1 3 31230 20 3 20 20 1 2 {}
+40 1 4 31230 20 0 20 3 1 1 {}
+41 1 4 31230 20 3 20 20 1 2 {}
+42 1 5 31230 20 0 20 3 1 1 {}
+43 1 5 31230 20 3 20 20 1 2 {}
+44 1 6 31230 20 0 20 3 1 1 {}
+45 1 6 31230 20 3 20 20 1 2 {}
+46 1 7 31230 20 0 20 3 1 1 {}
+47 1 7 31230 20 3 20 20 1 2 {}
+48 1 8 31230 20 0 20 3 1 1 {}
+49 1 8 31230 20 3 20 20 1 2 {}
+50 1 9 31230 20 0 20 3 1 1 {}
+51 1 9 31230 20 3 20 20 1 2 {}
+52 1 10 31230 20 0 20 3 1 1 {}
+53 1 10 31230 20 3 20 20 1 2 {}
+54 1 11 31230 20 0 20 3 1 1 {}
+55 1 11 31230 20 3 20 20 1 2 {}
+56 1 12 31230 20 0 20 3 1 1 {}
+57 1 12 31230 20 3 20 20 1 2 {}
+58 1 13 31230 20 0 20 3 1 1 {}
+59 1 13 31230 20 3 20 20 1 2 {}
+60 1 14 31230 20 0 20 3 1 1 {}
+61 1 14 31230 20 3 20 20 1 2 {}
+62 2 4 31170 21 0 21 15 1 1 {}
+63 2 4 31170 21 15 21 30 0 1 {}
+64 2 7 31170 21 0 21 15 1 1 {}
+65 2 7 31170 21 15 21 30 0 1 {}
+66 2 10 31170 21 0 21 15 1 1 {}
+67 2 10 31170 21 15 21 30 0 1 {}
+68 2 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+69 2 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+70 2 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+71 2 12 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+72 2 3 31160 20 30 20 50 1 1 {}
+73 2 5 31160 20 30 20 50 1 1 {}
+74 2 8 31160 20 30 20 50 1 1 {}
+75 2 10 31160 20 30 20 50 1 1 {}
+76 2 12 31160 20 30 20 50 1 1 {}
+77 2 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+78 2 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+79 2 3 31220 21 19 21 20 0 13 {}
+80 2 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+81 2 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+82 2 3 31220 21 49 23 59 0 23 {}
+83 2 11 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+84 2 11 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+85 2 11 31220 21 19 21 20 0 13 {}
+86 2 11 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+87 2 11 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+88 2 11 31220 21 49 23 59 0 23 {}
+89 2 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+90 2 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+91 2 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+92 2 13 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+93 2 1 31230 20 0 20 3 1 1 {}
+94 2 1 31230 20 3 20 20 1 2 {}
+95 2 2 31230 20 0 20 3 1 1 {}
+96 2 2 31230 20 3 20 20 1 2 {}
+97 2 3 31230 20 0 20 3 1 1 {}
+98 2 3 31230 20 3 20 20 1 2 {}
+99 2 4 31230 20 0 20 3 1 1 {}
+100 2 4 31230 20 3 20 20 1 2 {}
+101 2 5 31230 20 0 20 3 1 1 {}
+102 2 5 31230 20 3 20 20 1 2 {}
+103 2 6 31230 20 0 20 3 1 1 {}
+104 2 6 31230 20 3 20 20 1 2 {}
+105 2 7 31230 20 0 20 3 1 1 {}
+106 2 7 31230 20 3 20 20 1 2 {}
+107 2 8 31230 20 0 20 3 1 1 {}
+108 2 8 31230 20 3 20 20 1 2 {}
+109 2 9 31230 20 0 20 3 1 1 {}
+110 2 9 31230 20 3 20 20 1 2 {}
+111 2 10 31230 20 0 20 3 1 1 {}
+112 2 10 31230 20 3 20 20 1 2 {}
+113 2 11 31230 20 0 20 3 1 1 {}
+114 2 11 31230 20 3 20 20 1 2 {}
+115 2 12 31230 20 0 20 3 1 1 {}
+116 2 12 31230 20 3 20 20 1 2 {}
+117 2 13 31230 20 0 20 3 1 1 {}
+118 2 13 31230 20 3 20 20 1 2 {}
+119 3 4 31170 21 0 21 15 1 1 {}
+120 3 4 31170 21 15 21 30 0 1 {}
+121 3 6 31170 21 0 21 15 1 1 {}
+122 3 6 31170 21 15 21 30 0 1 {}
+123 3 9 31170 21 0 21 15 1 1 {}
+124 3 9 31170 21 15 21 30 0 1 {}
+125 3 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+126 3 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+127 3 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+128 3 11 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+129 3 3 31160 20 30 20 50 1 1 {}
+130 3 5 31160 20 30 20 50 1 1 {}
+131 3 7 31160 20 30 20 50 1 1 {}
+132 3 9 31160 20 30 20 50 1 1 {}
+133 3 11 31160 20 30 20 50 1 1 {}
+134 3 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+135 3 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+136 3 3 31220 21 19 21 20 0 13 {}
+137 3 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+138 3 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+139 3 3 31220 21 49 23 59 0 23 {}
+140 3 10 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+141 3 10 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+142 3 10 31220 21 19 21 20 0 13 {}
+143 3 10 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+144 3 10 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+145 3 10 31220 21 49 23 59 0 23 {}
+146 3 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+147 3 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+148 3 12 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+149 3 1 31230 20 0 20 3 1 1 {}
+150 3 1 31230 20 3 20 20 1 2 {}
+151 3 2 31230 20 0 20 3 1 1 {}
+152 3 2 31230 20 3 20 20 1 2 {}
+153 3 3 31230 20 0 20 3 1 1 {}
+154 3 3 31230 20 3 20 20 1 2 {}
+155 3 4 31230 20 0 20 3 1 1 {}
+156 3 4 31230 20 3 20 20 1 2 {}
+157 3 5 31230 20 0 20 3 1 1 {}
+158 3 5 31230 20 3 20 20 1 2 {}
+159 3 6 31230 20 0 20 3 1 1 {}
+160 3 6 31230 20 3 20 20 1 2 {}
+161 3 7 31230 20 0 20 3 1 1 {}
+162 3 7 31230 20 3 20 20 1 2 {}
+163 3 8 31230 20 0 20 3 1 1 {}
+164 3 8 31230 20 3 20 20 1 2 {}
+165 3 9 31230 20 0 20 3 1 1 {}
+166 3 9 31230 20 3 20 20 1 2 {}
+167 3 10 31230 20 0 20 3 1 1 {}
+168 3 10 31230 20 3 20 20 1 2 {}
+169 3 11 31230 20 0 20 3 1 1 {}
+170 3 11 31230 20 3 20 20 1 2 {}
+171 3 12 31230 20 0 20 3 1 1 {}
+172 3 12 31230 20 3 20 20 1 2 {}
+173 4 4 31170 21 0 21 15 1 1 {}
+174 4 4 31170 21 15 21 30 0 1 {}
+175 4 8 31170 21 0 21 15 1 1 {}
+176 4 8 31170 21 15 21 30 0 1 {}
+177 4 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+178 4 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+179 4 6 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+180 4 10 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+181 4 3 31160 20 30 20 50 1 1 {}
+182 4 6 31160 20 30 20 50 1 1 {}
+183 4 8 31160 20 30 20 50 1 1 {}
+184 4 10 31160 20 30 20 50 1 1 {}
+185 4 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+186 4 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+187 4 3 31220 21 19 21 20 0 13 {}
+188 4 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+189 4 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+190 4 3 31220 21 49 23 59 0 23 {}
+191 4 9 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+192 4 9 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+193 4 9 31220 21 19 21 20 0 13 {}
+194 4 9 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+195 4 9 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+196 4 9 31220 21 49 23 59 0 23 {}
+197 4 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+198 4 7 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+199 4 11 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+200 4 1 31230 20 0 20 3 1 1 {}
+201 4 1 31230 20 3 20 20 1 2 {}
+202 4 2 31230 20 0 20 3 1 1 {}
+203 4 2 31230 20 3 20 20 1 2 {}
+204 4 3 31230 20 0 20 3 1 1 {}
+205 4 3 31230 20 3 20 20 1 2 {}
+206 4 4 31230 20 0 20 3 1 1 {}
+207 4 4 31230 20 3 20 20 1 2 {}
+208 4 5 31230 20 0 20 3 1 1 {}
+209 4 5 31230 20 3 20 20 1 2 {}
+210 4 6 31230 20 0 20 3 1 1 {}
+211 4 6 31230 20 3 20 20 1 2 {}
+212 4 7 31230 20 0 20 3 1 1 {}
+213 4 7 31230 20 3 20 20 1 2 {}
+214 4 8 31230 20 0 20 3 1 1 {}
+215 4 8 31230 20 3 20 20 1 2 {}
+216 4 9 31230 20 0 20 3 1 1 {}
+217 4 9 31230 20 3 20 20 1 2 {}
+218 4 10 31230 20 0 20 3 1 1 {}
+219 4 10 31230 20 3 20 20 1 2 {}
+220 4 11 31230 20 0 20 3 1 1 {}
+221 4 11 31230 20 3 20 20 1 2 {}
+222 5 4 31170 21 0 21 15 1 1 {}
+223 5 4 31170 21 15 21 30 0 1 {}
+224 5 7 31170 21 0 21 15 1 1 {}
+225 5 7 31170 21 15 21 30 0 1 {}
+226 5 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+227 5 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+228 5 9 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+229 5 3 31160 20 30 20 50 1 1 {}
+230 5 5 31160 20 30 20 50 1 1 {}
+231 5 7 31160 20 30 20 50 1 1 {}
+232 5 9 31160 20 30 20 50 1 1 {}
+233 5 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+234 5 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+235 5 3 31220 21 19 21 20 0 13 {}
+236 5 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+237 5 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+238 5 3 31220 21 49 23 59 0 23 {}
+239 5 8 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+240 5 8 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+241 5 8 31220 21 19 21 20 0 13 {}
+242 5 8 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+243 5 8 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+244 5 8 31220 21 49 23 59 0 23 {}
+245 5 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+246 5 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+247 5 10 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+248 5 1 31230 20 0 20 3 1 1 {}
+249 5 1 31230 20 3 20 20 1 2 {}
+250 5 2 31230 20 0 20 3 1 1 {}
+251 5 2 31230 20 3 20 20 1 2 {}
+252 5 3 31230 20 0 20 3 1 1 {}
+253 5 3 31230 20 3 20 20 1 2 {}
+254 5 4 31230 20 0 20 3 1 1 {}
+255 5 4 31230 20 3 20 20 1 2 {}
+256 5 5 31230 20 0 20 3 1 1 {}
+257 5 5 31230 20 3 20 20 1 2 {}
+258 5 6 31230 20 0 20 3 1 1 {}
+259 5 6 31230 20 3 20 20 1 2 {}
+260 5 7 31230 20 0 20 3 1 1 {}
+261 5 7 31230 20 3 20 20 1 2 {}
+262 5 8 31230 20 0 20 3 1 1 {}
+263 5 8 31230 20 3 20 20 1 2 {}
+264 5 9 31230 20 0 20 3 1 1 {}
+265 5 9 31230 20 3 20 20 1 2 {}
+266 5 10 31230 20 0 20 3 1 1 {}
+267 5 10 31230 20 3 20 20 1 2 {}
+268 6 4 31170 21 0 21 15 1 1 {}
+269 6 4 31170 21 15 21 30 0 1 {}
+270 6 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+271 6 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+272 6 8 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+273 6 3 31160 20 30 20 50 1 1 {}
+274 6 5 31160 20 30 20 50 1 1 {}
+275 6 8 31160 20 30 20 50 1 1 {}
+276 6 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+277 6 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+278 6 3 31220 21 19 21 20 0 13 {}
+279 6 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+280 6 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+281 6 3 31220 21 49 23 59 0 23 {}
+282 6 7 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+283 6 7 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+284 6 7 31220 21 19 21 20 0 13 {}
+285 6 7 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+286 6 7 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+287 6 7 31220 21 49 23 59 0 23 {}
+288 6 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+289 6 6 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+290 6 9 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+291 6 1 31230 20 0 20 3 1 1 {}
+292 6 1 31230 20 3 20 20 1 2 {}
+293 6 2 31230 20 0 20 3 1 1 {}
+294 6 2 31230 20 3 20 20 1 2 {}
+295 6 3 31230 20 0 20 3 1 1 {}
+296 6 3 31230 20 3 20 20 1 2 {}
+297 6 4 31230 20 0 20 3 1 1 {}
+298 6 4 31230 20 3 20 20 1 2 {}
+299 6 5 31230 20 0 20 3 1 1 {}
+300 6 5 31230 20 3 20 20 1 2 {}
+301 6 6 31230 20 0 20 3 1 1 {}
+302 6 6 31230 20 3 20 20 1 2 {}
+303 6 7 31230 20 0 20 3 1 1 {}
+304 6 7 31230 20 3 20 20 1 2 {}
+305 6 8 31230 20 0 20 3 1 1 {}
+306 6 8 31230 20 3 20 20 1 2 {}
+307 6 9 31230 20 0 20 3 1 1 {}
+308 6 9 31230 20 3 20 20 1 2 {}
+309 7 4 31170 21 0 21 15 1 1 {}
+310 7 4 31170 21 15 21 30 0 1 {}
+311 7 1 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+312 7 5 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+313 7 7 31180 21 0 21 30 1 1 {-5:['HLYYBeforeStart',[5]],0:['HLYYStart',[]]}
+314 7 3 31160 20 30 20 50 1 1 {}
+315 7 5 31160 20 30 20 50 1 1 {}
+316 7 7 31160 20 30 20 50 1 1 {}
+317 7 3 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+318 7 3 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+319 7 3 31220 21 19 21 20 0 13 {}
+320 7 3 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+321 7 3 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+322 7 3 31220 21 49 23 59 0 23 {}
+323 7 6 31220 19 0 21 0 0 11 {0:["FamilyMatchTime", []]}
+324 7 6 31220 21 0 21 18 1 12 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+325 7 6 31220 21 19 21 20 0 13 {}
+326 7 6 31220 21 20 21 30 0 21 {0:["FamilyMatchTime", []]}
+327 7 6 31220 21 30 21 48 1 22 {-5:["FamilyMatchBeforeStart", [5]], -3:["FamilyMatchBeforeStart", [3]], -1:["FamilyMatchBeforeStart", [1]], 0:["FamilyMatchStart", []]}
+328 7 6 31220 21 49 23 59 0 23 {}
+329 7 2 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+330 7 8 31010 21 0 21 30 1 1 {-5:['XMZZBeforeStart',[5]],0:['XMZZStart',[]]}
+331 7 1 31230 20 0 20 3 1 1 {}
+332 7 1 31230 20 3 20 20 1 2 {}
+333 7 2 31230 20 0 20 3 1 1 {}
+334 7 2 31230 20 3 20 20 1 2 {}
+335 7 3 31230 20 0 20 3 1 1 {}
+336 7 3 31230 20 3 20 20 1 2 {}
+337 7 4 31230 20 0 20 3 1 1 {}
+338 7 4 31230 20 3 20 20 1 2 {}
+339 7 5 31230 20 0 20 3 1 1 {}
+340 7 5 31230 20 3 20 20 1 2 {}
+341 7 6 31230 20 0 20 3 1 1 {}
+342 7 6 31230 20 3 20 20 1 2 {}
+343 7 7 31230 20 0 20 3 1 1 {}
+344 7 7 31230 20 3 20 20 1 2 {}
+345 7 8 31230 20 0 20 3 1 1 {}
+346 7 8 31230 20 3 20 20 1 2 {}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 9710910..323f491 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -43,7 +43,7 @@
OpenJob 1|2 0 0 0 0
TeamReadyTime 30
BossShunt 10040|21070 1 3
-MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110
+MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020
DropRecordValue 4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078
DropRecordNum 40 1
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016):1} 0_3|2_3|1_9999 {0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'} {} {0:[21,'WorldBossNoHarm']}
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 612b184..3474cac 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -106,3 +106,4 @@
157 200 0 0
158 300 0 0
159 300 0 0
+160 1 0 0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
index adce420..fdea4ef 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt
@@ -243,12 +243,12 @@
242 ['老子']
243 ['孔子']
244 ['水浒传']
-245 ['鲁迅']
+245 ['鲁迅','周树人']
246 ['永乐大典']
247 ['木兰辞']
248 ['关羽']
249 ['杜甫']
-250 ['妻子','老婆']
+250 ['妻子','老婆','夫人']
251 ['望庐山瀑布']
252 ['白居易']
253 ['贵州']
diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc
index ed2eeab..e3b08d2 100644
--- a/CoreServerGroup/GameServer/Script/ChConfig.pyc
+++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index e1085b4..19d78fb 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index ff34311..3aeb25a 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
index 315682a..714a42f 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index 42e3ded..d9c950e 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/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
index 185b4da..e482072 100644
--- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
index 401b06e..0c91848 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerEventCounter.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
index 41b0b9d..c1e3f2c 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamily.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 534872c..5650ffb 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
index 0123b15..c2aef3f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
@@ -3,4 +3,5 @@
Map135_Llxg 32012 跨服竞技场3 32012 0 0 0 50 1
Map135_Llxg 32013 跨服竞技场4 32013 0 0 0 50 1
Map135_Llxg 32014 跨服竞技场5 32014 0 0 0 50 1
-Map130_Kzly 32020 异兽之地 32020 0 0 0 50 1
\ No newline at end of file
+Map132_Plxj 32020 跨服BOSS 32020 0 0 0 50 1
+Map132_Plxj 32021 跨服BOSS 32020 0 0 0 50 1
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 0653c5d..2ff59d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -123,7 +123,7 @@
#抢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))",
+ "PVE_1_5" :"int((wReFightPower/12.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)*0.8)*(1+aFinalHurtPer/10000.0))",
#助战机器人：参数: suppressNPCFightPower-助战玩家战力; fbFightPower-副本战力; fbBaseHurt-保底伤害
"HelpRobot_Atk" :"max(int(fbBaseHurt*suppressNPCFightPower*1.0/max(fbFightPower,1.0)),1)",
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index ce5b958..4ad462d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -43,4 +43,6 @@
Map135_Llxg_32012 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map135_Llxg_32013 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
Map135_Llxg_32014 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
-Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
\ No newline at end of file
+Map132_Plxj_32020 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map133_Bzjsc_31031 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
+Map132_Plxj_32021 127.0.0.1 19001 1 500 500 250 500 30 1000 500 180 500 2000 500 2000 500 30000 3000 1000 200 500 500000 1000000 1 5000 0 127.0.0.1 16900 0 0 1 127.0.0.1 60005 0 0 60000 0 0 100 0 1:00:00 0
\ No newline at end of file
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index e6a178d..4b080be 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -339,7 +339,7 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 18
+RegisterPackCount = 19
PacketCMD_1 = 0xA5
PacketSubCMD_1 = 0x04
@@ -373,9 +373,9 @@
PacketSubCMD_8=0x03
PacketCallFunc_8=PySetAdult
-PacketCMD_9=
-PacketSubCMD_9=
-PacketCallFunc_9=
+PacketCMD_9=C1
+PacketSubCMD_9=05
+PacketCallFunc_9=OnEnterCrossServer
PacketCMD_10=0xB4
PacketSubCMD_10=0x04
@@ -412,6 +412,10 @@
PacketCMD_18=0xA2
PacketSubCMD_18=0x30
PacketCallFunc_18=OnSetChatBubbleBox
+
+PacketCMD_19=0xA1
+PacketSubCMD_19=0x08
+PacketCallFunc_19=OnRefreshMainServerRole
;购买相关的
[BuySomething]
@@ -1007,12 +1011,16 @@
Writer = xdh
Releaser = xdh
RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
PacketCMD_1=0xA5
PacketSubCMD_1=0x0B
PacketCallFunc_1=OnPlayerCoatUp
+PacketCMD_2=0xA5
+PacketSubCMD_2=0x20
+PacketCallFunc_2=OnCoatDecompose
+
;悬赏任务
[PlayerArrestTask]
ScriptName = Player\PlayerArrestTask.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 6c6c760..b5f1112 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 2ab703f..af3cecd 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/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index ddb78a6..e693e12 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 0f6f45d..a4fc8ad 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.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 f7c399c..35f150d 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/GM/Commands/PrintFightPower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc
index 17958d0..718383b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc
new file mode 100644
index 0000000..bf2a74d
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossPenglai.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
index be6b0fe..d4876b4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_CrossRealmPK.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 7cd57a0..e752e57 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/Item/ChEquip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
index adebee7..45a7f9e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ClothesCoatSkin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ClothesCoatSkin.pyc
deleted file mode 100644
index aec5b25..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_ClothesCoatSkin.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
index 23f1203..a0f70ae 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.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 ce98080..06ca974 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/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
index da506c5..b132d49 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc
index bcc20ca..4976a40 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.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 b3497bf..d56fced 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 8d49808..21a198a 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/RemoteQuery/GY_Query_CrossRealmReg.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc
index 6200f10..d18bb61 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossRealmReg.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 036839c..ee83e0a 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/tagActWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
new file mode 100644
index 0000000..cc29e64
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
@@ -0,0 +1,2 @@
+CfgID StartDate EndDate IsDayReset ResetType LimitLV TemplateID PointAward
+1 8 15 1 1 110 [[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300]] {0:{100:[(5408,1,1)]},1:{100:[(5408,1,1)]},2:{100:[(5408,1,1)]},3:{100:[(5408,1,1)]},4:{100:[(5408,1,1)]},5:{100:[(5408,1,1)]},6:{100:[(5408,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index 5d5df7b..1f0124b 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -77,11 +77,11 @@
50103005 21070 99 0 1 17 0
50103006 21100 99 0 1 17 0
50103007 10080 99 0 1 17 0
-40103001 32020 90 0 0 0 2040
-40103002 32020 91 0 0 0 2041
-40103003 32020 92 0 0 0 2042
-40103004 32020 93 0 0 0 2043
-40103005 32020 94 0 0 0 2044
-40103006 32020 95 0 0 0 2045
-40103007 32020 96 0 0 0 2046
-40103008 32020 97 0 0 0 2047
+40103001 32020 180 0 0 0 2040
+40103002 32020 181 0 0 0 2041
+40103003 32020 182 0 0 0 2042
+40103004 32020 183 0 0 0 2043
+40103005 32020 184 0 0 0 2044
+40103006 32020 185 0 0 0 2045
+40103007 32020 186 0 0 0 2046
+40103008 32020 187 0 0 0 2047
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index aa73463..612ff27 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -199,9 +199,9 @@
4008 4011_5
4009 4011_5
2412 [[5000,[3503,1]],[10000,[3513,1]]] 1
-2413 101_6|102_3|103_1
-2414 104_6|105_3|106_1
-2415 110_6|111_3|112_1
+2413 101_24|103_1
+2414 104_24|106_1
+2415 110_24|112_1
2416 181_20
2417 181_200
2418 102_18
diff --git a/db/PyMongoDataServer/PySysDB/tagCoat.txt b/db/PyMongoDataServer/PySysDB/tagCoat.txt
new file mode 100644
index 0000000..000e06e
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCoat.txt
@@ -0,0 +1,10 @@
+CoatID EquipItemID UnlockItemID MaxLV CostItemCnt StarAttr
+1 6000|6200 5800 3 1|2|3 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3000}}
+2 6001|6201 5801 3 1|2|4 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3001}}
+3 6002|6202 5802 3 1|2|5 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3002}}
+4 6003|6203 5803 3 1|2|6 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3003}}
+5 6004|6204 5804 3 1|2|7 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3004}}
+6 6005|6205 5805 3 1|2|8 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3005}}
+7 6006|6206 5806 3 1|2|9 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3006}}
+8 6007|6207 5807 3 1|2|10 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3007}}
+9 6008|6208 5808 3 1|2|11 {"1":{"6":1000,"7":1000},"2":{"6":2000,"7":2000},"3":{"6":3000,"7":3008}}
diff --git a/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt b/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt
new file mode 100644
index 0000000..84debaa
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCoatChestUp.txt
@@ -0,0 +1,11 @@
+LV NeedExp AttrType
+1 108 6_100|7_200
+2 127 6_100|7_201
+3 149 6_100|7_202
+4 192 6_100|7_203
+5 221 6_100|7_204
+6 264 6_100|7_205
+7 293 6_100|7_206
+8 314 6_100|7_207
+9 332 6_100|7_208
+10 400 6_100|7_209
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
new file mode 100644
index 0000000..93e4ee9
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt
@@ -0,0 +1,6 @@
+ZoneID ServerGroupIDList MapID CopyMapID PosX PosY
+1 [(1,50)] 32020 0 199 380
+2 [(51,100)] 32020 1 199 380
+3 [(101,150)] 32021 0 199 380
+4 [(151,200)] 32021 1 199 380
+5 [(201,250)] 32021 2 199 380
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1711279..b9a4f49 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -96,10 +96,10 @@
PetUpItem 4151 100
SignConsumption 10
ShopItemBuyCntLimitNPC [] 0 0 0 0
-GodWeapon1 101|102|103 0 0 0 0
-GodWeapon2 104|105|106 0 0 0 0
-GodWeapon3 107|108|109 0 0 0 0
-GodWeapon4 110|111|112 int(46870+maxHP*proDefPer/10000.0) 0 0 0
+GodWeapon1 101|103 0 0 0 0
+GodWeapon2 104|106 0 0 0 0
+GodWeapon3 107|109 0 0 0 0
+GodWeapon4 110|112 int(46870+maxHP*proDefPer/10000.0) 0 0 0
GodWeaponActive 1 {"2":[[1,100]], "4":[[2,100]]} {"2":250, "4":320} 0 0
GodWeaponSys {1:'GetGodWeapon3',2:'GetGodWeapon1',3:'GetGodWeapon2',4:'GetGodWeapon4'}
GodMagicExp {"1":[1,10],"2":[1,10],"4":[1,10]}
@@ -217,7 +217,7 @@
AngryAdd 60 1 20 100 0
BossHomeCost 1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200 0 0 0 0
BossShunt 10040|21070 1 3
-MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110
+MapLine 10040_10|10080_10|21070_1 10010_11|10020_11|10030_11|10080_11|10040_26 [10103001,10203001,10303001,10403001] 21070|21100|21110|32020
NeutralMapExpAward {(21070,21100,21110):[500,'int(0.6*reExp)']}
DungeonDeliver 31020|31030|31150|31031
DungeonIntegral 2000
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 632cb89..cf5ac96 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -106,3 +106,4 @@
157 200 0 0 0 0
158 300 0 0 0 0
159 300 0 0 0 0
+160 1 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index 34de11e..b51a043 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -170,3 +170,16 @@
31031 30303014 0 0 0
31031 30303015 0 0 0
31031 30303016 0 0 0
+32020 40102001 325 345 2797
+32020 40102002 350 370 3447
+32020 40102003 375 395 4824
+32020 40102004 400 420 5805
+32020 40102005 425 445 7814
+32020 40103001 340 340 0
+32020 40103002 365 365 0
+32020 40103003 390 390 0
+32020 40103004 415 415 0
+32020 40103005 440 440 0
+32020 40103006 460 460 0
+32020 40103007 480 480 0
+32020 40103008 500 500 0
diff --git a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
index e3d8ec3..70d6d51 100644
--- a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
@@ -210,3 +210,18 @@
50103005 21070 (75,71)
50103006 21100 (104,120)
50103007 10080 (61,61)
+40102001 32020 (159,333)
+40102002 32020 (106,334)
+40102003 32020 (191,268)
+40102004 32020 (135,269)
+40102005 32020 (78,261)
+40102006 32020 (78,261)
+40102007 32020 (78,261)
+40103001 32020 (218,326)
+40103002 32020 (220,270)
+40103003 32020 (160,247)
+40103004 32020 (107,247)
+40103005 32020 (165,303)
+40103006 32020 (103,303)
+40103007 32020 (227,210)
+40103008 32020 (213,135)
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 5e9b17d..599e5f0 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -239,3 +239,18 @@
33402005 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:9259} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:500000,13202:500000,13203:888,13204:222,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
33402006 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:0,7102:0,7103:0,7104:0,7105:0,701:9259} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:500000,13202:500000,13203:888,13204:222,13205:0,13051:0,13052:0,13053:0,13054:0,13055:0} {} {} 0 0 0 0 [] []
33403006 0 0 0 0 [] 0 {} 0 {} {} [] [] {7101:333333,7102:300000,7103:80000,7104:20000,7105:8000,701:166666} {7101:3,7102:2,7103:1,7104:1,7105:1,701:3} {13201:3000000,13202:3000000,13203:64000,13204:16000,13205:8000,13051:400000,13052:100000,13053:20000,13054:10000,13055:6666} {} {} 0 0 0 0 [] []
+40102001 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40102002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40102003 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40102004 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40102005 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40102006 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40102007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
+40103001 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
+40103002 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
+40103003 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1750000,2001:1000000,2002:250000,3001:100000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
+40103004 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1700000,2001:1000000,2002:300000,3001:112500,3002:37500,3003:0} {} {} 25 800 1129 1694 [] [1144]
+40103005 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,107):1000000,(7,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1650000,2001:1000000,2002:350000,3001:150000,3002:50000,3003:0} {} {} 25 800 1129 1694 [] [1144]
+40103006 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,107):1000000,(7,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1600000,2001:1000000,2002:400000,3001:210000,3002:75000,3003:15000} {} {} 25 800 1129 1694 [] [1144]
+40103007 0 0 0 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 20 {(8,4,107):1000000,(8,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1550000,2001:1000000,2002:450000,3001:280000,3002:100000,3003:20000} {} {} 25 800 1356 1824 [] [1144]
+40103008 0 0 0 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 20 {(8,4,107):1000000,(8,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1500000,2001:1000000,2002:500000,3001:350000,3002:125000,3003:25000} {} {} 25 800 1356 1824 [] [1144]
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index dd494f3..755b607 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -92,13 +92,13 @@
61203006 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
61203007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
61203008 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-50103001 1 0 3 1 232800 10000 0 8000 2 9900 50 1 0 0 1311 0
-50103002 1 0 3 1 251400 10000 0 8000 2 9900 50 1 0 0 1238 0
-50103003 1 0 3 1 279300 10000 0 8000 2 9900 50 1 0 0 1165 0
-50103004 1 0 3 1 325900 10000 0 8000 2 9900 50 1 0 0 1092 0
-50103005 1 0 3 1 372500 10000 0 8000 2 9900 50 1 0 0 1020 0
-50103006 1 0 3 1 419000 10000 0 8000 2 9900 50 1 0 0 947 0
-50103007 1 0 3 1 465600 10000 0 8000 2 9900 50 1 0 0 874 0
+50103001 1 0 3 1 290300 10000 0 8000 2 9900 50 1 0 0 1311 0
+50103002 1 0 3 1 309700 10000 0 8000 2 9900 50 1 0 0 1238 0
+50103003 1 0 3 1 338700 10000 0 8000 2 9900 50 1 0 0 1165 0
+50103004 1 0 3 1 387100 10000 0 8000 2 9900 50 1 0 0 1092 0
+50103005 1 0 3 1 435500 10000 0 8000 2 9900 50 1 0 0 1020 0
+50103006 1 0 3 1 483900 10000 0 8000 2 9900 50 1 0 0 947 0
+50103007 1 0 3 1 580600 10000 0 8000 2 9900 50 1 0 0 874 0
31401002 0 0 2 0 2400 10000 0 8000 3 9900 50 24 0 0 0 0
31403002 0 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0
31401003 0 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
index f4aeeaf..539f781 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillRankAward.txt
@@ -1,37 +1,37 @@
RangListType RankA RankB Gift
-2 1 1 {"1":[[203,1,1],[6712,1,0],[181,40,1],[101,40,1]],"2":[[203,1,1],[6812,1,0],[181,40,1],[101,40,1]],"3":[[203,1,1],[6912,1,0],[181,40,1],[101,40,1]]}
-2 2 3 {"1":[[203,1,1],[6713,1,0],[181,30,1],[101,30,1]],"2":[[203,1,1],[6813,1,0],[181,30,1],[101,30,1]],"3":[[203,1,1],[6913,1,0],[181,30,1],[101,30,1]]}
-2 4 5 {"1":[[204,1,1],[6714,1,0],[181,25,1],[101,25,1]],"2":[[204,1,1],[6814,1,0],[181,25,1],[101,25,1]],"3":[[204,1,1],[6914,1,0],[181,25,1],[101,25,1]]}
-2 6 10 {"1":[[204,1,1],[181,20,1],[101,20,1]],"2":[[204,1,1],[181,20,1],[101,20,1]],"3":[[204,1,1],[181,20,1],[101,20,1]]}
-2 11 20 {"1":[[205,1,1],[181,15,1],[101,15,1]],"2":[[205,1,1],[181,15,1],[101,15,1]],"3":[[205,1,1],[181,15,1],[101,15,1]]}
-2 21 50 {"1":[[1801,1,1],[181,10,1],[101,10,1]],"2":[[1801,1,1],[181,10,1],[101,10,1]],"3":[[1801,1,1],[181,10,1],[101,10,1]]}
-8 1 1 {"1":[[1902,1,1],[6706,1,0],[4151,40,1],[101,40,1]],"2":[[1902,1,1],[6806,1,0],[4151,40,1],[101,40,1]],"3":[[1902,1,1],[6906,1,0],[4151,40,1],[101,40,1]]}
-8 2 3 {"1":[[1902,1,1],[6707,1,0],[4151,30,1],[101,30,1]],"2":[[1902,1,1],[6807,1,0],[4151,30,1],[101,30,1]],"3":[[1902,1,1],[6907,1,0],[4151,30,1],[101,30,1]]}
-8 4 5 {"1":[[1903,1,1],[6708,1,0],[4151,25,1],[101,25,1]],"2":[[1903,1,1],[6808,1,0],[4151,25,1],[101,25,1]],"3":[[1903,1,1],[6908,1,0],[4151,25,1],[101,25,1]]}
-8 6 10 {"1":[[1903,1,1],[4151,20,1],[101,20,1]],"2":[[1903,1,1],[4151,20,1],[101,20,1]],"3":[[1903,1,1],[4151,20,1],[101,20,1]]}
-8 11 20 {"1":[[1904,1,1],[4151,15,1],[101,15,1]],"2":[[1904,1,1],[4151,15,1],[101,15,1]],"3":[[1904,1,1],[4151,15,1],[101,15,1]]}
-8 21 50 {"1":[[1905,1,1],[4151,10,1],[101,10,1]],"2":[[1905,1,1],[4151,10,1],[101,10,1]],"3":[[1905,1,1],[4151,10,1],[101,10,1]]}
-10 1 1 {"1":[[4190,1,1],[6709,1,0],[3504,2,1],[3514,2,1]],"2":[[4190,1,1],[6809,1,0],[3504,2,1],[3514,2,1]],"3":[[4190,1,1],[6909,1,0],[3504,2,1],[3514,2,1]]}
-10 2 3 {"1":[[4190,1,1],[6710,1,0],[3503,4,1],[3513,4,1]],"2":[[4190,1,1],[6810,1,0],[3503,4,1],[3513,4,1]],"3":[[4190,1,1],[6910,1,0],[3503,4,1],[3513,4,1]]}
-10 4 5 {"1":[[4191,1,1],[6711,1,0],[3503,3,1],[3513,3,1]],"2":[[4191,1,1],[6811,1,0],[3503,3,1],[3513,3,1]],"3":[[4191,1,1],[6911,1,0],[3503,3,1],[3513,3,1]]}
-10 6 10 {"1":[[4191,1,1],[3503,2,1],[3513,2,1]],"2":[[4191,1,1],[3503,2,1],[3513,2,1]],"3":[[4191,1,1],[3503,2,1],[3513,2,1]]}
-10 11 20 {"1":[[4192,1,1],[3503,1,1],[3513,1,1]],"2":[[4192,1,1],[3503,1,1],[3513,1,1]],"3":[[4192,1,1],[3503,1,1],[3513,1,1]]}
-10 21 50 {"1":[[1900,1,1],[3502,2,1],[3512,2,1]],"2":[[1900,1,1],[3502,2,1],[3512,2,1]],"3":[[1900,1,1],[3502,2,1],[3512,2,1]]}
-3 1 1 {"1":[[4699,1,1],[6703,1,0],[181,40,1],[4304,20,1]],"2":[[4699,1,1],[6803,1,0],[181,40,1],[4304,20,1]],"3":[[4699,1,1],[6903,1,0],[181,40,1],[4304,20,1]]}
-3 2 3 {"1":[[4699,1,1],[6704,1,0],[181,30,1],[4304,15,1]],"2":[[4699,1,1],[6804,1,0],[181,30,1],[4304,15,1]],"3":[[4699,1,1],[6904,1,0],[181,30,1],[4304,15,1]]}
-3 4 5 {"1":[[4700,1,1],[6704,1,0],[181,25,1],[4304,10,1]],"2":[[4700,1,1],[6804,1,0],[181,25,1],[4304,10,1]],"3":[[4700,1,1],[6904,1,0],[181,25,1],[4304,10,1]]}
-3 6 10 {"1":[[4700,1,1],[181,20,1],[4304,6,1]],"2":[[4700,1,1],[181,20,1],[4304,6,1]],"3":[[4700,1,1],[181,20,1],[4304,6,1]]}
-3 11 20 {"1":[[4701,1,1],[181,15,1],[4303,6,1]],"2":[[4701,1,1],[181,15,1],[4303,6,1]],"3":[[4701,1,1],[181,15,1],[4303,6,1]]}
-3 21 50 {"1":[[1901,1,1],[181,10,1],[4303,4,1]],"2":[[1901,1,1],[181,10,1],[4303,4,1]],"3":[[1901,1,1],[181,10,1],[4303,4,1]]}
-7 1 1 {"1":[[4696,1,1],[6700,1,0],[3504,2,1],[3514,2,1]],"2":[[4696,1,1],[6800,1,0],[3504,2,1],[3514,2,1]],"3":[[4696,1,1],[6900,1,0],[3504,2,1],[3514,2,1]]}
-7 2 3 {"1":[[4696,1,1],[6701,1,0],[3503,4,1],[3513,4,1]],"2":[[4696,1,1],[6801,1,0],[3503,4,1],[3513,4,1]],"3":[[4696,1,1],[6901,1,0],[3503,4,1],[3513,4,1]]}
-7 4 5 {"1":[[4697,1,1],[6701,1,0],[3503,3,1],[3513,3,1]],"2":[[4697,1,1],[6801,1,0],[3503,3,1],[3513,3,1]],"3":[[4697,1,1],[6901,1,0],[3503,3,1],[3513,3,1]]}
-7 6 10 {"1":[[4697,1,1],[3503,2,1],[3513,2,1]],"2":[[4697,1,1],[3503,2,1],[3513,2,1]],"3":[[4697,1,1],[3503,2,1],[3513,2,1]]}
-7 11 20 {"1":[[4698,1,1],[3503,1,1],[3513,1,1]],"2":[[4698,1,1],[3503,1,1],[3513,1,1]],"3":[[4698,1,1],[3503,1,1],[3513,1,1]]}
-7 21 50 {"1":[[1802,1,1],[3502,2,1],[3512,2,1]],"2":[[1802,1,1],[3502,2,1],[3512,2,1]],"3":[[1802,1,1],[3502,2,1],[3512,2,1]]}
-6 1 1 {"1":[[4702,1,1],[6723,1,0],[4151,40,1],[4304,20,1]],"2":[[4702,1,1],[6823,1,0],[4151,40,1],[4304,20,1]],"3":[[4702,1,1],[6923,1,0],[4151,40,1],[4304,20,1]]}
-6 2 3 {"1":[[4702,1,1],[6724,1,0],[4151,30,1],[4304,15,1]],"2":[[4702,1,1],[6824,1,0],[4151,30,1],[4304,15,1]],"3":[[4702,1,1],[6924,1,0],[4151,30,1],[4304,15,1]]}
-6 4 5 {"1":[[4703,1,1],[6724,1,0],[4151,25,1],[4304,10,1]],"2":[[4703,1,1],[6824,1,0],[4151,25,1],[4304,10,1]],"3":[[4703,1,1],[6924,1,0],[4151,25,1],[4304,10,1]]}
-6 6 10 {"1":[[4704,1,1],[4151,20,1],[4304,6,1]],"2":[[4704,1,1],[4151,20,1],[4304,6,1]],"3":[[4704,1,1],[4151,20,1],[4304,6,1]]}
-6 11 20 {"1":[[4704,1,1],[4151,15,1],[4303,6,1]],"2":[[4704,1,1],[4151,15,1],[4303,6,1]],"3":[[4704,1,1],[4151,15,1],[4303,6,1]]}
-6 21 50 {"1":[[1803,1,1],[4151,10,1],[4303,4,1]],"2":[[1803,1,1],[4151,10,1],[4303,4,1]],"3":[[1803,1,1],[4151,10,1],[4303,4,1]]}
+2 1 1 {"1":[[203,1,1],[6712,1,0],[5805,1,1],[5803,1,1],[101,40,1]],"2":[[203,1,1],[6812,1,0],[5805,1,1],[5803,1,1],[101,40,1]],"3":[[203,1,1],[6912,1,0],[5805,1,1],[5803,1,1],[101,40,1]]}
+2 2 3 {"1":[[203,1,1],[6713,1,0],[5805,1,1],[5701,2,1],[101,30,1]],"2":[[203,1,1],[6813,1,0],[5805,1,1],[5701,2,1],[101,30,1]],"3":[[203,1,1],[6913,1,0],[5805,1,1],[5701,2,1],[101,30,1]]}
+2 4 5 {"1":[[204,1,1],[6714,1,0],[5805,1,1],[101,25,1]],"2":[[204,1,1],[6814,1,0],[5805,1,1],[101,25,1]],"3":[[204,1,1],[6914,1,0],[5805,1,1],[101,25,1]]}
+2 6 10 {"1":[[204,1,1],[5701,3,1],[101,20,1]],"2":[[204,1,1],[5701,3,1],[101,20,1]],"3":[[204,1,1],[5701,3,1],[101,20,1]]}
+2 11 20 {"1":[[205,1,1],[5701,2,1],[101,15,1]],"2":[[205,1,1],[5701,2,1],[101,15,1]],"3":[[205,1,1],[5701,2,1],[101,15,1]]}
+2 21 50 {"1":[[1801,1,1],[5701,1,1],[101,10,1]],"2":[[1801,1,1],[5701,1,1],[101,10,1]],"3":[[1801,1,1],[5701,1,1],[101,10,1]]}
+8 1 1 {"1":[[1902,1,1],[6706,1,0],[5803,1,1],[5804,1,1],[4151,40,1]],"2":[[1902,1,1],[6806,1,0],[5803,1,1],[5804,1,1],[4151,40,1]],"3":[[1902,1,1],[6906,1,0],[5803,1,1],[5804,1,1],[4151,40,1]]}
+8 2 3 {"1":[[1902,1,1],[6707,1,0],[5803,1,1],[5701,2,1],[4151,30,1]],"2":[[1902,1,1],[6807,1,0],[5803,1,1],[5701,2,1],[4151,30,1]],"3":[[1902,1,1],[6907,1,0],[5803,1,1],[5701,2,1],[4151,30,1]]}
+8 4 5 {"1":[[1903,1,1],[6708,1,0],[5803,1,1],[4151,25,1]],"2":[[1903,1,1],[6808,1,0],[5803,1,1],[4151,25,1]],"3":[[1903,1,1],[6908,1,0],[5803,1,1],[4151,25,1]]}
+8 6 10 {"1":[[1903,1,1],[5701,3,1],[4151,20,1]],"2":[[1903,1,1],[5701,3,1],[4151,20,1]],"3":[[1903,1,1],[5701,3,1],[4151,20,1]]}
+8 11 20 {"1":[[1904,1,1],[5701,2,1],[4151,15,1]],"2":[[1904,1,1],[5701,2,1],[4151,15,1]],"3":[[1904,1,1],[5701,2,1],[4151,15,1]]}
+8 21 50 {"1":[[1905,1,1],[5701,1,1],[4151,10,1]],"2":[[1905,1,1],[5701,1,1],[4151,10,1]],"3":[[1905,1,1],[5701,1,1],[4151,10,1]]}
+10 1 1 {"1":[[4190,1,1],[6709,1,0],[5804,1,1],[5805,1,1],[2346,2,1]],"2":[[4190,1,1],[6809,1,0],[5804,1,1],[5805,1,1],[2346,2,1]],"3":[[4190,1,1],[6909,1,0],[5804,1,1],[5805,1,1],[2346,2,1]]}
+10 2 3 {"1":[[4190,1,1],[6710,1,0],[5804,1,1],[5701,2,1],[2412,4,1]],"2":[[4190,1,1],[6810,1,0],[5804,1,1],[5701,2,1],[2412,4,1]],"3":[[4190,1,1],[6910,1,0],[5804,1,1],[5701,2,1],[2412,4,1]]}
+10 4 5 {"1":[[4191,1,1],[6711,1,0],[5804,1,1],[2412,3,1]],"2":[[4191,1,1],[6811,1,0],[5804,1,1],[2412,3,1]],"3":[[4191,1,1],[6911,1,0],[5804,1,1],[2412,3,1]]}
+10 6 10 {"1":[[4191,1,1],[5701,3,1],[2412,2,1]],"2":[[4191,1,1],[5701,3,1],[2412,2,1]],"3":[[4191,1,1],[5701,3,1],[2412,2,1]]}
+10 11 20 {"1":[[4192,1,1],[5701,2,1],[2412,1,1]],"2":[[4192,1,1],[5701,2,1],[2412,1,1]],"3":[[4192,1,1],[5701,2,1],[2412,1,1]]}
+10 21 50 {"1":[[1900,1,1],[5701,1,1],[2206,1,1]],"2":[[1900,1,1],[5701,1,1],[2206,1,1]],"3":[[1900,1,1],[5701,1,1],[2206,1,1]]}
+3 1 1 {"1":[[4699,1,1],[6703,1,0],[5805,1,1],[5803,1,1],[4304,30,1]],"2":[[4699,1,1],[6803,1,0],[5805,1,1],[5803,1,1],[4304,30,1]],"3":[[4699,1,1],[6903,1,0],[5805,1,1],[5803,1,1],[4304,30,1]]}
+3 2 3 {"1":[[4699,1,1],[6704,1,0],[5805,1,1],[5701,2,1],[4304,25,1]],"2":[[4699,1,1],[6804,1,0],[5805,1,1],[5701,2,1],[4304,25,1]],"3":[[4699,1,1],[6904,1,0],[5805,1,1],[5701,2,1],[4304,25,1]]}
+3 4 5 {"1":[[4700,1,1],[6704,1,0],[5805,1,1],[4304,20,1]],"2":[[4700,1,1],[6804,1,0],[5805,1,1],[4304,20,1]],"3":[[4700,1,1],[6904,1,0],[5805,1,1],[4304,20,1]]}
+3 6 10 {"1":[[4700,1,1],[5701,3,1],[4304,15,1]],"2":[[4700,1,1],[5701,3,1],[4304,15,1]],"3":[[4700,1,1],[5701,3,1],[4304,15,1]]}
+3 11 20 {"1":[[4701,1,1],[5701,2,1],[4303,10,1]],"2":[[4701,1,1],[5701,2,1],[4303,10,1]],"3":[[4701,1,1],[5701,2,1],[4303,10,1]]}
+3 21 50 {"1":[[1901,1,1],[5701,1,1],[4303,5,1]],"2":[[1901,1,1],[5701,1,1],[4303,5,1]],"3":[[1901,1,1],[5701,1,1],[4303,5,1]]}
+7 1 1 {"1":[[4696,1,1],[6700,1,0],[5803,1,1],[5804,1,1],[3514,2,1]],"2":[[4696,1,1],[6800,1,0],[5803,1,1],[5804,1,1],[3514,2,1]],"3":[[4696,1,1],[6900,1,0],[5803,1,1],[5804,1,1],[3514,2,1]]}
+7 2 3 {"1":[[4696,1,1],[6701,1,0],[5803,1,1],[5701,2,1],[3513,4,1]],"2":[[4696,1,1],[6801,1,0],[5803,1,1],[5701,2,1],[3513,4,1]],"3":[[4696,1,1],[6901,1,0],[5803,1,1],[5701,2,1],[3513,4,1]]}
+7 4 5 {"1":[[4697,1,1],[6701,1,0],[5803,1,1],[3513,3,1]],"2":[[4697,1,1],[6801,1,0],[5803,1,1],[3513,3,1]],"3":[[4697,1,1],[6901,1,0],[5803,1,1],[3513,3,1]]}
+7 6 10 {"1":[[4697,1,1],[5701,3,1],[3513,2,1]],"2":[[4697,1,1],[5701,3,1],[3513,2,1]],"3":[[4697,1,1],[5701,3,1],[3513,2,1]]}
+7 11 20 {"1":[[4698,1,1],[5701,2,1],[3513,1,1]],"2":[[4698,1,1],[5701,2,1],[3513,1,1]],"3":[[4698,1,1],[5701,2,1],[3513,1,1]]}
+7 21 50 {"1":[[1802,1,1],[5701,1,1],[3512,2,1]],"2":[[1802,1,1],[5701,1,1],[3512,2,1]],"3":[[1802,1,1],[5701,1,1],[3512,2,1]]}
+6 1 1 {"1":[[4702,1,1],[6723,1,0],[5804,1,1],[5805,1,1],[4151,40,1]],"2":[[4702,1,1],[6823,1,0],[5804,1,1],[5805,1,1],[4151,40,1]],"3":[[4702,1,1],[6923,1,0],[5804,1,1],[5805,1,1],[4151,40,1]]}
+6 2 3 {"1":[[4702,1,1],[6724,1,0],[5804,1,1],[5701,2,1],[4151,30,1]],"2":[[4702,1,1],[6824,1,0],[5804,1,1],[5701,2,1],[4151,30,1]],"3":[[4702,1,1],[6924,1,0],[5804,1,1],[5701,2,1],[4151,30,1]]}
+6 4 5 {"1":[[4703,1,1],[6724,1,0],[5804,1,1],[4151,25,1]],"2":[[4703,1,1],[6824,1,0],[5804,1,1],[4151,25,1]],"3":[[4703,1,1],[6924,1,0],[5804,1,1],[4151,25,1]]}
+6 6 10 {"1":[[4703,1,1],[5701,3,1],[4151,20,1]],"2":[[4703,1,1],[5701,3,1],[4151,20,1]],"3":[[4703,1,1],[5701,3,1],[4151,20,1]]}
+6 11 20 {"1":[[4704,1,1],[5701,2,1],[4151,15,1]],"2":[[4704,1,1],[5701,2,1],[4151,15,1]],"3":[[4704,1,1],[5701,2,1],[4151,15,1]]}
+6 21 50 {"1":[[1803,1,1],[5701,1,1],[4151,10,1]],"2":[[1803,1,1],[5701,1,1],[4151,10,1]],"3":[[1803,1,1],[5701,1,1],[4151,10,1]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
index 4364d3b..d934563 100644
--- a/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOSCBillTagAward.txt
@@ -5,8 +5,8 @@
8 30 {"1":[[4151,5],[101,5]],"2":[[4151,5],[101,5]],"3":[[4151,5],[101,5]]}
10 15 {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
10 10 {"1":[[3501,2],[3511,2]],"2":[[3501,2],[3511,2]],"3":[[3501,2],[3511,2]]}
-3 8 {"1":[[181,10],[4303,2]],"2":[[181,10],[4303,2]],"3":[[181,10],[4303,2]]}
-3 4 {"1":[[181,5],[4303,1]],"2":[[181,5],[4303,1]],"3":[[181,5],[4303,1]]}
+3 8 {"1":[[2206,1],[4303,2]],"2":[[2206,1],[4303,2]],"3":[[2206,1],[4303,2]]}
+3 4 {"1":[[2206,1],[4303,1]],"2":[[2206,1],[4303,1]],"3":[[2206,1],[4303,1]]}
7 35 {"1":[[3502,1],[3512,1]],"2":[[3502,1],[3512,1]],"3":[[3502,1],[3512,1]]}
7 20 {"1":[[3501,2],[3511,2]],"2":[[3501,2],[3511,2]],"3":[[3501,2],[3511,2]]}
6 1000000 {"1":[[4151,10],[4303,2]],"2":[[4151,10],[4303,2]],"3":[[4151,10],[4303,2]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt b/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt
index 6c27600..cba275f 100644
--- a/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt
@@ -1,8 +1,8 @@
NPCID ChanllengeLv
-31903001 100
-31903002 150
-31903003 200
-31903004 250
-31903005 300
-31903006 350
-31903007 400
+31903001 150
+31903002 200
+31903003 250
+31903004 300
+31903005 350
+31903006 400
+31903007 450
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index fb867d7..bd9e7c8 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,9 +1,9 @@
TreasureType MinLV GridItemInfo JobItemList GridItemRateListFree FreeGridItemRateList2 FreeGridItemRateList3 GridItemRateList1 GridItemRateList2 GridItemRateList3 LuckyGridNum
-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":[102,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":[102,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":[105,10],"10":[4609,1],"11":[102,10],"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":[105,10],"10":[4609,1],"11":[102,10],"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,10],"10":[4609,1],"11":[111,10],"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
+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":[103,2],"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":[103,2],"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":[106,2],"10":[4609,1],"11":[103,2],"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":[106,2],"10":[4609,1],"11":[103,2],"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":[106,2],"10":[4609,1],"11":[112,2],"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,5],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4385,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,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,5],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4360,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] {} [(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,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,5],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4380,1],"13":[2331,1],"14":[4305,3]} [] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] [(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)] {} [(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,12),(9000,13),(10000,14)] [(9000,8),(10000,12)] {1:[(6000,8),(9000,9),(10000,10)]} 1
diff --git a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
new file mode 100644
index 0000000..7eec2fc
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
@@ -0,0 +1,14 @@
+TemplateID ActionType TotalTimes SingleTimes Reward Point
+100 1 20 10 [(2341,1,1)] 10
+200 2 4 2 [(2341,1,1)] 10
+300 3 10 1 [(2341,1,1)] 10
+400 4 10 1 [(2341,1,1)] 10
+500 5 20 1 [(2341,1,1)] 10
+600 6 3 3 [(2341,1,1)] 10
+700 7 6 1 [(2341,1,1)] 10
+800 8 28 2 [(2341,1,1)] 10
+900 9 20 10 [(2341,1,1)] 10
+1000 10 5 1 [(2341,1,1)] 10
+1100 11 3 1 [(2341,1,1)] 10
+1200 12 20 1 [(2341,1,1)] 10
+1300 13 3 1 [(2341,1,1)] 10
diff --git a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
index 82ced1f..2c03f82 100644
--- a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
@@ -35,3 +35,5 @@
105295 10100 60 18 1 0
108493 31031 97 42 1 0
108588 31340 23 29 1 0
+110869 40000 39 131 5 0
+111350 32020 199 380 1 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index b6a5df5..741c17f 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -406,7 +406,7 @@
2203 1 0 洗炼宝箱 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2204 1 0 潜力宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 800 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2205 1 0 套装石宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 200 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-2206 1 0 超值铜钱礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 400 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 20 0 0 0 0 0 0 0 0
+2206 1 0 2级随机宝石 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
2207 1 0 护法礼包 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 6 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2208 1 0 橙色符印选择宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 500 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
2209 1 0 红色符印选择宝箱 81 0 0 0 0 999 1 1 1 0 1 0 0 1 0 0 1 1000 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -1042,6 +1042,35 @@
5410 1 0 红2合成幸运草 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 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
5411 1 0 红3合成幸运草 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5412 1 0 洗炼必增符 126 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 5 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
+5700 1 0 熊猫时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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
+5701 1 0 熊猫时装碎片 82 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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
+5800 1 0 熊猫武器激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 1 10 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
+5801 1 0 熊猫副手激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 2 10 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
+5802 1 0 熊猫衣服激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 3 10 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
+5803 1 0 魔术师武器激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 4 10 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
+5804 1 0 魔术师副手激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 5 10 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
+5805 1 0 魔术师衣服激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 6 10 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
+5806 1 0 夏日武器激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 4 10 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
+5807 1 0 夏日副手激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 5 10 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
+5808 1 0 夏日衣服激活 83 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 243 6 10 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
+6000 1 0 男熊猫武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6001 1 0 男熊猫副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6002 1 0 男熊猫衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6003 1 0 男魔术师武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6004 1 0 男魔术师副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6005 1 0 男魔术师衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6006 1 0 男魔术师武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6007 1 0 男魔术师副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6008 1 0 男魔术师衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 101 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6200 1 0 女熊猫武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6201 1 0 女熊猫副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6202 1 0 女熊猫衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6203 1 0 女魔术师武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6204 1 0 女魔术师副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6205 1 0 女魔术师衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6206 1 0 女魔术师武器 91 20 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6207 1 0 女魔术师副手 92 22 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6208 1 0 女魔术师衣服 93 21 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 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 201 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6501 1 0 虬龙 102 2 1 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 1744 0 0 0 0 220 10142 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 4 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6502 5 0 奔雷铁鞋 107 7 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 10 0 11456 0 0 0 0 220 10587 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 3 0 0 0 0 0 0 0 0 0 0 0 0 105 0 0 0 0 0
6601 9 1 绝世龙枪 101 1 0 0 0 1 1 1 1 0 1 0 0 0 0 0 1 25560 0 1 0 0 0 0 220 9001 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 101 0 0 5 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 67e80a7..2c2e959 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -27,7 +27,7 @@
31210 仙盟BOSS 1 0 3600000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31220 仙盟联赛 1 0 3600000 4 0 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 5 32
31230 仙盟宴会 1 0 1200000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
-31240 个人Boss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
+31240 VIPBoss 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
31170 守卫人皇 1 0 1800000 3 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
51010 娲皇遗迹 1 0 0 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
41110 法宝副本 1 0 900000 1 1 0 0 0 0 0 0 0 0 0 10000 50 50 0 1 0 0 1
@@ -44,3 +44,4 @@
32014 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2
31340 幽暗迷森 1 0 3600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1
32020 蓬莱仙境 1 260 0 0 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35
+32021 蓬莱仙境 1 260 0 0 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index c41b0f5..2495cdd 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -93,6 +93,23 @@
2058 0 1 墓碑 400 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
2059 0 1 墓碑 400 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
2060 0 1 墓碑 400 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
+2061 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2062 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2063 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2064 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2065 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2066 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2067 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2068 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2069 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2070 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2071 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2072 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2073 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2074 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2075 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2076 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
+2077 0 1 墓碑 1 0 3 3 3 1 0 0 3 3 3 0 0 0 0 0 0 0 0 3 3 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 3 3 0 0 5 0 0 0 200 0 1
10000 14 0 静心灯 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 2 0 0 0 0 0 0 0 214 0 1
10104001 0 1 若雨 400 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10104002 0 1 道尘 400 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
@@ -791,11 +808,11 @@
33403005 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 450 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
33402006 2 0 第六波小怪 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 1 0 0 197 1 1
33403006 2 0 狂暴巨猿 1 2 3 3 3 0 0 0 3 3 3 0 0 1 0 0 0 0 0 3 3 0 600 2 6 0 0 0 0 0 0 0 0 1 15 2 3 3 0 0 0 3 0 0 197 1 1
-60103001 2 0 妖兵 30 0 71 71 0 0 0 0 0 48 0 0 0 0 0 0 19888 101 800 19888 8 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 10640 0 0 0 0 3 0 0 180 1 1
-60103002 2 0 机关幻兽 40 0 89 89 0 0 0 0 0 52 0 0 0 0 0 0 20112 101 800 20112 10 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 13300 0 0 0 0 3 0 0 180 1 1
-60103003 2 0 符塔狂豹 50 0 103 103 0 0 0 0 0 83 0 0 0 0 0 0 22454 101 800 22454 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 14069 0 0 0 0 3 0 0 180 1 1
-60103004 2 0 狂暴巨熊 55 0 124 124 0 0 0 0 0 125 0 0 0 0 0 0 25653 101 800 25653 12 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 14839 0 0 0 0 3 0 0 180 1 1
-60103005 2 0 魔化豪猪 60 0 132 132 0 0 0 0 0 214 0 0 0 0 0 0 28153 101 800 28153 14 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 16053 0 0 0 0 3 0 0 180 1 1
+60103001 2 0 妖兵 30 0 71 71 0 0 0 0 0 48 0 0 0 0 0 0 19888 101 800 19888 8 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 3232 0 0 0 0 3 0 0 180 1 1
+60103002 2 0 机关幻兽 40 0 89 89 0 0 0 0 0 52 0 0 0 0 0 0 20112 101 800 20112 10 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 4560 0 0 0 0 3 0 0 180 1 1
+60103003 2 0 符塔狂豹 50 0 103 103 0 0 0 0 0 83 0 0 0 0 0 0 22454 101 800 22454 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 9690 0 0 0 0 3 0 0 180 1 1
+60103004 2 0 狂暴巨熊 55 0 124 124 0 0 0 0 0 125 0 0 0 0 0 0 25653 101 800 25653 12 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 12000 0 0 0 0 3 0 0 180 1 1
+60103005 2 0 魔化豪猪 60 0 132 132 0 0 0 0 0 214 0 0 0 0 0 0 28153 101 800 28153 14 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 13500 0 0 0 0 3 0 0 180 1 1
60103006 2 0 残暴凶狼 65 0 154 154 0 0 0 0 0 365 0 0 0 0 0 0 32456 101 800 32456 17 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 17267 0 0 0 0 3 0 0 180 1 1
60103007 2 0 幽魂邪道 70 0 178 178 0 0 0 0 0 482 0 0 0 0 0 0 51323 101 800 51323 18 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 21440 0 0 0 0 3 0 0 180 1 1
60103008 2 0 狂躁巨猿 75 0 215 215 0 0 0 0 0 684 0 0 0 0 0 0 65452 101 800 71242 19 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 30932 0 0 0 0 3 0 0 180 1 1
@@ -803,10 +820,10 @@
60103010 2 0 巨剑师 85 0 610 610 0 0 0 0 0 1010 0 0 0 0 0 0 81531 101 800 116886 22 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 66969 0 0 0 0 3 0 0 180 1 1
60103011 2 0 符塔剑魂 90 0 896 896 0 0 0 0 0 1060 0 0 0 0 0 0 94251 101 800 123634 23 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 81872 0 0 0 0 3 0 0 180 1 1
60103012 2 0 符塔剑尊 99 0 1096 1096 0 0 0 0 0 1110 0 0 0 0 0 0 106452 101 800 137638 24 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 109859 0 0 0 0 3 0 0 180 1 1
-60103013 2 0 守塔哨兵 110 0 1761 1761 0 0 0 0 0 886 0 0 0 0 0 0 147553 101 800 216372 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 121172 0 0 0 0 3 0 0 180 1 1
-60103014 2 0 仙人掌球球 120 0 1954 1954 0 0 0 0 0 986 0 0 0 0 0 0 173065 101 800 225862 12 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 131347 0 0 0 0 3 0 0 180 1 1
-60103015 2 0 封印花妖 125 0 2448 2448 0 0 0 0 0 1250 0 0 0 0 0 0 234561 101 800 244842 13 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 158977 0 0 0 0 3 0 0 180 1 1
-60103016 2 0 逍遥尊者 130 0 2872 2872 0 0 0 0 0 1485 0 0 0 0 0 0 284014 101 800 254332 13 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 206030 0 0 0 0 3 0 0 180 1 1
+60103013 2 0 守塔哨兵 110 0 1761 1761 0 0 0 0 0 886 0 0 0 0 0 0 147553 101 800 216372 11 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 80781 0 0 0 0 3 0 0 180 1 1
+60103014 2 0 仙人掌球球 120 0 1954 1954 0 0 0 0 0 986 0 0 0 0 0 0 173065 101 800 225862 12 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 94862 0 0 0 0 3 0 0 180 1 1
+60103015 2 0 封印花妖 125 0 2448 2448 0 0 0 0 0 1250 0 0 0 0 0 0 234561 101 800 244842 13 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 123648 0 0 0 0 3 0 0 180 1 1
+60103016 2 0 逍遥尊者 130 0 2872 2872 0 0 0 0 0 1485 0 0 0 0 0 0 284014 101 800 254332 13 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 183138 0 0 0 0 3 0 0 180 1 1
60103017 2 0 符塔魔兵 135 0 3301 3301 0 0 0 0 0 1716 0 0 0 0 0 0 344684 101 800 263822 14 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 331487 0 0 0 0 3 0 0 180 1 1
60103018 2 0 符塔蛮兽 140 0 3721 3721 0 0 0 0 0 1933 0 0 0 0 0 0 400465 101 800 273312 14 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 409585 0 0 0 0 3 0 0 180 1 1
60103019 2 0 紫金炎龙 145 0 4227 4227 0 0 0 0 0 2197 0 0 0 0 0 0 467226 101 800 282802 15 0 300 2 6 0 0 0 0 0 0 0 0 0 40 2 505648 0 0 0 0 3 0 0 180 1 1
@@ -1132,28 +1149,28 @@
30603006 2 0 玄界冰魔 320 0 10459 10459 7847 0 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
40108001 14 0 小宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
40108002 14 0 大宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
-40102001 2 0 金甲蛮牛 335 0 4483 4483 0 9 0 0 0 800 0 0 0 0 0 0 0 3 3000 682910 49 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 7704451 0 0 0 0 1 435165 22 1 1 1
-40102002 2 0 食灵鱼 360 0 5472 5472 0 11 0 0 0 950 0 0 0 0 0 0 0 3 3000 787543 59 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 9910868 0 0 0 0 1 528050 25 1 1 1
-40102003 2 0 秘境守卫 385 0 6578 6578 0 12 0 0 0 950 0 0 0 0 0 0 0 3 3000 905897 69 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 12459199 0 0 0 0 1 539535 29 1 1 1
-40102004 2 0 灵鲛斗士 410 0 10717 10717 0 14 0 0 0 1349 0 0 0 0 0 0 0 3 3000 1134852 90 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 22724479 0 0 0 0 1 546410 33 1 1 1
-40102005 2 0 紫炎灵狮 435 0 13422 13422 0 15 0 0 0 1738 0 0 0 0 0 0 0 3 3000 1196094 95 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 32053830 0 0 0 0 1 602510 38 1 1 1
-40102006 2 0 金甲剑士 455 0 18169 18169 0 16 0 0 0 2480 0 0 0 0 0 0 0 3 3000 1295068 103 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 50019222 0 0 0 0 1 809985 22 1 1 1
-40102007 2 0 黄金战将 475 0 21171 21171 0 17 0 0 0 3454 0 0 0 0 0 0 0 3 3000 1382730 111 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 63979278 0 0 0 0 1 1036030 25 1 1 1
-40103001 2 0 残暴古熊王 340 0 12783 12783 0 10 0 0 10000 13276 0 1 0 0 0 0 0 3 3000 682910 49 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 28407552 1 10000 0 0 5 0 0 186 1 1
-40103002 2 0 魅影蛛皇 365 0 15587 15587 0 12 0 0 10000 15824 0 1 0 0 0 0 0 3 3000 787543 59 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 65181166 1 10000 0 0 5 0 0 186 1 1
-40103003 2 0 紫金貔貅 390 0 18212 18212 0 13 0 0 10000 17564 0 1 0 0 0 0 0 3 3000 905897 69 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7653341 2 10000 0 0 5 0 0 186 1 1
-40103004 2 0 双翼角兽 415 0 27390 27390 0 15 0 0 10000 25302 0 1 0 0 0 0 0 3 3000 1134852 90 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 78741327 3 10000 0 0 5 0 0 186 1 1
-40103005 2 0 金甲蛮狮 440 0 33069 33069 0 16 0 0 10000 31490 0 1 0 0 0 0 0 3 3000 1196094 95 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 34230539 5 10000 0 0 5 0 0 186 1 1
-40103006 2 0 麒麟瑞兽 460 0 43632 43632 0 17 0 0 10000 42880 0 1 0 0 0 0 0 3 3000 1295068 103 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 384487 10 10000 0 0 5 0 0 186 1 1
-40103007 2 0 金色战神 480 0 55692 55692 0 18 0 0 10000 54502 0 1 0 0 0 0 0 3 3000 1382730 111 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 99481988 15 10000 0 0 5 0 0 186 1 1
-40103008 2 0 金色战神 500 0 55692 55692 0 18 0 0 10000 54502 0 1 0 0 0 0 0 3 3000 1382730 111 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 99481988 15 10000 0 0 5 0 0 186 1 1
-50103001 2 0 道士鼠 1 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 觉灵鹿 1 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 球球 1 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 地狱冥虎 1 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 冰火冥魂 200 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 八宝葫芦 250 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 九黎妖虎 300 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
+40102001 2 0 幽谷法师 335 0 13422 13422 0 9 0 0 0 1738 0 0 0 0 0 0 0 3 3000 1196094 95 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 32053830 0 0 0 0 1 435165 22 1 1 1
+40102002 2 0 磐石之灵 360 0 18495 18495 0 11 0 0 0 2535 0 0 0 0 0 0 0 3 3000 1300889 104 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 51652061 0 0 0 0 1 528050 25 1 1 1
+40102003 2 0 秘境魔鹰 385 0 21934 21934 0 12 0 0 0 3651 0 0 0 0 0 0 0 3 3000 1397535 112 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 67169713 0 0 0 0 1 539535 29 1 1 1
+40102004 2 0 枯萎树妖 410 0 26391 26391 0 14 0 0 0 4611 0 0 0 0 0 0 0 3 3000 1496712 120 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 84899360 0 0 0 0 1 546410 33 1 1 1
+40102005 2 0 亚种雷兽 435 0 28866 28866 0 15 0 0 0 7467 0 0 0 0 0 0 0 3 3000 1611629 130 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 12026311 1 0 0 0 1 602510 38 1 1 1
+40102006 2 0 金甲剑士 455 0 31450 31450 0 16 0 0 0 8115 0 0 0 0 0 0 0 3 3000 1671530 135 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 25170648 1 0 0 0 1 809985 22 1 1 1
+40102007 2 0 黄金战将 475 0 34527 34527 0 17 0 0 0 9152 0 0 0 0 0 0 0 3 3000 1761976 143 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 43922990 1 0 0 0 1 1036030 25 1 1 1
+40103001 2 0 仙境守护者 340 0 56915 56915 0 10 0 0 0 33320 0 1 0 0 0 0 0 3 3000 1221071 97 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 8460021 7 10000 0 0 5 0 0 186 1 1
+40103002 2 0 丛林祭祀 365 0 76851 76851 0 12 0 0 0 45990 0 1 0 0 0 0 0 3 3000 1315440 105 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 79945808 12 10000 0 0 5 0 0 186 1 1
+40103003 2 0 秘境之吻 390 0 105266 105266 0 13 0 0 0 59127 0 1 0 0 0 0 0 3 3000 1412339 113 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 54218576 17 10000 0 0 5 0 0 186 1 1
+40103004 2 0 仙湖守卫 415 0 135630 135630 0 15 0 0 0 70290 0 1 0 0 0 0 0 3 3000 1524473 122 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 20834600 22 10000 0 0 5 0 0 186 1 1
+40103005 2 0 湖中之灵 440 0 151050 151050 0 16 0 0 0 93753 0 1 0 0 0 0 0 3 3000 1627066 131 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 82810219 38 10000 0 0 5 0 0 186 1 1
+40103006 2 0 岩石守卫 460 0 168697 168697 0 17 0 0 0 105206 0 1 0 0 0 0 0 3 3000 1716500 139 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 21903336 45 10000 0 0 5 0 0 186 1 1
+40103007 2 0 裂空魅影 480 0 181384 181384 0 18 0 0 0 115311 0 1 0 0 0 0 0 3 3000 1793610 145 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 88870769 63 10000 0 0 5 0 0 186 1 1
+40103008 2 0 秘境勇士 500 0 183812 183812 0 18 0 0 0 120314 0 1 0 0 0 0 0 3 3000 1886586 153 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7882470 77 10000 0 0 5 0 0 186 1 1
+50103001 2 0 道士鼠 1 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 23072 0 0 0 0 0 0 0 10 2 1742024 0 0 0 0 5 0 0 186 1 1
+50103002 2 0 觉灵鹿 1 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 23068 0 0 0 0 0 0 0 10 2 5087089 0 0 0 0 5 0 0 186 1 1
+50103003 2 0 球球 1 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 23074 0 0 0 0 0 0 0 10 2 7079698 0 0 0 0 5 0 0 186 1 1
+50103004 2 0 地狱冥虎 1 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 23070 0 0 0 0 0 0 0 10 2 9937882 0 0 0 0 5 0 0 186 1 1
+50103005 2 0 冰火冥魂 200 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 23062 0 0 0 0 0 0 0 10 2 45127197 0 0 0 0 5 0 0 186 1 1
+50103006 2 0 八宝葫芦 250 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 23066 0 0 0 0 0 0 0 10 2 79667846 0 0 0 0 5 0 0 186 1 1
+50103007 2 0 九黎妖虎 300 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 23064 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 3fefdf0..a3993c0 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -671,13 +671,13 @@
23066 骑宠3技能 23066 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105029 0 0 0 0 0 0 0 0 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 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
23067 八宝葫芦 23067 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
23068 骑宠3技能 23068 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105030 0 0 0 0 0 0 0 0 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 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23069 八宝葫芦 23069 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
+23069 觉灵鹿 23069 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
23070 骑宠3技能 23070 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105031 0 0 0 0 0 0 0 0 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 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23071 八宝葫芦 23071 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
+23071 地狱冥虎 23071 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
23072 骑宠3技能 23072 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105032 0 0 0 0 0 0 0 0 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 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23073 八宝葫芦 23073 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
+23073 道士鼠 23073 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
23074 骑宠3技能 23074 1 1 0 0 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105033 0 0 0 0 0 0 0 0 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 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0
-23075 八宝葫芦 23075 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
+23075 球球 23075 1 1 0 0 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 1000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 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
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
23051 聚魂副本群攻 23051 1 1 0 0 0 1 0 0 2 5 40 5 0 800 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 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
23052 聚魂副本减速 23052 1 1 0 0 0 6 0 0 6 5 40 5 0 1950 0 0 0 0 0 16 5000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 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
diff --git a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
index 744d6e0..cf59201 100644
--- a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
@@ -108,3 +108,14 @@
111340 32012 23 23 25 20010 0
111344 32013 23 23 25 20010 0
111348 32014 23 23 25 20010 0
+111372 32020 104 368 13 20011 0
+111373 32020 197 380 13 20011 0
+111374 32020 103 304 17 20008 0
+111375 32020 166 304 16 20008 0
+111376 32020 222 326 15 20008 0
+111377 32020 220 271 12 20008 0
+111378 32020 227 209 15 20008 0
+111379 32020 213 133 15 20008 0
+111380 32020 159 245 15 20008 0
+111381 32020 108 246 14 20008 0
+111382 32020 158 201 200 20010 0
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index 93641db..42cc9e2 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -1114,6 +1114,9 @@
34642 10802001 10080 0 [57,25,1,15] 1 1 0 2500 0 0 1 5 5 0 0
34643 10802001 10080 0 [59,22,1,15] 1 1 0 2500 0 0 1 5 5 0 0
34644 10802001 10080 0 [61,25,1,15] 1 1 0 2500 0 0 1 5 5 0 0
+111387 0 32020 0 [78,261,6,12] 4 4 0 2500 0 0 1 5 5 0 105
+111388 0 32020 0 [191,268,6,12] 4 4 0 2500 0 0 1 5 5 0 103
+111389 0 32020 0 [106,334,6,15] 4 4 0 2500 0 0 1 5 5 0 102
89838 11101003 10110 0 [70,117,1,15] 1 1 0 3000 0 0 1 5 5 0 0
89914 11101004 10110 0 [22,100,1,15] 1 1 0 3000 0 0 1 5 5 0 0
89926 11101004 10110 0 [16,105,1,15] 1 1 0 3000 0 0 1 5 5 0 0
@@ -1143,6 +1146,9 @@
871 31704003 31170 0 [60,27,0,15] 1 1 0 0 0 0 1 5 5 100 101
879 31704001 31170 0 [36,25,0,15] 1 1 0 0 0 0 1 5 5 185 102
1110 31704002 31170 0 [54,50,0,15] 1 1 0 0 0 0 1 5 5 255 103
+111351 0 32020 0 [218,326,0,12] 1 1 0 0 0 0 1 5 5 0 180
+111353 0 32020 0 [165,303,0,16] 1 1 0 0 0 0 1 5 5 0 181
+111354 0 32020 0 [103,303,0,17] 1 1 0 0 0 0 1 5 5 0 182
509 0 31250 0 [23,23,1,15] 1 1 0 0 0 0 1 5 5 0 101
510 0 31250 0 [20,20,1,15] 1 1 0 0 0 0 1 5 5 0 103
511 0 31250 0 [19,25,1,15] 1 1 0 0 0 0 1 5 5 0 102
@@ -1176,6 +1182,13 @@
80238 10901003 10090 0 [104,69,0,15] 1 1 0 3000 0 0 1 5 5 0 0
80239 10901003 10090 0 [104,67,0,15] 1 1 0 3000 0 0 1 5 5 0 0
89854 11101003 10110 0 [71,110,1,15] 1 1 0 3000 0 0 1 5 5 0 0
+111355 0 32020 0 [220,271,0,13] 1 1 0 0 0 0 1 5 5 0 183
+111356 0 32020 0 [160,247,0,15] 1 1 0 0 0 0 1 5 5 0 184
+111357 0 32020 0 [107,247,0,15] 1 1 0 0 0 0 1 5 5 0 185
+111358 0 32020 0 [227,210,0,14] 1 1 0 0 0 0 1 5 5 0 186
+111359 0 32020 0 [213,135,0,15] 1 1 0 0 0 0 1 5 5 0 187
+111384 0 32020 0 [159,333,6,12] 4 4 0 2500 0 0 1 5 5 0 101
+111386 0 32020 0 [135,269,6,12] 4 4 0 2500 0 0 1 5 5 0 104
92478 0 21110 0 [23,81,0,15] 1 1 0 0 0 0 1 5 5 0 110
92479 0 21110 0 [24,103,0,15] 1 1 0 0 0 0 1 5 5 0 111
92480 0 21110 0 [25,130,0,15] 1 1 0 0 0 0 1 5 5 0 112
--
Gitblit v1.8.0