From 684f08509e711c31a17fc72e2f38f81a5cd1170b Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期五, 28 九月 2018 20:14:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagActCostRebate.txt                                                              |    8 +--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc                          |    0 
 db/PyMongoDataServer/PySysDB/tagHorseUp.txt                                                                    |   12 +++---
 db/PyMongoDataServer/PySysDB/tagChests.txt                                                                     |    7 ++-
 db/PyMongoDataServer/PySysDB/tagHorse.txt                                                                      |    2 +
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt                                                                    |    1 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                     |   10 ++--
 CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt                                                        |    8 +--
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                                 |    4 +-
 db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt                                                         |   20 ++++-----
 11 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
index d5bcdd2..4f06916 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,4 @@
 CfgID	ActMark	ServerIDList	StartDate	EndDate	NotifyInfoStart	NotifyInfoEnd	NotifyInfoLoop	IsDayReset
-1	test1	[]	2018-8-30	2018-8-31	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-2	test2	[24,30]	2018-7-13	2018-7-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-3	NationalDay	[]	2018-9-13	2018-9-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	1
-4	NationalDay1	[24]	2018-9-13	2018-9-15	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
-5	test3	[]	5	6	{0:["ConsumptionRebate1", []]}	{0:["ConsumptionRebate4", [2]]}	[120, "ConsumptionRebate1"]	0
+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
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
index 9780668..ce5d80a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
index 07f1ce6..620b7d8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBindJadeWheel.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
index ce5528a..769a613 100644
--- a/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActCostRebate.txt
@@ -1,6 +1,4 @@
 CfgID	StartDate	EndDate	LimitLV	IsDayReset	TemplateIDList
-1	2018-8-30	2018-8-31	50	0	1
-2	2018-7-13	2018-7-15	50	0	3
-3	2018-9-13	2018-9-15	50	1	1|2|3
-4	2018-9-13	2018-9-15	50	0	1
-5	5	6	50	0	1
+1	2	3	50	0	2
+2	5	6	50	0	3
+3	8	9	50	0	3
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index dbaf807..effb3d2 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -174,6 +174,7 @@
 2384	0	0	0	1	0
 2385	0	0	0	1	0
 2386	0	0	0	1	0
-2387	0	0	0	1	1
-2388	0	0	0	1	1
-2389	0	0	0	1	1
+2387	0	0	0	1	0
+2388	0	0	0	1	0
+2389	0	0	0	1	0
+2390	0	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
index f084751..45731ef 100644
--- a/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
+++ b/db/PyMongoDataServer/PySysDB/tagCostRebateTemplate.txt
@@ -1,15 +1,13 @@
 TemplateID	NeedCostGold	AwardIndex	AwardItemList	NotifyKey
 1	128	0	[(141,130,1)]	ConsumptionRebate3
-1	588	1	[(4215,1,1),(14,2,1),(3807,1,1)]	ConsumptionRebate3
+1	588	1	[(199,1,1),(14,2,1),(3807,1,1)]	ConsumptionRebate3
 1	1588	2	[(51,1,1),(143,50,1),(4151,30,1)]	ConsumptionRebate3
 1	5000	3	[(3515,1,1),(3505,1,1),(106,8,1),(103,8,1)]	ConsumptionRebate2
-2	500	0	[(4651,10,1),(4652,10,1)]	
-2	1000	1	[(4651,20,1),(4652,20,1)]	
-2	2000	2	[(4651,30,1),(4652,30,1)]	ConsumptionRebate3
-2	5000	3	[(4651,40,1),(4652,40,1)]	ConsumptionRebate3
-2	10000	4	[(4651,50,1),(4652,50,1)]	ConsumptionRebate2
-3	500	0	[(921,10,1),(922,10,1)]	
-3	1000	1	[(921,20,1),(922,20,1)]	
-3	2000	2	[(921,30,1),(922,30,1)]	ConsumptionRebate3
-3	5000	3	[(921,40,1),(922,40,1)]	ConsumptionRebate3
-3	10000	4	[(921,50,1),(922,50,1)]	ConsumptionRebate2
+2	60	0	[(4181,1,1),(181,10,1),(4151,10,1),(2211,10,1)]	ConsumptionRebate3
+2	150	1	[(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)]	ConsumptionRebate3
+2	300	2	[(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)]	ConsumptionRebate3
+2	1500	3	[(51,1,1),(4182,1,1),(181,30,1),(4151,30,1)]	ConsumptionRebate2
+3	60	0	[(4181,1,1),(181,10,1),(4151,10,1),(2211,10,1)]	ConsumptionRebate3
+3	150	1	[(983,1,1),(4181,1,1),(4151,15,1),(2211,20,1)]	ConsumptionRebate3
+3	300	2	[(982,1,1),(4609,1,1),(4182,1,1),(2211,30,1)]	ConsumptionRebate3
+3	1500	3	[(4610,1,1),(4182,1,1),(181,30,1),(4151,30,1)]	ConsumptionRebate2
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 92849b8..1e73c0f 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -213,8 +213,8 @@
 FBEncourageBuff	{31080:20051,52010:20081}	31080_10|52010_10	31080_10|52010_10		
 DropRecordValue	4213|250|4202|3802|983|982|260|4209|3803|258|4210|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
 DropRecordEquipment	{(1,2,3,4,5,6,7):[3,4,2],(8):[3,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|8206|8219|8232|8245|8258|8207|8220|8233|8246|8259				
-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|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				
+DropRecordNormal	2320|4606|4607|4608|4609|4610|3801|2339|2340|5302|5206|5207|5202|5006|5007|4182|4253|224|4252|222|4250|223|4251|8205|8206|8207|8218|8219|8220|8231|8232|8233|8244|8245|8246|8257|8258|8259				
+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|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				
 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):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1,(20303001,20303002,20303003,20303004,2030300,5,20303006,20303007):2}	0_3|1_0|2_3	{0:'WB_Limit',1:'BossHome_Limit',2:'DogzDungeonPL'}	{1:27}	{0:[21,'WorldBossNoHarm']}
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index f28c72f..930e290 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -11,3 +11,5 @@
 305	290	260	1	1	40	1	4	13968	GetMount7
 306	288	258	1	1	50	1	5	21168	GetMount8
 307	291	261	1	1	30	1	3	2116	GetMount11
+308	292	262	1	1	40	1	4	6048	GetMount12
+309	293	263	1	1	30	1	3	3528	GetMount13
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 8a9c545..fe91463 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -462,13 +462,13 @@
 308	1	1945	6|7|23	10584|529|80	0	
 308	2	2111	6|7|23	12140|607|80	0	
 308	3	2291	6|7|23	13776|688|80	0	
-308	4	2486	6|7|23	15495|774|80	49150	
+308	4	2486	6|7|23	15495|774|80	49210	
 308	5	2694	6|7|23	17297|864|80	0	
 308	6	2915	6|7|23	19183|959|80	0	
 308	7	3151	6|7|23	21204|1060|80	0	
 308	8	3400	6|7|23	23366|1168|80	0	
 308	9	3663	6|7|23	25675|1283|80	0	
-308	10	3940	6|7|23	28137|1406|80	49155	
+308	10	3940	6|7|23	28137|1406|80	49215	
 308	11	4231	6|7|23	30757|1537|80	0	
 308	12	4535	6|7|23	33501|1675|80	0	
 308	13	4853	6|7|23	36368|1818|80	0	
@@ -478,7 +478,7 @@
 308	17	6264	6|7|23	49018|2450|80	0	
 308	18	6651	6|7|23	52461|2623|80	0	
 308	19	7052	6|7|23	56006|2800|80	0	
-308	20	7467	6|7|23	59649|2982|80	49160	
+308	20	7467	6|7|23	59649|2982|80	49220	
 308	21	7896	6|7|23	63383|3169|80	0	
 308	22	8338	6|7|23	67232|3361|80	0	
 308	23	8794	6|7|23	71193|3559|80	0	
@@ -512,13 +512,13 @@
 309	1	1945	6|7|23	10584|529|80	0	
 309	2	2111	6|7|23	12140|607|80	0	
 309	3	2291	6|7|23	13776|688|80	0	
-309	4	2486	6|7|23	15495|774|80	49150	
+309	4	2486	6|7|23	15495|774|80	49195	
 309	5	2694	6|7|23	17297|864|80	0	
 309	6	2915	6|7|23	19183|959|80	0	
 309	7	3151	6|7|23	21204|1060|80	0	
 309	8	3400	6|7|23	23366|1168|80	0	
 309	9	3663	6|7|23	25675|1283|80	0	
-309	10	3940	6|7|23	28137|1406|80	49155	
+309	10	3940	6|7|23	28137|1406|80	49200	
 309	11	4231	6|7|23	30757|1537|80	0	
 309	12	4535	6|7|23	33501|1675|80	0	
 309	13	4853	6|7|23	36368|1818|80	0	
@@ -528,7 +528,7 @@
 309	17	6264	6|7|23	49018|2450|80	0	
 309	18	6651	6|7|23	52461|2623|80	0	
 309	19	7052	6|7|23	56006|2800|80	0	
-309	20	7467	6|7|23	59649|2982|80	49160	
+309	20	7467	6|7|23	59649|2982|80	49205	
 309	21	7896	6|7|23	63383|3169|80	0	
 309	22	8338	6|7|23	67232|3361|80	0	
 309	23	8794	6|7|23	71193|3559|80	0	
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index ae3ded2..510c50f 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -16,3 +16,4 @@
 50106309	5	GetPet14	4217	1	1000	1	50	6	48440|48445|48450	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	14400
 50106310	4	GetPet15	4218	1	1000	1	40	6	48425|48430|48435	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	7200
 50106311	3	GetPet16	4219	1	1000	1	30	6	48455|48460|48465	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1396
+50106312	3	GetPet17	4220	1	1000	1	30	6	48470|48475|48480	4|10|20	['PetUpLv','PetUpLv','PetUpLv']	1440
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 46a6dc8..eb3ceee 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -114,8 +114,8 @@
 258	1	0	坐骑:八宝葫芦	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 260	1	0	坐骑:地狱冥虎	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 261	1	0	坐骑:小黄鸭	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
-262	1	0	坐骑:白玉兽	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
-263	1	0	坐骑:筋斗云	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
+262	1	0	坐骑:白玉兽	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1680	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
+263	1	0	坐骑:筋斗云	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	980	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 264	1	0	坐骑:福源猫	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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
 265	1	0	坐骑:森之灵	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	5	0	1	0	0	7	11014	0	0	6	220281	0	0	23	100	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	0	0	0	0
 289	1	0	追风	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	288	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	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -276,7 +276,7 @@
 1501	1	0	宗门令牌	76	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	25	0	10	0	1	0	0	233	60010	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	0	0	0	0
 1502	1	0	封魔令牌	76	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	10	0	1	0	0	233	52010	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	0	0	0	0
 1503	1	0	娲皇卷轴	76	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	10	0	1	0	0	233	51010	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	0	0	0	0
-1504	1	0	矿脉地图	76	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	10	0	1	0	0	233	51010	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	0	0	0	0
+1504	1	0	矿脉钥匙	76	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	10	0	1	0	0	233	31140	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	0	0	0	0
 2050	1	0	世界喇叭	48	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	50	0	5	0	0	0	0	2700	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	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2100	1	0	铜钱	43	0	0	0	0	1	1	1	1	0	1	0	0	1	0	0	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	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2101	1	0	铜钱	43	0	0	0	0	1	1	1	1	0	1	0	0	1	0	0	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	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -591,12 +591,12 @@
 4212	1	0	灵宠:齐天小美	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4213	1	0	灵宠:球球	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4214	1	0	灵宠:荒漠梦魇	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4215	1	0	灵宠:灵狐仙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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	0	0	0	0
+4215	1	0	灵宠:灵狐仙	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	400	0	100	0	1	0	0	77	27200	0	0	78	27200	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	0	0	0	0
 4216	1	0	灵宠:灵鲛刺客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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	0	0	0	0
 4217	1	0	灵宠:荒古巨兽	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4218	1	0	灵宠:熊猫斗士	26	0	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4219	1	0	灵宠:海牛侍卫	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	100	0	1	0	0	77	27200	0	0	78	27200	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
-4220	1	0	灵宠:雷震子	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	0	100	0	1	0	0	77	27200	0	0	78	27200	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
+4220	1	0	灵宠:雷震子	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	690	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4221	1	0	灵宠:极炎剑客	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4222	1	0	灵宠:阴雷之狼	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1288	0	100	0	1	0	0	77	27200	0	0	78	27200	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
 4223	1	0	灵宠:雷蛟	26	0	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	388	0	100	0	1	0	0	77	27200	0	0	78	27200	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

--
Gitblit v1.8.0