From 499417dcdd39e4f0a6b1d1ad7f6eca27c085a56f Mon Sep 17 00:00:00 2001
From: CeHua_ZWJ <ceh@163.com>
Date: 星期二, 13 十一月 2018 16:29:41 +0800
Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2

---
 db/PyMongoDataServer/PySysDB/tagActBossReborn.txt                                             |    2 +
 db/PyMongoDataServer/PySysDB/tagHorseUp.txt                                                   |   60 +++++++++++++++---------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col                           |    0 
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                   |   10 ++--
 db/PyMongoDataServer/PySysDB/tagHorse.txt                                                     |    2 
 CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt                                       |    2 +
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                    |    4 +-
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc |    0 
 CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt                                         |    2 
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                                          |    1 
 11 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
index a0a0a9d..a351835 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActBossReborn.txt
@@ -3,3 +3,5 @@
 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
+5	yunying	[]	[]	2018-11-3	2018-11-5	1	{0:["BossFHOpen", []]}	{}	110	1
+6	yunying2	[]	[]	2018-11-14	2018-11-16	1	{0:["BossFHOpen", []]}	{}	110	1
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index a8e5c08..eee99be 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -68,3 +68,4 @@
 FirstDayActivePlayerCnt	1000				
 CeremonyWorldLv	{"1":[[0,250],[251,300],[301,900]],"2":[[0,250],[251,300],[301,900]],"3":[[0,250],[251,300],[301,900]],"4":[[0,250],[251,300],[301,900]]}				
 FairyGrabBossID	[50103001,50103002,50103003,50103004,50103005,50103006,50103007]	[[26,14000,1]]	-60		
+OperationAction	10	0	0	0	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
index 4f94d3b..050b905 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagMarketQuery.txt
@@ -27,7 +27,7 @@
 130	{'ItemType':[4,6,8,10,11,12,13,14,15,16,17,18,19,20,24,29,31,33,36,37,38,40,44,48,49,51,57,59,60,76,81,119,120,121,122,123,126]}
 131	{'ItemType':[34,35]}
 132	{'ItemType':[21,22,41,124]}
-133	{'SpecialItemID':[3807.3808]}
+133	{'SpecialItemID':[3807,3808]}
 134	{'ItemType':[26,27,28,125,21,22,41,124]}
 135	{'ItemType':[25]}
 136	{'ItemType':[45]}
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index bf8eb36..5f4f856 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col
index 81e5e98..8141d77 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
index b13b4d6..8c67b71 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuff/PassiveBuff_4508.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
index 6a0ff47..3db2d01 100644
--- a/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
+++ b/db/PyMongoDataServer/PySysDB/tagActBossReborn.txt
@@ -3,3 +3,5 @@
 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
+5	2018-11-3	2018-11-5	1	110	1
+6	2018-11-14	2018-11-16	1	110	1
diff --git a/db/PyMongoDataServer/PySysDB/tagHorse.txt b/db/PyMongoDataServer/PySysDB/tagHorse.txt
index 7262cfe..8c8236e 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorse.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorse.txt
@@ -14,4 +14,4 @@
 308	292	262	1	1	40	1	4	6048	GetMount12
 309	293	263	1	1	30	1	3	3528	GetMount13
 310	294	264	1	1	40	1	4	6048	GetMount14
-311	295	265	1	1	30	1	3	2448	GetMount15
+311	295	265	1	1	30	1	2	1440	GetMount15
diff --git a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
index 77e83b5..792a7c5 100644
--- a/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagHorseUp.txt
@@ -569,33 +569,33 @@
 310	38	9268	6|7|23	90884|4544|60	0	
 310	39	9682	6|7|23	94533|4726|60	0	
 310	40	0	6|7|23	98235|4911|60	0	
-311	1	478	6|7|23	1224|61|40	0	
-311	2	519	6|7|23	1990|99|40	0	
-311	3	564	6|7|23	2795|139|40	0	
-311	4	612	6|7|23	3642|182|40	49225	
-311	5	663	6|7|23	4529|226|40	0	
-311	6	717	6|7|23	5458|272|40	0	
-311	7	775	6|7|23	6453|322|40	0	
-311	8	837	6|7|23	7517|375|40	0	
-311	9	901	6|7|23	8654|432|40	0	
-311	10	970	6|7|23	9866|493|40	49230	
-311	11	1041	6|7|23	11157|557|40	0	
-311	12	1116	6|7|23	12508|625|40	0	
-311	13	1194	6|7|23	13919|695|40	0	
-311	14	1276	6|7|23	15390|769|40	0	
-311	15	1361	6|7|23	16920|846|40	0	
-311	16	1450	6|7|23	18506|925|40	0	
-311	17	1542	6|7|23	20148|1007|40	0	
-311	18	1637	6|7|23	21843|1092|40	0	
-311	19	1736	6|7|23	23589|1179|40	0	
-311	20	1838	6|7|23	25383|1269|40	49235	
-311	21	1943	6|7|23	27221|1361|40	0	
-311	22	2052	6|7|23	29117|1455|40	0	
-311	23	2165	6|7|23	31067|1553|40	0	
-311	24	2280	6|7|23	33069|1653|40	0	
-311	25	2399	6|7|23	35122|1756|40	0	
-311	26	2522	6|7|23	37222|1861|40	0	
-311	27	2648	6|7|23	39366|1968|40	0	
-311	28	2777	6|7|23	41551|2077|40	0	
-311	29	2987	6|7|23	43773|2188|40	0	
-311	30	0	6|7|23	46028|2301|40	0	
+311	1	246	6|7|23	720|36|40	0	
+311	2	267	6|7|23	1114|55|40	0	
+311	3	290	6|7|23	1530|76|40	0	
+311	4	315	6|7|23	1966|98|40	49225	
+311	5	341	6|7|23	2424|121|40	0	
+311	6	370	6|7|23	2902|145|40	0	
+311	7	399	6|7|23	3415|170|40	0	
+311	8	431	6|7|23	3964|198|40	0	
+311	9	464	6|7|23	4550|227|40	0	
+311	10	500	6|7|23	5175|258|40	49230	
+311	11	536	6|7|23	5840|292|40	0	
+311	12	575	6|7|23	6536|326|40	0	
+311	13	615	6|7|23	7264|363|40	0	
+311	14	658	6|7|23	8022|401|40	0	
+311	15	701	6|7|23	8810|440|40	0	
+311	16	747	6|7|23	9628|481|40	0	
+311	17	795	6|7|23	10475|523|40	0	
+311	18	844	6|7|23	11348|567|40	0	
+311	19	895	6|7|23	12248|612|40	0	
+311	20	947	6|7|23	13173|658|40	49235	
+311	21	1002	6|7|23	14120|706|40	0	
+311	22	1058	6|7|23	15097|754|40	0	
+311	23	1116	6|7|23	16103|805|40	0	
+311	24	1175	6|7|23	17135|856|40	0	
+311	25	1237	6|7|23	18193|909|40	0	
+311	26	1300	6|7|23	19275|963|40	0	
+311	27	1365	6|7|23	20381|1019|40	0	
+311	28	1431	6|7|23	21507|1075|40	0	
+311	29	1500	6|7|23	22652|1132|40	0	
+311	30	0	6|7|23	23815|1190|40	0	
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index e8ec8b6..3ab5f04 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -119,7 +119,7 @@
 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	1280	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	680	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
+265	1	0	坐骑:森之灵	41	19	1	0	0	1	1	0	1	0	1	0	0	0	0	0	1	680	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
 280	1	0	觉灵鹿	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	1000	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
 281	1	0	皓月狼	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	588	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
@@ -135,7 +135,7 @@
 292	1	0	白玉兽	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	6000	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
 293	1	0	筋斗云	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	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
 294	1	0	福源猫	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	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
-295	1	0	森之灵	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	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
+295	1	0	森之灵	42	19	0	0	0	1	1	0	1	0	1	0	0	0	0	0	1	2000	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
 600	1	0	时装1	91	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	220	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
 601	1	0	时装2	92	0	0	0	0	999	120	1	1	0	1	0	0	0	0	0	1	220	0	50	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
 602	1	0	时装3	93	0	1	0	0	999	1	1	1	0	1	0	0	0	0	0	1	220	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	5	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 e9d7bd6..b528b07 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -833,10 +833,10 @@
 49210	浩瀚	49210	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	308	7	500	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	8197	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49215	玄翎	49215	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	4	6	300	511	4	7	300	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	20492	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49220	玄极	49220	1	1	0	5	0	16	1	0	0	0	10	0	0	30000	0	0	0	0	0	4023	10000	10000	0	77	1000	1	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	71722	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-49225	赶月	49225	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	311	7	500	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	4061	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-49230	扶柳	49230	1	1	0	5	0	16	0	0	0	0	10	0	0	25000	0	0	0	0	0	4023	10000	5500	0	4500	2500	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	10152	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49225	赶月	49225	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	311	7	500	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	1580	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49230	扶柳	49230	1	1	0	5	0	16	0	0	0	0	10	0	0	25000	0	0	0	0	0	4023	10000	5500	0	4500	2500	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	3950	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 48231	减速	48231	1	1	0	0	0	14	3	0	1	0	41	8	0	0	0	0	0	0	0	16	4000	4	0	4012	2	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	0	0	0	0	0	0	0
-49235	随心	49235	1	1	0	5	0	16	1	0	0	0	10	0	0	50000	0	0	0	0	0	4023	10000	5500	0	74	3000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	4000	0	0	0	0	0	0	0	0	0	0	0	0	2	35532	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+49235	随心	49235	1	1	0	5	0	16	1	0	0	0	10	0	0	50000	0	0	0	0	0	4023	10000	5500	0	74	3000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	4000	0	0	0	0	0	0	0	0	0	0	0	0	2	13825	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49240	星暴	49240	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	510	310	6	600	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	8616	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49245	弑浪	49245	1	1	0	5	0	20	0	0	0	0	0	0	0	0	0	0	0	0	0	511	4	6	300	511	4	7	300	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	21540	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 49250	乱舞	49250	1	1	0	5	0	16	1	0	0	0	10	0	0	50000	0	0	0	0	0	4023	10000	5000	0	74	5000	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	10000	4000	0	0	0	0	0	0	0	0	0	0	0	0	2	75390	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -1700,7 +1700,7 @@
 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	14	3	0	1	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	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	3	511	511	3	4	0	0	0	0	0	0
 50948	起死回生	50948	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
-50949	召唤兽攻击	50949	1	1	0	4	0	1	0	0	1	0	41	8	0	500	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	2	0	0	0	0	0	0
+50949	召唤兽攻击	50949	1	1	0	8	0	1	0	0	1	0	41	8	0	500	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	2	0	0	0	0	0	0
 51200	魔枪突刺	51200	1	1	2	4	0	7	0	0	1	0	0	2	0	0	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	1033	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 51250	天威陨石	51250	1	1	2	4	0	7	0	0	1	0	0	2	0	0	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	1240	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 51300	魔枪击	51300	1	1	2	4	0	7	0	0	1	0	0	2	0	0	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	1446	0	0	0	0	0	0	0	0	0	0	0	0	0	0
@@ -3113,7 +3113,7 @@
 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	14	3	0	1	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	10000	1000	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	3	511	511	3	4	0	0	0	0	0	0
 55948	起死回生回血	55948	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
-55949	召唤兽攻击	55949	1	1	0	4	0	1	0	0	1	0	41	8	0	500	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	2	0	0	0	0	0	0
+55949	召唤兽攻击	55949	1	1	0	8	0	1	0	0	1	0	41	8	0	500	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	2	0	0	0	0	0	0
 56200	暴风雪	56200	1	1	4	4	0	7	0	0	1	0	0	2	0	0	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	692	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 56250	天威冰锥	56250	1	1	4	4	0	7	0	0	1	0	0	2	0	0	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	692	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 56300	冰封天下	56300	1	1	4	4	0	7	0	0	1	0	0	2	0	0	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	692	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0