From 66e2ae8006d1fb3bdfc49cea33e9cc61b548253c Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 31 一月 2019 13:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt |    4 
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt       |   18 +----
 db/PyMongoDataServer/PySysDB/tagStore.txt               |   25 ++++---
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt        |    6 +-
 db/PyMongoDataServer/SysDB/tagChinItem.txt              |   13 +++-
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt          |    6 +-
 db/PyMongoDataServer/SysDB/tagChinMap.txt               |    2 
 db/PyMongoDataServer/PySysDB/tagAttrFruit.txt           |    7 ++
 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt       |    2 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt |    2 
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt |    8 --
 db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt    |    6 +-
 CoreServerGroup/GameServer/PySysDB/tagStore.txt         |   25 ++++---
 13 files changed, 64 insertions(+), 60 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index dea4021..792d690 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -7,4 +7,4 @@
 6	tast6	[]	[]	2018-12-8	2018-12-8	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
 7	test7	[]	[]	2018-12-9	2018-12-9	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
 8	test8	[]	[]	2018-12-15	2018-12-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-9	20190212	[]	[]	2019-2-12	2018-2-13	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+9	20190212	[]	[]	2019-2-12	2019-2-13	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index bedaf44..1801314 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -54,17 +54,9 @@
 53	20190131	[]	[]	2019-1-31	2019-1-31				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 54	20190202	[]	[]	2019-2-2	2019-2-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 55	20190203	[]	[]	2019-2-3	2019-2-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-56	20190203	[]	[]	2019-2-3	2019-2-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-57	20190203	[]	[]	2019-2-3	2019-2-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 58	20190204	[]	[]	2019-2-4	2019-2-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-59	20190204	[]	[]	2019-2-4	2019-2-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 60	20190205	[]	[]	2019-2-5	2019-2-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-61	20190205	[]	[]	2019-2-5	2019-2-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 62	20190206	[]	[]	2019-2-6	2019-2-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-63	20190206	[]	[]	2019-2-6	2019-2-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 64	20190207	[]	[]	2019-2-7	2019-2-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-65	20190207	[]	[]	2019-2-7	2019-2-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 66	20190215	[]	[]	2019-2-15	2019-2-15				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-67	20190215	[]	[]	2019-2-15	2019-2-15				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
 68	20190216	[]	[]	2019-2-16	2019-2-16				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
-69	20190216	[]	[]	2019-2-16	2019-2-16				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift4"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 29d2693..67ce0a7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -229,17 +229,20 @@
 1320	135	0	0
 1321	136	0	0
 1322	137	0	0
-1323	138	0	0
-1324	139	0	0
-1325	140	0	0
-1326	141	0	0
-1327	142	0	0
-1328	143	0	0
-1329	144	0	0
-1330	145	0	0
-1331	146	0	0
-1332	147	0	0
-1333	148	0	0
+1323	137	0	0
+1324	137	0	0
+1325	138	0	0
+1326	138	0	0
+1327	139	0	0
+1328	139	0	0
+1329	140	0	0
+1330	140	0	0
+1332	141	0	0
+1331	141	0	0
+1333	142	0	0
+1334	142	0	0
+1335	143	0	0
+1336	143	0	0
 801	19	0	0
 802	19	0	0
 803	19	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index c7e4afa..8c493d5 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -7,4 +7,4 @@
 6	2018-12-8	2018-12-8	50	0	5
 7	2018-12-9	2018-12-9	50	0	6
 8	2018-12-15	2018-12-15	50	0	7
-9	2019-2-12	2018-2-13	50	0	8
+9	2019-2-12	2019-2-13	50	0	8
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index f9779ae..1a8086f 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -54,17 +54,9 @@
 53	2019-1-31	2019-1-31				110	0	[[135]]	SellMail3	
 54	2019-2-2	2019-2-2				110	0	[[136]]	SellMail3	
 55	2019-2-3	2019-2-3				110	0	[[137]]	SellMail3	
-56	2019-2-3	2019-2-3				110	0	[[138]]	SellMail3	
-57	2019-2-3	2019-2-3				110	0	[[147]]	SellMail3	
-58	2019-2-4	2019-2-4				110	0	[[139]]	SellMail3	
-59	2019-2-4	2019-2-4				110	0	[[140]]	SellMail3	
-60	2019-2-5	2019-2-5				110	0	[[141]]	SellMail3	
-61	2019-2-5	2019-2-5				110	0	[[142]]	SellMail3	
-62	2019-2-6	2019-2-6				110	0	[[143]]	SellMail3	
-63	2019-2-6	2019-2-6				110	0	[[128]]	SellMail3	
+58	2019-2-4	2019-2-4				110	0	[[138]]	SellMail3	
+60	2019-2-5	2019-2-5				110	0	[[139]]	SellMail3	
+62	2019-2-6	2019-2-6				110	0	[[140]]	SellMail3	
 64	2019-2-7	2019-2-7				110	0	[[141]]	SellMail3	
-65	2019-2-7	2019-2-7				110	0	[[148]]	SellMail3	
-66	2019-2-15	2019-2-15				110	0	[[144]]	SellMail3	
-67	2019-2-15	2019-2-15				110	0	[[128]]	SellMail3	
-68	2019-2-16	2019-2-16				110	0	[[145]]	SellMail3	
-69	2019-2-16	2019-2-16				110	0	[[146]]	SellMail3	
+66	2019-2-15	2019-2-15				110	0	[[142]]	SellMail3	
+68	2019-2-16	2019-2-16				110	0	[[143]]	SellMail3	
diff --git a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
index 2e28f0c..ed50d71 100644
--- a/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActTotalRecharge.txt
@@ -27,6 +27,6 @@
 31	2018-12-30	2018-12-30	5	0	16
 32	2019-1-26	2019-1-26	5	0	20
 33	2019-1-27	2019-1-27	5	0	21
-34	2019-2-9	2019-2-10	5	0	22
-35	2019-2-14	2019-2-14	5	0	23
-36	2019-2-17	2019-2-18	5	0	24
+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
diff --git a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
index a46c120..f8b194f 100644
--- a/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
+++ b/db/PyMongoDataServer/PySysDB/tagAttrFruit.txt
@@ -87,6 +87,13 @@
 4789	2	60	625	0
 4790	2	60	625	0
 4791	2	60	625	0
+4792	2	80	625	0
+4793	2	240	625	0
+4794	2	80	625	0
+4795	2	80	625	0
+4796	2	80	625	0
+4797	2	80	625	0
+4798	2	5	625	0
 4740	2	2	1000	0
 4730	2	2	1000	0
 4731	2	2	1000	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index e06e443..0eb90ea 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -67,6 +67,6 @@
 5	66	200	1	[(2445,1,1)]	2445	LimitGift3
 4	67	150	1	[(913,1,1),(4694,10,1)]	913	LimitGift3
 2	68	35	1	[(912,1,1),(4694,4,1)]	912	LimitGift3
-8	69	400	1	[(226,1,1),(181,25,1)]	4223	LimitGift3
-5	70	180	1	[(4228,1,1),(4151,25,1)]	5800	LimitGift3
-5	71	150	1	[(5809,1,1),(5810,1,1),(5811,1,1)]	5800	LimitGift3
+8	69	400	1	[(226,1,1),(181,25,1)]	226	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
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 305e1f9..748f43f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -226,7 +226,7 @@
 BossHomeCost	1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200	0	0	0	0
 BossShunt	10040|21070	1	3		
 MapLine	10040_10|10080_10|21070_1	10010_11|10020_11|10030_11|10080_11|10040_26	[10103001,10203001,10303001,10403001]	21070|21100|21110|32020|21310	
-NeutralMapExpAward	{(21070,21100,21110,32020,31230):[500,'int(0.6*reExp)']}				
+NeutralMapExpAward	{(21070,21100,21110,21310,32020,31230):[500,'int(0.6*reExp)']}				
 DungeonDeliver	31020|31030|31150|31031				
 DungeonIntegral	2000				
 BuyFBCntCost	{"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30","51010":"50","31380":"50"}				
@@ -234,7 +234,7 @@
 DropRecordValue	4213|250|4202|2404|2405|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|5408|9074|9075|9077|9078|5409|5302				
 DropRecordEquipment	{(1,2,3,4,5,6,7):[3,4,2],(8):[3,3,0],(101,102,103,104,105):[1,3,1],(121,122,123,124,125,126,127,128,129,130,131,132):[1,3,0]}				
 DropRecordNormal	2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251				
-DropRecordBossID	10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|31501009|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009|60303001|60303002|60303003|60303004|60303005|60303006				
+DropRecordBossID	10403001|10503001|10603001|10703001|10803001|20103001|20103002|20103003|20103004|20103005|20103006|20103007|20203001|20203002|20203003|20203004|20203005|20203006|20203007|30301001|30301002|30303001|30303002|30303003|30303004|30303005|30303006|30303007|30303008|30303009|30303010|30303011|30303012|31903001|31903002|31903003|31903004|31903005|31903006|31903007|31903008|31903009|31903010|31903011|31903012|31903013|31503001|31503002|31503003|31503004|31503005|31503006|31503007|31503008|31501001|31501002|31501003|31501004|31501005|31501006|31501007|31501008|31501009|60203001|60203002|60203003|60203004|60203005|60203006|60203007|60203008|60203009|60203010|60203011|60203012|60203013|60203014|60203015|60203016|60203017|60203018|60203019|60203020|30903001|30603001|30603002|30603003|30603004|30603005|30603006|50103001|50103002|50103003|50103004|50103005|50103006|50103007|20303001|20303002|20303003|20303004|20303005|20303006|20303007|10903001|30303013|30303014|30303015|30303016|11003001|40103001|40103002|40103003|40103004|40103005|40103006|40103007|40103008|31503009|60303001|60303002|60303003|60303004|60303005|60303006|20403001|20403002|20403003|20403004|20403005|20403006|20403007|30303017|30303018|30303019|30303020				
 PKConfig	[[22,00], [8,00]]	50	10	10	110
 FamilyKilledNotify	{1:"PK_pan_31379",2:"PK_pan_861048",3:"PK_pan_202580",10:"PK_pan_272921"}				
 KillBossCntLimit	{(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007,10903001,11003001,11103001,20403001,20403002,20403003,20403004,20403005,20403006,20403007):0,(20303001,20303002,20303003,20303004,20303005,20303006,20303007,40103001,40103002,40103003,40103004,40103005,40103006,40103007,40103008):2,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012,30303013,30303014,30303015,30303016,30303017,30303018,30303019,30303020):1}	0_3|2_3|1_9999	{0:'WB_Limit',2:'DogzDungeonPL',1:'BossHome_Limit'}	{}	{0:[21,'WorldBossNoHarm']}
@@ -319,7 +319,7 @@
 CeremonyRankLimit	3280				
 NewCeremonyWorldLv	{"1":[[0,250],[251,300],[301,330],[331,900]],"2":[[0,250],[251,300],[301,330],[331,900]],"3":[[0,250],[251,300],[301,330],[331,900]],"4":[[0,250],[251,280],[281,330],[331,380],[381,900]]}				
 NewCeremonyRecharge	{"0":[[4184,1,1],[2392,1,1],[912,1,1],[1145,5,1],[4609,1,1]],"1":[[4184,1,1],[2394,1,1],[912,1,1],[1146,5,1],[4609,1,1]],"2":[[4184,1,1],[2396,1,1],[912,1,1],[1147,5,1],[4609,1,1]],"3":[[4184,1,1],[2424,1,1],[912,1,1],[1025,5,1],[4609,1,1]]}				
-NewCeremonyFireParty	{"0":811,"1":812,"2":813,"3":814}				
+NewCeremonyFireParty	{"0":810,"1":811,"2":812,"3":813}				
 NewCeremonyRankLimit	3280				
 TJDropTaskItem	{}				
 SuperGiftTimeList	[[6,3],[7,5],[8,7]]	[]			
diff --git a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
index 91b55dd..75490a3 100644
--- a/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMonsterRefreshPoint.txt
@@ -175,8 +175,8 @@
 30303016	31031	(118,70)
 30303017	31360	(17,81)
 30303018	31360	(88,81)
-30303019	31360	(53,45)
-30303020	31360	(53,9)
+30303019	31360	(53,115)
+30303020	31360	(53,171)
 31903001	31240	(22,20)
 31903002	31240	(22,20)
 31903003	31240	(22,20)
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f8338e0..80d0287 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -229,17 +229,20 @@
 1320	135	1	912	1	1	[[1128,1,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
 1321	136	1	110	50	1	[[112,25,1]]	110		0	0	0	1	0	1	388	1600	0	LimitGift6	
 1322	137	1	913	1	1	[[4694,3,1]]	913		0	0	0	1	0	1	188	800	0	LimitGift6	
-1323	138	1	2453	1	1	[]	2453		0	0	0	1	0	1	388	1000	0	LimitGift7	
-1324	139	1	4306	1920	1	[]	4306		0	0	0	1	0	1	388	1920	0	LimitGift6	
-1325	140	1	2445	1	1	[]	2445		0	0	0	1	0	1	688	2000	0	LimitGift7	
-1326	141	1	912	1	1	[[4694,2,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
-1327	142	1	913	1	1	[[4694,10,1]]	913		0	0	0	1	0	1	388	1500	0	LimitGift7	
-1328	143	1	4608	1	1	[[2213,25,1]]	4608		0	0	0	1	0	1	188	812	0	LimitGift6	
-1329	144	1	2213	30	1	[]	2213		0	0	0	1	0	1	88	375	0	LimitGift6	
-1330	145	1	912	2	1	[[2213,10,1]]	912		0	0	0	1	0	1	88	425	0	LimitGift6	
-1331	146	1	2450	1	1	[]	2450		0	0	0	1	0	1	1588	6000	0	LimitGift6	
-1332	147	1	2487	1	1	[]	2487		0	0	0	1	0	1	688	1200	0	LimitGift6	
-1333	148	1	5413	40	1	[]	5413		0	0	0	1	0	1	688	1200	0	LimitGift6	
+1323	137	1	2453	1	1	[]	2453		0	0	0	1	0	1	388	1000	0	LimitGift7	
+1324	137	1	2487	1	1	[]	2487		0	0	0	1	0	1	688	1200	0	LimitGift8	
+1325	138	1	4306	1920	1	[]	4306		0	0	0	1	0	1	388	1920	0	LimitGift6	
+1326	138		2445	1	1	[]	2445		0	0	0	1	0	1	688	2000	0	LimitGift7	
+1327	139	1	912	1	1	[[4694,2,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
+1328	139	1	913	1	1	[[4694,10,1]]	913		0	0	0	1	0	1	388	1500	0	LimitGift7	
+1329	140	1	4608	1	1	[[2213,25,1]]	4608		0	0	0	1	0	1	188	812	0	LimitGift6	
+1330	140	1	4606	1	1	[[2213,50,1]]	4606		0	0	0	1	0	1	388	1625	0	LimitGift7	
+1332	141	1	2213	30	1	[]	2213		0	0	0	1	0	1	88	375	0	LimitGift6	
+1331	141	1	4606	1	1	[[2213,50,1]]	4606		0	0	0	1	0	1	388	1625	0	LimitGift7	
+1333	142	1	912	2	1	[[2213,10,1]]	912		0	0	0	1	0	1	88	425	0	LimitGift6	
+1334	142	1	2450	1	1	[]	2450		0	0	0	1	0	1	1588	6000	0	LimitGift7	
+1335	143	1	912	1	1	[[4694,2,1]]	912		0	0	0	1	0	1	88	350	0	LimitGift6	
+1336	143	1	5413	40	1	[]	5413		0	0	0	1	0	1	688	1200	0	LimitGift7	
 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/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 81c41ab..a1c7da6 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1158,6 +1158,13 @@
 4789	8	0	八品抵抗丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	333	0	1000	0	1	0	0	27	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	17	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4790	8	0	八品伤害丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	416	0	1000	0	1	0	0	35	250	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 4791	8	0	八品减伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	333	0	1000	0	1	0	0	36	200	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	18	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4792	9	0	九品攻击丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	466	0	1000	0	1	0	0	7	300	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	20	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4793	9	0	九品生命丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	375	0	1000	0	1	0	0	6	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	20	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4794	9	0	九品真伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	366	0	1000	0	1	0	0	26	240	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4795	9	0	九品抵抗丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	333	0	1000	0	1	0	0	27	220	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	21	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4796	9	0	九品伤害丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	416	0	1000	0	1	0	0	35	275	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	22	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4797	9	0	九品减伤丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	333	0	1000	0	1	0	0	36	225	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	22	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+4798	9	0	还神丹	58	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	333	0	1000	0	1	0	0	37	750	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	23	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 5006	1	0	通用套装石(龙牙)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	50	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
 5007	1	0	通用套装石(玉佩)	34	0	1	0	0	9999	1	1	1	0	1	0	0	0	0	0	1	50	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
 5012	1	0	枪系套装石(防具)	34	0	1	0	0	9999	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	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -1188,7 +1195,7 @@
 5503	1	0	3级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	3	3	5504	6	3440	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
 5504	1	0	4级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	3	4	5505	6	6880	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
 5505	1	0	5级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	810	0	50	0	0	0	1	225	3	5	5506	6	13740	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
-5506	1	0	6级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	3	6	5507	6	27480	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
+5506	1	0	6级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	3	6	0	6	27480	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
 5507	1	0	7级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	3	7	0	6	54940	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
 5508	1	0	8级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	3	8	0	6	109880	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
 5509	1	0	9级诛仙生命宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	65610	0	50	0	0	0	1	225	3	9	0	6	219740	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
@@ -1197,7 +1204,7 @@
 5513	1	0	3级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	4	3	5514	7	172	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
 5514	1	0	4级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	4	4	5515	7	344	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
 5515	1	0	5级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	810	0	50	0	0	0	1	225	4	5	5516	7	687	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
-5516	1	0	6级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	4	6	5517	7	1374	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
+5516	1	0	6级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	4	6	0	7	1374	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
 5517	1	0	7级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	4	7	0	7	2747	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
 5518	1	0	8级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	4	8	0	7	5494	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
 5519	1	0	9级诛仙攻击宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	65610	0	50	0	0	0	1	225	4	9	0	7	10987	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
@@ -1206,7 +1213,7 @@
 5523	1	0	3级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	20	0	0	0	1	225	5	3	5524	35	172	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
 5524	1	0	4级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	5	4	5525	35	344	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
 5525	1	0	5级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	810	0	50	0	0	0	1	225	5	5	5526	35	687	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
-5526	1	0	6级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	5	6	5527	35	1374	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
+5526	1	0	6级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	2430	0	50	0	0	0	1	225	5	6	0	35	1374	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
 5527	1	0	7级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	7290	0	20	0	0	0	1	225	5	7	0	35	2747	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
 5528	1	0	8级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	21870	0	50	0	0	0	1	225	5	8	0	35	5494	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
 5529	1	0	9级诛仙附伤宝石	140	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	65610	0	50	0	0	0	1	225	5	9	0	35	10987	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
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 43b4298..ac4e4fb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -18,7 +18,7 @@
 31020	BOSS之家一层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	31020	49	71	0	1	0	5	35
 31030	BOSS之家二层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	31030	55	14	0	1	0	5	35
 31031	BOSS之家三层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	31031	97	42	0	1	0	5	35
-31360	BOSS之家四层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	31360	97	42	0	1	0	5	35
+31360	BOSS之家四层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	31360	53	7	0	1	0	5	35
 31040	日常副本	1	0	360000	1	1	0	0	0	0	0	0	0	1	1	31040	18	44	0	1	0	0	1
 31080	仙界秘境	1	0	900000	1	1	0	0	0	0	0	0	0	1	1	31080	20	19	0	1	0	0	1
 31110	渡劫	1	0	900000	1	1	0	0	0	0	0	0	0	0	0	10010	196	80	0	1	0	0	1

--
Gitblit v1.8.0