From 9735c0dd08f492143cc5dd2e48cece713bdba6c1 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期五, 28 九月 2018 19:29:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt                                                              |    4 
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt                                                              |   20 +++---
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                                      |    4 
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                                                              |    8 +-
 db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt                                                              |   14 ++--
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc                                             |    0 
 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt                                                                 |    1 
 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt                                                           |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt         |   14 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                                                  |    0 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                                                |    8 +-
 db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt                                                               |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc                          |    0 
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                                                        |   20 +++---
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                                      |    8 +-
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                                                      |   34 +++++-----
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt                                                            |   34 +++++-----
 18 files changed, 87 insertions(+), 85 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 27343c9..1fe5ba3 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -4,20 +4,20 @@
 3	OpenServer03	[]	6	6			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	50	0
 4	OpenServer04	[]	7	7			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	180	0
 5	OpenServer05	[]	10	10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	280	0
-6	NationalDay	[]	2018-9-1	2018-9-3			1440	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
-7	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	1440	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
-8	1OpenServer01	[7001]	2018-9-7	2018-9-7			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-9	1OpenServer02	[7001]	2018-9-9	2018-9-9			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-10	1OpenServer03	[7001]	2018-9-11	2018-9-11			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-11	1OpenServer04	[7001]	2018-9-12	2018-9-12			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-12	1OpenServer05	[7001]	2018-9-15	2018-9-15			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-13	2OpenServer01	[7002]	2018-9-8	2018-9-8			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-14	2OpenServer02	[7002]	2018-9-10	2018-9-10			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-15	2OpenServer03	[7002]	2018-9-12	2018-9-12			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-16	2OpenServer04	[7002]	2018-9-13	2018-9-13			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-17	2OpenServer05	[7002]	2018-9-16	2018-9-16			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
-18	3OpenServer01	[7003]	2018-9-12	2018-9-12			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-19	3OpenServer02	[7003]	2018-9-14	2018-9-14			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-20	3OpenServer03	[7003]	2018-9-16	2018-9-16			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
-21	3OpenServer04	[7003]	2018-9-17	2018-9-17			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
-22	3OpenServer05	[7003]	2018-9-20	2018-9-20			0	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+6	NationalDay	[]	2018-9-1	2018-9-3			120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[30, "LimitGift2"]	50	1
+7	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	{0:["LimitGift1",[]]}	{-30:["LimitGift2",[]]}	[240, "LimitGift2"]	50	1
+8	1OpenServer01	[7001]	2018-9-7	2018-9-7			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+9	1OpenServer02	[7001]	2018-9-9	2018-9-9			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+10	1OpenServer03	[7001]	2018-9-11	2018-9-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+11	1OpenServer04	[7001]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+12	1OpenServer05	[7001]	2018-9-15	2018-9-15			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+13	2OpenServer01	[7002]	2018-9-8	2018-9-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+14	2OpenServer02	[7002]	2018-9-10	2018-9-10			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+15	2OpenServer03	[7002]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+16	2OpenServer04	[7002]	2018-9-13	2018-9-13			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+17	2OpenServer05	[7002]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+18	3OpenServer01	[7003]	2018-9-12	2018-9-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+19	3OpenServer02	[7003]	2018-9-14	2018-9-14			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+20	3OpenServer03	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
+21	3OpenServer04	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
+22	3OpenServer05	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index b4a5893..c947958 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV	IsDayReset
-1	test1	[]	2018-7-24	2018-7-31			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	50	1
-2	test2	[]	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	0	{}	{}	[120, "LimitGift1"]	50	1
-3	NationalDay	[]	2018-9-1	2018-9-3			0	{}	{}	[120, "LimitGift1"]	50	1
-4	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3			0	{}	{}	[120, "LimitGift1"]	50	1
-5	NationalDay	[(200, 210)]	2018-9-1	2018-9-3			0	{}	{}	[120, "LimitGift1"]	50	1
-6	New1	[]	2018-8-5	2018-8-5			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
-7	New2	[]	2018-8-7	2018-8-7			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
-8	New3	[]	2018-8-9	2018-8-9			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
-9	New4	[]	2018-8-11	2018-8-11			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
-10	New5	[]	2018-8-13	2018-8-13			0	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
+1	test1	[]	2018-7-24	2018-7-31			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	50	1
+2	test2	[]	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	120	{}	{}	[120, "LimitGift1"]	50	1
+3	NationalDay	[]	2018-9-1	2018-9-3			120	{}	{}	[120, "LimitGift1"]	50	1
+4	NationalDay	[(1,10), (100, 110), 120]	2018-9-1	2018-9-3			120	{}	{}	[120, "LimitGift1"]	50	1
+5	NationalDay	[(200, 210)]	2018-9-1	2018-9-3			120	{}	{}	[120, "LimitGift1"]	50	1
+6	New1	[]	2018-8-5	2018-8-5			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
+7	New2	[]	2018-8-7	2018-8-7			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
+8	New3	[]	2018-8-9	2018-8-9			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
+9	New4	[]	2018-8-11	2018-8-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
+10	New5	[]	2018-8-13	2018-8-13			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index b5b9dc7..4cb7c5e 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -806,10 +806,10 @@
 30601001	暗影剑士	105
 30601002	剑魂	105
 30603001	御剑尊者	105
-30601003	魔化哨兵	150
-30601004	狂暴妖兵	150
-30601005	魔界冥魂	150
-30603002	逍遥城主	150
+30601003	魔化哨兵	165
+30601004	狂暴妖兵	165
+30601005	魔界冥魂	165
+30603002	逍遥城主	165
 30601006	冰霜巨蝎	200
 30601007	冰川蛮兽	200
 30601008	雪山巨猿	200
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index fd610b0..3b15f26 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -93,3 +93,4 @@
 141		0	0
 142	110	0	0
 143	120	0	0
+144	500	0	0
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index ec79bf5..ede57ea 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
index 088fbf6..cfacc7a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/QuestMission/LvUpTrigMissionNotAdd.txt
@@ -2,12 +2,12 @@
 #{职业:[等级]}
 (
 {
-	0:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	1:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	2:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	3:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	4:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	5:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
-	6:[70,80,95,100,105,110,113,115,120,125,128,130,150,155,160,170,180,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	0:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	1:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	2:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	3:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	4:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	5:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
+	6:[70,80,95,100,105,108,110,113,115,120,125,128,130,155,160,165,170,175,178,180,185,190,200,210,220,240,250,260,280,300,310,320,330,340,350,360,370,380,390,400,410,420,430,440,450],
 }
 )
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 653b910..f5ee0bc 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/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
index 9780668..ce5d80a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
index 07f1ce6..620b7d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index ff71ec4..2d9cae7 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -4,20 +4,20 @@
 3	6	6			120	50	0	[[1]]	SellMail4	[[181,2,1],[4151,2,1]]
 4	7	7			0	180	0	[[3]]	SellMail4	[[181,2,1],[4151,2,1]]
 5	10	10			120	280	0	[[5]]	SellMail4	[[181,2,1],[4151,2,1]]
-6	2018-9-1	2018-9-3			1440	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
-7	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	1440	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-8	2018-9-7	2018-9-7			0	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-9	2018-9-9	2018-9-9			0	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-10	2018-9-11	2018-9-11			0	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-11	2018-9-12	2018-9-12			0	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-12	2018-9-15	2018-9-15			0	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-13	2018-9-8	2018-9-8			0	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-14	2018-9-10	2018-9-10			0	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-15	2018-9-12	2018-9-12			0	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-16	2018-9-13	2018-9-13			0	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-17	2018-9-16	2018-9-16			0	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
-18	2018-9-12	2018-9-12			0	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
-19	2018-9-14	2018-9-14			0	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
-20	2018-9-16	2018-9-16			0	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
-21	2018-9-17	2018-9-17			0	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
-22	2018-9-20	2018-9-20			0	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+6	2018-9-1	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
+7	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+8	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+9	2018-9-9	2018-9-9			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+10	2018-9-11	2018-9-11			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+11	2018-9-12	2018-9-12			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+12	2018-9-15	2018-9-15			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+13	2018-9-8	2018-9-8			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+14	2018-9-10	2018-9-10			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+15	2018-9-12	2018-9-12			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+16	2018-9-13	2018-9-13			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+17	2018-9-16	2018-9-16			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+18	2018-9-12	2018-9-12			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
+19	2018-9-14	2018-9-14			120	50	1	[[4]]	SellMail4	[[13,2,1],[2,2,1]]
+20	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
+21	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
+22	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 8004c3b..42fe534 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -1,11 +1,11 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	ShopTypeList	MailKey	MailItemPrize
-1	2018-7-24	2018-7-31			0	50	1	[[16],[17],[18],[20],[21],[22],[23],[24]]	SellMail3	[[13,2,1],[2,2,1]]
-2	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	0	50	1	[[16,17],[16,17],[16,17]]	SellMail3	[[13,2,1],[2,2,1]]
-3	2018-9-1	2018-9-3			0	50	1	[[16],[17],[18]]	SellMail3	[[13,2,1],[2,2,1]]
-4	2018-9-1	2018-9-3			0	50	1	[[16],[17],[18]]	SellMail3	[[13,2,1],[2,2,1]]
-5	2018-9-1	2018-9-3			0	50	1	[[16],[17],[18]]	SellMail3	[[13,2,1],[2,2,1]]
-6	2018-8-5	2018-8-5			0	100	1	[[25]]	SellMail3	[[13,2,1],[2,2,1]]
-7	2018-8-7	2018-8-7			0	100	1	[[26]]	SellMail3	[[13,2,1],[2,2,1]]
-8	2018-8-9	2018-8-9			0	100	1	[[27]]	SellMail3	[[13,2,1],[2,2,1]]
-9	2018-8-11	2018-8-11			0	100	1	[[28]]	SellMail3	[[13,2,1],[2,2,1]]
-10	2018-8-13	2018-8-13			0	100	1	[[29]]	SellMail3	[[13,2,1],[2,2,1]]
+1	2018-7-24	2018-7-31			120	50	1	[[16],[17],[18],[20],[21],[22],[23],[24]]	SellMail3	[[13,2,1],[2,2,1]]
+2	2018-5-1	2018-5-3	12:00|18:00	13:00|19:00	120	50	1	[[16,17],[16,17],[16,17]]	SellMail3	[[13,2,1],[2,2,1]]
+3	2018-9-1	2018-9-3			120	50	1	[[16],[17],[18]]	SellMail3	[[13,2,1],[2,2,1]]
+4	2018-9-1	2018-9-3			120	50	1	[[16],[17],[18]]	SellMail3	[[13,2,1],[2,2,1]]
+5	2018-9-1	2018-9-3			120	50	1	[[16],[17],[18]]	SellMail3	[[13,2,1],[2,2,1]]
+6	2018-8-5	2018-8-5			120	100	1	[[25]]	SellMail3	[[13,2,1],[2,2,1]]
+7	2018-8-7	2018-8-7			120	100	1	[[26]]	SellMail3	[[13,2,1],[2,2,1]]
+8	2018-8-9	2018-8-9			120	100	1	[[27]]	SellMail3	[[13,2,1],[2,2,1]]
+9	2018-8-11	2018-8-11			120	100	1	[[28]]	SellMail3	[[13,2,1],[2,2,1]]
+10	2018-8-13	2018-8-13			120	100	1	[[29]]	SellMail3	[[13,2,1],[2,2,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 48dda06..4e88533 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -93,3 +93,4 @@
 141		0	0	0
 142	110	0	0	0
 143	120	0	0	0
+144	500	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 4477168..23cc40a 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -94,8 +94,8 @@
 20202007	0	460	1	0	[(974945,0),(981945,(8,1,107)),(996667,(8,2,107)),(1000000,(8,3,107))]	1	{}	0	{}	{3:[(9600,0),(10000,1)]}	[]	[]	{951:208,4002:583,4003:583,4501:0,4008:208,4009:208,4005:417,4006:417,4502:0,956:528}	{}	{2:500000}	{}	{2:1}	1	800	1588	1962	[]	[]
 20103001	210	225	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[1,3,4,[(10000,2)],107]	[]	{2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1077	1615	[]	[1005,3904]
 20103002	210	245	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6500,1),(10000,2)],5:[(10000,2)]}	[1,3,4,[(10000,2)],107]	[]	{2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1077	1615	[]	[1005,3904]
-20103003	210	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[1,4,5,[(10000,2)],107]	[]	{3801:300000,2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1115	1673	[]	[999,3904]
-20103004	210	280	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,4,4,[(10000,2)],107]	[]	{3801:300000,5202:420000,2320:100000,2339:20000,2340:80000}	{}	{2:499200}	{}	{2:5}	25	800	1115	1673	[]	[999,3904]
+20103003	210	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[1,4,4,[(10000,2)],107]	[]	{3801:300000,2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1115	1673	[1,0,0,[3801]]	[999,3904]
+20103004	210	280	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,4,5,[(10000,2)],107]	[]	{3801:300000,5202:420000,2320:100000,2339:20000,2340:80000}	{}	{2:499200}	{}	{2:5}	25	800	1115	1673	[]	[999,3904]
 20103005	210	315	2	0	[(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]	30	{(5,4,107):1200000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,5,5,[(10000,2)],107]	[]	{3801:300000,3802:40000,5202:440000,2320:100000,2339:20000,2340:80000}	{}	{2:582400}	{}	{2:5}	25	800	1123	1685	[]	[999,3904]
 20103006	210	335	2	0	[(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]	30	{(5,4,107):1300000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,5,5,[(10000,2)],107]	[]	{3801:300000,3802:50000,5202:460000,2320:100000,2339:20000,2340:80000}	{}	{2:665600}	{}	{2:5}	25	800	1123	1685	[]	[999,3904]
 20103007	210	365	2	0	[(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1300000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,6,5,[(10000,2)],107]	[]	{3801:300000,3802:60000,9051:4630,5202:480000,2320:100000,2339:20000,2340:80000}	{}	{2:748800}	{}	{2:5}	25	800	1129	1694	[]	[999,3904]
@@ -108,8 +108,8 @@
 20203007	210	505	2	0	[(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))]	30	{(8,4,107):1300000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[]	[]	{3801:300000,3802:50000,3803:5000,9051:11574,5202:560000,2320:100000,2339:20000,2340:80000}	{}	{2:800000}	{}	{2:5}	25	800	1588	1962	[]	[999,3904]
 20103001	1000	225	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[1,3,4,[(10000,2)],107]	[]	{2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1077	1615	[]	[999,3904]
 20103002	1000	245	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6500,1),(10000,2)],5:[(10000,2)]}	[1,3,4,[(10000,2)],107]	[]	{2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1077	1615	[]	[999,3904]
-20103003	1000	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[1,4,5,[(10000,2)],107]	[]	{3801:300000,2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1115	1673	[]	[999,3904]
-20103004	1000	280	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,4,4,[(10000,2)],107]	[]	{3801:300000,5202:420000,2320:100000,2339:20000,2340:80000}	{}	{2:499200}	{}	{2:5}	25	800	1115	1673	[]	[999,3904]
+20103003	1000	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]}	[1,4,4,[(10000,2)],107]	[]	{3801:300000,2320:100000,2339:20000,2340:80000}	{}	{}	{}	{}	25	800	1115	1673	[1,0,0,[3801]]	[999,3904]
+20103004	1000	280	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,4,5,[(10000,2)],107]	[]	{3801:300000,5202:420000,2320:100000,2339:20000,2340:80000}	{}	{2:499200}	{}	{2:5}	25	800	1115	1673	[]	[999,3904]
 20103005	1000	315	2	0	[(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]	30	{(5,4,107):1200000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,5,5,[(10000,2)],107]	[]	{3801:300000,3802:30000,5202:440000,2320:100000,2339:20000,2340:80000}	{}	{2:582400}	{}	{2:5}	25	800	1123	1685	[]	[999,3904]
 20103006	1000	335	2	0	[(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))]	30	{(5,4,107):1300000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,5,5,[(10000,2)],107]	[]	{3801:300000,3802:35000,5202:460000,2320:100000,2339:20000,2340:80000}	{}	{2:665600}	{}	{2:5}	25	800	1123	1685	[]	[999,3904]
 20103007	1000	365	2	0	[(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))]	30	{(6,4,107):1300000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500}	1	{4:4,5:2}	{3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]}	[1,6,5,[(10000,2)],107]	[]	{3801:200000,3802:45000,9051:4630,5202:480000,2320:100000,2339:20000,2340:80000}	{}	{2:748800}	{}	{2:5}	25	800	1129	1694	[]	[999,3904]
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
index f970bbc..9c783ca 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt
@@ -66,8 +66,8 @@
 31704002	0	1	0	12000	100000	0	0	2	9990	50	1	0	0	0	0
 31704003	0	1	0	40000	150000	0	0	2	9990	50	1	0	0	0	0
 30403001	0	1	0	1000	10000	0	8000	2	9900	50	12	0	0	0	0
-30403002	0	1	0	1000	10000	0	8000	2	9900	50	12	0	0	0	8000
-30403003	0	1	0	1200	10000	0	8000	2	9900	50	2	0	0	0	20000
+30403002	0	1	0	1000	10000	0	8000	2	9900	50	12	0	0	0	6000
+30403003	0	1	0	1200	10000	0	8000	2	9900	50	2	0	0	0	16000
 30903001	1	3	0	48000	10000	0	8000	2	9900	50	1	0	0	120	0
 30601001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 30601002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 12c30e4..fcd6055 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -26,8 +26,8 @@
 62	2	0	4004	1	0	[]	0		0	0	180	0	1	20	0	0	
 63	2	0	957	1	0	[]	0		0	0	0	0	1	50	0	0	
 64	2	0	2050	1	0	[]	0		0	0	0	0	1	50	0	0	
-65	2	0	982	1	0	[]	0		0	0	0	0	1	248	0	0	
-66	2	0	983	1	0	[]	0		0	0	0	0	1	98	0	0	
+65	2	0	982	1	0	[]	0		0	0	0	0	1	250	0	0	
+66	2	0	983	1	0	[]	0		0	0	0	0	1	30	0	0	
 101	3	0	181	1	0	[]	0		0	0	0	0	1	10	0	0	
 103	3	0	3501	1	0	[]	0		0	0	0	0	1	10	0	0	
 104	3	0	3511	1	0	[]	0		0	0	0	0	1	10	0	0	
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index e7fad80..aafd394 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,8 +1,8 @@
 TreasureType	MinLV	GridItemInfo	JobItemList	GridItemRateListFree	FreeGridItemRateList2	FreeGridItemRateList3	GridItemRateList1	GridItemRateList2	GridItemRateList3	LuckyGridNum
-1	0	{"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}	[]	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]}	1
-1	200	{"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[2347,1],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}	[]	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]}	1
-1	250	{"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2320,4],"5":[5303,500],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}	[]	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]}	1
-2	0	{"1":[4425,1],"2":[4394,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4385,1],"8":[2332,1],"9":[4334,1],"10":[4384,1],"11":[4304,20],"12":[4395,1],"13":[2331,1],"14":[4305,10]}	[]	[(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]	[(1000,8),(3000,6),(6000,9),(10000,2)]	{1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]}	[(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]	[(1000,3),(2000,5),(6000,8),(10000,12)]	{1:[(1000,6),(7000,8),(10000,9)]}	1
-2	200	{"1":[4425,1],"2":[4354,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4365,1],"8":[2332,1],"9":[4334,1],"10":[4364,1],"11":[4304,20],"12":[4355,1],"13":[2331,1],"14":[4305,10]}	[]	[(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]	[(1000,8),(3000,6),(6000,9),(10000,2)]	{1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]}	[(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]	[(1000,3),(2000,5),(6000,8),(10000,12)]	{1:[(1000,6),(7000,8),(10000,9)]}	1
-2	250	{"1":[4425,1],"2":[4359,1],"3":[4370,1],"4":[4369,1],"5":[4335,1],"6":[4368,1],"7":[4390,1],"8":[2332,1],"9":[4334,1],"10":[4389,1],"11":[4304,20],"12":[4360,1],"13":[2331,1],"14":[4305,10]}	[]	[(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]	[(1000,8),(3000,6),(6000,9),(10000,2)]	{1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]}	[(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]	[(1000,3),(2000,5),(6000,8),(10000,12)]	{1:[(1000,6),(7000,8),(10000,9)]}	1
-2	300	{"1":[4425,1],"2":[4379,1],"3":[4370,1],"4":[4369,1],"5":[4400,1],"6":[4368,1],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4374,1],"11":[4304,20],"12":[4405,1],"13":[2331,1],"14":[4305,10]}	[]	[(0,1),(270,2),(270,3),(540,4),(590,5),(860,6),(1130,7),(1130,8),(1230,9),(1500,10),(2300,11),(2300,12),(9900,13),(10000,14)]	[(1000,8),(3000,6),(6000,9),(10000,2)]	{1:[(6000,2),(9000,10),(10000,11)],3:[(1000,8),(3000,6),(6000,9),(10000,2)]}	[(10,1),(1490,2),(1540,3),(2040,4),(2140,5),(2940,6),(3440,7),(3940,8),(4540,9),(6020,10),(7020,11),(7520,12),(8520,13),(10000,14)]	[(1000,3),(2000,5),(6000,8),(10000,12)]	{1:[(1000,6),(7000,8),(10000,9)]}	1
+1	0	{"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[2347,1],"6":[2346,1],"7":[7,1],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}	[]	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]}	1
+1	180	{"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[5303,300],"6":[2346,1],"7":[3807,2],"8":[4151,100],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}	[]	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]}	1
+1	260	{"1":[9074,1],"2":[4182,1],"3":[4151,20],"4":[2342,1],"5":[5303,300],"6":[2346,1],"7":[3807,2],"8":[2390,1],"9":[181,30],"10":[2319,1],"11":[198,1],"12":[2348,1],"13":[2326,1],"14":[912,2]}	[]	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(6381,7),(6481,8),(7735,9),(8135,10),(9390,11),(9400,12),(9600,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(6000,5),(9000,8),(10000,12)],150:[(10000,1)]}	1
+2	0	{"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,12],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4385,1],"13":[2331,1],"14":[4305,4]}	[]	[(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)]	[(8000,14),(9500,9),(10000,8)]	{1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]}	[(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)]	[(5000,8),(7500,5),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
+2	200	{"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,12],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,8],"12":[4365,1],"13":[2331,1],"14":[4305,4]}	[]	[(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)]	[(8000,14),(9500,9),(10000,8)]	{1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]}	[(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)]	[(5000,8),(7500,5),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
+2	250	{"1":[4425,1],"2":[4359,1],"3":[4335,1],"4":[4369,1],"5":[4360,1],"6":[4303,16],"7":[4349,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,12],"12":[4350,1],"13":[2331,1],"14":[4305,8]}	[]	[(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)]	[(8000,14),(9500,9),(10000,8)]	{1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]}	[(1,1),(1380,2),(1480,3),(1580,4),(1880,5),(3260,6),(4640,7),(4940,8),(5440,9),(5940,10),(7320,11),(7620,12),(9000,13),(10000,14)]	[(5000,8),(7500,5),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
+2	300	{"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,16],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,12],"12":[4380,1],"13":[2331,1],"14":[4305,8]}	[]	[(0,1),(500,2),(500,3),(500,4),(500,5),(1500,6),(1500,7),(1600,8),(1900,9),(1900,10),(2400,11),(2400,12),(9900,13),(10000,14)]	[(8000,14),(9500,9),(10000,8)]	{1:[(6000,2),(9000,7),(10000,11)],3:[(5000,14),(8000,9),(10000,8)]}	[(1,1),(1675,2),(1775,3),(2175,4),(2275,5),(3950,6),(4250,7),(4550,8),(5050,9),(5550,10),(7225,11),(7325,12),(9000,13),(10000,14)]	[(5000,8),(7500,7),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
index 16f9298..40c379e 100644
--- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt
@@ -28,4 +28,4 @@
 27	0	0	1	2	2	3	3	4	4	4	4	5	5	5	5	5
 28	0	1	1	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	1	2	3	4	5	6	7	8	9	10	11	12	13	14	15	16
+30	0	1	1	2	2	3	5	7	10	12	15	15	15	15	15	15
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 2e90310..32a22a1 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -806,10 +806,10 @@
 30601001	2	0	暗影剑士	105	0	769	769	0	0	0	0	0	171	0	0	0	0	0	0	0	0	2500	64577	18	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	43703	0	0	0	0	1	0	0	1	1	1
 30601002	2	0	剑魂	105	0	733	733	0	0	0	0	0	138	0	0	0	0	0	0	0	0	2500	64577	18	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	65556	0	0	0	0	1	0	0	1	1	1
 30603001	2	0	御剑尊者	105	0	2153	2153	0	0	0	0	0	1442	0	0	0	0	0	0	0	0	2500	64577	18	0	300	2	6	10041	23030	10042	0	0	0	0	0	0	15	2	400626	0	0	0	0	5	0	0	186	1	1
-30601003	2	0	魔化哨兵	150	0	1853	1853	0	0	0	0	0	730	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	129283	0	0	0	0	1	0	0	1	1	1
-30601004	2	0	狂暴妖兵	150	0	1682	1682	0	0	0	0	0	584	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	166221	0	0	0	0	1	0	0	1	1	1
-30601005	2	0	魔界冥魂	150	0	4931	4931	0	0	0	0	0	3357	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	738765	0	0	0	0	1	0	0	1	1	1
-30603002	2	0	逍遥城主	150	0	8865	8865	0	0	0	0	0	6715	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	6	10043	23030	10044	0	0	0	0	0	0	15	2	1292840	0	0	0	0	5	0	0	186	1	1
+30601003	2	0	魔化哨兵	165	0	1853	1853	0	0	0	0	0	730	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	129283	0	0	0	0	1	0	0	1	1	1
+30601004	2	0	狂暴妖兵	165	0	1682	1682	0	0	0	0	0	584	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	166221	0	0	0	0	1	0	0	1	1	1
+30601005	2	0	魔界冥魂	165	0	4931	4931	0	0	0	0	0	3357	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	738765	0	0	0	0	1	0	0	1	1	1
+30603002	2	0	逍遥城主	165	0	8865	8865	0	0	0	0	0	6715	0	0	0	0	0	0	0	0	2500	95127	24	0	300	2	6	10043	23030	10044	0	0	0	0	0	0	15	2	1292840	0	0	0	0	5	0	0	186	1	1
 30601006	2	0	冰霜巨蝎	200	0	2872	2872	0	0	0	0	0	835	0	0	0	0	0	0	0	0	2500	119662	28	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	390641	0	0	0	0	1	0	0	1	1	1
 30601007	2	0	冰川蛮兽	200	0	2946	2946	0	0	0	0	0	885	0	0	0	0	0	0	0	0	2500	119662	28	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	468768	0	0	0	0	1	0	0	1	1	1
 30601008	2	0	雪山巨猿	200	0	8349	8349	0	0	0	0	0	4858	0	0	0	0	0	0	0	0	2500	119662	28	0	300	2	4	0	0	0	0	0	0	0	0	0	15	2	2031333	0	0	0	0	1	0	0	1	1	1

--
Gitblit v1.8.0