From 962ff7789654c49191d1d32a44831ee0d0775792 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期二, 08 一月 2019 20:12:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PySysDB/tagFBLine.txt                           |    2 -
 db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt                          |   10 ++--
 CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt                     |    2 +
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagFBFunc.txt                                 |    1 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                |    8 ++--
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                 |    2 -
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                            |    6 +-
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                      |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                  |   14 +++---
 db/PyMongoDataServer/PySysDB/tagActWeekParty.txt                           |    2 +
 db/PyMongoDataServer/PySysDB/tagWeekParty.txt                              |   14 +++++++
 CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt                           |    1 
 13 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt b/CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt
new file mode 100644
index 0000000..9a03887
--- /dev/null
+++ b/CoreServerGroup/GameServer/PySysDB/tagActWeekParty.txt
@@ -0,0 +1,2 @@
+CfgID	ActMark	PlatformList	ServerIDList	StartDate	EndDate	IsDayReset	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV
+1	OpenSever1	[]	[]	8	15	1	1	{}	{}	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
index 887ee3d..eab41db 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt
@@ -23,4 +23,3 @@
 31010	0
 31340	0
 32010	0
-32020	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
index 7d5a81c..52ba958 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt
@@ -100,5 +100,3 @@
 32010	2	32012
 32010	3	32013
 32010	4	32014
-32020	0	32020
-32020	1	32021
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 08e9672..3aeb25a 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 760aac9..35f150d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
new file mode 100644
index 0000000..3b7a503
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagActWeekParty.txt
@@ -0,0 +1,2 @@
+CfgID	StartDate	EndDate	IsDayReset	ResetType	LimitLV	TemplateID	PointAward
+1	8	15	1	1	110	[[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300],[100,200,300,400,500,600,700,800,900,1000,1100,1200,1300]]	{0:{100:[(5408,1,1)]},1:{100:[(5408,1,1)]},2:{100:[(5408,1,1)]},3:{100:[(5408,1,1)]},4:{100:[(5408,1,1)]},5:{100:[(5408,1,1)]},6:{100:[(5408,1,1)]},}
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index aa73463..612ff27 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -199,9 +199,9 @@
 4008			4011_5									
 4009			4011_5									
 2412				[[5000,[3503,1]],[10000,[3513,1]]]	1							
-2413			101_6|102_3|103_1									
-2414			104_6|105_3|106_1									
-2415			110_6|111_3|112_1									
+2413			101_24|103_1									
+2414			104_24|106_1									
+2415			110_24|112_1									
 2416			181_20									
 2417			181_200									
 2418			102_18									
diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
index 5426622..83d4cf5 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt
@@ -23,4 +23,3 @@
 31010	3	2	0	0	0	0	0	0	0	180	0	0	0
 31340	2	2	0	0	0	0	0	0	1	0	0	0	0
 32010	0	2	0	0	0	0	0	0	0	0	0	0	0
-32020	0	0	0	0	0	0	0	0	0	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index dcf260a..6ff8e78 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -100,5 +100,3 @@
 32010	2	32012	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	3	32013	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
 32010	4	32014	150	0	0	0	0	0	0	0	0	[26,6]	[180,3,10]			
-32020	0	32020	150	0	0	0	0	0	0	0	0					
-32020	1	32021	150	0	0	0	0	0	0	0	0					
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
index fb867d7..bd9e7c8 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureHouse.txt
@@ -1,9 +1,9 @@
 TreasureType	MinLV	GridItemInfo	JobItemList	GridItemRateListFree	FreeGridItemRateList2	FreeGridItemRateList3	GridItemRateList1	GridItemRateList2	GridItemRateList3	LuckyGridNum
-1	0	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)]	[(4000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1157,2),(2305,3),(3452,4),(3552,5),(4700,6),(5847,7),(5947,8),(7095,9),(7495,10),(8642,11),(8652,12),(9800,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
-1	180	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)]	[(5000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1321,2),(2632,3),(3944,4),(4044,5),(5355,6),(5555,7),(5655,8),(6967,9),(7167,10),(8478,11),(8488,12),(9800,13),(10000,14)]	[(5000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
-1	230	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[105,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)]	[(3000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)]	[(3000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
-1	260	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,10],"10":[4609,1],"11":[102,10],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
-1	300	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[105,10],"10":[4609,1],"11":[111,10],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
+1	0	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[5,1],"8":[4610,1],"9":[181,10],"10":[4609,1],"11":[103,2],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1157,1),(2305,1),(3452,10),(3552,1),(4700,1),(5847,1),(5947,1),(7095,10),(7495,1),(8642,10),(8652,1),(9800,1),(10000,1)]	[(4000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1157,2),(2305,3),(3452,4),(3552,5),(4700,6),(5847,7),(5947,8),(7095,9),(7495,10),(8642,11),(8652,12),(9800,13),(10000,14)]	[(4000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
+1	180	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2346,1],"6":[2324,1],"7":[4610,1],"8":[5412,40],"9":[181,10],"10":[4609,1],"11":[103,2],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1321,1),(2632,1),(3944,10),(4044,1),(5355,1),(5555,1),(5655,40),(6967,10),(7167,1),(8478,10),(8488,1),(9800,1),(10000,1)]	[(5000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1321,2),(2632,3),(3944,4),(4044,5),(5355,6),(5555,7),(5655,8),(6967,9),(7167,10),(8478,11),(8488,12),(9800,13),(10000,14)]	[(5000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
+1	230	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[5412,30],"9":[106,2],"10":[4609,1],"11":[103,2],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,30),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)]	[(3000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)]	[(3000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
+1	260	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[106,2],"10":[4609,1],"11":[103,2],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,10),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
+1	300	{"1":[9073,1],"2":[4182,1],"3":[2412,1],"4":[4151,10],"5":[2347,1],"6":[2324,1],"7":[4610,1],"8":[2390,1],"9":[106,2],"10":[4609,1],"11":[112,2],"12":[9062,1],"13":[2342,1],"14":[912,1]}	[]	[(10,1),(1264,1),(2518,1),(3772,10),(3872,1),(5127,1),(5527,1),(5627,1),(6881,3),(7281,1),(8535,5),(8545,1),(9800,1),(10000,1)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	[(10,1),(1264,2),(2518,3),(3772,4),(3872,5),(5127,6),(5527,7),(5627,8),(6881,9),(7281,10),(8535,11),(8545,12),(9800,13),(10000,14)]	[(6000,5),(8000,8),(10000,12)]	{1:[(5000,5),(9200,8),(10000,12)],10:[(2500,5),(5000,8),(10000,12)],20:[(2500,5),(5000,8),(10000,12)]}	1
 2	0	{"1":[4425,1],"2":[4394,1],"3":[4335,1],"4":[4369,1],"5":[4395,1],"6":[4303,5],"7":[4384,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4385,1],"13":[2331,1],"14":[4305,3]}	[]	[(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)]	[(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)]	{}	[(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,12),(9000,13),(10000,14)]	[(2500,5),(7500,8),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
 2	200	{"1":[4425,1],"2":[4354,1],"3":[4335,1],"4":[4369,1],"5":[4355,1],"6":[4303,5],"7":[4364,1],"8":[2332,1],"9":[4334,1],"10":[4368,1],"11":[4304,4],"12":[4360,1],"13":[2331,1],"14":[4305,3]}	[]	[(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)]	[(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)]	{}	[(1,1),(1470,2),(1520,3),(1560,4),(1570,5),(3570,6),(5040,7),(5050,8),(5550,9),(6050,10),(7520,11),(7530,12),(9000,13),(10000,14)]	[(2500,5),(7500,8),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
 2	250	{"1":[4425,1],"2":[4379,1],"3":[4306,1920],"4":[4369,1],"5":[4335,1],"6":[4303,5],"7":[4375,1],"8":[2332,1],"9":[4334,1],"10":[4306,384],"11":[4304,4],"12":[4380,1],"13":[2331,1],"14":[4305,3]}	[]	[(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)]	[(0,1),(50,2),(50,3),(50,4),(50,5),(9550,6),(9550,7),(9600,8),(9650,9),(9650,10),(9750,11),(9750,12),(9900,13),(10000,14)]	{}	[(1,1),(1914,2),(2014,3),(2054,4),(2104,5),(4104,6),(4154,7),(4164,8),(4664,9),(5164,10),(7077,11),(7087,12),(9000,13),(10000,14)]	[(9000,8),(10000,12)]	{1:[(6000,8),(9000,9),(10000,10)]}	1
diff --git a/db/PyMongoDataServer/PySysDB/tagWeekParty.txt b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
new file mode 100644
index 0000000..7eec2fc
--- /dev/null
+++ b/db/PyMongoDataServer/PySysDB/tagWeekParty.txt
@@ -0,0 +1,14 @@
+TemplateID	ActionType	TotalTimes	SingleTimes	Reward	Point
+100	1	20	10	[(2341,1,1)]	10
+200	2	4	2	[(2341,1,1)]	10
+300	3	10	1	[(2341,1,1)]	10
+400	4	10	1	[(2341,1,1)]	10
+500	5	20	1	[(2341,1,1)]	10
+600	6	3	3	[(2341,1,1)]	10
+700	7	6	1	[(2341,1,1)]	10
+800	8	28	2	[(2341,1,1)]	10
+900	9	20	10	[(2341,1,1)]	10
+1000	10	5	1	[(2341,1,1)]	10
+1100	11	3	1	[(2341,1,1)]	10
+1200	12	20	1	[(2341,1,1)]	10
+1300	13	3	1	[(2341,1,1)]	10
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 9d1a655..2495cdd 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -1164,13 +1164,13 @@
 40103006	2	0	岩石守卫	460	0	168697	168697	0	17	0	0	0	105206	0	1	0	0	0	0	0	3	3000	1716500	139	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	21903336	45	10000	0	0	5	0	0	186	1	1
 40103007	2	0	裂空魅影	480	0	181384	181384	0	18	0	0	0	115311	0	1	0	0	0	0	0	3	3000	1793610	145	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	88870769	63	10000	0	0	5	0	0	186	1	1
 40103008	2	0	秘境勇士	500	0	183812	183812	0	18	0	0	0	120314	0	1	0	0	0	0	0	3	3000	1886586	153	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	7882470	77	10000	0	0	5	0	0	186	1	1
-50103001	2	0	道士鼠	1	0	1184	1184	0	2	0	0	10000	1430	0	7	0	0	0	0	0	5	3000	453622	18	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	1742024	0	0	0	0	5	0	0	186	1	1
-50103002	2	0	觉灵鹿	1	0	2863	2863	0	3	0	0	10000	4148	0	7	0	0	0	0	0	5	3000	556113	20	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	5087089	0	0	0	0	5	0	0	186	1	1
-50103003	2	0	球球	1	0	3046	3046	0	4	0	0	10000	4235	0	7	0	0	0	0	0	5	3000	634880	22	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	7079698	0	0	0	0	5	0	0	186	1	1
-50103004	2	0	地狱冥虎	1	0	3599	3599	0	5	0	0	10000	4474	0	7	0	0	0	0	0	5	3000	738321	25	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	9937882	0	0	0	0	5	0	0	186	1	1
-50103005	2	0	冰火冥魂	200	0	6059	6059	0	6	0	0	10000	7005	0	7	0	0	0	0	0	5	3000	1023022	29	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	45127197	0	0	0	0	5	0	0	186	1	1
-50103006	2	0	八宝葫芦	250	0	7098	7098	0	9	0	0	10000	7780	0	7	0	0	0	0	0	5	3000	1188148	32	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	79667846	0	0	0	0	5	0	0	186	1	1
-50103007	2	0	九黎妖虎	300	0	7098	7098	0	13	0	0	10000	7780	0	7	0	0	0	0	0	5	3000	1188148	32	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	79667846	0	0	0	0	5	0	0	186	1	1
+50103001	2	0	道士鼠	1	0	1184	1184	0	2	0	0	10000	1430	0	7	0	0	0	0	0	5	3000	453622	18	0	300	2	6	23010	23072	0	0	0	0	0	0	0	10	2	1742024	0	0	0	0	5	0	0	186	1	1
+50103002	2	0	觉灵鹿	1	0	2863	2863	0	3	0	0	10000	4148	0	7	0	0	0	0	0	5	3000	556113	20	0	300	2	6	23010	23068	0	0	0	0	0	0	0	10	2	5087089	0	0	0	0	5	0	0	186	1	1
+50103003	2	0	球球	1	0	3046	3046	0	4	0	0	10000	4235	0	7	0	0	0	0	0	5	3000	634880	22	0	300	2	6	23010	23074	0	0	0	0	0	0	0	10	2	7079698	0	0	0	0	5	0	0	186	1	1
+50103004	2	0	地狱冥虎	1	0	3599	3599	0	5	0	0	10000	4474	0	7	0	0	0	0	0	5	3000	738321	25	0	300	2	6	23010	23070	0	0	0	0	0	0	0	10	2	9937882	0	0	0	0	5	0	0	186	1	1
+50103005	2	0	冰火冥魂	200	0	6059	6059	0	6	0	0	10000	7005	0	7	0	0	0	0	0	5	3000	1023022	29	0	300	2	6	23010	23062	0	0	0	0	0	0	0	10	2	45127197	0	0	0	0	5	0	0	186	1	1
+50103006	2	0	八宝葫芦	250	0	7098	7098	0	9	0	0	10000	7780	0	7	0	0	0	0	0	5	3000	1188148	32	0	300	2	6	23010	23066	0	0	0	0	0	0	0	10	2	79667846	0	0	0	0	5	0	0	186	1	1
+50103007	2	0	九黎妖虎	300	0	7098	7098	0	13	0	0	10000	7780	0	7	0	0	0	0	0	5	3000	1188148	32	0	300	2	6	23010	23064	0	0	0	0	0	0	0	10	2	79667846	0	0	0	0	5	0	0	186	1	1
 50104001	0	1	乾坤熊猫	100	0	272	283	555	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	838	104	10	300	0	6	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	200	1	1
 50104002	0	1	暗裔暴君	100	0	272	283	555	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	838	104	10	300	0	6	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	200	1	1
 50104003	0	1	龙血武姬	100	0	272	283	555	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	838	104	10	300	0	6	0	0	0	0	0	0	0	0	0	10	2	1	0	0	0	0	0	0	0	200	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 3fefdf0..a3993c0 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -671,13 +671,13 @@
 23066	骑宠3技能	23066	1	1	0	0	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105029	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 23067	八宝葫芦	23067	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 23068	骑宠3技能	23068	1	1	0	0	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105030	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-23069	八宝葫芦	23069	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+23069	觉灵鹿	23069	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 23070	骑宠3技能	23070	1	1	0	0	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105031	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-23071	八宝葫芦	23071	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+23071	地狱冥虎	23071	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 23072	骑宠3技能	23072	1	1	0	0	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105032	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-23073	八宝葫芦	23073	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+23073	道士鼠	23073	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 23074	骑宠3技能	23074	1	1	0	0	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105033	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	10000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
-23075	八宝葫芦	23075	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
+23075	球球	23075	1	1	0	0	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	1000	0	0	9999	1000	0	0	1200	10	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 23050	沉默	23050	1	1	0	5	0	14	0	0	1	0	41	0	0	0	0	0	0	0	0	4012	10	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	8000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	2	0	0	2	0	0	0	0	0	0	0
 23051	聚魂副本群攻	23051	1	1	0	0	0	1	0	0	2	5	40	5	0	800	0	0	0	0	0	1010	10000	0	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	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 23052	聚魂副本减速	23052	1	1	0	0	0	6	0	0	6	5	40	5	0	1950	0	0	0	0	0	16	5000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2000	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