From fbfa7a41966c8f56b059066114538bc5268b72fd Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 06 十二月 2018 10:40:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagCTG.txt                                      |    8 ++--
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                  |    6 +-
 db/PyMongoDataServer/PySysDB/tagStore.txt                                    |   12 +++---
 CoreServerGroup/GameServer/PyNetPack.ini                                     |    6 ++
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                             |   12 +++---
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc           |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                   |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc       |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                               |   44 +++++++++++-----------
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                            |    0 
 11 files changed, 47 insertions(+), 43 deletions(-)

diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini
index 3a5b702..6317eef 100644
--- a/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/CoreServerGroup/GameServer/PyNetPack.ini
@@ -327,7 +327,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
 
 PacketCMD_1=0xA9
 PacketSubCMD_1=0x03
@@ -341,6 +341,10 @@
 PacketSubCMD_3=0x05
 PacketCallFunc_3=OnCallupFamilyMemberToBoss
 
+PacketCMD_4=0xA9
+PacketSubCMD_4=0x04
+PacketCallFunc_4=OnQueryBossInfo
+
 [PlayerXMZZ]
 ScriptName = Player\PlayerXMZZ.py
 Writer = xdh
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 0b78f80..bfbdd5b 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 032729a..d9af06d 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index f98c6c9..8492cb3 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/Player/PlayerRune.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
index c02a287..66939a0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagCTG.txt b/db/PyMongoDataServer/PySysDB/tagCTG.txt
index e68b64f..bb96a29 100644
--- a/db/PyMongoDataServer/PySysDB/tagCTG.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCTG.txt
@@ -10,8 +10,8 @@
 109	0	30000	5888	0	[]	
 110	0	10	1	0	[]	
 111	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]	Bargaingift1
-112	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]	Bargaingift2
-113	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]	Bargaingift3
+112	1	0	0	0	[[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]]	Bargaingift2
+113	1	0	0	0	[[255,1,1],[196,1,1],[181,50,1],[913,1,1]]	Bargaingift3
 2	0	60	6	0	[]	
 201	1	0	0	0	[[2317,1,1],[109,2,1],[108,5,1],[107,10,1]]	
 202	0	60	6	0	[]	
@@ -25,5 +25,5 @@
 210	0	1	0	0	[]	
 211	0	1	0	0	[]	
 212	1	0	0	0	[[58,1,1],[194,1,1],[5,1,1],[912,1,1]]	Bargaingift1
-213	1	0	0	0	[[4208,1,1],[4151,50,1],[5,1,1],[913,1,1]]	Bargaingift2
-214	1	0	0	0	[[255,1,1],[196,1,1],[181,80,1],[913,1,1]]	Bargaingift3
+213	1	0	0	0	[[4208,1,1],[4151,25,1],[5,1,1],[913,1,1]]	Bargaingift2
+214	1	0	0	0	[[255,1,1],[196,1,1],[181,50,1],[913,1,1]]	Bargaingift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index 33250e6..d6171c7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -13,14 +13,14 @@
 2	12	25	1	[(8353,2,1),(2213,3,1),(143,30,1)]	8353	LimitGift3
 4	13	50	1	[(30,310,1),(2389,1,1)]	2389	LimitGift3
 4	14	50	1	[(2213,10,1),(2389,1,1)]	2389	LimitGift3
-8	15	400	1	[(262,1,1),(181,100,1)]	262	LimitGift3
-4	16	60	1	[(4215,1,1),(4151,30,1)]	4215	LimitGift3
+8	15	400	1	[(262,1,1),(181,45,1)]	262	LimitGift3
+4	16	60	1	[(4215,1,1),(4151,15,1)]	4215	LimitGift3
 5	17	180	1	[(7002,1,1),(195,1,1)]	7002	LimitGift3
-5	18	150	1	[(263,1,1),(181,60,1)]	263	LimitGift3
-5	19	150	1	[(4220,1,1),(4151,60,1)]	4220	LimitGift3
+5	18	150	1	[(263,1,1),(181,30,1)]	263	LimitGift3
+5	19	150	1	[(4220,1,1),(4151,25,1)]	4220	LimitGift3
 4	20	80	1	[(913,1,1),(181,30,1)]	913	LimitGift3
-8	21	260	1	[(4214,1,1),(4151,100,1)]	4214	LimitGift3
-3	22	60	1	[(265,1,1),(181,30,1)]	265	LimitGift3
+8	21	260	1	[(4214,1,1),(4151,50,1)]	4214	LimitGift3
+3	22	60	1	[(265,1,1),(181,15,1)]	265	LimitGift3
 2	23	25	1	[(2213,20,1)]	2213	LimitGift3
 2	24	27	1	[(3514,1,1)]	3514	LimitGift3
 2	25	27	1	[(4694,9,1)]	4694	LimitGift3
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 2585255..c2e4dba 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -24,28 +24,28 @@
 RuneUnlock	0|204|304|404|504|604|704|804	8_100	8_120	9	0
 RuneDoubleInlayCnt	101_1|908_2|1008_3|1108_4|1208_5|1308_6|1408_7|1508_8|1608_9				
 RunePackageNum	200	0	0	0	0
-RuneAttr7	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr6	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr44	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr45	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr46	1000+level*100	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	0	0
-RuneAttr35	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr36	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/3/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr63	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr64	(1500+level*500)*1.3	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr65	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr66	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr11	1000+level*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	0	0
-RuneAttr42	level*600	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr41	level*400	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr27	(150+level*50)/2	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr8	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	0	0
-RuneAttr26	150+level*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	0	0
-RuneAttr15	500+level*20	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	0	0
-RuneAttr14	160+level*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
-RuneAttr17	200+level*50	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
-RuneAttr28	160+level*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
-RuneAttr29	150+level*30	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	0	0
+RuneAttr7	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr6	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr44	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr45	1300+level*200	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr46	1000+level*100	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr35	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr36	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20*0.7/3/5)*5	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr63	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr64	(1500+level*500)*1.3	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr65	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr66	1500+level*500	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr11	1000+level*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr42	level*600	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr41	level*400	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr27	(150+level*50)/2	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr8	int(118154*(0.1+0.3*(level/50.0)+0.35*pow(level/50.0,2)+0.25*pow(level/50.0,3))*2*0.5/20/3)	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr26	150+level*50	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1.5	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr15	500+level*20	1_0.3|2_0.45|3_0.6|4_0.75|5_1	1	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr14	160+level*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr17	200+level*50	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr28	160+level*40	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_1|2_2|3_3|4_4|5_5	0
+RuneAttr29	150+level*30	1_0.2|2_0.3|3_0.5|4_0.7|5_1	1	1_1|2_2|3_3|4_4|5_5	0
 RuneExp	int(4000000*(0.02*((level-1)/49.0)+0.08*pow(((level-1)/49.0),2)+0.2*pow(((level-1)/49.0),3)+0.3*pow(((level-1)/49.0),4)+0.4*pow(((level-1)/49.0),5)))-int(4000000*(0.02*((max((level-2),0))/49.0)+0.08*pow(((max((level-2),0))/49.0),2)+0.2*pow(((max((level-2),0))/49.0),3)+0.3*pow(((max((level-2),0))/49.0),4)+0.4*pow(((max((level-2),0))/49.0),5)))	1_0.5|2_0.7|3_0.8|4_0.9|5_1	1.6	1_100|2_300|3_3000|4_15000|5_30000	0
 RuneMaxLV	1_10|2_20|3_30|4_40|5_50	0	0	0	0
 RuneAwardCntRate	{(101,1608):[(6000,2),(8000,3),(10000,4)],(1701,3208):[(6000,2),(8000,3),(10000,4)]}	{(101,1608):[(6000,0),(9000,1),(10000,2)],(1701,3208):[(6000,0),(9000,1),(10000,2)]}	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index c00f9f4..0d6dd82 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -49,9 +49,9 @@
 114	3	0	4219	1	1	[]	0		0	0	122	1	0	1	258	0	0		
 115	3	0	261	1	1	[]	0		0	0	132	1	0	1	258	0	0		
 116	3	0	5412	1	0	[]	0		0	0	180	0	0	1	5	0	0		
-117	3	0	101	1	0	[]	0		0	0	0	0	0	1	10	0	0		
-118	3	0	104	1	0	[]	0		0	0	0	0	0	1	15	0	0		
-119	3	0	110	1	0	[]	0		0	0	0	0	0	1	25	0	0		
+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	5	0	0		
+119	3	0	110	1	0	[]	0		0	0	0	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		
@@ -145,7 +145,7 @@
 702	15	0	982	20	1	[]	982		0	0	106	1	0	1	588	1600	1	OpenTakePreferential2	
 703	15	0	2416	1	1	[]	2416		0	0	106	1	0	1	38	200	2	OpenTakePreferential1	
 704	15	0	2417	1	1	[]	2417		0	0	106	1	0	1	688	2000	2	OpenTakePreferential2	
-705	15	0	2317	1	1	[]	2317		0	0	106	1	0	1	38	200	3	OpenTakePreferential1	
+705	15	0	2418	1	1	[]	2418		0	0	106	1	0	1	38	200	3	OpenTakePreferential1	
 706	15	0	2419	1	1	[]	2419		0	0	106	1	0	1	688	2000	3	OpenTakePreferential2	
 707	15	0	2420	1	1	[]	2420		0	0	106	1	0	1	38	200	4	OpenTakePreferential1	
 708	15	0	2421	1	1	[]	2421		0	0	106	1	0	1	688	2000	4	OpenTakePreferential2	
@@ -258,8 +258,8 @@
 1056	16	0	3513	1	1	[[3503,1,1]]	4681		0	0	58	1	0	1	18	180	86400		
 1057	16	0	4151	20	1	[]	4151		0	0	65	1	0	1	18	200	86400		
 1058	16	0	181	20	1	[]	181		0	0	80	1	0	1	18	200	86400		
-1059	16	0	101	20	1	[]	101		0	0	110	1	0	1	28	200	86400		
-1060	16	0	4334	1	1	[]	4334		0	0	115	1	0	1	18	100	86400		
+1059	16	0	101	50	1	[]	101		0	0	110	1	0	1	18	100	86400		
+1060	16	0	4304	30	1	[]	4304		0	0	115	1	0	1	18	150	86400		
 1061	16	0	142	100	1	[[29,5000000,1]]	142		0	0	155	1	0	1	18	175	86400		
 1062	16	0	5303	200	1	[[5412,5,1]]	5303		0	0	180	1	0	1	28	225	86400		
 1063	16	0	2205	1	1	[]	2205		0	0	200	1	0	1	18	200	86400		
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index fa47ec6..b2d4ae6 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -460,7 +460,7 @@
 2314	1	0	宗门试炼找回宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1	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
 2315	1	0	宗门试炼找回宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1	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
 2316	1	0	宗门试炼找回宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1	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
-2317	1	0	神兵石大礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1800	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
+2317	1	0	暴击神兵石礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	1800	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
 2318	1	0	二品秘方礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2319	1	0	二品阴魄礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	200	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2320	1	0	炼丹材料	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	50	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index c70e815..48ecba2 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -575,9 +575,9 @@
 21017	攻速符	21017	1	1	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	17	1500	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	900000	0	0	0	0	0	0	0	0	0	3	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 21018	防御符	21018	1	1	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	13	100	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	900000	0	0	0	0	0	0	0	0	0	3	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 21019	好运符	21019	1	1	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	46	5000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3600000	0	0	0	0	0	0	0	0	0	3	1	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-21020	骑宠的怨念	21020	1	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1800000	0	0	0	0	0	0	0	0	0	3	10	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-21021	骑宠的怨念	21020	2	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	7000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1800000	0	0	0	0	0	0	0	0	0	3	10	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-21022	骑宠的怨念	21020	3	3	0	0	0	9	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	0	0	0	0	0	0	0	0	0	10000	1800000	0	0	0	0	0	0	0	0	0	3	10	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+21020	骑宠的怨念	21020	1	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3300	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1800000	0	0	0	0	0	0	0	0	0	3	10	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+21021	骑宠的怨念	21020	2	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	6600	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1800000	0	0	0	0	0	0	0	0	0	3	10	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+21022	骑宠的怨念	21020	3	3	0	0	0	9	0	0	0	0	0	0	0	0	0	0	0	0	0	0	9900	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1800000	0	0	0	0	0	0	0	0	0	3	10	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 22000	Vip7特权加成	22000	1	4	0	0	0	5	0	0	0	0	40	6	0	240000	0	0	0	0	0	76	500	1	0	0	0	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	3	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 22001	Vip7特权加成	22000	2	4	0	0	0	5	0	0	0	0	40	6	0	240000	0	0	0	0	0	76	1000	1	0	0	0	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	3	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 22002	Vip7特权加成	22000	3	4	0	0	0	5	0	0	0	0	40	6	0	240000	0	0	0	0	0	76	1500	1	0	0	0	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	3	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0