From 8e18b26b190e83a100079b235a0c245e58262d05 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期三, 30 一月 2019 14:33:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagItemCompound.txt            |   18 +++++++++
 db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt       |    2 
 db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt           |   32 ++++++++--------
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                 |   10 ++--
 db/PyMongoDataServer/PySysDB/tagStore.txt                   |    1 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                  |   36 +++++++++---------
 CoreServerGroup/GameServer/PySysDB/tagStore.txt             |    1 
 db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt          |    3 +
 CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt |    2 
 9 files changed, 64 insertions(+), 41 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt b/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt
index 8129fb2..f4b50d5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFeastWeekParty.txt
@@ -1,2 +1,2 @@
 CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	AdvanceMinutes	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV
-1	OpenSever1	[]	[]	2019-1-25	2019-2-1	300	1	1	{0:["SevenDayStart", []],30:["SevenDayStart", []],60:["SevenDayStart", []],180:["SevenDayStart", []],360:["SevenDayStart", []]}	{-60:["SevenDayEnd", []],-30:["SevenDayEnd", []],0:["SevenDayOver", []]}	110
+1	OpenSever1	[]	[]	2019-2-4	2019-2-11	300	1	1	{0:["SevenDayStart", []],30:["SevenDayStart", []],60:["SevenDayStart", []],180:["SevenDayStart", []],360:["SevenDayStart", []]}	{-60:["SevenDayEnd", []],-30:["SevenDayEnd", []],0:["SevenDayOver", []]}	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagStore.txt b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
index 6665e1d..869c27d 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagStore.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagStore.txt
@@ -56,6 +56,7 @@
 117	3	0	0
 118	3	0	0
 119	3	0	0
+120	3	0	0
 151	4	0	0
 152	4	0	0
 153	4	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt
index cf992f2..b5a9d62 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFeastWeekParty.txt
@@ -1,2 +1,2 @@
 CfgID	StartDate	EndDate	AdvanceMinutes	IsDayReset	ResetType	LimitLV	TemplateID	PointAward
-1	2019-1-25	2019-2-1	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,1200,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,1200,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	2019-2-4	2019-2-11	300	1	1	110	[[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201],[2000,200,303,401,702,1001,1103,1201]]	{0:{160:[(2475,1,1)],210:[(5810,1,1)]},1:{160:[(2475,1,1)],210:[(1653,1,1)]},2:{160:[(2475,1,1)],210:[(5809,1,1)]},3:{160:[(2475,1,1)],210:[(5811,1,1)]},4:{160:[(2475,1,1)],210:[(5810,1,1)]},5:{160:[(2475,1,1)],210:[(67,1,1)]},6:{160:[(2475,1,1)],210:[(5809,1,1)]},7:{160:[(2475,1,1)],210:[(5811,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt
index f7b0209..367e829 100644
--- a/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFeastWeekParty.txt
@@ -5,16 +5,19 @@
 300	3	2	1	[(2426,1,1),(882,1,1)]	10
 301	3	3	1	[(2426,1,1),(882,1,1)]	10
 302	3	5	1	[(2426,1,1),(882,1,1)]	10
+303	3	4	1	[(2426,1,1),(882,1,1)]	10
 400	4	2	1	[(2426,1,1),(882,1,1)]	10
 401	4	3	1	[(2426,1,1),(882,1,1)]	10
 500	5	5	1	[(2426,1,1),(882,1,1)]	10
 600	6	50	50	[(2426,1,1),(882,1,1)]	10
 700	7	3	1	[(2426,1,1),(882,1,1)]	10
 701	7	4	1	[(2426,1,1),(882,1,1)]	10
+702	7	1	1	[(2426,1,1),(882,1,1)]	10
 800	8	1	1	[(2426,1,1),(882,1,1)]	10
 900	9	5	1	[(2426,1,1),(882,1,1)]	10
 901	9	8	1	[(2426,1,1),(882,1,1)]	10
 1000	10	1	1	[(2426,1,1),(882,1,1)]	10
+1001	10	2	1	[(2426,1,1),(882,1,1)]	10
 1100	11	5	5	[(2427,1,1),(882,1,1)]	25
 1101	11	10	5	[(2427,1,1),(882,1,1)]	25
 1102	11	15	5	[(2427,1,1),(882,1,1)]	25
diff --git a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
index b08fe4b..e777a5d 100644
--- a/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
+++ b/db/PyMongoDataServer/PySysDB/tagItemCompound.txt
@@ -294,3 +294,21 @@
 264	0	5803	0	0	0	5701	4	0	10000	0	0	0	0	1
 265	0	5804	0	0	0	5701	4	0	10000	0	0	0	0	1
 266	0	5805	0	0	0	5701	4	0	10000	0	0	0	0	1
+1000	0	5501	0	0	0	5500	10	0	10000	0	0	0	0	1
+1001	0	5502	0	0	0	5501	3	0	10000	0	0	0	0	1
+1002	0	5503	0	0	0	5502	3	0	10000	0	0	0	0	1
+1003	0	5504	0	0	0	5503	3	0	10000	0	0	0	0	1
+1004	0	5505	0	0	0	5504	3	0	10000	0	0	0	0	1
+1005	0	5506	0	0	0	5505	3	0	10000	0	0	0	0	1
+1100	0	5511	0	0	0	5500	10	0	10000	0	0	0	0	1
+1101	0	5512	0	0	0	5511	3	0	10000	0	0	0	0	1
+1102	0	5513	0	0	0	5512	3	0	10000	0	0	0	0	1
+1103	0	5514	0	0	0	5513	3	0	10000	0	0	0	0	1
+1104	0	5515	0	0	0	5514	3	0	10000	0	0	0	0	1
+1105	0	5516	0	0	0	5515	3	0	10000	0	0	0	0	1
+1200	0	5521	0	0	0	5500	10	0	10000	0	0	0	0	1
+1201	0	5522	0	0	0	5521	3	0	10000	0	0	0	0	1
+1202	0	5523	0	0	0	5522	3	0	10000	0	0	0	0	1
+1203	0	5524	0	0	0	5523	3	0	10000	0	0	0	0	1
+1204	0	5525	0	0	0	5524	3	0	10000	0	0	0	0	1
+1205	0	5526	0	0	0	5525	3	0	10000	0	0	0	0	1
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index a6b3732..eafe21f 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -183,23 +183,23 @@
 32020	40103006	460	460	0
 32020	40103007	480	480	0
 32020	40103008	500	500	0
-21310	20402001	250	270	3619
-21310	20402002	265	285	4327
-21310	20402003	280	300	4978
-21310	20402004	300	320	6428
-21310	20402005	320	340	7397
-21310	20403001	395	415	25533
-21310	20403002	430	450	29839
-21310	20403003	440	460	31450
-21310	20403004	480	500	36998
-21310	20403005	490	510	39084
-21310	20403006	530	550	45948
-21310	20403007	540	560	48174
+21310	20402001	395	415	25533
+21310	20402002	430	450	29839
+21310	20402003	440	460	31450
+21310	20402004	480	500	36998
+21310	20402005	490	510	39084
+21310	20403001	395	415	0
+21310	20403002	430	450	0
+21310	20403003	440	460	0
+21310	20403004	480	500	0
+21310	20403005	490	510	0
+21310	20403006	530	550	0
+21310	20403007	540	560	0
 31360	30301004	390	410	22079
-31360	30303017	380	400	75896
-31360	30303018	410	430	86179
-31360	30303019	440	460	105152
-31360	30303020	490	510	115919
+31360	30303017	390	390	75896
+31360	30303018	420	420	86179
+31360	30303019	450	450	105152
+31360	30303020	500	500	115919
 31360	30303017	0	0	0
 31360	30303018	0	0	0
 31360	30303019	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 5400622..7ad579f 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -56,6 +56,7 @@
 117	3	0	101	1	0	[]	0		0	0	0	0	0	1	2	0	0		
 118	3	0	104	1	0	[]	0		0	0	0	0	0	1	2	0	0		
 119	3	0	110	1	0	[]	0		0	0	0	0	0	1	2	0	0		
+120	3	0	5521	1	0	[]	0		0	0	240	0	0	1	10	0	0		
 151	4	0	181	1	1	[]	0		0	0	0	0	0	2	10	0	0		
 152	4	0	952	1	1	[]	0		0	0	0	0	0	2	25	0	0		
 153	4	0	4101	1	1	[]	0		0	0	0	0	0	2	688	0	0		
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 481aebc..3bcdbbb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1792,12 +1792,12 @@
 9120	4	0	奔雷腿甲	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10476	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	5	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9121	4	0	奔雷铁鞋	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10477	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	5	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9122	4	0	烈阳	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9123	4	0	白驹	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10482	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9124	4	0	奔雷缨冠	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10483	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9125	4	0	奔雷战袍	104	4	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10484	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9126	4	0	奔雷虎符	105	5	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10485	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9127	4	0	奔雷腿甲	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10486	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9128	4	0	奔雷铁鞋	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10487	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9123	4	0	白驹	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9124	4	0	奔雷缨冠	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9125	4	0	奔雷战袍	104	4	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9126	4	0	奔雷虎符	105	5	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9127	4	0	奔雷腿甲	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9128	4	0	奔雷铁鞋	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9129	5	0	沥泉	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10551	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9130	5	0	冷山魂	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10552	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9131	5	0	寒沁缨冠	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	10553	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -1925,12 +1925,12 @@
 9320	4	0	青云朱裳	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20476	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	5	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9321	4	0	青云云靴	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20477	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	5	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9322	4	0	云雾缭绕	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9323	4	0	沉星	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20482	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9324	4	0	青云发簪	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20483	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9325	4	0	青云道袍	104	4	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20484	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9326	4	0	青云长绦	105	5	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20485	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9327	4	0	青云朱裳	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20486	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9328	4	0	青云云靴	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20487	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9323	4	0	沉星	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9324	4	0	青云发簪	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9325	4	0	青云道袍	104	4	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9326	4	0	青云长绦	105	5	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9327	4	0	青云朱裳	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9328	4	0	青云云靴	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9329	5	0	寒鸦	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20551	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9330	5	0	青衿	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20552	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9331	5	0	紫霄发簪	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	20553	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -2058,12 +2058,12 @@
 9520	4	0	4阶2星红色下装	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30476	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	5	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9521	4	0	4阶2星红色鞋履	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30477	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	5	0	5	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9522	4	0	4阶3星红色武器	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9523	4	0	4阶3星红色副手	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30482	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9524	4	0	4阶3星红色帽子	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30483	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9525	4	0	4阶3星红色衣袍	104	4	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30484	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9526	4	0	4阶3星红色腰带	105	5	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30485	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9527	4	0	4阶3星红色下装	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30486	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-9528	4	0	4阶3星红色鞋履	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30487	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9523	4	0	4阶3星红色副手	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9524	4	0	4阶3星红色帽子	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9525	4	0	4阶3星红色衣袍	104	4	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9526	4	0	4阶3星红色腰带	105	5	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9527	4	0	4阶3星红色下装	106	6	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+9528	4	0	4阶3星红色鞋履	107	7	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30481	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	7	0	5	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9529	5	0	5阶2星橙色武器	101	1	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30551	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9530	5	0	5阶2星橙色副手	102	2	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30552	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 9531	5	0	5阶2星橙色帽子	103	3	0	0	0	1	1	1	1	0	1	0	0	0	0	0	1	100000	0	15136	0	0	0	0	220	30553	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	301	6	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index cdb1662..236c480 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -892,11 +892,11 @@
 45550	福瑞健体	45550	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	7	13822	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	13822	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48551	福瑞强攻	48551	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	9	1244	1	0	10	1244	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	24888	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48552	福瑞守护	48552	1	1	0	6	0	16	0	0	0	0	111	0	0	30000	0	0	0	0	0	2106	0	0	0	20	2000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	62173	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48560	魔龙健体	48560	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	7	19377	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	19377	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48561	魔龙强攻	48561	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	9	1743	1	0	10	1743	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	34869	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48562	魔龙守护	48562	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	5000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	87219	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48563	魔龙之体	48563	1	1	0	6	0	16	0	0	0	0	111	0	0	50000	0	0	0	0	0	2105	0	0	0	4521	6000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	218035	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48564	魔龙法身	48564	1	1	0	6	0	16	0	0	0	0	111	0	0	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	654026	0	0	0	3	511	511	3	0	0	0	0	0	0	0
+48560	神牛健体	48560	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	7	19377	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	19377	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48561	神牛强攻	48561	1	1	0	6	0	20	0	0	0	0	111	0	0	0	0	0	0	0	0	9	1743	1	0	10	1743	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	34869	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48562	神牛蛮力	48562	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	5000	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	87219	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48563	神牛之体	48563	1	1	0	6	0	16	0	0	0	0	111	0	0	50000	0	0	0	0	0	2105	0	0	0	4521	6000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	218035	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48564	神牛法相	48564	1	1	0	6	0	16	0	0	0	0	111	0	0	15000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	654026	0	0	0	3	511	511	3	0	0	0	0	0	0	0
 49000	全能	49000	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	7	1038	1	0	9	51	1	0	10	51	1	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	2076	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49005	玄冥	49005	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	500	511	2	7	500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	2	5195	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	全费	49010	1	1	0	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	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0