From c7d5827fb1861bff64af2128a7033f18c58a3020 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期六, 24 十一月 2018 17:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagCTG.txt                                                               |   58 ++++----
 db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt                                                     |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                              |    0 
 db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt                                                     |    8 
 CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt                                                |   35 +++++
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                                                     |    8 
 db/PyMongoDataServer/PySysDB/tagSuccess.txt                                                           |    2 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                            |   21 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc                            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc                           |    0 
 db/PyMongoDataServer/PySysDB/tagFBFunc.txt                                                            |   46 +++---
 db/PyMongoDataServer/SysDB/tagChinMap.txt                                                             |    8 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc                          |    0 
 db/PyMongoDataServer/PySysDB/tagItemCompound.txt                                                      |    9 
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                                            |   26 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc |    0 
 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt                                                          |   28 ++--
 CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt                                                      |   45 +++---
 db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt                                                     |   26 +-
 CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc                                                   |    0 
 CoreServerGroup/GameServer/PySysDB/tagChinMap.txt                                                     |    8 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc                   |    0 
 db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt                                                      |   30 ++--
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                        |    3 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                                         |    0 
 db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt                                                      |    4 
 db/PyMongoDataServer/PySysDB/tagChests.txt                                                            |    1 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                           |   10 
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                                       |    1 
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                                                 |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                             |   18 +-
 32 files changed, 221 insertions(+), 176 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index e4ff932..3eaf48b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -18,8 +18,8 @@
 31030	BOSS之家二层	8	0
 31031	BOSS之家三层	8	0
 31040	日常副本	1	0
-31080	仙界秘境	2	1
-31110	渡劫	2	0
+31080	仙界秘境	1	1
+31110	渡劫	1	0
 31130	符印塔	1	0
 31140	冰晶矿脉	1	0
 31150	古神禁地	8	0
@@ -29,9 +29,9 @@
 31230	仙盟宴会	3	0
 31240	VIP Boss	1	0
 31170	守卫人皇	3	0
-51010	娲皇遗迹	2	0
+51010	娲皇遗迹	1	0
 41110	法宝副本	1	0
-60010	宗门试炼	2	0
+60010	宗门试炼	1	0
 31180	混乱妖域	2	0
 31160	上古战场	8	0
 31250	守护副本	1	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 01db16b..b0771da 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -385,25 +385,25 @@
 10801003	龙鲛战士	330
 10801004	枪神护卫	340
 10801005	梦境之狼	350
-10802001	雷炎狮	350
+10802001	雷炎狮	355
 10901001	两仪狂豹	360
 10901002	山间凶虎	370
 10901003	夜鹰	380
 10901004	亡者巫师	390
 10901005	魔之士兵	400
-10902001	魔界战将	400
+10902001	魔界战将	405
 11001001	古城魔兵	410
 11001002	幽森冥魂	420
 11001003	巨剑之魔	430
 11001004	燃魂巫者	440
 11001005	魔化山石	450
-11002001	暗裔之魔	450
+11002001	暗裔之魔	455
 11101001	地宫巨蝎	460
 11101002	盗墓者	470
 11101003	青铜巨虎	480
 11101004	地宫风水师	490
 11101005	青铜士兵	500
-11102001	黄金战将	500
+11102001	黄金战将	505
 10303001	御剑尊者	100
 10403001	逍遥城主	105
 10503001	极寒之心	200
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index 8342571..577a4b0 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -1,22 +1,23 @@
-DataMapID	OpenServerDay	OpenTime	CanEnterTime	NotifyInfo
-31020	0	{}	0	{}
-31040	0	{}	0	{}
-31090	0	{}	0	{}
-41110	0	{}	0	{}
-31080	0	{}	0	{}
-31110	0	{}	0	{}
-31130	0	{}	0	{}
-31140	0	{}	0	{}
-31150	0	{}	0	{}
-31170	3	{"2":[[21,00]],"4":[[21,00]],"6":[[21,00]]}	30	{}
-31180	0	{"1":[[20,30]],"3":[[20,30]],"5":[[20,30]]}	30	{}
-31190	0	{}	0	{}
-31210	0	{}	0	{}
-31230	0	{"2":[[20,30]],"4":[[20,30]],"6":[[20,30]]}	15	{}
-31240	0	{}	0	{}
-40000	0	{"1":[[20,0]],"3":[[20,0]],"5":[[20,0]]}	30	{-5:["FB_liubo_54470", [5]], -3:["FB_liubo_54470", [3]], -1:["FB_liubo_54470", [1]]}
-51010	0	{}	0	{}
-60010	0	{}	0	{}
-31160	0	{"1":[[20,0]],"3":[[20,0]],"5":[[20,0]]}	30	{}
-31250	0	{}	0	{}
-52010	0	{}	0	{}
+DataMapID	HelpPoint
+31020	0
+31040	0
+31090	0
+41110	0
+31080	0
+31110	50
+31130	0
+31140	0
+31150	0
+31170	0
+31180	120
+31190	0
+31210	0
+31220	0
+31230	0
+31240	0
+51010	30
+60010	25
+31160	0
+31250	0
+52010	0
+31010	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
new file mode 100644
index 0000000..1a518c4
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagVipPrivilege.txt
@@ -0,0 +1,35 @@
+VIPPrivilege 	VIP0	VIP1	VIP2	VIP3	VIP4	VIP5	VIP6	VIP7	VIP8	VIP9	VIP10	VIP11	VIP12	VIP13	VIP14	VIP15
+1	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+2	0	0	0	0	0	0	1	1	1	1	1	1	1	1	1	1
+3	0	0	0	0	0	0	0	1	1	1	1	1	1	1	1	1
+4	2000	1000	1000	1000	1000	1000	1000	1000	1000	1000	1000	1000	1000	1000	1000	1000
+5	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+6	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+7	0	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+8	0	0	0	0	0	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000
+9	0	0	0	0	0	0	0	1	1	1	1	1	1	1	1	1
+10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+11	0	0	0	0	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000	5000
+12	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
+13	3	4	5	6	10	11	12	15	16	17	20	20	22	24	26	28
+14	2	3	4	5	8	9	10	13	14	15	20	16	18	20	22	24
+15	0	0	0	2	3	4	4	5	6	7	8	9	10	11	12	12
+16	0	0	1	1	1	2	2	2	3	3	4	5	6	6	6	6
+17	1	1	2	2	3	3	4	4	4	4	4	4	4	4	4	4
+18	0	0	0	0	1	1	2	2	2	2	2	2	2	2	2	2
+19	0	0	1	1	3	3	5	5	7	7	9	11	11	13	13	15
+20	0	0	0	0	1	1	1	2	2	2	2	3	3	3	3	3
+21	1	1	1	1	2	2	3	3	3	3	3	3	3	3	3	3
+22	0	0	0	0	0	1	1	1	1	1	2	2	2	2	2	2
+23	0	0	0	0	0	0	1	1	1	1	1	1	1	1	1	1
+24	0	0	0	0	1	1	1	1	1	1	1	1	1	1	1	1
+25	2	3	4	5	6	7	8	10	12	14	16	18	20	22	24	25
+26	0	0	0	0	1	1	1	1	1	1	1	1	1	1	1	1
+27	0	0	1	2	2	3	3	4	4	4	4	5	5	5	5	5
+28	0	0	0	1	1	1	1	1	1	1	1	1	1	1	1	1
+29	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+30	0	1	1	2	2	3	5	7	10	12	15	15	15	15	15	15
+31	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+32	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+33	0	0	0	500	500	500	500	1000	1000	1000	1000	1000	1000	1000	1000	1000
+34	0	0	0	5000	5000	10000	10000	10000	10000	10000	10000	10000	10000	10000	10000	10000
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index a28ae92..bf78a5d 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
index 3cfc31a..015cd6b 100644
--- a/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
+++ b/CoreServerGroup/GameServer/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index e41d250..b5a1a52 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 7fd9159..90ba154 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/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index f85c917..22c6d2a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
index bffba03..ff651dd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_IceLode.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 531eb4a..a0f9fa4 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/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 84b026c..6c2fc9d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
index b0f0137..105bf46 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGodWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index 2159bb2..e99c9e5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index 7316e69..1abdd16 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -1,29 +1,29 @@
-RecordID	DailyBuyCount	GainGold	GainGoldPaper	FirstGoldPaperPrize	GainItemList
-101	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-102	0	100	10	100	[]
-103	0	300	30	300	[]
-104	0	980	100	980	[]
-105	0	1280	138	1280	[]
-106	0	1980	248	1980	[]
-107	0	3280	468	3280	[]
-108	0	6480	1088	6480	[]
-109	0	30000	5888	0	[]
-110	0	10	1	0	[]
-111	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
-112	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
-113	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
-2	0	60	6	60	[]
-201	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]
-202	0	60	6	60	[]
-203	0	300	30	300	[]
-204	0	980	100	980	[]
-205	0	1280	138	1280	[]
-206	0	1980	248	1980	[]
-207	0	3280	468	3280	[]
-208	0	6480	1088	6480	[]
-209	0	30000	5888	0	[]
-210	0	1	0	0	[]
-211	0	1	0	0	[]
-212	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]
-213	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]
-214	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]
+RecordID	DailyBuyCount	GainGold	GainGoldPaper	FirstGoldPaperPrize	GainItemList	NotifyMark
+101	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]	
+102	0	100	10	100	[]	
+103	0	300	30	300	[]	
+104	0	980	100	980	[]	
+105	0	1280	138	1280	[]	
+106	0	1980	248	1980	[]	
+107	0	3280	468	3280	[]	
+108	0	6480	1088	6480	[]	
+109	0	30000	5888	0	[]	
+110	0	10	1	0	[]	
+111	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]	Bargaingift1
+112	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]	Bargaingift2
+113	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]	Bargaingift3
+2	0	60	6	60	[]	
+201	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]	
+202	0	60	6	60	[]	
+203	0	300	30	300	[]	
+204	0	980	100	980	[]	
+205	0	1280	138	1280	[]	
+206	0	1980	248	1980	[]	
+207	0	3280	468	3280	[]	
+208	0	6480	1088	6480	[]	
+209	0	30000	5888	0	[]	
+210	0	1	0	0	[]	
+211	0	1	0	0	[]	
+212	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]	Bargaingift1
+213	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]	Bargaingift2
+214	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]	Bargaingift3
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 6e5aad1..5bc7e01 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -201,3 +201,4 @@
 2411	0	0	0	1	1
 4008	0	0	0	0	0
 4009	0	0	0	0	0
+2412	0	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 373ef7f..3654a30 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -198,3 +198,4 @@
 2411	0		181_300									
 4008			4011_5									
 4009			4011_5									
+2412				[[5000,[3503,1]],[10000,[3513,1]]]	1							
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
index 983c1ad..0ad95f3 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipGSParam.txt
@@ -1,19 +1,19 @@
 EquipClass	EquipColor	EquipStar	AtkPerC	DamagePerC	SuperHitRateC	SuperHitPerC	DamReduceC	MaxHPPerC	DefPerC	LuckyHitRateC	PetDamPerC	PerLVAtkC	MissRateC	HitRateC	DamBackPerC	PerLVMaxHPC	DropEquipPerC	DropMoneyPerC	IgnoreDefRateReduceC	DamChanceDefC	SuperHitReduceC	SkillAtkRateC	SpeedPerC	AtkSpeedC	SkillAtkRateReduceC	HitC	MissC
-0	3	0	43637	32728	72001	18000	202207	44120	4603	13091	4115	750	37	345	19854	37	0	0	23564	9706	5823	19636	17673	43637	38826	800	800
-1	1	0	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	103919	55694	33416	86599	77939	192443	222777	1350	1300
-1	2	0	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	103919	55694	33416	86599	77939	192443	222777	1350	1300
-1	2	1	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	103919	55694	33416	86599	77939	192443	222777	1350	1300
-1	2	2	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	103919	55694	33416	86599	77939	192443	222777	1350	1300
-1	2	3	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	103919	55694	33416	86599	77939	192443	222777	1350	1300
-1	3	0	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	126616	69237	41542	105513	94962	234475	276949	1450	1300
-1	3	1	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	126616	69237	41542	105513	94962	234475	276949	1450	1300
-1	3	2	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	126616	69237	41542	105513	94962	234475	276949	1450	1300
-1	3	3	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	126616	69237	41542	105513	94962	234475	276949	1450	1300
-1	4	2	289439	217079	477574	119393	446596	405996	41660	86831	39851	1500	209	2563	182698	75	0	0	156297	89319	53591	130247	117222	289439	357277	1550	1300
-1	4	3	289439	217079	477574	119393	446596	405996	41660	86831	39851	1500	209	2563	182698	75	0	0	156297	89319	53591	130247	117222	289439	357277	1550	1300
-1	5	2	342330	7399	564844	141211	536144	487403	48609	2959	61833	1600	241	2987	219331	80	0	0	184858	107228	64337	154048	138643	342330	428915	1650	1300
-1	5	3	342330	256748	564844	141211	536144	487403	48609	102699	61833	1600	241	2987	219331	80	0	0	184858	107228	64337	154048	138643	342330	428915	1650	1300
-1	6	3	458690	344018	756838	189209	722490	656809	64344	137607	103545	1750	294	3691	295564	87	0	0	247692	144498	86698	206410	185769	458690	577992	1800	1300
+0	3	0	43637	32728	72001	18000	202207	44120	4603	13091	4115	750	37	345	19854	37	0	0	19636	38826	11647	19636	17673	43637	38826	800	800
+1	1	0	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	86599	222777	66833	86599	77939	192443	222777	1350	1350
+1	2	0	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	86599	222777	66833	86599	77939	192443	222777	1350	1350
+1	2	1	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	86599	222777	66833	86599	77939	192443	222777	1350	1350
+1	2	2	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	86599	222777	66833	86599	77939	192443	222777	1350	1350
+1	2	3	192443	144332	317530	79382	278472	253156	19798	57732	17328	1300	143	1672	113920	65	0	0	86599	222777	66833	86599	77939	192443	222777	1350	1350
+1	3	0	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	105513	276949	83084	105513	94962	234475	276949	1450	1450
+1	3	1	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	105513	276949	83084	105513	94962	234475	276949	1450	1450
+1	3	2	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	105513	276949	83084	105513	94962	234475	276949	1450	1450
+1	3	3	234475	175856	386883	96720	346186	314714	28270	70342	25675	1400	174	2078	141621	70	0	0	105513	276949	83084	105513	94962	234475	276949	1450	1450
+1	4	2	289439	217079	477574	119393	446596	405996	41660	86831	39851	1500	209	2563	182698	75	0	0	130247	357277	107183	130247	117222	289439	357277	1550	1550
+1	4	3	289439	217079	477574	119393	446596	405996	41660	86831	39851	1500	209	2563	182698	75	0	0	130247	357277	107183	130247	117222	289439	357277	1550	1550
+1	5	2	342330	7399	564844	154251	536144	487403	48609	2959	61833	1600	241	2987	219331	80	0	0	168274	467474	140242	154048	138643	342330	428915	1700	1700
+1	5	3	342330	256748	564844	206862	536144	487403	48609	102699	61833	1600	241	2987	219331	80	0	0	225668	908406	272521	154048	138643	342330	428915	1850	1850
+1	6	3	458690	344018	756838	280216	722490	656809	64344	137607	103545	1750	294	3691	295564	87	0	0	305690	1221867	366560	206410	185769	458690	577992	2050	2050
 2	1	0	1590	1192	2623	655	930	845	595	477	0	150	2	19	380	7	0	0	858	186	111	715	643	1590	744	200	200
 2	2	0	2752	2064	4540	1135	5436	4942	949	825	0	250	5	45	2223	12	0	0	1485	1087	652	1238	1114	2752	4349	300	300
 2	3	0	5010	3758	8266	2066	7079	6436	1592	1503	1516	400	11	106	2896	20	0	0	2705	1415	849	2254	2029	5010	5663	450	450
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index fd61b1c..e400734 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -1,23 +1,23 @@
-DataMapID	DayTimes	DayReKind	WeekTimes	WeekReKind	RewardRate	BuyTimesID	ExtraTimesID	MWPrivilegeID	GuardPick	OfflineTime	HelpPoint
-31020	0	0	0	0	0	0	0	0	1	180	0
-31040	0	0	0	0	0	0	0	0	0	0	0
-31090	0	0	0	0	0	0	0	0	0	0	0
-41110	0	0	0	0	0	0	0	0	0	0	0
-31080	2	2	0	0	75|60|45|30|21	21	0	0	1	0	0
-31110	0	0	0	0	75|60|45|30|17	0	0	0	1	0	180
-31130	0	0	0	0	75|60|45|30|16	0	0	0	1	0	0
-31140	0	2	0	0	0	0	0	0	1	0	0
-31150	1	2	0	0	0	0	19	0	1	180	0
-31170	1	2	0	0	75|60|45|30|20	0	0	0	1	0	0
-31180	1	2	0	0	100|90|80|70|60	0	0	0	1	0	120
-31190	2	2	0	0	75|60|45|30|18	17	0	0	1	0	0
-31210	0	0	0	0	0	0	0	0	0	0	0
-31220	2	2	0	0	0	0	0	0	0	0	0
-31230	1	2	0	0	0	0	0	0	0	0	0
-31240	0	2	0	0	0	0	15	0	1	0	0
-51010	2	2	0	0	100|80|70|60|40	29	0	0	1	0	100
-60010	3	2	0	0	75|60|45|30|21	0	0	0	1	0	120
-31160	1	2	0	0	0	0	0	0	1	0	0
-31250	0	0	0	0	0	0	0	0	0	0	0
-52010	5	2	0	0	0	25	0	0	1	180	0
-31010	3	2	0	0	0	0	0	0	0	180	0
+DataMapID	DayTimes	DayReKind	WeekTimes	WeekReKind	RewardRate	BuyTimesID	ExtraTimesID	MWPrivilegeID	GuardPick	OfflineTime	FBPoint	HelpPoint	DayHelpCountMax
+31020	0	0	0	0	0	0	0	0	1	180	0	0	0
+31040	0	0	0	0	0	0	0	0	0	0	0	0	0
+31090	0	0	0	0	0	0	0	0	0	0	0	0	0
+41110	0	0	0	0	0	0	0	0	0	0	0	0	0
+31080	2	2	0	0	75|60|45|30|21	21	0	0	1	0	0	0	0
+31110	0	0	0	0	75|60|45|30|17	0	0	0	1	0	100	50	0
+31130	0	0	0	0	75|60|45|30|16	0	0	0	1	0	0	0	0
+31140	10	2	0	0	0	0	0	0	1	0	0	0	0
+31150	1	2	0	0	0	0	19	0	1	180	0	0	0
+31170	1	2	0	0	75|60|45|30|20	0	0	0	1	0	0	0	0
+31180	1	2	0	0	100|90|80|70|60	0	0	0	1	0	120	120	1
+31190	2	2	0	0	75|60|45|30|18	17	0	0	1	0	0	0	0
+31210	0	0	0	0	0	0	0	0	0	0	0	0	0
+31220	2	2	0	0	0	0	0	0	0	0	0	0	0
+31230	1	2	0	0	0	0	0	0	0	0	0	0	0
+31240	0	2	0	0	0	0	15	0	1	0	0	0	0
+51010	2	2	0	0	100|80|70|60|40	29	0	0	1	0	60	30	0
+60010	3	2	0	0	75|60|45|30|21	0	0	0	1	0	50	25	0
+31160	1	2	0	0	0	0	0	0	1	0	0	0	0
+31250	0	0	0	0	0	0	0	0	0	0	0	0	0
+52010	5	2	0	0	0	25	0	0	1	180	0	0	0
+31010	3	2	0	0	0	0	0	0	0	180	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 9225ade..c9933c1 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -41,7 +41,7 @@
 31140	3	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[105,31401005,24,6],[104,31403004,1,1]]		[(5303,5,1),(5412,1,1)]
 31140	4	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[106,31401006,12,6],[104,31403005,1,1]]		[(5303,5,1),(5412,1,1)]
 31140	5	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[105,31401007,24,6],[104,31403006,1,1]]		[(5303,5,1),(5412,1,1)]
-31140	6	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[101,31401008,4,4],[102,31403007,1,1]]		[(5303,5,1),(5412,1,1)]
+31140	6	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[101,31401008,4,1],[102,31403007,1,1]]		[(5303,5,1),(5412,1,1)]
 31140	7	31140	180	500	0	0	0	0	250	0	0	[16,14]	[3,300,30,10,[180,60]]	[[103,31401009,12,6],[104,31403008,1,1]]		[(5303,5,1),(5412,1,1)]
 31150	0	31150	0	0	0	4007	1|2|2|3|3|4	80	0	0	0	[132,45]	[30,12]			
 31170	0	31170	110	0	0	0	0	0	0	0	0	[76,15]				[(26,33000,33000)]
@@ -55,17 +55,17 @@
 31220	0	31220	110	0	0	0	0	0	0	0	0	[12,23]				
 31230	0	31230	0	0	0	0	0	0	0	0	0	[12,6]	[900,[30,20,10,9,8,7,6,5,4,3,2,1]]			
 31240	0	31240	0	0	0	4010	2	80	0	0	0	[32,16]	[3,1800,15,101]			
-51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[5,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[60,30,30,30,30]	[793536, [141,45]]
-51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[5,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[60,30,30,30,30]	[831840, [141,36], [142,6]]
-51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[5,360,10]	[{5101031:1, 5101032:1}]	[60,30,30,30,30]	[1017600, [141,13], [142,18], [143,5]]
-51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[5,360,10]	[{5101041:0, 5101042:1}]	[60,30,30,30,30]	[1169280, [142,24], [143,8]]
-51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[5,360,10]	[{5101051:1, 5101052:0}]	[60,30,30,30,30]	[1404720, [142,9], [143,15], [144,6]]
-51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[5,360,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[60,30,30,30,30]	[1666080, [143,18], [144,9]]
-51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[5,360,10]	[{5101071:1, 5101072:0}]	[60,30,30,30,30]	[1953360, [144,15]]
-51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[5,360,10]	[{5101081:1}]	[60,30,30,30,30]	[2265840, [153,15]]
-60010	0	60010	105	500	0	0	0	0	0	0	0	[83,13]	[5,1800,30,10]	[[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]		{1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
-60010	1	60010	165	500	0	0	0	0	0	0	0	[208,24]	[5,1800,30,10]	[[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]		{1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
-60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[5,1800,30,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
+51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[3,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[60,30,30,30,30]	[793536, [141,45]]
+51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[3,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[60,30,30,30,30]	[831840, [141,36], [142,6]]
+51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[3,360,10]	[{5101031:1, 5101032:1}]	[60,30,30,30,30]	[1017600, [141,13], [142,18], [143,5]]
+51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[3,360,10]	[{5101041:0, 5101042:1}]	[60,30,30,30,30]	[1169280, [142,24], [143,8]]
+51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[3,360,10]	[{5101051:1, 5101052:0}]	[60,30,30,30,30]	[1404720, [142,9], [143,15], [144,6]]
+51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[3,360,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[60,30,30,30,30]	[1666080, [143,18], [144,9]]
+51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[3,360,10]	[{5101071:1, 5101072:0}]	[60,30,30,30,30]	[1953360, [144,15]]
+51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[3,360,10]	[{5101081:1}]	[60,30,30,30,30]	[2265840, [153,15]]
+60010	0	60010	105	500	0	0	0	0	0	0	0	[83,13]	[3,1800,30,10]	[[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]		{1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
+60010	1	60010	165	500	0	0	0	0	0	0	0	[208,24]	[3,1800,30,10]	[[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]		{1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
+60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[3,1800,30,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
 31160	0	31160	110	230	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1200	[311601,311603]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
 31160	1	31160	231	300	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1200	[311604,311605]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
 31160	2	31160	301	500	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1200	[311606,311607]		{1:[[101,2],[104,2]], 2:[[101,2],[102,1],[104,2]],3 :[[101,4],[102,2],[104,2]], 4:[[101,4],[102,2],[104,2],[105,1]], 5:[[101,6],[102,3],[104,2],[105,1]], 6:[[101,6],[102,4],[104,4],[105,2]]}
@@ -92,5 +92,5 @@
 52010	19	52010	455	0	0	0	0	0	0	0	0	[17,19,8]	10			
 31130	0	31130	0	500	0	0	0	0	0	0	0	[29,12]	[3,180,10,10]	101		
 31110	0	31110	80	500	0	0	0	0	0	0	0	[19,13,3]	[3, 180, 10, [210, 180, 150, 120],  [51,13]]	101		
-31110	1	31110	80	500	0	0	0	0	0	0	0	[59,13,3]	[5, 180, 10, [360, 245, 185, 125],  [51,13]]	102		
+31110	1	31110	80	500	0	0	0	0	0	0	0	[59,13,3]	[3, 180, 10, [360, 245, 185, 125],  [51,13]]	102		
 31210	0	31210	0	500	0	0	0	0	0	0	0	[12,6,3]	[10, 3600, 60, [1800, 900, 600, 300]]	[101,30903001]		
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6c5dc7a..8f85f9f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -16,6 +16,7 @@
 IceLodeSweep	{31401001:10,31403001:2}	0	0	0	0
 IceLodeNeedPoint	1500	31401001_50|31403001_300	0	0	0
 IceLodeCfg	25	[8,5]	125	[[5303,25,1],[5412,5,1]]	4
+IceLodeSpecial	[31403002]	[23043,23044]			
 ClearDevilPoint	1200	{30102001:20,30102002:50,30102003:300}	0	0	0
 AI197Point	{"31040":[[16,34],[18,99]]} 				
 AI198Point	{"3119000":[[15,19],[7,16],[13,22],[21,26]],"3119001":[[15,19],[7,16],[13,22],[21,26]],"3119002":[[15,19],[7,16],[13,22],[21,26]],"3119003":[[15,19],[7,16],[13,22],[21,26]],"3119004":[[15,19],[7,16],[13,22],[21,26]],"3119005":[[15,19],[7,16],[13,22],[21,26]],"3119006":[[15,19],[7,16],[13,22],[21,26]],"3118000":[[71,17],[73,63],[21,48]],"5101002":[[114,19]],"5101004":[[56,65],[83,88]],"3101000":[[6,25]],"4111000":[[17,16]],"4111001":[[17,16]],"4111002":[[17,16]],"4111003":[[17,16]],"4111004":[[17,16]],"4111005":[[17,16]],"4111006":[[17,16]],"4111007":[[17,16]],"4111008":[[17,16]],"4111009":[[77,17]],"4111010":[[77,17]],"4111011":[[77,17]],"4111012":[[77,17]],"4111013":[[77,17]],"4111014":[[77,17]],"4111015":[[77,17]],"4111016":[[77,17]],"4111017":[[77,17]],"4111018":[[77,17]],"4111019":[[77,17]],"4111020":[[77,17]],"4111021":[[77,17]],"4111022":[[77,17]],"4111023":[[17,16]],"4111024":[[17,16]],"3116000":[[59,25],[116,27],[88,53],[114,65],[36,78],[135,82],[99,93],[109,111],[66,111],[41,120]],"6001000":[[46,16],[10,18]],"6001001":[[198,24],[184,21],[144,23],[123,23]],"6001002":[[294,21],[279,21],[264,21],[236,23]],"3121000":[[12,38]],"5101007":[[66,118]],"5101003":[[18,66]],"5101005":[[122,70]],"5101006":[[8,109],[17,109],[12,119]],"5101001":[[63,13],[63,30],[76,27],[78,13]]} 				
@@ -175,7 +176,7 @@
 LegendAttrValueByColor2	{30:{2:100,3:140,4:180,5:200,6:220},26:{2:250,3:350,4:450,5:500,6:550},27:{2:250,3:350,4:450,5:500,6:550},14:{2:300,3:420,4:540,5:600,6:660},70:{2:300,3:420,4:540,5:600,6:660},29:{2:350,3:490,4:630,5:700,6:770},10:{1:450,2:750,3:1050,4:1125,5:1200},9:{1:450,2:750,3:1050,4:1125,5:1200},25:{1:120,2:200,3:280,4:300,5:320},55:{1:120,2:200,3:280,4:300,5:320},52:{1:6,2:10,3:14,4:15,5:16},53:{1:1,2:2,3:2,4:3,5:4}}				
 LegendAttrValueByClassLV	{29:{8:600,9:900,10:1200,11:1320,12:1425,13:1500,14:1575},30:{8:1200,9:1800,10:2400,11:2640,12:2850,13:3000,14:3150},14:{8:1600,9:2400,10:3200,11:3520,12:3800,13:4000,14:4200},18:{8:1000,9:1500,10:2000,11:2200,12:2375,13:2500,14:2625},71:{8:800,9:1200,10:1600,11:1760,12:1900,13:2000,14:2100}}	0	0	0	0
 EquipGSTypeForSort	101|102|103|104|105|106|107|108|109|110|111|112|119|120|121|122|123	0	0	0	0
-EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SpeedPer/10000.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*5.0+IceDef*5.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0)	0	0
+EquipGSFormula	int(((MinAtk+MaxAtk)/2.0*10.0+Def*10.0+MaxHP/2.0+AtkPer/10000.0+DamagePer/10000.0+SuperHitRate/10000.0+SuperHitPer/10000.0+DamReducePer/10000.0+MaxHPPer/10000.0+DefPer/10000.0+LuckyHitRate/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+MissRate/10000.0+HitRate/10000.0+DamBackPer/10000.0+PerLVMaxHP+DropEquipPer/10000.0+DropMoneyPer/10000.0+IgnoreDefRateReduce/10000.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SkillAtkRate/10000.0+SpeedPer/10000.0+(math.sqrt((AtkSpeed+10000.0)/10000.0)-1)*AtkSpeedC+OnlyFinalHurt*5.0/2.0+PVPAtkBackHP*5.0+SpeedPer/10000.0+SkillAtkRateReduce/10000.0))	[67,68,6,7,8,11,20,19,23]	int((MinAtk+MaxAtk)/2.0*5.0+Def*5.0+MaxHP/4.0+AtkPer/10000.0+IceAtk*10.0+IceDef*10.0+DamChanceDef/10000.0+SuperHitReduce/10000.0+SuperHitPer/10000.0+IgnoreDefRateReduce/10000.0+PetDamPer/10000.0+PerLVAtk/100.0+PerLVMaxHP+Hit/10000.0+Miss/10000.0)	0	0
 HorseUpItem	181	100	0	0	0
 HorseSuperRate	{}	0	0	0	0
 NeedSysHorseLV	{100:(3,6,9),101:(3,6,9),102:(3,6,9),103:(3,6,9),104:(3,6,9),105:(3,6,9),106:(3,6,9),107:(3,6,9),108:(3,6,9),109:(3,6,9),110:(3,6,9)}				
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index 71fdd9e..0337c3c 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -212,9 +212,12 @@
 214	0	6616	0	9013|9014	3	0	0	0	10000	0	0	0	EquipComposeSuccess4	1
 215	0	6617	0	9015|9016	3	0	0	0	10000	0	0	0	EquipComposeSuccess5	1
 216	0	6618	0	9015|9016	3	0	0	0	10000	0	0	0	EquipComposeSuccess5	1
-217	0	9075	0	9074	3	0	0	0	10000	0	0	0	EquipComposeSuccess6	1
-218	0	9077	0	9075	3	5305	10	0	10000	0	0	0	EquipComposeSuccess1	1
-219	0	9078	0	9077	3	5306	20	0	10000	0	0	0	EquipComposeSuccess2	1
+244	0	9062	0	9051	5	0	0	0	10000	0	0	0	XianComposeSucces1	1
+245	0	9073	0	9062	4	0	0	0	10000	0	0	0	XianComposeSucces2	1
+246	0	9074	0	9073	4	0	0	0	10000	0	0	0	XianComposeSucces3	1
+217	0	9075	0	9074	3	0	0	0	10000	0	0	0	XianComposeSucces4	1
+218	0	9077	0	9075	3	5305	10	0	10000	0	0	0	XianComposeSucces5	1
+219	0	9078	0	9077	3	5306	20	0	10000	0	0	0	XianComposeSucces6	1
 220	0	3502	0	0	0	3501	3	0	10000	0	0	0	0	1
 221	0	3503	0	0	0	3502	3	0	10000	0	0	0	0	1
 222	0	3504	0	0	0	3503	3	0	10000	0	0	0	0	1
diff --git a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
index ac92ade..21f8559 100644
--- a/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMagicWeaponFB.txt
@@ -1,5 +1,5 @@
 MWID	LineID	Level	RefreshNPC	Attr
-201	9	1	[[102,31203001,1,1,1,1,0]]	
+201	9	1	[[102,31203001,1,1,1,1,0]]	{"6":2440}
 202	10	1	[[102,31203002,1,1,1,1,0]]	{"6":3925}
 202	10	2	[[102,31203003,1,1,1,1,0]]	{"6":9159}
 202	10	3	[[102,31203004,1,1,1,1,0]]	{"6":9159}
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index 08503b9..34de11e 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -53,28 +53,28 @@
 10080	10801003	320	340	6697
 10080	10801004	330	350	8223
 10080	10801005	340	360	12124
-10080	10802001	340	360	14548
+10080	10802001	345	365	14548
 10080	10803001	0	0	0
 10090	10901001	350	370	12510
 10090	10901002	360	380	13052
 10090	10901003	370	390	14110
 10090	10901004	380	400	14873
 10090	10901005	390	410	16232
-10090	10902001	390	410	18394
+10090	10902001	395	415	18394
 10090	10903001	0	0	0
 10100	11001001	400	420	17343
 10100	11001002	410	430	18058
 10100	11001003	420	440	18932
 10100	11001004	430	450	19857
 10100	11001005	440	460	21459
-10100	11002001	440	460	24349
+10100	11002001	445	465	24349
 10100	11003001	0	0	0
 10110	11101001	450	470	22783
 10110	11101002	460	480	23635
 10110	11101003	470	490	24601
 10110	11101004	480	500	25806
 10110	11101005	490	510	27697
-10110	11102001	490	510	32059
+10110	11102001	495	515	32059
 10110	11103001	0	0	0
 21070	20102001	110	130	767
 21070	20102002	120	140	867
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index c1f55d1..c87a941 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -99,18 +99,18 @@
 50103005	1	3	1	372500	10000	0	8000	2	9900	50	1	0	0	1020	0
 50103006	1	3	1	419000	10000	0	8000	2	9900	50	1	0	0	947	0
 50103007	1	3	1	465600	10000	0	8000	2	9900	50	1	0	0	874	0
-31401002	0	2	0	2000	10000	0	8000	3	9900	50	1	0	0	0	0
-31403002	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401003	0	2	0	800	10000	0	8000	3	9900	50	1	0	0	0	0
-31403003	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401004	0	2	0	800	10000	1000	8000	3	9900	50	1	0	0	0	0
+31401002	0	2	0	2000	10000	0	8000	3	9900	50	24	0	0	0	0
+31403002	0	2	0	5500	10000	0	8000	3	9900	50	1	0	0	50	0
+31401003	0	2	0	800	10000	0	8000	3	9900	50	24	0	0	0	0
+31403003	0	2	0	5500	10000	0	8000	3	9900	50	1	0	0	50	0
+31401004	0	2	0	600	10000	1000	8000	3	9900	50	12	0	0	0	0
 31403004	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401005	0	2	0	1000	10000	0	8000	3	9900	50	1	0	0	0	0
-31403005	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401006	0	2	0	800	10000	0	8000	3	9900	50	1	0	0	0	0
+31401005	0	2	0	1500	10000	0	8000	3	9900	50	12	0	0	0	0
+31403005	0	2	0	5500	10000	0	8000	3	9900	50	1	0	0	50	0
+31401006	0	2	0	600	10000	0	8000	3	9900	50	12	0	0	0	0
 31403006	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401007	0	2	0	1000	10000	0	8000	3	9900	50	1	0	0	0	0
-31403007	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401008	0	2	0	500	10000	0	8000	3	9900	50	1	0	0	0	0
-31403008	0	2	0	6000	10000	0	8000	3	9900	50	1	0	0	50	0
-31401009	0	2	0	800	10000	0	8000	3	9900	50	1	0	0	0	0
+31401007	0	2	0	1000	10000	0	8000	3	9900	50	12	0	0	0	0
+31403007	0	2	0	5500	10000	0	8000	3	9900	50	1	0	0	50	0
+31401008	0	2	0	500	10000	0	8000	3	9900	50	12	0	0	0	0
+31403008	0	2	0	5800	10000	0	8000	3	9900	50	1	0	0	50	0
+31401009	0	2	0	1500	10000	0	8000	3	9900	50	12	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index b72fb88..0b37329 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -311,7 +311,7 @@
 824	3	1	107020	0	0	0	0		0		
 825	3	1	108020	0	0	0	0		0		
 826	3	1	109020	0	0	0	0		0		
-831	30	1	10|0	0	0	0	0		0		
+831	30	1	10|1	0	0	0	0		0		
 832	30	1	11|3	0	0	0	0		0		
 833	30	1	12|5	0	0	0	0		0		
 834	30	1	13|7	0	0	0	0		0		
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 5dc470c..1a518c4 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -13,7 +13,7 @@
 12	0	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000	3000
 13	3	4	5	6	10	11	12	15	16	17	20	20	22	24	26	28
 14	2	3	4	5	8	9	10	13	14	15	20	16	18	20	22	24
-15	0	0	0	1	2	2	3	3	4	4	4	9	10	11	12	12
+15	0	0	0	2	3	4	4	5	6	7	8	9	10	11	12	12
 16	0	0	1	1	1	2	2	2	3	3	4	5	6	6	6	6
 17	1	1	2	2	3	3	4	4	4	4	4	4	4	4	4	4
 18	0	0	0	0	1	1	2	2	2	2	2	2	2	2	2	2
@@ -31,3 +31,5 @@
 30	0	1	1	2	2	3	5	7	10	12	15	15	15	15	15	15
 31	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
 32	0	1	1	1	1	1	1	1	1	1	1	1	1	1	1	1
+33	0	0	0	500	500	500	500	1000	1000	1000	1000	1000	1000	1000	1000	1000
+34	0	0	0	5000	5000	10000	10000	10000	10000	10000	10000	10000	10000	10000	10000	10000
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 38da247..f8e1ffc 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -104,9 +104,9 @@
 208	1	0	玄武之魂(地)	22	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	2460	0	20	0	1	0	0	7	180	0	0	6	18000	0	0	15	100	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
 209	1	0	玄武之魂(人)	22	0	0	0	0	999	1	0	1	0	1	0	0	0	0	0	1	1440	0	20	0	1	0	0	7	120	0	0	6	12000	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
 221	1	0	娲皇的祝福	8	0	0	0	0	999	1	0	0	0	1	0	0	0	0	0	1	5000	0	10	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	47112	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
-222	1	0	地狱冥虎碎片	124	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	10	0	0	0	0	0	260	0	0	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
-223	1	0	八宝葫芦碎片	124	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	10	0	0	0	0	0	258	0	0	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
-224	1	0	觉灵鹿碎片	124	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	10	0	0	0	0	0	250	0	0	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
+222	1	0	地狱冥虎碎片	124	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	50000	0	0	0	0	0	260	0	0	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
+223	1	0	八宝葫芦碎片	124	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	100000	0	0	0	0	0	258	0	0	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
+224	1	0	觉灵鹿碎片	124	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	30000	0	0	0	0	0	250	0	0	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
 259	1	0	坐骑:追风	41	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	0	5	0	1	0	0	7	400	0	0	6	8000	0	0	23	20	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
 250	1	0	坐骑:觉灵鹿	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	5	0	1	0	0	7	400	0	0	6	8000	0	0	23	20	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
 251	1	0	坐骑:皓月狼	41	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	588	0	5	0	1	0	0	7	1472	0	0	6	29445	0	0	23	40	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
@@ -477,9 +477,9 @@
 2343	1	0	坐骑丹大礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	380	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
 2344	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	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2345	1	0	攻击神兵石礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	480	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
-2346	1	0	4级宝石随机礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	270	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
-2347	1	0	5级宝石随机礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	810	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
-2348	1	0	6级宝石随机礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	2430	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2346	1	0	4级随机宝石	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	270	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
+2347	1	0	5级随机宝石	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	810	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
+2348	1	0	6级随机宝石	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	2430	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2349	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
 2350	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
 2351	1	0	道士鼠参与宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	50	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
@@ -543,6 +543,7 @@
 2409	1	0	C级妖丹宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	110	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2410	1	0	D级妖丹宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2411	1	0	坐骑丹奢华礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	3000	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2412	1	0	3级随机宝石	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	2430	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3501	1	0	1级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	1	1	3502	6	190	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3502	1	0	2级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	1	2	3503	6	465	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3503	1	0	3级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	1	3	3504	6	1160	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -644,10 +645,10 @@
 4221	1	0	灵宠:极炎剑客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	680	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4222	1	0	灵宠:阴雷之狼	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1280	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4223	1	0	灵宠:雷蛟	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1280	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4250	1	0	冰火冥魂碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4209	0	0	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
-4251	1	0	九黎妖虎碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4210	0	0	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
-4252	1	0	球球碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	200	0	100	0	0	0	0	0	4213	0	0	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
-4253	1	0	道士鼠碎片	125	0	1	0	0	999	1	0	1	0	1	0	0	0	0	0	1	100	0	100	0	0	0	0	0	4202	0	0	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
+4250	1	0	冰火冥魂碎片	125	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	50000	0	0	0	0	0	4209	0	0	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
+4251	1	0	九黎妖虎碎片	125	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	100000	0	0	0	0	0	4210	0	0	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
+4252	1	0	球球碎片	125	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	200	0	30000	0	0	0	0	0	4213	0	0	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
+4253	1	0	道士鼠碎片	125	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	100	0	20000	0	0	0	0	0	4202	0	0	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
 4301	1	0	符印精华	31	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	60	0	5	0	1	0	0	0	260	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4302	1	0	符印精华	31	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	150	0	10	0	1	0	0	0	420	0	0	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
 4303	1	0	符印精华	31	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	210	0	20	0	1	0	0	0	790	0	0	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
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 4b77702..33acecd 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -18,8 +18,8 @@
 31030	BOSS之家二层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	5	35
 31031	BOSS之家三层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	5	35
 31040	日常副本	1	0	360000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
-31080	仙界秘境	1	0	900000	2	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
-31110	渡劫	1	0	220000	2	1	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	0	1
+31080	仙界秘境	1	0	900000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
+31110	渡劫	1	0	220000	1	1	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	0	1
 31130	符印塔	1	0	0	1	1	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	0	1
 31140	冰晶矿脉	1	0	900000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
 31150	古神禁地	1	0	0	8	0	0	0	0	0	0	0	0	0	0	10000	50	50	1	1	0	5	32
@@ -29,9 +29,9 @@
 31230	仙盟宴会	1	0	930000	3	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
 31240	VIP Boss	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	2	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
-60010	宗门试炼	1	0	900000	2	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
+60010	宗门试炼	1	0	900000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
 31180	混乱妖域	1	0	900000	2	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
 31160	上古战场	1	0	1200000	8	0	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	1	2
 31250	守护副本	1	0	600000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 7c35e26..c202c5e 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -385,25 +385,25 @@
 10801003	2	0	龙鲛战士	330	0	6697	6697	0	0	0	300	10000	55	0	0	1760	0	9188616	0	0	2	4000	150400	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	217452	0	0	0	0	0	215899	55	1	1	1
 10801004	2	0	枪神护卫	340	0	8223	8223	0	0	0	300	10000	89	0	0	1760	0	9727236	0	0	2	4000	158578	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	251884	0	0	0	0	0	232539	61	1	1	1
 10801005	2	0	梦境之狼	350	0	12124	12124	0	0	0	300	10000	144	0	0	2000	0	10265856	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	308118	0	0	0	0	0	247062	68	1	1	1
-10802001	2	0	雷炎狮	350	0	14548	14548	0	0	0	521	10000	233	0	0	2000	0	10265856	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	616237	0	0	0	0	1	494125	68	1	1	1
+10802001	2	0	雷炎狮	355	0	14548	14548	0	0	0	521	10000	233	0	0	2000	0	10535166	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	616237	0	0	0	0	1	494125	68	1	1	1
 10901001	2	0	两仪狂豹	360	0	12510	12510	0	0	0	300	10000	392	0	0	2000	0	10804476	0	0	2	4000	134044	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	896563	0	0	0	0	0	704524	76	1	1	1
 10901002	2	0	山间凶虎	370	0	13052	13052	0	0	0	300	10000	768	0	0	2000	0	11458024	0	0	2	4000	142222	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	977789	0	0	0	0	0	737618	84	1	1	1
 10901003	2	0	夜鹰	380	0	14110	14110	0	0	0	300	10000	952	0	0	2000	0	13645227	0	0	2	4000	150400	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1074889	0	0	0	0	0	762215	93	1	1	1
 10901004	2	0	亡者巫师	390	0	14873	14873	0	0	0	300	10000	1142	0	0	2000	0	14669101	0	0	2	4000	158578	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1177860	0	0	0	0	0	768414	103	1	1	1
 10901005	2	0	魔之士兵	400	0	16232	16232	0	0	0	300	10000	1338	0	0	2240	0	16599134	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1280598	0	0	0	0	0	793667	113	1	1	1
-10902001	2	0	魔界战将	400	0	18394	18394	0	0	0	521	10000	3003	0	0	2240	0	16599134	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2561197	0	0	0	0	1	1587335	113	1	1	1
+10902001	2	0	魔界战将	405	0	18394	18394	0	0	0	521	10000	3003	0	0	2240	0	18568228	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2561197	0	0	0	0	1	1587335	113	1	1	1
 11001001	2	0	古城魔兵	410	0	17343	17343	0	0	0	300	10000	1540	0	0	2240	0	20159678	0	0	2	4000	134044	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1408972	0	0	0	0	0	864496	113	1	1	1
 11001002	2	0	幽森冥魂	420	0	18058	18058	0	0	0	300	10000	1750	0	0	2240	0	23535043	0	0	2	4000	142222	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1518330	0	0	0	0	0	922278	113	1	1	1
 11001003	2	0	巨剑之魔	430	0	18932	18932	0	0	0	300	10000	1968	0	0	2240	0	27026703	0	0	2	4000	150400	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1631069	0	0	0	0	0	980852	113	1	1	1
 11001004	2	0	燃魂巫者	440	0	19857	19857	0	0	0	300	10000	3855	0	0	2240	0	31700571	0	0	2	4000	158578	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1809944	0	0	0	0	0	1077535	113	1	1	1
 11001005	2	0	魔化山石	450	0	21459	21459	0	0	0	300	10000	4139	0	0	2480	0	36096772	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	1948439	0	0	0	0	0	1148387	113	1	1	1
-11002001	2	0	暗裔之魔	450	0	24349	24349	0	0	0	521	10000	6729	0	0	2480	0	36096772	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	3896878	0	0	0	0	1	2273807	113	1	1	1
+11002001	2	0	暗裔之魔	455	0	24349	24349	0	0	0	521	10000	6729	0	0	2480	0	38326371	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	3896878	0	0	0	0	1	2273807	113	1	1	1
 11101001	2	0	地宫巨蝎	460	0	22783	22783	0	0	0	300	10000	4434	0	0	2480	0	40577188	0	0	2	4000	134044	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2078540	0	0	0	0	0	1200688	113	1	1	1
 11101002	2	0	盗墓者	470	0	23635	23635	0	0	0	300	10000	4738	0	0	2480	0	45302941	0	0	2	4000	142222	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2179582	0	0	0	0	0	1246465	113	1	1	1
 11101003	2	0	青铜巨虎	480	0	24601	24601	0	0	0	300	10000	5051	0	0	2480	0	50236783	0	0	2	4000	150400	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2312751	0	0	0	0	0	1309396	113	1	1	1
 11101004	2	0	地宫风水师	490	0	25806	25806	0	0	0	300	10000	5374	0	0	2480	0	55231919	0	0	2	4000	158578	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2455265	0	0	0	0	0	1376182	113	1	1	1
 11101005	2	0	青铜士兵	500	0	27697	27697	0	0	0	300	10000	5707	0	0	2720	0	60438696	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	2609976	0	0	0	0	0	1448269	113	1	1	1
-11102001	2	0	黄金战将	500	0	32059	32059	0	0	0	521	10000	8313	0	0	2720	0	60438696	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	5219955	0	0	0	0	1	2867574	113	1	1	1
+11102001	2	0	黄金战将	505	0	32059	32059	0	0	0	521	10000	8313	0	0	2720	0	60873324	0	0	2	4000	166756	0	0	200	2	6	10033	0	0	0	0	0	0	0	0	10	2	5219955	0	0	0	0	1	2867574	113	1	1	1
 10303001	2	0	御剑尊者	100	0	864	864	479	1	0	0	10000	2598	0	3	0	0	0	0	0	0	3000	428948	17	42	200	0	6	23010	0	0	0	0	0	0	0	0	10	1	169500	0	10000	0	0	5	0	0	186	1	1
 10403001	2	0	逍遥城主	105	0	962	962	0	2	0	0	10000	1095	0	1	0	0	0	0	0	0	3000	298935	15	0	200	2	6	23010	0	0	0	0	0	0	0	0	10	1	514389	0	10000	0	0	5	0	0	186	1	1
 10503001	2	0	极寒之心	200	0	4966	4966	0	5	0	0	10000	5933	0	1	0	0	0	0	0	3	3000	583635	30	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	19841376	0	10000	0	0	5	0	0	186	1	1
@@ -680,14 +680,14 @@
 31203106	2	0	招魂幡	380	0	120343	120343	23388	0	0	0	0	57690	0	0	0	0	0	0	33889452	101	800	171260	132	0	300	2	6	11026	11027	10313	0	0	0	0	0	0	40	2	78848073	1	0	0	0	3	0	0	186	1	1
 31401001	2	0	冰霜石精	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	1	0	0	1	1	1
 31403001	2	0	霜冻巨石	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	1	0	0	198	1	1
-31401002	2	0	试炼木人	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	100	0	0	0	0	1	0	0	180	1	1
+31401002	2	0	试炼木人	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	30	2	100	0	0	0	0	1	0	0	180	1	1
 31401003	2	0	冰霜毒蝎	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	30	2	100	0	0	0	0	1	0	0	180	1	1
 31401004	2	0	顽固之石	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	0	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
 31401005	2	0	虾兵	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
-31401006	2	0	深渊刺客	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	0	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
-31401007	2	0	海马勇士	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	0	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
-31401008	2	0	花精灵	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	0	2	6	23045	0	0	0	0	0	0	0	0	10	2	100	0	0	0	0	1	0	0	180	1	1
-31401009	2	0	毒牙	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	0	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
+31401006	2	0	深渊刺客	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
+31401007	2	0	海马勇士	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
+31401008	2	0	花精灵	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	0	2	30	23045	0	0	0	0	0	0	0	0	30	2	100	0	0	0	0	1	0	0	180	1	1
+31401009	2	0	毒牙	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	5	2	100	0	0	0	0	1	0	0	180	1	1
 31403002	2	0	冰晶巨石	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	100	0	0	0	0	1	0	0	198	1	1
 31403003	2	0	巨石之力	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	23041	0	0	0	0	0	0	0	0	10	1	100	0	0	0	0	1	0	0	186	1	1
 31403004	2	0	深海龙王	50	0	309	309	0	0	0	0	20000	0	0	0	0	0	0	0	0	0	2000	7049	0	0	300	2	6	23042	0	0	0	0	0	0	0	0	10	1	100	0	0	0	0	1	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index ea96d5f..3ec3888 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -620,12 +620,12 @@
 23024	第四层加血	23024	1	1	0	0	0	2	0	0	8	5	141	20	0	30000	0	0	0	0	0	1000	1000	0	5	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
 23030	境界压制	23030	1	1	0	11	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105019	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
 23031	压制法阵	23031	1	1	0	11	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	10000	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
-23041	新冰晶矿脉3层加防	23041	1	1	0	0	0	5	0	0	6	200	140	9	0	1800000	0	0	0	0	0	13	50000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	120000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+23041	新冰晶矿脉3层加防	23041	1	1	0	0	0	5	0	0	6	200	140	9	0	1800000	0	0	0	0	0	13	100000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	60000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 23042	新冰晶矿脉4层放毒	23042	1	1	0	0	0	4	0	0	6	200	140	9	0	1800000	0	0	0	0	0	1089	10000	0	10	9999	1000	0	0	4012	14	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-23043	新冰晶矿脉5层减攻	23043	1	1	0	0	0	6	0	0	6	201	40	9	0	1800000	0	0	0	0	0	9	5000	4	0	10	5000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	120000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	31140	0	0
-23044	新冰晶矿脉6层加攻	23044	1	1	0	0	0	5	0	0	6	201	40	9	0	1800000	0	0	0	0	0	9	5000	3	0	10	5000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	300000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	31140	0	0
-23045	新冰晶矿脉7层加血	23045	1	1	0	0	0	2	0	0	8	0	151	10	0	0	0	0	0	0	0	0	500	0	5	2103	31403007	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-23046	新冰晶矿脉8层沉默	23046	1	1	0	0	3100	1	0	0	2	5	41	6	0	60000	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	23050	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+23043	新冰晶矿脉5层减攻	23043	1	1	0	0	0	6	0	0	6	201	40	9	0	1800000	0	0	0	0	0	9	8000	4	0	10	8000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	60000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	31140	0	0
+23044	新冰晶矿脉6层加攻	23044	1	1	0	0	0	5	0	0	6	201	40	9	0	1800000	0	0	0	0	0	9	8000	3	0	10	8000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	300000	0	0	0	0	0	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	31140	0	0
+23045	新冰晶矿脉7层加血	23045	1	1	0	0	0	2	0	0	8	0	151	30	0	0	0	0	0	0	0	1000	500	500	5	2103	31403007	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+23046	新冰晶矿脉8层沉默	23046	1	1	0	0	2000	1	0	0	2	5	41	6	0	60000	0	0	0	0	0	1010	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	23050	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 23050	沉默	23050	1	1	0	5	0	14	0	0	1	0	41	0	0	0	0	0	0	0	0	4012	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	8000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0
 23100	复仇之刃(1层)	23100	1	10	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	9	1000	3	0	10	1000	3	0	7	1000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1200000	0	0	0	0	0	0	0	0	0	3	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	31160	0	0
 23101	复仇之刃(2层)	23100	2	10	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	9	2000	3	0	10	2000	3	0	7	2000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1200000	0	0	0	0	0	0	0	0	0	3	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	31160	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index c474a48..f76fd7c 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -601,6 +601,11 @@
 108543	30301003	31031	0	[69,65,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 34587	10801003	10080	0	[55,104,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 34588	10801003	10080	0	[57,106,1,15]	1	1	0	2500	0	0	1		5	5	0	0
+108557	0	31140	0	[25,10,2,10]	1	1	0	0	0	0	1		5	5	0	105
+108558	0	31140	0	[7,11,2,10]	1	1	0	0	0	0	1		5	5	0	105
+108559	0	31140	0	[8,21,2,10]	1	1	0	0	0	0	1		5	5	0	105
+108560	0	31140	0	[26,15,2,5]	1	1	0	0	0	0	1		5	5	0	106
+108561	0	31140	0	[5,15,2,5]	1	1	0	0	0	0	1		5	5	0	106
 81048	0	31150	0	[144,120,0,12]	1	1	0	0	0	0	1		5	5	0	91
 108495	0	31031	0	[71,17,0,15]	1	1	0	0	0	0	1		5	5	0	90
 108497	0	31031	0	[17,70,0,15]	1	1	0	0	0	0	1		5	5	0	91
@@ -693,6 +698,7 @@
 68424	0	60010	0	[236,96,6,15]	1	1	0	0	0	0	1		5	5	0	128
 68425	0	60010	0	[243,95,6,15]	1	1	0	0	0	0	1		5	5	0	129
 68426	0	60010	0	[239,129,1,15]	1	1	0	0	0	0	1		5	5	0	130
+108569	0	31140	0	[16,15,1,20]	1	1	0	0	0	0	1		5	5	0	102
 80253	10901004	10090	0	[74,92,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 18735	10702001	10070	0	[56,183,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 27800	10601004	10060	0	[11,99,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -1616,7 +1622,14 @@
 13402	10504001	10050	0	[103,22,0,1]	1	1	0	0	0	0	1		5	5	64	0
 13404	10501004	10050	0	[25,93,1,16]	1	1	0	2500	0	0	1		5	5	0	0
 13406	10501005	10050	0	[68,96,1,12]	1	1	0	2500	0	0	1		5	5	0	0
-108569	0	31140	0	[16,15,1,20]	1	1	0	0	0	0	1		5	5	0	102
+108549	0	31140	0	[7,11,2,30]	1	1	0	0	0	0	1		5	5	0	101
+108550	0	31140	0	[8,21,2,30]	1	1	0	0	0	0	1		5	5	0	101
+108551	0	31140	0	[25,21,2,30]	1	1	0	0	0	0	1		5	5	0	101
+108552	0	31140	0	[25,10,2,30]	1	1	0	0	0	0	1		5	5	0	101
+108553	0	31140	0	[26,15,2,30]	1	1	0	0	0	0	1		5	5	0	103
+108554	0	31140	0	[5,15,2,30]	1	1	0	0	0	0	1		5	5	0	103
+108555	0	31140	0	[16,15,1,8]	1	1	0	5	0	0	1		5	5	0	104
+108556	0	31140	0	[25,21,2,10]	1	1	0	0	0	0	1		5	5	0	105
 27962	10601003	10060	0	[32,57,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 80291	10901005	10090	0	[69,139,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 76661	10301002	10030	0	[51,72,1,16]	1	1	0	1800	0	0	1		5	5	0	0
@@ -1716,8 +1729,6 @@
 101010	30301002	31030	0	[74,64,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 77036	10401002	10040	0	[147,74,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 101012	0	31030	0	[95,30,0,12]	1	1	0	0	0	0	1		5	5	0	90
-108558	0	31140	0	[7,11,2,10]	1	1	0	0	0	0	1		5	5	0	105
-108559	0	31140	0	[8,21,2,10]	1	1	0	0	0	0	1		5	5	0	105
 101016	30301002	31030	0	[73,61,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 101018	30301002	31030	0	[72,64,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 101020	30301002	31030	0	[75,61,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -1737,14 +1748,6 @@
 19011	10701003	10070	0	[66,52,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 241	0	31130	0	[16,16,0,30]	1	1	0	0	0	0	1		5	5	0	101
 19013	10701005	10070	0	[101,151,1,15]	1	1	0	2500	0	0	1		5	5	0	0
-108549	0	31140	0	[7,11,2,30]	1	1	0	0	0	0	1		5	5	0	101
-108550	0	31140	0	[8,21,2,30]	1	1	0	0	0	0	1		5	5	0	101
-108551	0	31140	0	[25,21,2,30]	1	1	0	0	0	0	1		5	5	0	101
-108552	0	31140	0	[25,10,2,30]	1	1	0	0	0	0	1		5	5	0	101
-108553	0	31140	0	[16,23,2,30]	1	1	0	0	0	0	1		5	5	0	103
-108554	0	31140	0	[16,6,2,30]	1	1	0	0	0	0	1		5	5	0	103
-108555	0	31140	0	[16,15,1,8]	1	1	0	5	0	0	1		5	5	0	104
-108556	0	31140	0	[25,21,2,10]	1	1	0	0	0	0	1		5	5	0	105
 27762	10601001	10060	0	[77,16,1,10]	1	1	0	2500	0	0	1		5	5	0	0
 76649	10301001	10030	0	[61,23,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76651	10302001	10030	0	[12,112,1,15]	1	1	0	1800	0	0	1		5	5	0	0
@@ -1759,8 +1762,6 @@
 77519	10604002	10060	0	[76,29,0,15]	1	1	0	0	0	0	1		5	5	80	0
 18751	10702001	10070	0	[70,180,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 77520	10604004	10060	0	[72,8,0,15]	1	1	0	0	0	0	1		5	5	65	0
-108560	0	31140	0	[16,23,2,5]	1	1	0	0	0	0	1		5	5	0	106
-108561	0	31140	0	[16,6,2,5]	1	1	0	0	0	0	1		5	5	0	106
 77116	10404004	10040	0	[153,88,0,1]	1	1	0	0	0	0	1		5	5	127	0
 76083	10201001	10020	0	[183,33,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76085	10202001	10020	0	[48,100,1,16]	1	1	0	1800	0	0	1		5	5	0	0
@@ -1904,7 +1905,6 @@
 108545	30301003	31031	0	[69,67,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 108546	30301003	31031	0	[71,67,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 108547	30301003	31031	0	[67,64,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-108557	0	31140	0	[25,10,2,10]	1	1	0	0	0	0	1		5	5	0	105
 51407	30908001	31230	0	[9,40,0,1]	1	1	0	0	0	0	1		5	5	0	0
 76003	10201001	10020	0	[195,32,1,9]	1	1	0	1800	0	0	1		5	5	0	0
 51408	30908001	31230	0	[15,40,0,0]	1	1	0	0	0	0	1		5	5	0	0

--
Gitblit v1.8.0