From 76c19701da8d18c13297aa4d22369e3301f5701a Mon Sep 17 00:00:00 2001
From: cehua-HWJ35 <hwj35@163.com>
Date: 星期四, 28 二月 2019 10:52:14 +0800
Subject: [PATCH] Merge branch '1.6' of http://192.168.0.87:10010/r/snxx_server into 1.6

---
 db/PyMongoDataServer/PySysDB/tagActBossReborn.txt                                                          |    3 
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt                                                          |    9 +
 CoreServerGroup/GameServer/PySysDB/tagFBLine.txt                                                           |    1 
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                                                          |    8 
 db/PyMongoDataServer/PySysDB/tagOrderInfo.txt                                                              |   42 +++++++
 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt                                                    |    1 
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                                                       |    2 
 db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt                                                  |   33 +++++
 db/PyMongoDataServer/PySysDB/tagItemCompound.txt                                                           |   12 ++
 db/PyMongoDataServer/PySysDB/tagZhuXianBoss.txt                                                            |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc                       |    0 
 CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt                                                    |   25 ++--
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt                                                        |   10 +
 db/PyMongoDataServer/PySysDB/tagActWeekParty.txt                                                           |    2 
 db/PyMongoDataServer/PySysDB/tagWeekParty.txt                                                              |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                        |    0 
 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt                                                               |    2 
 CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt                                                      |    8 
 CoreServerGroup/GameServer/Script/GameWorld.pyc                                                            |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                             |    6 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                                            |    2 
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt                                                                |   26 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc                     |    0 
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                                            |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc                                 |    0 
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                                                  |   10 +
 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt                                                         |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc                               |    0 
 CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt                                                   |    4 
 db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt                                                  |    3 
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt                                                       |    3 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                 |   16 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc                                     |    0 
 db/PyMongoDataServer/PySysDB/tagActWishingWell.txt                                                         |    4 
 db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt                                                          |    1 
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                                                 |    9 
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                                                    |    9 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc          |    0 
 CoreServerGroup/GameServer/PySysDB/tagStore.txt                                                            |   15 ++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc             |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyInvade.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc                          |    0 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                                                  |   15 ++
 db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt                                                          |   25 ++--
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                                                           |   14 ++
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                                                    |    3 
 db/PyMongoDataServer/PySysDB/tagActExpRate.txt                                                             |    3 
 db/PyMongoDataServer/PySysDB/tagChests.txt                                                                 |    3 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc                                     |    0 
 CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt                                                 |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc                |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                                  |    8 
 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt                                                       |    1 
 db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt                                                       |    1 
 CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt                                                 |    1 
 CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt                                               |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc                                       |    0 
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                                                          |    0 
 58 files changed, 292 insertions(+), 59 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index d0dff3f..2688cf8 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -18,3 +18,6 @@
 18	[]	[]	2019-2-5	2019-2-8	1	{0:["BossFHOpen", []]}	{}	110	1
 19	[]	[]	2019-2-12	2019-2-14	1	{0:["BossFHOpen", []]}	{}	110	1
 20	[]	[]	2019-2-17	2019-2-20	1	{0:["BossFHOpen", []]}	{}	110	1
+21	[]	[]	2019-2-22	2019-2-24	1	{0:["BossFHOpen", []]}	{}	110	1
+22	[]	[]	Mix1	Mix2	1	{0:["BossFHOpen", []]}	{}	110	1
+23	[]	[]	2019-2-28	2019-3-2	1	{0:["BossFHOpen", []]}	{}	110	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index a7b12f2..a75c8ae 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -9,3 +9,6 @@
 8	[]	[]	2019-2-5	2019-2-5	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	20000
 9	[]	[]	2019-2-7	2019-2-7	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
 10	[]	[]	2019-2-16	2019-2-16	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+11	[]	[]	2019-2-24	2019-2-24	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+12	[]	[]	Mix1	Mix5	19:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
+13	[]	[]	2019-3-2	2019-3-2	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	[30, "ExpActivity_Goahead", [2]]	110	10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index b833d17..02c54ac 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -81,3 +81,13 @@
 80	20190205	[]	[]	2019-2-5	2019-2-8			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
 81	20190209	[]	[]	2019-2-9	2019-2-11			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
 82	20190212	[]	[]	2019-2-12	2019-2-12			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+83	20190220	[]	[]	2019-2-20	2019-2-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+84	20190221	[]	[]	2019-2-21	2019-2-21			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+85	20190222	[]	[]	2019-2-22	2019-2-22			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+86	20190223	[]	[]	2019-2-23	2019-2-23			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+87	20190224	[]	[]	2019-2-24	2019-2-24			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+88	20190226	[]	[]	2019-2-26	2019-2-26			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+89	20190303	[]	[]	2019-3-3	2019-3-3			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+90	20190304	[]	[]	2019-3-4	2019-3-4			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+91	20190305	[]	[]	2019-3-5	2019-3-5			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+92	20190306	[]	[]	2019-3-6	2019-3-6			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt b/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
index 2193f7f..5538a0c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActLuckyTreasure.txt
@@ -1,2 +1,3 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	LimitLV
 1	xiaoxuexy18	[]	[]	2019-1-20	2019-1-20	0	{0:["LuckyAppraisal_Start", []]}	{0:["LuckyAppraisal_End", []]}	[]	110
+2	xiaoxuexy18	[]	[]	2019-3-2	2019-3-2	0	{0:["LuckyAppraisal_Start", []]}	{0:["LuckyAppraisal_End", []]}	[]	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index ce9f583..0c69cc3 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -4,3 +4,4 @@
 3	20190120	[]	[]	2019-1-20	2019-1-21	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
 4	20190206	[]	[]	2019-2-6	2019-2-7	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
 5	20190215	[]	[]	2019-2-15	2019-2-16	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
+6	20190303	[]	[]	2019-3-3	2019-3-4	1	{0:["MultipleXXDOpen", []]}	{}	2	110	3000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index a084505..c26f5a5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -61,3 +61,12 @@
 60	20190207	[]	[]	2019-2-7	2019-2-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 61	20190215	[]	[]	2019-2-15	2019-2-15				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 62	20190216	[]	[]	2019-2-16	2019-2-16				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+63	20190221	[]	[]	2019-2-21	2019-2-21				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+64	20190223	[]	[]	2019-2-23	2019-2-23				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+65	20190224	[]	[]	2019-2-24	2019-2-24				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+66	20190228	[]	[]	2019-2-28	2019-2-28				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+67	20190301	[]	[]	2019-3-1	2019-3-1				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+68	20190303	[]	[]	2019-3-3	2019-3-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+69	20190304	[]	[]	2019-3-4	2019-3-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+70	20190305	[]	[]	2019-3-5	2019-3-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
+71	20190306	[]	[]	2019-3-6	2019-3-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
index 647bfc2..c4c753c 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActTotalRecharge.txt
@@ -30,3 +30,4 @@
 34	20190209	[]	[]	2019-2-9	2019-2-10	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
 35	20190214	[]	[]	2019-2-14	2019-2-14	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
 36	20190217	[]	[]	2019-2-17	2019-2-18	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	0
+37	20190228	[]	[]	2019-2-28	2019-3-1	{0:["AccumulatedTopUp1", []]}	{0:["AccumulatedTopUp3", [2]]}	{0:["AccumulatedTopUp1", []]}	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
index 6abb15a..66354be 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWishingWell.txt
@@ -24,3 +24,7 @@
 23	[]	[]	2019-2-2	2019-2-2	1	0	{0:["XYCOpen", []]}	{}	[]	110
 24	[]	[]	2019-2-4	2019-2-4	1	0	{0:["XYCOpen", []]}	{}	[]	110
 25	[]	[]	2019-2-14	2019-2-15	1	0	{0:["XYCOpen", []]}	{}	[]	110
+26	[]	[]	2019-2-20	2019-2-21	1	0	{0:["XYCOpen", []]}	{}	[]	110
+28	[]	[]	2019-2-25	2019-2-25	1	0	{0:["XYCOpen", []]}	{}	[]	110
+29	[]	[]	Mix1	Mix3	1	0	{0:["XYCOpen", []]}	{}	[]	110
+30	[]	[]	2019-3-4	2019-3-6	1	0	{0:["XYCOpen", []]}	{}	[]	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index 9810c8a..38e6da3 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -102,3 +102,5 @@
 60303004	31380	480	[]	0	0	0	100	诛仙Boss
 60303005	31380	720	[]	0	0	0	100	诛仙Boss
 60303006	31380	900	[]	0	0	0	100	诛仙Boss
+60303007	31380	1200	[]	0	0	0	100	诛仙Boss
+60303008	31380	1440	[]	0	0	0	100	诛仙Boss
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 991a823..1f279de 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -1131,10 +1131,10 @@
 60303004	诛仙古妖	400
 60303005	诛仙妖龙	450
 60303006	诛仙海王	500
-60303007	诛仙冰魔	550
-60303008	诛仙帝皇	600
-60303009	诛仙暗影	650
-60303010	诛仙麒麟	700
+60303007	诛仙冰魔	520
+60303008	诛仙帝皇	560
+60303009	诛仙暗影	580
+60303010	诛仙麒麟	600
 60403001	冰川蛮兽	250
 60403002	虚妄魔龙	260
 60403003	虚妄古妖	270
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt
index 04d9e6d..f91ef42 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossRealmPKSeason.txt
@@ -3,8 +3,12 @@
 android_ziyou	2	1	2018-12-29	2019-1-18	22:00
 android_ziyou	1	2	2019-1-20	2019-2-20	22:00
 android_ziyou	2	2	2019-1-20	2019-2-20	22:00
+android_ziyou	1	3	2019-2-22	2019-3-22	22:00
+android_ziyou	2	3	2019-2-22	2019-3-22	22:00
 android_qudao	1	1	2019-1-28	2019-2-28	22:00
 android_qudao	2	1	2019-1-28	2019-2-28	22:00
+android_qudao	1	2	2019-3-02	2019-4-02	22:00
+android_qudao	2	2	2019-3-02	2019-4-02	22:00
 test	1	1	2018-12-29	2019-1-18	22:00
 test	2	1	2018-12-29	2019-1-18	22:00
 test	1	2	2019-1-20	2019-2-20	22:00
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt
index 0f6513f..e32d874 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZoneComm.txt
@@ -1,16 +1,17 @@
 CrossZoneName	ZoneID	ServerGroupIDList
-android_ziyou	1	[(10001,10004),(20001,20003)]
-android_ziyou	2	[(8002,8004),(7001,7008)]
-android_ziyou	3	[(7009,7015)]
-android_ziyou	4	[(7016,7021)]
-android_ziyou	5	[(7022,7025)]
-android_ziyou	6	[(7026,7028),(30001,30002)]
-android_ziyou	7	[(7029,7031),(30003,30004),(30005,30006)]
-android_ziyou	8	[(7032,7040),(30007,30010)]
-android_qudao	1	[(40001,40005),(50001,50002)]
-android_qudao	2	[(40006,40010),(50003,50006)]
-android_qudao	3	[(40011,40020),(50007,50010),(60001,60004)]
-android_qudao	4	[(40021,40030),(50011,50015),(60005,60010)]
+android_ziyou	1	[(8002,8004),(7001,7007),(10001,10004)]
+android_ziyou	2	[(20001,20003),(7008,7011)]
+android_ziyou	3	[(7012,7022)]
+android_ziyou	4	[(7023,7028)]
+android_ziyou	5	[(7029,7035),(30001,30010)]
+android_ziyou	6	[(7036,7042)]
+android_ziyou	7	[(7043,7050),(70001,70010),(80001,80010)]
+android_qudao	1	[(40001,40003),(50001)]
+android_qudao	2	[(40004,40007),(50002,50003)]
+android_qudao	3	[(40008,40010),(50004,50006)]
+android_qudao	4	[(40011,40014)]
+android_qudao	5	[(40015,40020),(50007,50010),(60001,60005)]
+android_qudao	6	[(40021,40030),(50011,50015),(60006,60010)]
 ios	1	[]
 ios	2	[]
 test	1	[(121, 150)]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt
index c2ae60c..2f7dd39 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagCrossZonePK.txt
@@ -1,8 +1,8 @@
 CrossZoneName	ZoneID	ZoneName	ServerGroupIDList
-android_ziyou	1	赛区1	[(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7021)]
-android_ziyou	2	赛区2	[(7022, 7050),(30001, 30004),(30005, 30010)]
-android_qudao	1	赛区1	[(40001,40010),(50001,50003)]
-android_qudao	2	赛区2	[(40011,40030),(50004,50012),(60001,60010)]
+android_ziyou	1	赛区1	[(10001, 10004),(20001, 20003),(8002, 8004),(7001, 7028)]
+android_ziyou	2	赛区2	[(7029, 7050),(30001, 30010),(70001, 70010),(80001, 80010)]
+android_qudao	1	赛区1	[(40001,40008),(50001,50006)]
+android_qudao	2	赛区2	[(40009,40030),(50007,50015),(60001,60010)]
 ios	1	赛区1	[]
 ios	2	赛区2	[]
 test	1	赛区1	[(101, 200)]
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index ed88c00..cbe3878 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -112,3 +112,4 @@
 31380	7	31380
 31380	8	31380
 31380	9	31380
+1000	0	1000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index b34c731..61e5885 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -79,7 +79,7 @@
 PlayerViewCache	100	[0,4]			
 CrossRealmCfg	4				
 CrossRealmPKMatch	5	10	60	[32010,32011,32012,32013,32014]	[(10, 7), (40,37)]
-CrossRealmPKCfg	[100, 5]	180	50		
+CrossRealmPKCfg	[100, 10]	180	50		
 CrossRealmPKScore	0	[100, 80]	min(cWinCount*20,100)		
 MixServer	5				
 MixServerMail	[[181,100,1],[4151,100,1],[953,1,1],[4680,1,1]]	[[1000,20,1],[1001,20,1],[1002,20,1],[1003,20,1],[1026,20,1],[1027,20,1],[1028,20,1],[1029,20,1],[1030,20,1]]	[500, 2000000]	[[947,1,1]]	
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 7844fd7..bf87eeb 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -245,6 +245,21 @@
 1336	143	0	0
 1337	143	0	0
 1338	144	0	0
+1339	145	0	0
+1340	146	0	0
+1341	147	0	0
+1342	148	0	0
+1343	149	0	0
+1344	150	0	0
+1345	151	0	0
+1346	152	0	0
+1347	153	0	0
+1348	154	0	0
+1349	155	0	0
+1350	156	0	0
+1351	157	0	0
+1352	158	0	0
+1353	159	0	0
 801	19	0	0
 802	19	0	0
 803	19	0	0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index ef873dd..be1c409 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorld.pyc b/CoreServerGroup/GameServer/Script/GameWorld.pyc
index 749d406..c737644 100644
--- a/CoreServerGroup/GameServer/Script/GameWorld.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorld.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index e852d26..d5957c6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 13d605b..3fd9932 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
index 0bafa20..ec0fcd7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_ItemCompound.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc
index 6e0747c..63bf9de 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/Operate_PlayerBuyZhenQi.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
index db81f51..2b375a6 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorld.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyInvade.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyInvade.pyc
index b3e09b0..c504b62 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyInvade.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyInvade.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
index 19bd569..15013b7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChItem.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc
index eae8064..0af04d0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/EquipZhuXian.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc
new file mode 100644
index 0000000..be9da00
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/UseItem/Item_WeekPartyPoint.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index 594309a..d21e967 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
index 3faadc2..1fb79dd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc
index 5a39112..eb36f5d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFeastWeekParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc
index d91e710..41115a4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerWeekParty.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index c96fdf7..ae1338f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -18,3 +18,6 @@
 18	2019-2-5	2019-2-8	1	110	1
 19	2019-2-12	2019-2-14	1	110	1
 20	2019-2-17	2019-2-20	1	110	1
+21	2019-2-22	2019-2-24	1	110	1
+22	Mix1	Mix2	1	110	1
+23	2019-2-28	2019-3-2	1	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index f445ee1..26fc50a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -9,3 +9,6 @@
 8	110	20000
 9	110	10000
 10	110	10000
+11	110	10000
+12	110	10000
+13	110	10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index c55762d..3464a71 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -81,3 +81,13 @@
 80	2019-2-5	2019-2-8			120	110	0	{(0,1000):[[69]]}	SellMail4	
 81	2019-2-9	2019-2-11			120	110	0	{(0,1000):[[70]]}	SellMail4	
 82	2019-2-12	2019-2-12			120	110	0	{(0,1000):[[71]]}	SellMail4	
+83	2019-2-20	2019-2-20			120	110	0	{(0,1000):[[72]]}	SellMail4	
+84	2019-2-21	2019-2-21			120	110	0	{(0,1000):[[73]]}	SellMail4	
+85	2019-2-22	2019-2-22			120	110	0	{(0,1000):[[74]]}	SellMail4	
+86	2019-2-23	2019-2-23			120	110	0	{(0,1000):[[75]]}	SellMail4	
+87	2019-2-24	2019-2-24			120	110	0	{(0,1000):[[76]]}	SellMail4	
+88	2019-2-26	2019-2-26			120	110	0	{(0,1000):[[77]]}	SellMail4	
+89	2019-3-3	2019-3-3			120	110	0	{(0,300):[[78]],(301,1000):[[82]]}	SellMail4	
+90	2019-3-4	2019-3-4			120	110	0	{(0,300):[[79]],(301,1000):[[83]]}	SellMail4	
+91	2019-3-5	2019-3-5			120	110	0	{(0,300):[[80]],(301,1000):[[84]]}	SellMail4	
+92	2019-3-6	2019-3-6			120	110	0	{(0,300):[[81]],(301,1000):[[85]]}	SellMail4	
diff --git a/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt b/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
index 5c04630..1b298ed 100644
--- a/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActLuckyTreasure.txt
@@ -1,2 +1,3 @@
 CfgID	StartDate	EndDate	ResetType	LimitLV	TemplateID	LuckyPoint
 1	2019-1-20	2019-1-20	0	110	1	600
+2	2019-3-2	2019-3-2	0	110	4	700
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
index 0103d45..b5f15ce 100644
--- a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -4,3 +4,4 @@
 3	2	110	3000
 4	2	110	3000
 5	2	110	3000
+6	2	110	3000
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 5cc635b..9aef655 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -61,3 +61,12 @@
 60	2019-2-7	2019-2-7				110	0	{(0,1000):[[141]]}	SellMail3	
 61	2019-2-15	2019-2-15				110	0	{(0,1000):[[142]]}	SellMail3	
 62	2019-2-16	2019-2-16				110	0	{(0,1000):[[143]]}	SellMail3	
+63	2019-2-21	2019-2-21				110	0	{(0,1000):[[145]]}	SellMail3	
+64	2019-2-23	2019-2-23				110	0	{(0,1000):[[146]]}	SellMail3	
+65	2019-2-24	2019-2-24				110	0	{(0,1000):[[147]]}	SellMail3	
+66	2019-2-28	2019-2-28				110	0	{(1,300):[[148]],(301,1000):[[154]]}	SellMail3	
+67	2019-3-1	2019-3-1				110	0	{(1,300):[[149]],(301,1000):[[155]]}	SellMail3	
+68	2019-3-3	2019-3-3				110	0	{(1,300):[[150]],(301,1000):[[156]]}	SellMail3	
+69	2019-3-4	2019-3-4				110	0	{(1,300):[[151]],(301,1000):[[157]]}	SellMail3	
+70	2019-3-5	2019-3-5				110	0	{(1,300):[[152]],(301,1000):[[158]]}	SellMail3	
+71	2019-3-6	2019-3-6				110	0	{(1,300):[[153]],(301,1000):[[159]]}	SellMail3	
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index ed50d71..5893e9f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -30,3 +30,4 @@
 34	2019-2-9	2019-2-10	5	0	24
 35	2019-2-14	2019-2-14	5	0	25
 36	2019-2-17	2019-2-18	5	0	26
+37	2019-2-28	2019-3-1	5	1	27
diff --git a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
index 99ae9b4..86b4c4e 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
@@ -1,2 +1,2 @@
 CfgID	StartDate	EndDate	AdvanceMinutes	IsDayReset	ResetType	LimitLV	TemplateID	PointAward
-1	8	15	300	1	1	110	[[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1103,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,1103,1201,2500]]	{0:{330:[(1652,1,1)]},1:{350:[(5801,1,1)],410:[(5801,1,1)]},2:{350:[(5800,1,1)],410:[(5800,1,1)]},3:{350:[(5802,1,1)],410:[(5802,1,1)]},4:{380:[(4216,1,1)]},5:{380:[(62,1,1)]},6:{380:[(4221,1,1)]},}
+1	8	15	300	1	1	110	[[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1000,2700,1200,2200],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1000,2700,1200,2400],[1400,1500,1600,1700,1800,1900,2000,201,302,401,700,900,1000,2700,1200,2300],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1201,2600],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1200,2100],[1400,1500,1600,1700,1800,1900,2000,200,301,401,700,900,1000,2700,1201,2500]]	{0:{180:[(2488,1,1)],330:[(1652,1,1)]},1:{310:[(5801,1,1)],410:[(5801,1,1)]},2:{310:[(5800,1,1)],410:[(5800,1,1)]},3:{310:[(5802,1,1)],410:[(5802,1,1)]},4:{180:[(2488,1,1)],380:[(4216,1,1)]},5:{180:[(2488,1,1)],380:[(62,1,1)]},6:{180:[(2488,1,1)],380:[(4221,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
index 6984ab1..f4e3882 100644
--- a/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActWishingWell.txt
@@ -24,3 +24,7 @@
 23	2019-2-2	2019-2-2	1	0	110	1
 24	2019-2-4	2019-2-4	1	0	110	1
 25	2019-2-14	2019-2-15	1	0	110	1
+26	2019-2-20	2019-2-21	1	0	110	1
+28	2019-2-25	2019-2-25	1	0	110	1
+29	Mix1	Mix3	1	0	110	1
+30	2019-3-4	2019-3-6	1	0	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index 0e45419..5b73e27 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -102,3 +102,5 @@
 60303004	31380	90	0	0	0	0
 60303005	31380	90	0	0	0	0
 60303006	31380	90	0	0	0	0
+60303007	31380	90	0	0	0	0
+60303008	31380	90	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 76b7495..1fcba89 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -263,7 +263,7 @@
 2472	0	0	0	0	1
 2473	0	0	600	0	1
 2474	0	0	0	1	1
-2475	0	0	0	0	1
+2475	0	0	0	1	1
 2476	0	0	0	1	0
 2477	0	0	280	1	1
 2478	0	0	0	1	0
@@ -276,3 +276,4 @@
 2485	0	0	0	0	1
 2486	0	0	0	0	1
 2487	0	0	0	0	1
+2488	0	0	0	1	1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index c650fdf..586ecaa 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -273,3 +273,4 @@
 2485			912_1|5503_2|5513_2									[912]
 2486			913_1|5414_500|5523_2									[913,5414]
 2487		8416_1|8417_1|8418_1|8419_1										[8416,8417,8418,8419]
+2488				[[300,[5800,1]],[600,[5801,1]],[900,[5802,1]],[1100,[199,1]],[1700,[4680,1]],[2700,[15,1]],[3000,[5413,20]],[5000,[181,20]],[7000,[4151,20]],[10000,[5303,200]]]	1							[5800,5801,5802,199,4680,15]
diff --git a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt
index 0f6513f..e32d874 100644
--- a/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCrossZoneComm.txt
@@ -1,16 +1,17 @@
 CrossZoneName	ZoneID	ServerGroupIDList
-android_ziyou	1	[(10001,10004),(20001,20003)]
-android_ziyou	2	[(8002,8004),(7001,7008)]
-android_ziyou	3	[(7009,7015)]
-android_ziyou	4	[(7016,7021)]
-android_ziyou	5	[(7022,7025)]
-android_ziyou	6	[(7026,7028),(30001,30002)]
-android_ziyou	7	[(7029,7031),(30003,30004),(30005,30006)]
-android_ziyou	8	[(7032,7040),(30007,30010)]
-android_qudao	1	[(40001,40005),(50001,50002)]
-android_qudao	2	[(40006,40010),(50003,50006)]
-android_qudao	3	[(40011,40020),(50007,50010),(60001,60004)]
-android_qudao	4	[(40021,40030),(50011,50015),(60005,60010)]
+android_ziyou	1	[(8002,8004),(7001,7007),(10001,10004)]
+android_ziyou	2	[(20001,20003),(7008,7011)]
+android_ziyou	3	[(7012,7022)]
+android_ziyou	4	[(7023,7028)]
+android_ziyou	5	[(7029,7035),(30001,30010)]
+android_ziyou	6	[(7036,7042)]
+android_ziyou	7	[(7043,7050),(70001,70010),(80001,80010)]
+android_qudao	1	[(40001,40003),(50001)]
+android_qudao	2	[(40004,40007),(50002,50003)]
+android_qudao	3	[(40008,40010),(50004,50006)]
+android_qudao	4	[(40011,40014)]
+android_qudao	5	[(40015,40020),(50007,50010),(60001,60005)]
+android_qudao	6	[(40021,40030),(50011,50015),(60006,60010)]
 ios	1	[]
 ios	2	[]
 test	1	[(121, 150)]
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 65e4386..b6baf36 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -108,7 +108,8 @@
 31380	3	31380	400	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,3,1],[1158,1,1],[5500,4,1]]
 31380	4	31380	400	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
 31380	5	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
-31380	6	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
-31380	7	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
-31380	8	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
-31380	9	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	6	31380	500	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,5,1],[1158,1,1],[5500,6,1]]
+31380	7	31380	560	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,5,1],[1158,1,1],[5500,6,1]]
+31380	8	31380	600	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+31380	9	31380	600	0	0	0	0	0	0	0	0	[17,19,8]	10			[[5414,4,1],[1158,1,1],[5500,5,1]]
+1000	0	1000	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 19360f2..90195f9 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -70,3 +70,17 @@
 8	69	400	1	[(266,1,1),(181,25,1)]	266	LimitGift3
 5	70	180	1	[(4228,1,1),(4151,25,1)]	4228	LimitGift3
 5	71	150	1	[(5809,1,1),(5810,1,1),(5811,1,1)]	5809	LimitGift3
+2	72	22	1	[(110,50,1),(112,2,1)]	112	LimitGift3
+5	73	150	1	[(5414,750,1)]	5414	LimitGift3
+4	74	175	1	[(4680,1,1),(5411,10,1)]	4680	LimitGift3
+5	75	150	1	[(5803,1,1),(5804,1,1),(5805,1,1)]	5803	LimitGift3
+4	76	150	1	[(913,1,1),(4694,10,1)]	913	LimitGift3
+4	77	130	1	[(4606,1,1),(2213,25,1)]	4606	LimitGift3
+4	78	130	1	[(4608,2,1),(2213,25,1)]	4608	LimitGift3
+2	79	22	1	[(104,50,1),(106,2,1)]	106	LimitGift3
+2	80	18	1	[(5503,1,1),(5513,1,1)]	5503	LimitGift3
+5	81	225	1	[(5206,3,1),(5207,6,1)]	5207	LimitGift3
+4	82	130	1	[(4606,1,1),(2213,25,1)]	4606	LimitGift3
+2	83	22	1	[(110,50,1),(112,2,1)]	110	LimitGift3
+2	84	19	1	[(700,50000,1)]	700	LimitGift3
+5	85	225	1	[(5206,3,1),(5207,6,1)]	5207	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 5d22eb4..6c79e31 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -58,7 +58,7 @@
 RuneAwardColor	{(101,1608):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(1000000,1)]},(1701,3208):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(500000,1),(1000000,2)]}}	{(101,1608):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(1000000,1)]},(1701,3208):{(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,24,25,26,27):[(500000,1),(1000000,2)]}}	0	0	0
 PreFourAward	{101:[(4316,3)],102:[(4316,3)],103:[(4316,2),(4317,1)],104:[(4316,2),(4317,1)]}				
 RuneTowerSweepBuy	2	25			
-ItemDecompound	103|104|105|106|107	6	0	0	0
+ItemDecompound	{(103,104,105,106,107):6,(128,131,134,135,136,137):3}	6	0	0	0
 ComposeAddonsType	101|102|103|104|105|106|107	0	0	0	0
 ComposeAddonsQuality	1|2	0	0	0	0
 ComposeAddonsFormula	min(int((800+100*itemClassLV)*(0.6+(itemColor-2)*0.4)),2500)	0	0	0	0
@@ -126,7 +126,7 @@
 MapDropBindRule	{52010:1,31340:1}	0	0	0	0
 MapDropItemNoBind	{52010:[3801,4606,4608]}	0	0	0	0
 MapDropItemBind	{}	0	0	0	0
-JobItemDropSets	{2:[5012,5022]}	{2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}	{3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]]}		
+JobItemDropSets	{2:[5012,5022]}	{2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],13001:[7201,7206,7211,7216],13002:[7202,7207,7212,7217],13003:[7203,7208,7213,7218],13004:[7204,7209,7214,7219],13005:[7205,7210,7215,7220],13051:[7106,7111,7116,7121],13052:[7107,7112,7117,7122],13053:[7108,7113,7118,7123],13054:[7109,7114,7119,7124],13055:[7110,7115,7120,7125],13101:[7201,7206,7211,7216,7236,7241,7256],13102:[7202,7207,7212,7217,7237,7242,7257],13103:[7203,7208,7213,7218,7238,7243,7258],13104:[7204,7209,7214,7219,7239,7244,7259],13105:[7205,7210,7215,7220,7240,7245,7260],13151:[7201,7206,7211,7216,7236,7241,7256,7246,7251],13152:[7202,7207,7212,7217,7237,7242,7257,7247,7252],13153:[7203,7208,7213,7218,7238,7243,7258,7248,7253],13154:[7204,7209,7214,7219,7239,7244,7259,7249,7254],13155:[7205,7210,7215,7220,7240,7245,7260,7250,7255],13201:[7201,7206,7211,7216,7236,7241,7256,7246,7251,7221,7226,7231],13202:[7202,7207,7212,7217,7237,7242,7257,7247,7252,7222,7227,7232],13203:[7203,7208,7213,7218,7238,7243,7258,7248,7253,7223,7228,7233],13204:[7204,7209,7214,7219,7239,7244,7259,7249,7254,7224,7229,7234],13205:[7205,7210,7215,7220,7240,7245,7260,7250,7255,7225,7230,7235]}	{3001:[[2800,8205],[4600,8218],[6400,8231],[8200,8244],[10000,8257]],3002:[[2800,8206],[4600,8219],[6400,8232],[8200,8245],[10000,8258]],3003:[[2800,8207],[4600,8220],[6400,8233],[8200,8246],[10000,8259]],4002:[[2800,8209],[4600,8222],[6400,8235],[8200,8248],[10000,8261]],4003:[[2800,8210],[4600,8223],[6400,8236],[8200,8249],[10000,8262]],5002:[[2800,8211],[4600,8224],[6400,8237],[8200,8250],[10000,8263]],5003:[[2800,8212],[4600,8225],[6400,8238],[8200,8251],[10000,8264]],6003:[[2800,8213],[4600,8226],[6400,8239],[8200,8252],[10000,8265]],8411:[[5000,8411],[10000,8412]],8412:[[3500,8411],[7000,8412],[9000,8414],[10000,8415]],8421:[[5000,8421],[10000,8422]],8422:[[3500,8421],[7000,8422],[9000,8424],[10000,8425]],8431:[[5000,8431],[10000,8432]],8432:[[3500,8431],[7000,8432],[9000,8434],[10000,8435]],8441:[[5000,8441],[10000,8442]],8442:[[3500,8441],[7000,8442],[9000,8444],[10000,8445]]}		
 EquipDropPartSets	{102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}				
 FamilyBOSSDropRule	6000+grade*800	min(2*playerCount,50)			
 FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,4]], 4:[[1016,1],[1131,6],[1134,6]], 5:[[1015,1],[1131,8],[1134,8]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,4]], 4:[[1016,1],[1132,6],[1135,6]], 5:[[1015,1],[1132,8],[1135,8]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,4]], 4:[[1016,1],[1133,6],[1136,6]], 5:[[1015,1],[1133,8],[1136,8]]}}		
@@ -337,7 +337,7 @@
 CrossUseItem	901|902|903|904				
 CrossRealmCfg	4				
 CrossSyncPlayerData	5				
-CrossRealmPKCfg	[100, 5]	180	50		
+CrossRealmPKCfg	[100, 10]	180	50		
 CrossRealmPKAward	{"5":[[1148,1,1],[2141,12,1]],"7":[[1148,1,1],[2141,12,1]], "10":[[1148,1,1],[2141,12,1]],"15":[[1148,1,1],[2141,24,1]]}	{"1":[[1148,1,1],[2141,18,1]],"2":[[1148,1,1],[2141,18,1]], "3":[[1148,1,1],[2141,18,1]],"8":[[1148,1,1],[2141,36,1]]}			
 CrossRealmPKScore	0	[100, 80]	min(cWinCount*20,100)		
 CrossRealmPKMatchCount	10	10	10+min(max(todayBuyCount-1,0),1)*10+min(max(todayBuyCount-3,0),1)*10+min(max(todayBuyCount-5,0),1)*10+min(max(todayBuyCount-7,0),1)*10		
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index e777a5d..353205a 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -262,6 +262,18 @@
 286	0	8427	0	8421|8422|8424|8425	5	5414	1600	0	10000	0	0	0	EquipComposeSuccess10	1
 287	0	8428	0	8421|8422|8424|8425	5	5414	1600	0	10000	0	0	0	EquipComposeSuccess10	1
 288	0	8429	0	8421|8422|8424|8425	5	5414	1600	0	10000	0	0	0	EquipComposeSuccess10	1
+320	0	8430	0	8431|8432|8434|8435	5	5413	250	0	10000	0	0	0	EquipComposeSuccess11	1
+321	0	8433	0	8431|8432|8434|8435	5	5413	250	0	10000	0	0	0	EquipComposeSuccess11	1
+322	0	8436	0	8431|8432|8434|8435	5	5414	6500	0	10000	0	0	0	EquipComposeSuccess11	1
+323	0	8437	0	8431|8432|8434|8435	5	5414	6500	0	10000	0	0	0	EquipComposeSuccess11	1
+324	0	8438	0	8431|8432|8434|8435	5	5414	6500	0	10000	0	0	0	EquipComposeSuccess11	1
+325	0	8439	0	8431|8432|8434|8435	5	5414	6500	0	10000	0	0	0	EquipComposeSuccess11	1
+326	0	8440	0	8441|8442|8444|8445	5	5413	470	0	10000	0	0	0	EquipComposeSuccess12	1
+327	0	8443	0	8441|8442|8444|8445	5	5413	470	0	10000	0	0	0	EquipComposeSuccess12	1
+328	0	8446	0	8441|8442|8444|8445	5	5414	15600	0	10000	0	0	0	EquipComposeSuccess12	1
+329	0	8447	0	8441|8442|8444|8445	5	5414	15600	0	10000	0	0	0	EquipComposeSuccess12	1
+330	0	8448	0	8441|8442|8444|8445	5	5414	15600	0	10000	0	0	0	EquipComposeSuccess12	1
+331	0	8449	0	8441|8442|8444|8445	5	5414	15600	0	10000	0	0	0	EquipComposeSuccess12	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/tagLuckyTreasureTemplate.txt b/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
index 7ebfe23..8a4d55e 100644
--- a/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLuckyTreasureTemplate.txt
@@ -89,3 +89,36 @@
 3	[301,1000]	144	20	1	1072
 3	[301,1000]	153	10	1	1072
 3	[301,1000]	252	1	1	333
+4	[0,250]	4151	10	1	500
+4	[0,250]	4694	1	1	500
+4	[0,250]	912	1	1	600
+4	[0,250]	5303	30	1	1800
+4	[0,250]	5412	5	1	1800
+4	[0,250]	3502	1	1	1800
+4	[0,250]	3512	1	1	1800
+4	[0,250]	4010	1	1	600
+4	[0,250]	2389	1	1	150
+4	[0,250]	913	1	1	300
+4	[0,250]	264	1	1	150
+4	[251,300]	4694	1	1	500
+4	[251,300]	912	1	1	600
+4	[251,300]	5303	30	1	1600
+4	[251,300]	5412	5	1	1600
+4	[251,300]	3503	1	1	1300
+4	[251,300]	3513	1	1	1300
+4	[251,300]	4010	1	1	650
+4	[251,300]	5501	1	1	1000
+4	[251,300]	5511	1	1	1000
+4	[251,300]	913	1	1	300
+4	[251,300]	264	1	1	150
+4	[301,1000]	4694	1	1	500
+4	[301,1000]	912	1	1	600
+4	[301,1000]	701	10	1	2500
+4	[301,1000]	3504	1	1	600
+4	[301,1000]	3514	1	1	600
+4	[301,1000]	5502	1	1	1800
+4	[301,1000]	5512	1	1	1800
+4	[301,1000]	4010	1	1	1000
+4	[301,1000]	913	1	1	300
+4	[301,1000]	5302	1	1	150
+4	[301,1000]	5417	1	1	150
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 343ab60..724af16 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -277,3 +277,5 @@
 60303004	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5414:1000000,1158:1000000,5511:1000000,5500:1000000}	{5414:13,5500:5}	{8422:1000000}	{}	{}	0	0	0	0	[]	[]
 60303005	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5414:1000000,1158:1000000,5511:1000000,5500:1000000}	{5414:16,5500:5}	{8431:1000000}	{}	{}	0	0	0	0	[]	[]
 60303006	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5414:1000000,1158:1000000,5511:1000000,5500:1000000}	{5414:16,5500:5}	{8432:1000000}	{}	{}	0	0	0	0	[]	[]
+60303007	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5414:1000000,1158:1000000,5511:1000000,5500:1000000}	{5414:25,5500:5}	{8441:1000000}	{}	{}	0	0	0	0	[]	[]
+60303008	0	0	0	0	[]	0	{}	0	{}	{}	[]	[]	{5414:1000000,1158:1000000,5511:1000000,5500:1000000}	{5414:25,5500:5}	{8442:1000000}	{}	{}	0	0	0	0	[]	[]
diff --git a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
index 56642c3..fa6c2d1 100644
--- a/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagOrderInfo.txt
@@ -532,3 +532,45 @@
 yyb2.android.jbch	yybgame2	18	111	0
 yyb2.android.ntlc	yybgame2	30	112	0
 yyb2.android.jszq	yybgame2	98	113	0
+xiaoniu.18	xngame	18	101	0
+xiaoniu.1	xngame	10	102	0
+xiaoniu.3	xngame	30	103	0
+xiaoniu.98	xngame	98	104	0
+xiaoniu.128	xngame	128	105	0
+xiaoniu.198	xngame	198	106	0
+xiaoniu.328	xngame	328	107	0
+xiaoniu.648	xngame	648	108	0
+xiaoniu.3000	xngame	3000	109	0
+xiaoniu.test1	xngame	1	110	0
+xiaoniu.android.6	xngame	6	0	2
+xiaoniu.android.30	xngame	30	0	4
+xiaoniu.android.68	xngame	68	0	5
+xiaoniu.android.128	xngame	128	0	7
+xiaoniu.android.168	xngame	168	0	8
+xiaoniu.android.18	xngame	18	0	3
+xiaoniu.android.98	xngame	98	0	6
+xiaoniu.android.198	xngame	198	0	9
+xiaoniu.android.jbch	xngame	18	111	0
+xiaoniu.android.ntlc	xngame	30	112	0
+xiaoniu.android.jszq	xngame	98	113	0
+superd.18	sdgame	18	101	0
+superd.1	sdgame	10	102	0
+superd.3	sdgame	30	103	0
+superd.98	sdgame	98	104	0
+superd.128	sdgame	128	105	0
+superd.198	sdgame	198	106	0
+superd.328	sdgame	328	107	0
+superd.648	sdgame	648	108	0
+superd.3000	sdgame	3000	109	0
+superd.test1	sdgame	1	110	0
+superd.android.6	sdgame	6	0	2
+superd.android.30	sdgame	30	0	4
+superd.android.68	sdgame	68	0	5
+superd.android.128	sdgame	128	0	7
+superd.android.168	sdgame	168	0	8
+superd.android.18	sdgame	18	0	3
+superd.android.98	sdgame	98	0	6
+superd.android.198	sdgame	198	0	9
+superd.android.jbch	sdgame	18	111	0
+superd.android.ntlc	sdgame	30	112	0
+superd.android.jszq	sdgame	98	113	0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index be82f07..431c5a5 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -1,25 +1,25 @@
 ID	Quality	UnlockSys	UnLockNeedItemID	UnLockNeedItemCnt	DecomposeExp	InitRank	MaxRank	UseNeedRank	SkillID	SkillUnLock	SkillUnLockSys	InitFightPower
 50106001	2	GetPet13	4201	1	1000	1	10	1	48200|48205	4|10	['PetUpLv','PetUpLv','PetUpLv']	1620
 50106002	2	GetPet	4202	1	1000	1	10	4	48215|48220	4|10	['PetUpLv','PetUpLv','PetUpLv']	1620
-50106101	3	GetPet2	4203	1	1000	1	25	6	48230|48235|47111	4|10|20	['PetUpLv1','PetUpLv','PetUpLv']	6139
+50106101	3	GetPet2	4203	1	1000	1	25	6	48230|48235|47111	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	6139
 50106102	3	GetPet3	4204	1	1000	1	25	6	48245|48250|48255	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	4199
-50106201	4	GetPet4	4205	1	1000	1	35	6	48260|48261|48265|48270	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv2']	24373
+50106201	4	GetPet4	4205	1	1000	1	35	6	48260|48261|48265|48270	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv2']	24373
 50106103	3	GetPet7	4208	1	1000	1	25	6	48320|48325|48330	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	22265
-50106204	4	GetPet5	4212	1	1000	1	35	6	48275|48276|48280|48285	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv3']	46045
-50106301	5	GetPet8	4206	1	1000	1	50	6	48290|48291|48292|48295|48300	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv4']	170557
-50106302	5	GetPet9	4207	1	1000	1	50	6	48305|48306|48307|48310|48315	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv5']	163699
-50106303	4	GetPet6	4209	1	1000	1	35	6	48335|48336|48340|48345	4|10|20|30	['PetUpLv','PetUpLv7','PetUpLv']	23022
-50106304	5	GetPet10	4210	1	1000	1	50	6	48350|48351|48352|48355|48360	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv6']	102334
+50106204	4	GetPet5	4212	1	1000	1	35	6	48275|48276|48280|48285	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv3']	46045
+50106301	5	GetPet8	4206	1	1000	1	50	6	48290|48291|48292|48295|48300	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv4']	170557
+50106302	5	GetPet9	4207	1	1000	1	50	6	48305|48306|48307|48310|48315	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv5']	163699
+50106303	4	GetPet6	4209	1	1000	1	35	6	48335|48336|48340|48345	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv7']	23022
+50106304	5	GetPet10	4210	1	1000	1	50	6	48350|48351|48352|48355|48360	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv6']	102334
 50106305	3	GetPet11	4213	1	1000	1	25	6	48380|48385|48390	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	5542
-50106306	4	GetPet12	4214	1	1000	1	35	6	48410|48411|48415|48420	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv8']	42975
-50106310	4	GetPet15	4218	1	1000	1	35	6	48425|48426|48430|48435	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv12']	28426
-50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48441|48442|48445|48450	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv11']	136445
+50106306	4	GetPet12	4214	1	1000	1	35	6	48410|48411|48415|48420	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv8']	42975
+50106310	4	GetPet15	4218	1	1000	1	35	6	48425|48426|48430|48435	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv12']	28426
+50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48441|48442|48445|48450	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv11']	136445
 50106307	2	GetPet1	4215	1	1000	1	10	6	48395|48400	4|10	['PetUpLv','PetUpLv','PetUpLv']	2267
 50106311	3	GetPet16	4219	1	1000	1	25	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	6516
 50106312	3	GetPet18	4220	1	1000	1	25	6	48470|48475|48480	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	16371
 50106313	3	GetPet19	4221	1	1000	1	25	6	48500|48505|48510	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	13915
-50106314	4	GetPet20	4222	1	1000	1	35	6	48515|48516|48520|48525	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv9']	32743
-50106315	4	GetPet21	4223	1	1000	1	35	6	48530|48531|48535|48540	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv10']	32743
+50106314	4	GetPet20	4222	1	1000	1	35	6	48515|48516|48520|48525	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv9']	32743
+50106315	4	GetPet21	4223	1	1000	1	35	6	48530|48531|48535|48540	4|10|20|30	['PetUpLv','PetUpLv','PetUpLv','PetUpLv10']	32743
 50106308	3	GetPet17	4216	1	1000	1	25	6	48485|48490|48495	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	13915
 50106318	3	GetPet24	4228	1	1000	1	25	6	48550|48551|48552	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	25561
-50106316	5	GetPet25	4226	1	1000	1	50	6	48560|48561|48562|48563|48564	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv']	254894
+50106316	5	GetPet25	4226	1	1000	1	50	6	48560|48561|48562|48563|48564	4|10|20|30|40	['PetUpLv','PetUpLv','PetUpLv','PetUpLv','PetUpLv13']	254894
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index d59bebf..8baad7f 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -245,6 +245,21 @@
 1336	143	1	912	2	1	[[2213,10,1]]	912		0	0	0	1	0	1	88	425	0	LimitGift6	
 1337	143	1	2450	1	1	[]	2450		0	0	0	1	0	1	1588	6000	0	LimitGift7	
 1338	144	1	5413	30	1	[]	5413		0	0	0	1	0	1	588	1000	0	LimitGift6	
+1339	145	1	5413	50	1	[]	5413		0	0	0	1	0	1	688	1500	0	LimitGift6	
+1340	146	1	912	2	1	[[3807,5,1]]	912		0	0	0	1	0	1	188	800	0	LimitGift7	
+1341	147	1	5701	12	1	[]	5701		0	0	0	1	0	1	688	1500	0	LimitGift6	
+1342	148	1	15	1	1	[[4010,10,1]]	15		0	0	0	1	0	1	388	1300	0	LimitGift6	
+1343	149	1	19	1	1	[[4007,6,1]]	19		0	0	0	1	0	1	188	680	0	LimitGift6	
+1344	150	1	4606	2	1	[[2213,120,1]]	4606		0	0	0	1	0	1	988	3500	0	LimitGift6	
+1345	151	1	912	2	1	[[4694,5,1]]	912		0	0	0	1	0	1	188	800	0	LimitGift6	
+1346	152	1	19	1	1	[[1503,10,1]]	19		0	0	0	1	0	1	188	700	0	LimitGift6	
+1347	153	1	5006	10	1	[[5007,20,1]]	5006		0	0	0	1	0	1	388	1500	0	LimitGift6	
+1348	154	1	15	1	1	[[4010,10,1]]	15		0	0	0	1	0	1	388	1300	0	LimitGift6	
+1349	155	1	5302	15	1	[]	5302		0	0	0	1	0	1	988	3000	0	LimitGift6	
+1350	156	1	4607	1	1	[[2213,120,1]]	4607		0	0	0	1	0	1	988	3500	0	LimitGift6	
+1351	157	1	912	2	1	[[4694,5,1]]	912		0	0	0	1	0	1	188	800	0	LimitGift6	
+1352	158	1	19	1	1	[[3807,5,1]]	19		0	0	0	1	0	1	188	700	0	LimitGift6	
+1353	159	1	5006	10	1	[[5007,20,1]]	5006		0	0	0	1	0	1	388	1500	0	LimitGift6	
 801	19	0	2391	1	0	[]	0		0	0	0	0	0	1	60	0	0		
 802	19	0	2393	1	0	[]	0		0	0	0	0	0	1	60	0	0		
 803	19	0	2395	1	0	[]	0		0	0	0	0	0	1	60	0	0		
diff --git a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
index 775e904..5fff2a3 100644
--- a/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTotalRechargeTemplate.txt
@@ -80,3 +80,6 @@
 26	30	1	{(0,1000):{"1":[[5810,1,1]],"2":[[5810,1,1]],"3":[[5810,1,1]]}}	AccumulatedTopUp2
 26	150	2	{(0,1000):{"1":[[5809,1,1],[15,1,1]],"2":[[5809,1,1],[15,1,1]],"3":[[5809,1,1],[15,1,1]]}}	AccumulatedTopUp2
 26	300	3	{(0,1000):{"1":[[5811,1,1],[15,1,1]],"2":[[5811,1,1],[15,1,1]],"3":[[5811,1,1],[15,1,1]]}}	AccumulatedTopUp2
+27	6	0	{(0,1000):{"1":[[1128,1,1],[5411,1,1]],"2":[[1128,1,1],[5411,1,1]],"3":[[1128,1,1],[5411,1,1]]}}	AccumulatedTopUp2
+27	30	1	{(0,1000):{"1":[[4681,1,1],[5411,2,1]],"2":[[4681,1,1],[5411,2,1]],"3":[[4681,1,1],[5411,2,1]]}}	AccumulatedTopUp2
+27	200	2	{(0,1000):{"1":[[4680,1,1],[5411,5,1]],"2":[[4680,1,1],[5411,5,1]],"3":[[4680,1,1],[5411,5,1]]}}	AccumulatedTopUp2
diff --git a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
index 68a9ddb..d01eb73 100644
--- a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
@@ -36,3 +36,4 @@
 2400	24	90	90	[(2427,1,1),(882,1,1)]	60
 2500	25	150	150	[(2427,1,1),(882,1,1)]	60
 2600	26	5	5	[(2427,1,1),(882,1,1)]	60
+2700	27	5	1	[(2427,1,1),(882,1,1)]	20
diff --git a/db/PyMongoDataServer/PySysDB/tagZhuXianBoss.txt b/db/PyMongoDataServer/PySysDB/tagZhuXianBoss.txt
index fd9b9e5..04cbf07 100644
--- a/db/PyMongoDataServer/PySysDB/tagZhuXianBoss.txt
+++ b/db/PyMongoDataServer/PySysDB/tagZhuXianBoss.txt
@@ -5,3 +5,5 @@
 60303004	3	540	0	168000
 60303005	4	660	0	226000
 60303006	5	780	0	226000
+60303007	6	840	0	345000
+60303008	7	900	0	345000
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 2767468..11f471c 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -162,6 +162,21 @@
 700	1	0	魂尘	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	20	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	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 701	1	0	聚魂碎片	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	150	0	20	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
 702	1	0	核心环	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	300	0	20	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
+703	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	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	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+704	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	2	0	0	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
+705	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	3	0	0	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
+706	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	4	0	0	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
+707	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	5	0	0	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
+708	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	6	0	0	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
+709	1	0	七日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	245	7	0	0	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
+710	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	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	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+711	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	2	0	0	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
+712	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	3	0	0	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
+713	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	4	0	0	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
+714	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	5	0	0	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
+715	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	6	0	0	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
+716	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	7	0	0	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
+717	1	0	节日巡礼积分	15	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	300	0	20	0	1	0	0	246	8	0	0	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
 800	1	0	1200万铜钱	1	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	240	0	20	0	1	0	0	201	12000000	0	0	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
 801	1	0	2500万铜钱	1	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	500	0	20	0	1	0	0	201	25000000	0	0	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
 802	1	0	200万铜钱	1	0	0	0	0	999	1	1	0	0	1	0	0	0	0	0	1	40	0	20	0	1	0	0	201	2000000	0	0	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
@@ -753,6 +768,7 @@
 2485	1	0	新春礼盒	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	60	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2486	1	0	新春大礼盒	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	280	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2487	1	0	一阶四剑自选箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	280	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
+2488	1	0	巡礼超级礼包 	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1840	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 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	600	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	840	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	1080	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 95f24d4..e5b54f8 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -1131,10 +1131,10 @@
 60303004	18	0	诛仙古妖	400	2	388782	388782	0	21	0	0	10000	179857	0	0	0	0	0	0	0	3	2500	5324698	334	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	96351353	277	0	0	0	5	0	0	186	1	1
 60303005	18	0	诛仙妖龙	450	2	652551	652551	0	27	0	0	10000	299265	0	0	0	0	0	0	0	3	2500	6196383	390	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	9796799	533	0	0	0	5	0	0	186	1	1
 60303006	18	0	诛仙海王	500	2	836838	836838	0	30	0	0	10000	385547	0	0	0	0	0	0	0	3	2500	7230515	454	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	78058133	782	0	0	0	5	0	0	186	1	1
-60303007	18	0	诛仙冰魔	550	2	1452142	1452142	0	31	0	0	10000	645536	0	0	0	0	0	0	0	3	2500	8587785	537	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	8924995	1179	0	0	0	5	0	0	186	1	1
-60303008	18	0	诛仙帝皇	600	2	1851669	1851669	0	32	0	0	10000	821276	0	0	0	0	0	0	0	3	2500	10401010	646	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	43838879	1629	0	0	0	5	0	0	186	1	1
-60303009	18	0	诛仙暗影	650	2	1851669	1851669	0	33	0	0	10000	821276	0	0	0	0	0	0	0	3	2500	10401010	646	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	43838879	1629	0	0	0	5	0	0	186	1	1
-60303010	18	0	诛仙麒麟	700	2	1001639	1001639	0	34	0	0	10000	481264	0	0	0	0	0	0	0	3	2500	10401010	646	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	43838879	1629	0	0	0	5	0	0	186	1	1
+60303007	18	0	诛仙冰魔	520	2	1074195	1074195	0	36	0	0	10000	494357	0	0	0	0	0	0	0	3	2500	8587785	537	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	8924995	1179	0	0	0	5	0	0	186	1	1
+60303008	18	0	诛仙帝皇	560	2	1365938	1365938	0	41	0	0	10000	626984	0	0	0	0	0	0	0	3	2500	10401010	646	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	43838879	1629	0	0	0	5	0	0	186	1	1
+60303009	18	0	诛仙暗影	580	2	1365938	1365938	0	33	0	0	10000	626984	0	0	0	0	0	0	0	3	2500	10401010	646	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	43838879	1629	0	0	0	5	0	0	186	1	1
+60303010	18	0	诛仙麒麟	600	2	1365938	1365938	0	34	0	0	10000	626984	0	0	0	0	0	0	0	3	2500	10401010	646	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	43838879	1629	0	0	0	5	0	0	186	1	1
 60403001	18	0	冰川蛮兽	250	0	11492	11492	0	8	0	0	10000	11460	0	0	0	0	0	0	0	0	2500	855512	59	0	300	2	6	0	0	0	0	0	0	0	0	0	40	2	41927140	12	0	0	0	3	0	0	180	1	1
 60403002	18	0	虚妄魔龙	260	0	12190	12190	0	8	0	0	10000	11583	0	0	0	0	0	0	0	0	2500	1351222	89	0	300	2	6	0	0	0	0	0	0	0	0	0	40	2	97864056	14	0	0	0	3	0	0	180	1	1
 60403003	18	0	虚妄古妖	270	0	14882	14882	0	9	0	0	10000	14369	0	0	0	0	0	0	0	0	2500	1707939	111	0	300	2	6	0	0	0	0	0	0	0	0	0	40	2	90279519	17	0	0	0	3	0	0	180	1	1

--
Gitblit v1.8.0