From 17b86921aaa073c4d779be70d4e94509785771a8 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期二, 08 一月 2019 10:50:50 +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 
 CoreServerGroup/GameServer/PySysDB/tagFBLine.txt                                                           |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCustomRefresh.pyc                            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc                                    |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc                 |    0 
 CoreServerGroup/GameServer/PySysDB/tagCrossPenglaiZone.txt                                                 |    6 +
 db/PyMongoDataServer/SysDB/tagBornRefresh.txt                                                              |    2 
 CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt                                                      |    1 
 db/PyMongoDataServer/SysDB/tagChinMap.txt                                                                  |    4 
 db/PyMongoDataServer/PySysDB/tagItemCompound.txt                                                           |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt                                       |    4 
 CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt                                                           |    1 
 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                                                          |    4 
 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt                                                               |   16 ++--
 CoreServerGroup/GameServer/PySysDB/tagQuestionBank.txt                                                     |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini                                              |   12 ++-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoat.pyc                               |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                             |    8 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt           |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc                                 |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt                                         |    2 
 db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt                                                    |   15 +++
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                 |   37 ++++++++-
 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 +
 db/PyMongoDataServer/PySysDB/tagFBFunc.txt                                                                 |    1 
 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/PySysDB/tagFBLine.txt                                                                 |    2 
 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt                                                               |   13 +++
 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.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 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map132_Plxj.col                                        |    0 
 /dev/null                                                                                                  |    0 
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                                                      |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc                         |    0 
 db/PyMongoDataServer/PySysDB/tagPersonalBoss.txt                                                           |   14 +-
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                                                          |    0 
 52 files changed, 177 insertions(+), 42 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index 6cd6e49..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
@@ -43,3 +43,5 @@
 32013	跨服竞技场	10	0
 32014	跨服竞技场	10	0
 31340	幽暗迷森	1	0
+32020	蓬莱仙境	0	0
+32021	蓬莱仙境	0	0
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/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index eab41db..887ee3d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -23,3 +23,4 @@
 31010	0
 31340	0
 32010	0
+32020	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index 52ba958..7d5a81c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -100,3 +100,5 @@
 32010	2	32012
 32010	3	32013
 32010	4	32014
+32020	0	32020
+32020	1	32021
diff --git a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
index 050b905..c5f5ba6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
@@ -24,6 +24,7 @@
 123	{'SpecialItemID':[3801]}
 124	{'SpecialItemID':[3802]}
 125	{'SpecialItemID':[3803]}
+126	{'SpecialItemID':[3804]}
 130	{'ItemType':[4,6,8,10,11,12,13,14,15,16,17,18,19,20,24,29,31,33,36,37,38,40,44,48,49,51,57,59,60,76,81,119,120,121,122,123,126]}
 131	{'ItemType':[34,35]}
 132	{'ItemType':[21,22,41,124]}
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..7ae7ec0 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..5bced11 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..680474c 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/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/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 928f88d..c2aef3f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/CrossMapID.txt
@@ -3,3 +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
+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/Map/Map132_Plxj.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map132_Plxj.col
new file mode 100644
index 0000000..1d8150b
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map132_Plxj.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index 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..ba09622 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -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
@@ -1007,12 +1007,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 78c12bf..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..442c049 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..242c2c3 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 b763577..db9fdb3 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 817e0d4..da506c5 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 a435424..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/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/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/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/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 83d4cf5..5426622 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -23,3 +23,4 @@
 31010	3	2	0	0	0	0	0	0	0	180	0	0	0
 31340	2	2	0	0	0	0	0	0	1	0	0	0	0
 32010	0	2	0	0	0	0	0	0	0	0	0	0	0
+32020	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 6ff8e78..dcf260a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -100,3 +100,5 @@
 32010	2	32012	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	3	32013	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	4	32014	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
+32020	0	32020	150	0	0	0	0	0	0	0	0					
+32020	1	32021	150	0	0	0	0	0	0	0	0					
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1711279..6ce57e8 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	102|103	0	0	0	0
+GodWeapon2	105|106	0	0	0	0
+GodWeapon3	108|109	0	0	0	0
+GodWeapon4	111|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]}				
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index ab48b80..d6de1d1 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -2,8 +2,8 @@
 1	1	3711|3721	1	0	0	3801	1	0	2000	10000	0	5	WingComposeSuccess1	1
 2	0	3712|3722	1	3711|3721|3796|3797|3792|3793	1	3802	1	0	2000	10000	0	5	WingComposeSuccess2	1
 3	0	3713|3723	1	3712|3722	1	3803	1	0	2000	10000	0	5	WingComposeSuccess3	1
-4	0	3714	0	3713	1	3804	1	0	2000	10000	0	5	WingComposeSuccess4	1
-5	0	3724	0	3723	1	3804	1	0	2000	10000	0	5	WingComposeSuccess4	1
+4	0	3714	0	3713	1	3804	2	0	2000	10000	0	5	WingComposeSuccess4	1
+5	0	3724	0	3723	1	3804	2	0	2000	10000	0	5	WingComposeSuccess4	1
 6	0	3715	0	3714	1	3805|3806	2|2	0	2000	10000	0	5	WingComposeSuccess5	1
 7	0	3725	0	3724	1	3805|3806	2|2	0	2000	10000	0	5	WingComposeSuccess5	1
 11	0	9065	0	9064|9064|9064	3	5304	20	0	10000	0	0	0	XianComposeSucces1	1
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index 34de11e..2573754 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	230	250	2797
+32020	40102002	240	260	3447
+32020	40102003	280	300	4824
+32020	40102004	290	310	5805
+32020	40102005	330	350	7814
+32020	40103001	0	0	0
+32020	40103002	0	0	0
+32020	40103003	0	0	0
+32020	40103004	0	0	0
+32020	40103005	0	0	0
+32020	40103006	0	0	0
+32020	40103007	0	0	0
+32020	40103008	0	0	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/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/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/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 c11be0d..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
@@ -638,13 +638,13 @@
 3711	5	0	幽尘之羽	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	50000	0	0	19	800	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3712	6	0	风炎之翼	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	6	120000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	6	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3713	8	0	魔龙之魂	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	13500	0	20	0	0	0	0	6	280000	0	0	19	4000	0	0	23	15	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3714	10	0	枪系4代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	24500	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	22	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3714	10	0	天蛛之舞	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	24500	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	22	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3715	12	0	枪系5代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	83500	0	20	0	0	0	0	6	1000000	0	0	19	8000	0	0	23	25	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	22	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3720	5	0	落英缤纷	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	2000	0	0	19	1500	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	1	0	0	0	0	3	0	0	0	0	0	0	3600	0	0	0	0	0	0	0
 3721	5	0	落英缤纷	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	50000	0	0	19	800	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	2	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3722	6	0	蝶舞流光	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	4680	0	10	0	0	0	0	6	120000	0	0	19	2500	0	0	23	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	6	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3723	8	0	百鸟朝凤	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	13500	0	20	0	0	0	0	6	280000	0	0	19	4000	0	0	23	15	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	13	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-3724	10	0	杖系4代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	24500	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	22	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3724	10	0	梦转千澜	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	24500	0	20	0	0	0	0	6	500000	0	0	19	6000	0	0	23	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	22	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3725	12	0	杖系5代翅膀	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	83500	0	20	0	0	0	0	6	1000000	0	0	19	8000	0	0	23	25	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	22	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3792	5	0	幽尘之羽	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	70000	0	0	19	1300	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3793	5	0	落英缤纷	111	11	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	280	0	5	0	0	0	0	6	70000	0	0	19	1300	0	0	23	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -657,7 +657,7 @@
 3801	5	0	青鸾之羽	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	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	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
 3802	6	0	火凤精血	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	3750	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3803	8	0	神凰冠羽	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	8100	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	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
-3804	10	0	翅膀4代材料	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	12250	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+3804	10	0	流梦炎翎	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	12250	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3805	12	0	翅膀5代材料1	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	41750	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	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
 3806	12	0	翅膀5代材料2	39	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	41750	0	50	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	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
 3807	1	0	初级翅膀精炼石	52	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	3	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 5b2b477..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
@@ -43,3 +43,5 @@
 32013	跨服竞技场	1	0	900000	10	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	1	2
 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/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..dce83d7 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -937,6 +937,8 @@
 105421	11001003	10100	0	[109,88,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105433	11001003	10100	0	[116,91,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105443	11001004	10100	0	[113,119,1,12]	1	1	0	2500	0	0	1		5	5	0	0
+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
 105453	11001004	10100	0	[105,121,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105455	11001004	10100	0	[107,122,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105457	11001004	10100	0	[108,120,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -963,6 +965,12 @@
 105569	11004009	10100	0	[84,136,0,15]	1	1	0	0	0	0	1		5	5	140	0
 105571	11004010	10100	0	[51,142,0,15]	1	1	0	0	0	0	1		5	5	140	0
 105573	11004011	10100	0	[27,92,0,15]	1	1	0	0	0	0	1		5	5	1	0
+111359	0	32020	0	[213,135,0,15]	1	1	0	0	0	0	1		5	5	0	187
+111384	40102001	32020	0	[159,333,6,12]	4	4	0	2500	0	0	1		5	5	0	0
+111386	40102004	32020	0	[135,269,6,12]	4	4	0	2500	0	0	1		5	5	0	0
+111387	40102005	32020	0	[78,261,6,12]	4	4	0	2500	0	0	1		5	5	0	0
+111388	40102003	32020	0	[191,268,6,12]	4	4	0	2500	0	0	1		5	5	0	0
+111389	40102002	32020	0	[106,334,6,15]	4	4	0	2500	0	0	1		5	5	0	0
 105491	11001005	10100	0	[64,136,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105493	11001005	10100	0	[56,134,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 105495	11001005	10100	0	[58,134,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -1101,6 +1109,11 @@
 76613	10301005	10030	0	[66,122,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76625	10301001	10030	0	[67,12,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 80303	10901005	10090	0	[61,123,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+111354	0	32020	0	[103,303,0,17]	1	1	0	0	0	0	1		5	5	0	182
+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
 76635	10301005	10030	0	[58,125,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76647	10303001	10030	0	[20,160,1,12]	1	1	0	10000	0	0	1		5	5	128	0
 90380	0	21110	0	[82,85,0,15]	1	1	0	0	0	0	1		5	5	0	102

--
Gitblit v1.8.0