From e5e4691afc446b4c89f8555647ee32af76de58be Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期六, 29 九月 2018 03:05:31 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActBossReborn.txt                        |    2 +
 db/PyMongoDataServer/PySysDB/tagActSpringSale.txt                        |    8 ++++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagStore.txt                                |    7 +++
 CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt                     |    1 
 db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt                         |    7 +++
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                  |    2 +
 db/PyMongoDataServer/PySysDB/tagActExpRate.txt                           |    1 
 CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt                  |    1 
 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt                        |    1 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                              |   26 ++++++------
 db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt                        |    1 
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt                  |    1 
 CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt                  |    8 ++++
 CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt                |    8 ++++
 db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt                      |   16 ++++++--
 16 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index b1eb882..db3efb7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,5 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	LimitLV	TemplateID
 1	OpenSever1	[]	3	5	1	{0:["BossFHOpen", []]}	{}	110	1
 2	OpenSever2	[]	9	11	1	{0:["BossFHOpen", []]}	{}	110	1
+3	Guoqing1	[7001,7002,7003,8002,8003,8004]	2018-10-1	2018-10-3	1	{0:["BossFHOpen", []]}	{}	110	1
+4	Guoqing2	[7001,7002,7003,8002,8003,8004]	2018-10-5	2018-10-7	1	{0:["BossFHOpen", []]}	{}	110	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index 4f06916..0e3c8f2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -2,3 +2,4 @@
 1	test1	[]	2	3	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
 2	test2	[]	5	6	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
 3	test3	[]	8	9	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+4	tast4	[7001,7002,7003,8002,8003,8004]	2018-9-29	2018-9-30	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index 410e5c7..0ac9781 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -2,3 +2,4 @@
 1	OpenServer	[]	6	6	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
 2	NationalDay	[(7001,7003),(8002,8004)]	2018-10-3	2018-10-3	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
 3	NationalDay	[(7001,7003),(8002,8004)]	2018-10-7	2018-10-7	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
+4	NationalDay	[(7001,7003),(8002,8004)]	2018-9-29	2018-9-29	18:00	20:00	{ 0:["ExpActivity_Start", [2]]}	{-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]}	110	10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
index 9462109..6ba4a94 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActFlashGiftbag.txt
@@ -20,3 +20,11 @@
 19	3OpenServer03	[7003]	2018-9-16	2018-9-16			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	50	1
 20	3OpenServer04	[7003]	2018-9-17	2018-9-17			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	180	1
 21	3OpenServer05	[7003]	2018-9-20	2018-9-20			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[]	280	1
+22	NationalDay01	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+23	NationalDay02	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+24	NationalDay03	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+25	NationalDay04	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+26	NationalDay05	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+27	NationalDay06	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+28	NationalDay07	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
+29	NationalDay08	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift1",[]]}	{-60:["LimitGift2",[]]}	[120, "LimitGift1"]	110	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
index 3102c9d..f4ce7cc 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActRealmPoint.txt
@@ -1,2 +1,3 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	ResetType	NotifyInfoStart	NotifyInfoEnd	Multiple	LimitLV
 1	opensever	[]	7	8	1	{0:["MultipleXXDOpen", []]}	{}	2	110
+2	guoqing11	[7001,7002,7003,8002,8003,8004]	2018-10-4	2018-10-5	1	{0:["MultipleXXDOpen", []]}	{}	2	110
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
index c947958..b524a42 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActSpringSale.txt
@@ -9,3 +9,11 @@
 8	New3	[]	2018-8-9	2018-8-9			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
 9	New4	[]	2018-8-11	2018-8-11			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
 10	New5	[]	2018-8-13	2018-8-13			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	100	1
+11	NationalDay01	[(7001,7003), (8002, 8004)]	2018-10-1	2018-10-1			120	{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+12	NationalDay02	[(7001,7003), (8002, 8004)]	2018-10-2	2018-10-2				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+13	NationalDay03	[(7001,7003), (8002, 8004)]	2018-10-3	2018-10-3				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+14	NationalDay04	[(7001,7003), (8002, 8004)]	2018-10-4	2018-10-4				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+15	NationalDay05	[(7001,7003), (8002, 8004)]	2018-10-5	2018-10-5				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+16	NationalDay06	[(7001,7003), (8002, 8004)]	2018-10-6	2018-10-6				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+17	NationalDay07	[(7001,7003), (8002, 8004)]	2018-10-7	2018-10-7				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
+18	NationalDay08	[(7001,7003), (8002, 8004)]	2018-10-8	2018-10-8				{0:["LimitGift4",[]]}	{-60:["LimitGift5",[]]}	[120, "LimitGift1"]	110	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index adb3cf4..c0afa32 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 9ee58df..22a705a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -1,3 +1,5 @@
 CfgID	StartDate	EndDate	ResetType	LimitLV	TemplateID
 1	3	5	1	110	1
 2	9	11	1	110	1
+3	2018-10-1	2018-10-3	1	110	1
+4	2018-10-5	2018-10-7	1	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index 769a613..0cb754c 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -2,3 +2,4 @@
 1	2	3	50	0	2
 2	5	6	50	0	3
 3	8	9	50	0	3
+4	2018-9-29	2018-9-30	50	0	3
diff --git a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
index 5a988cb..fd743b6 100644
--- a/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActExpRate.txt
@@ -2,3 +2,4 @@
 1	110	10000
 2	110	10000
 3	110	10000
+4	110	10000
diff --git a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
index 3ac62f2..74ce77d 100644
--- a/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActFlashGiftbag.txt
@@ -1,8 +1,8 @@
 CfgID	StartDate	EndDate	StartTime	EndTime	AdvanceMinutes	LimitLV	IsDayReset	GiftbagList	MailKey	MailItemPrize
-1	3	4			120	50	0	[[6]]	SellMail4	[[181,2,1],[4151,2,1]]
-2	5	6			0	50	0	[[7]]	SellMail4	[[181,2,1],[4151,2,1]]
-3	7	8			0	50	0	[[8]]	SellMail4	[[181,2,1],[4151,2,1]]
-4	9	10			0	50	0	[[9]]	SellMail4	[[181,2,1],[4151,2,1]]
+1	3	4			120	50	0	[[6]]	SellMail4	
+2	5	6			0	50	0	[[7]]	SellMail4	
+3	7	8			0	50	0	[[8]]	SellMail4	
+4	9	10			0	50	0	[[9]]	SellMail4	
 5	2018-9-1	2018-9-3			120	50	1	[[1,2,3]]	SellMail4	[[13,2,1],[2,2,1]]
 6	2018-9-1	2018-9-3	12:00|18:00	13:00|19:00	120	50	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
 7	2018-9-7	2018-9-7			120	50	1	[[2]]	SellMail4	[[13,2,1],[2,2,1]]
@@ -20,3 +20,11 @@
 19	2018-9-16	2018-9-16			120	50	1	[[1]]	SellMail4	[[13,2,1],[2,2,1]]
 20	2018-9-17	2018-9-17			120	180	1	[[3]]	SellMail4	[[13,2,1],[2,2,1]]
 21	2018-9-20	2018-9-20			120	280	1	[[5]]	SellMail4	[[13,2,1],[2,2,1]]
+22	2018-10-1	2018-10-1			120	110	0	[[8]]	SellMail4	
+23	2018-10-2	2018-10-2				110	0	[[10]]	SellMail4	
+24	2018-10-3	2018-10-3				110	0	[[13]]	SellMail4	
+25	2018-10-4	2018-10-4				110	0	[[10]]	SellMail4	
+26	2018-10-5	2018-10-5				110	0	[[9]]	SellMail4	
+27	2018-10-6	2018-10-6				110	0	[[11]]	SellMail4	
+28	2018-10-7	2018-10-7				110	0	[[14]]	SellMail4	
+29	2018-10-8	2018-10-8				110	0	[[12]]	SellMail4	
diff --git a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
index e571355..f0bb13a 100644
--- a/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActRealmPoint.txt
@@ -1,2 +1,3 @@
 CfgID	Multiple	LimitLV
 1	2	110
+2	2	110
diff --git a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
index 42fe534..e711d99 100644
--- a/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActSpringSale.txt
@@ -9,3 +9,11 @@
 8	2018-8-9	2018-8-9			120	100	1	[[27]]	SellMail3	[[13,2,1],[2,2,1]]
 9	2018-8-11	2018-8-11			120	100	1	[[28]]	SellMail3	[[13,2,1],[2,2,1]]
 10	2018-8-13	2018-8-13			120	100	1	[[29]]	SellMail3	[[13,2,1],[2,2,1]]
+11	2018-10-1	2018-10-1			120	110	0	[[31]]	SellMail3	
+12	2018-10-2	2018-10-2				110	0	[[32]]	SellMail3	
+13	2018-10-3	2018-10-3				110	0	[[33]]	SellMail3	
+14	2018-10-4	2018-10-4				110	0	[[34]]	SellMail3	
+15	2018-10-5	2018-10-5				110	0	[[35]]	SellMail3	
+16	2018-10-6	2018-10-6				110	0	[[36]]	SellMail3	
+17	2018-10-7	2018-10-7				110	0	[[31]]	SellMail3	
+18	2018-10-8	2018-10-8				110	0	[[37]]	SellMail3	
diff --git a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
index fd874e0..3f6b022 100644
--- a/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFlashGiftbag.txt
@@ -5,6 +5,11 @@
 7	4	320	1	[(4214,1,0),(4151,200,0)]	4214	LimitGift3
 8	5	600	1	[(4606,2,0),(4607,2,0)]	4606	LimitGift3
 4	6	70	1	[(4215,1,1),(4151,40,1)]	4215	LimitGift3
-6	7	210	1	[(263,1,1),(181,120,1)]	263	LimitGift3
+5	7	210	1	[(263,1,1),(181,80,1)]	263	LimitGift3
 5	8	140	1	[(4220,1,1),(4151,80,1)]	4220	LimitGift3
 8	9	360	1	[(262,1,1),(181,200,1)]	262	LimitGift3
+2	10	25	1	[(8353,2,1),(912,1,1),(142,50,1)]	8353	LimitGift3
+2	11	40	1	[(8353,2,1),(4010,2,1),(143,30,1)]	8353	LimitGift3
+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
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index f200f6c..204d430 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -154,6 +154,13 @@
 771	28	1	4610	2	1	[[2213,30,1]]	4610		0	0	0	1	1	388	1900	0	LimitGift7
 772	29	1	3513	2	1	[[3503,2,1]]	3513		0	0	0	1	1	88	360	0	LimitGift6
 773	29	1	4606	1	1	[[2213,40,1]]	4606		0	0	0	1	1	888	3000	0	LimitGift7
+774	31	1	2390	1	1	[[913,1,1]]	2390		0	0	0	1	1	388	1000	0	LimitGift6
+775	32	1	147	10	1	[[143,300,1]]	143		0	0	0	1	1	288	750	0	LimitGift6
+776	33	1	30	500	1	[[2389,2,1]]	2389		0	0	0	1	1	388	900	0	LimitGift6
+777	34	1	109	6	1	[[108,15,1]]	109		0	0	0	1	1	388	1100	0	LimitGift6
+778	35	1	2213	15	1	[[4606,1,1]]	4606		0	0	0	1	1	688	1450	0	LimitGift6
+779	36	1	30	500	1	[[1128,1,1]]	1128		0	0	0	1	1	388	1000	0	LimitGift6
+780	37	1	263	1	1	[[181,120,1]]	263		0	0	0	1	1	988	2100	0	LimitGift6
 801	19	0	2213	1	1	[]	0		0	0	0	0	1	80	0	0	
 802	19	0	2213	1	1	[]	0		0	0	0	0	1	80	0	0	
 803	19	0	2213	1	1	[]	0		0	0	0	0	1	80	0	0	
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 7e8b2a9..22e24cb 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -619,21 +619,21 @@
 23024	第四层加血	23024	1	1	0	0	0	2	0	0	8	5	141	20	0	30000	0	0	0	0	0	1000	1000	0	5	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
 23030	境界压制	23030	1	1	0	11	0	13	0	0	16	0	40	8	0	180000	0	0	0	0	0	1060	50105019	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
 23031	压制法阵	23031	1	1	0	11	0	1	0	0	2	6	40	0	0	1000	0	0	0	0	0	1010	10000	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
-46000	强健之体	46000	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	1800	7	3	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
-46001	强健之体	46001	2	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2500	7	6	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
-46005	锋芒利刃	46005	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2200	9	4	551	2200	10	4	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
-46006	锋芒利刃	46006	2	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2500	9	7	551	2500	10	7	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
-46010	坚磐硬甲	46010	1	3	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2500	13	1	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
-46011	坚磐硬甲	46011	2	3	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	3500	13	2	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
-46012	坚磐硬甲	46012	3	3	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	551	4500	13	5	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
-46015	生灵之心	46015	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2000	7	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
-46016	生灵之心	46016	2	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2500	7	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
-46020	无坚不摧	46020	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2000	9	0	550	2000	10	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
-46021	无坚不摧	46021	2	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2500	9	0	550	2500	10	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
+46000	强健之体	46000	1	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	1800	7	3	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
+46001	强健之体	46001	2	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2500	7	6	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
+46005	锋芒利刃	46005	1	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2200	9	4	551	2200	10	4	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
+46006	锋芒利刃	46006	2	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2500	9	7	551	2500	10	7	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
+46010	坚磐硬甲	46010	1	3	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	2500	13	1	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
+46011	坚磐硬甲	46011	2	3	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	3500	13	2	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
+46012	坚磐硬甲	46012	3	3	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	551	4500	13	5	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
+46015	生灵之心	46015	1	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2000	7	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
+46016	生灵之心	46016	2	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2500	7	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
+46020	无坚不摧	46020	1	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2000	9	0	550	2000	10	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
+46021	无坚不摧	46021	2	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2500	9	0	550	2500	10	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
 46025	血脉之力	46025	1	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	1400	13	0	550	1400	7	0	550	1400	9	0	550	1400	10	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
 46026	血脉之力	46026	2	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	2000	13	0	550	2000	7	0	550	2000	9	0	550	2000	10	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
-46030	坚不可摧	46030	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	550	3000	13	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
-46031	坚不可摧	46031	2	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	550	4000	13	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
+46030	坚不可摧	46030	1	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	3000	13	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
+46031	坚不可摧	46031	2	2	0	12	0	23	0	0	0	0	0	0	0	0	0	0	0	0	0	550	4000	13	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
 46035	不屈巨兽	46035	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	60	800	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	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 46036	不屈巨兽	46035	2	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	60	1200	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	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 46040	撼地镇天	46040	1	2	0	12	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	74	4000	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	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0