From 2c4a1cf89391c5572edebf91e1f26c19349e9ba1 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期六, 11 八月 2018 14:15:30 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagHorseUp.txt                                       |    6 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc            |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                        |    3 +
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                    |    8 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc |    0 
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                              |    8 ++--
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                 |    0 
 db/PyMongoDataServer/PySysDB/tagChests.txt                                        |    1 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                       |   31 ++++++++++-----
 db/PyMongoDataServer/PySysDB/tagPetInfo.txt                                       |    2 
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt                                   |    1 
 db/PyMongoDataServer/PySysDB/tagBossReborn.txt                                    |    8 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt                     |   10 ++--
 13 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 17c8c50..68c3a18 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -38,13 +38,13 @@
 MailMaxItemCnt	5	0	0	0	0
 OpenJob	1|2	0	0	0	0
 TeamReadyTime	30				
-BossShunt	10030|10040|10050|10060|21070	2	4		
-MapLine	10030_5|10040_5|10050_5|10060_5|21070_1				
-DropRecordValue	3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
+BossShunt	10040|21070	2	5		
+MapLine	10040_10|21070_1				
+DropRecordValue	2339|3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
 DropRecordNum	40	1			
 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}	0_3|1_0	{0:'WB_Limit',1:'BossHome_Limit'}	{1:27}	{0:[21,'WorldBossNoHarm']}
 CreateRoleMap	{1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}				
-SetWorldPosShunt	{10010:20, 10020:25, 10030:25, 10040:25, 10050:25, 10060:25}	160			
+SetWorldPosShunt	{10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25}	160			
 XMZZBetCfg	{}				
 XMZZAward	{"3":[[104,1,1]],"6":[[104,2,1]],"9":[[104,3,1]],"12":[[105,1,1]],"15":[[105,1,1]]}	[[56,1,1]]	[[105,2,1],[992,1,1]]	[[105,1,1],[993,1,1]]	500
 XMZZDogFallLimit	1000				
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 1070453..0f31253 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
index 7d945cc..6e82ed7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
@@ -1,9 +1,9 @@
-Map001_Sjz	10010	神诀宗	10010	0	0	0	5	1
-Map002_Yg	10020	影谷	10020	0	0	0	5	1
+Map001_Sjz	10010	神诀宗	10010	0	0	0	10	1
+Map002_Yg	10020	影谷	10020	0	0	0	10	1
 Map003_Yjsz	10030	御剑山庄	10030	0	0	0	10	1
-Map004_Xyc	10040	逍遥城	10040	0	0	0	10	1
-Map005_Bfhl	10050	冰封回廊	10050	0	0	0	10	1
-Map006_Mld	10060	秘灵岛	10060	0	0	0	10	1
+Map004_Xyc	10040	逍遥城	10040	0	0	0	20	1
+Map005_Bfhl	10050	冰封回廊	10050	0	0	0	5	1
+Map006_Mld	10060	秘灵岛	10060	0	0	0	5	1
 Map007_Jyzk	10070	极炎之窟	10070	0	0	0	5	1
 Map008_Xmhj	10080	玄梦幻界	10080	0	0	0	5	1
 Map009_Lysj	10090	两仪山间	10090	0	0	0	5	1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
index f17eac3..ffb74f2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index ecde48d..78869b5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
index a564ae7..e31b3f1 100644
--- a/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBossReborn.txt
@@ -1,11 +1,11 @@
 Id	TotalTimes	SingleTimes	Reward1	RewardCount1	Reward2	RewardCount2	Reward3	RewardCount3	WorldLevel
-1	3	1	21|21	20|20	11|11	2|2	0|0	0|0	100|999
-2	4	1	21|21	20|20	11|11	2|2	0|0	0|0	100|999
+1	3	1	21|21	20|20	11|11	1|1	0|0	0|0	100|999
+2	4	1	21|21	20|20	11|11	1|1	0|0	0|0	100|999
 3	10	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
 4	10	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
-5	20	1	21|21	15|15	11|11	2|2	0|0	0|0	100|999
+5	20	1	21|21	15|15	11|11	1|1	0|0	0|0	100|999
 6	3	3	21|21	50|50	1128|1128	1|1	0|0	0|0	100|999
-7	3	1	21|21	20|20	11|11	2|2	0|0	0|0	100|999
+7	3	1	21|21	20|20	11|11	1|1	0|0	0|0	100|999
 8	30	2	21|21	10|10	11|11	1|1	0|0	0|0	100|999
 9	20	10	21|21	10|10	11|11	1|1	0|0	0|0	100|999
 10	5	1	21|21	10|10	11|11	1|1	0|0	0|0	100|999
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 83739c3..077e573 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -126,3 +126,4 @@
 2336	0	0	0	1	0
 2337	0	0	0	1	0
 2338	0	0	0	1	0
+2339	0	0	0	0	1
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 76beba3..1019873 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -123,3 +123,4 @@
 2336	0			[[1428,[10441,1]],[2856,[10442,1]],[4284,[10443,1]],[5712,[10444,1]],[7140,[10445,1]],[8568,[10446,1]],[10000,[10447,1]]]	1			[[10441,20441,30441],[10442,20442,30442],[10443,20443,30443],[10444,20444,30444],[10445,20445,30445],[10446,20446,30446],[10447,20447,30447]]			
 2337	0			[[1428,[10551,1]],[2856,[10552,1]],[4284,[10553,1]],[5712,[10554,1]],[7140,[10555,1]],[8568,[10556,1]],[10000,[10557,1]]]	1			[[10551,20551,30551],[10552,20552,30552],[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557]]			[10551,10552,10553,10554,10555,10556,10557]
 2338	0			[[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]]	1			[[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]]			
+2339	0			[[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]]	1						
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 8649b05..7893d25 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -196,13 +196,13 @@
 GodAreaExpAward	{"Exp":"int(reExp*10)"}	5	0		
 AngryAdd	60	1	20	100	0
 BossHomeCost	1_0|2_100|3_200|4_200|5_200|6_200|7_200|8_200	0	0	0	0
-BossShunt	10030|10040|10050|10060|21070	2	4		
-MapLine	10030_5|10040_5|10050_5|10060_5|21070_1				
+BossShunt	10040|21070	2	5		
+MapLine	10040_10|21070_1				
 DungeonDeliver	31020|31030|31150				
 DungeonIntegral	10000				
 BuyFBCntCost	{"31080":"35","31140":"20","52010":"20+min(max(hasBuyCnt-1,0),1)*10+min(max(hasBuyCnt-3,0),1)*10+min(max(hasBuyCnt-5,0),1)*10+min(max(hasBuyCnt-7,0),1)*10+min(max(hasBuyCnt-9,0),1)*20","31190":"30"}				
 FBEncourageBuff	{31080:20051,52010:20051}				
-DropRecordValue	3802|983|982|3803|3804|9051|9062|3805|3806|9073|222|4250|260|4209|9074|9075|9077|9078				
+DropRecordValue	2339|3802|983|982|3803|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|5302|5206|5207|5202|5006|5007|4182				
 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				
@@ -221,7 +221,7 @@
 ElderBattlefieldTopAward	[[2214,1,1]]				
 ElderBattlefieldBuff	[23001,23002,23003,23004]	31609001	[102,105,106,107,108]	3	
 CornerPresentedMoney	0	1			
-SetWorldPosShunt	{10010:20, 10020:25, 10030:25, 10040:25, 10050:25, 10060:25}	160			
+SetWorldPosShunt	{10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25}	160			
 TransportPay	954	1			
 GuardFBCageNPCID	32502001	32504001	3		
 FBCntRegainInterval	7200				
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 7aec79b..1403c9e 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -372,13 +372,13 @@
 306	1	1945	6|7|23	10584|529|60	0
 306	2	2111	6|7|23	12140|607|60	0
 306	3	2291	6|7|23	13776|688|60	0
-306	4	2486	6|7|23	15495|774|60	49090
+306	4	2486	6|7|23	15495|774|60	49150
 306	5	2694	6|7|23	17297|864|60	0
 306	6	2915	6|7|23	19183|959|60	0
 306	7	3151	6|7|23	21204|1060|60	0
 306	8	3400	6|7|23	23366|1168|60	0
 306	9	3663	6|7|23	25675|1283|60	0
-306	10	3940	6|7|23	28137|1406|60	49095
+306	10	3940	6|7|23	28137|1406|60	49155
 306	11	4231	6|7|23	30757|1537|60	0
 306	12	4535	6|7|23	33501|1675|60	0
 306	13	4853	6|7|23	36368|1818|60	0
@@ -388,7 +388,7 @@
 306	17	6264	6|7|23	49018|2450|60	0
 306	18	6651	6|7|23	52461|2623|60	0
 306	19	7052	6|7|23	56006|2800|60	0
-306	20	7467	6|7|23	59649|2982|60	49100
+306	20	7467	6|7|23	59649|2982|60	49160
 306	21	7896	6|7|23	63383|3169|60	0
 306	22	8338	6|7|23	67232|3361|60	0
 306	23	8794	6|7|23	71193|3559|60	0
diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
index 5d47194..123d856 100644
--- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt
@@ -9,4 +9,4 @@
 50106301	5	4206	1	1000	1	50	6	48290|48295|48300	4|10|20	13996
 50106302	5	4207	1	1000	1	50	6	48305|48310|48315	4|10|20	31996
 50106303	4	4209	1	1000	1	40	6	48335|48340|48345	4|10|20	13248
-50106304	5	4210	1	1000	1	50	1	48305|48310|48315	4|10|20	24796
+50106304	5	4210	1	1000	1	50	1	48350|48355|48360	4|10|20	24796
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index e4b1d79..7fc4fbc 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -15,6 +15,8 @@
 15	1	0	500绑定仙玉	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	500	0	20	0	1	0	0	202	500	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
 16	1	0	20绑定仙玉	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	20	0	1	0	0	202	20	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
 17	1	0	25绑定仙玉	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	25	0	20	0	1	0	0	202	25	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
+18	1	0	150绑定仙玉	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	20	0	20	0	1	0	0	202	150	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
+19	1	0	200绑定仙玉	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	25	0	20	0	1	0	0	202	200	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
 21	1	0	Boss复活点	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	25	0	20	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
 22	1	0	铜钱	1	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	25	0	20	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
 23	1	0	符印精华	1	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	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -436,6 +438,7 @@
 2336	1	0	宗门4阶橙1宝箱	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
 2337	1	0	宗门5阶橙2宝箱	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
 2338	1	0	宗门5阶橙1宝箱	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
+2339	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
 3501	1	0	1级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	1	1	3502	6	190	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
 3502	1	0	2级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	90	0	10	0	0	0	1	225	1	2	3503	6	465	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
 3503	1	0	3级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	270	0	20	0	0	0	1	225	1	3	3504	6	1160	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
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 99d9359..e830f5b 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -680,9 +680,12 @@
 48335	噬灵冰炎	48335	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2000	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	6568	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
 48340	残暴之魂	48340	1	1	0	6	0	17	0	0	0	0	91	8	0	25000	0	0	0	0	0	4004	10000	0	0	13	3000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	16420	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48345	冰火魂体 	48345	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	4	3000	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	57470	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48350	妖虎之力	48350	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1000	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	870	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48355	妖虎之伤	48355	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1000	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	870	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-48360	妖虎之心	48360	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	1000	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	870	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48350	咆哮之力	48350	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	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	17313	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48355	九黎真身	48355	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	5	3000	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	43282	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48360	妖虎之威	48360	1	1	0	6	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	5000	10000	0	4503	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	151487	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48365	咆哮之力	48365	1	1	0	6	0	7	0	0	0	0	0	0	0	0	0	0	0	0	0	4005	2500	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	6568	0	0	0	0	0	0	0	0	0	48200	0	0	0	0
+48370	九黎真身	48370	1	1	0	6	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	509	5	3000	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	57470	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+48375	妖虎之威	48375	1	1	0	6	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	5000	10000	0	4503	5000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	22420	0	0	0	0	0	0	0	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	510	100	6	1000	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	1242	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	14	800	3	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	3105	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49010	培元	49010	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	2	6	1000	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	10867	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -717,6 +720,12 @@
 49140	凶魂	49140	1	1	0	5	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	5000	10000	0	4503	3500	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	6000	0	0	0	0	0	0	0	0	0	0	0	0	2	22420	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49145	重爪	49145	1	1	0	5	0	16	0	0	0	0	10	0	0	25000	0	0	0	0	0	4023	10000	5500	0	4500	4000	49146	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	78470	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49146	定身	49146	1	1	0	0	0	14	3	0	1	0	41	0	0	0	0	0	0	0	0	4012	7	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	2500	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	511	511	4	8	0	0	0	0	0	0
+49150	驭灵	49150	1	1	0	5	0	17	0	0	0	0	10	8	0	25000	0	0	0	0	0	4004	10000	0	0	13	3000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	10736	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49155	阴阳	49155	1	1	0	5	0	16	0	0	0	0	10	0	0	30000	0	0	0	0	0	4004	10000	0	0	4511	5000	0	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	26840	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49160	神游	49160	1	1	0	5	0	16	0	0	0	0	10	0	0	60000	0	0	0	0	0	4023	10000	2000	0	19	4000	3	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	93940	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49165	坚韧	49165	1	1	0	5	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4023	10000	2000	0	13	5000	3	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	7239	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49170	健体	49170	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	304	6	1500	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	18097	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49175	潜心	49175	1	1	0	5	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	2000	3000	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	63339	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50000	金箍幻灭	50000	1	1	2	1	0	1	0	0	2	8	40	4	0	8000	0	0	0	0	0	1010	25000	0	0	1200	4	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	692	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50100	皓月腾空	50100	1	1	2	1	0	1	0	0	2	6	41	10	0	16000	0	0	0	0	0	1010	30000	0	0	1200	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	0	0	50101	0	0	0	0	0	0	0	0	0	0	2	879	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50101	加速	50101	1	1	0	0	0	5	0	0	0	0	10	0	0	0	0	0	0	0	0	16	1000	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	190	0	0	0	0
@@ -1415,10 +1424,10 @@
 50907	混元决	50907	1	1	2	2	0	7	0	0	0	0	0	0	0	15000	0	0	0	0	0	4026	5000	0	14	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	27230	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50908	甘露回春	50908	1	1	2	2	0	20	0	0	0	0	10	0	0	5000	0	0	0	0	0	65	2000	1	0	116	8000	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	30979	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50909	神火护身	50909	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	808	1000	20000	50939	4023	10000	5000	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	35041	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50910	森罗万象 	50910	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	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	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50911	斩杀	50911	1	1	2	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	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	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-50912	起死回生	50912	1	1	2	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	3	511	511	3	4	0	0	0	0	0	0
-50913	元素召唤	50913	1	1	2	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105002	0	0	1013	10000	0	0	4004	10000	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	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50910	元素召唤	50910	1	1	2	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105002	0	0	1013	10000	0	0	4004	10000	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	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50911	森罗万象 	50911	1	1	2	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	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	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50912	斩杀	50912	1	1	2	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	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	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+50913	起死回生	50913	1	1	2	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	3	511	511	3	4	0	0	0	0	0	0
 50932	元素减少攻防	50932	1	1	0	0	0	6	3	0	0	0	41	10	0	0	0	0	0	0	0	13	3000	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	5000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 50939	剩余护盾爆炸	50939	1	1	2	0	0	1	0	0	2	3	40	0	0	0	0	0	0	0	0	0	0	0	0	4023	10000	5000	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	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0
 50947	起死回生回血	50947	1	1	0	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1500	0	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	4	0	0	0	0	0	0
@@ -2187,10 +2196,10 @@
 55907	混元决	55907	1	1	4	2	0	7	0	0	0	0	0	0	0	15000	0	0	0	0	0	4026	5000	0	14	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	27230	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55908	甘露回春	55908	1	1	4	2	0	20	0	0	0	0	10	0	0	5000	0	0	0	0	0	65	2000	1	0	116	8000	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	30979	0	0	0	0	0	0	0	4	0	0	0	0	0	0
 55909	神火护身	55909	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	808	1000	20000	50939	4023	10000	5000	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	35041	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55910	森罗万象 	55910	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	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	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55911	斩杀	55911	1	1	4	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	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	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
-55912	起死回生	55912	1	1	4	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	3	511	511	3	4	0	0	0	0	0	0
-55913	元素召唤	55913	1	1	4	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105003	0	0	4004	10000	0	0	1013	10000	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	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55910	元素召唤	55910	1	1	4	2	0	7	0	0	16	6	10	6	0	60000	0	0	0	0	0	1060	50105003	0	0	4004	10000	0	0	1013	10000	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	65142	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55911	森罗万象 	55911	1	1	4	2	0	16	0	0	0	0	10	0	0	20000	0	0	0	0	0	4004	2000	0	0	4513	500	0	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	40174	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55912	斩杀	55912	1	1	4	2	0	7	3	0	0	0	0	0	0	0	0	0	0	0	0	4002	1500	5000	0	4027	2000	2000	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	48037	0	0	0	0	0	0	0	4	0	0	0	0	0	0
+55913	起死回生	55913	1	1	4	2	0	18	0	0	0	0	41	10	0	100000	0	0	0	0	0	4012	7	0	0	4028	10000	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	1000	0	50947	0	0	0	0	0	0	0	0	0	0	2	56001	0	0	0	3	511	511	3	4	0	0	0	0	0	0
 55932	定身	55932	1	1	0	0	0	14	3	0	0	0	41	10	0	0	0	0	0	0	0	4012	7	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3000	3000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	507	507	4	8	0	0	0	0	0	0
 55939	剩余护盾爆炸	55939	1	1	4	0	0	1	0	0	2	3	40	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	10000	5000	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
 55947	起死回生回血	55947	1	1	0	0	0	2	0	0	8	1	10	0	0	0	0	0	0	0	0	1000	1500	0	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	4	0	0	0	0	0	0

--
Gitblit v1.8.0