From c9540c1d027d2920635f76ed3170f44ca8ca77b7 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 12 十一月 2018 17:39:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_ElderBattlefield.pyc | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 62 ++++++++++++++++---------------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 3 +
8 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc
index fad68ec..4252c74 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index b598a22..1141e3f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
index 252519c..52ca97f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
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 6eb261d..110a05e 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/RemoteQuery/GY_Query_EnterFB.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.pyc
index 140f30b..46cc8be 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_EnterFB.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
index e69ebc3..a77f0dd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 6985658..7b00656 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -234,10 +234,11 @@
MunekadoLockLimit 5
ChaosDemonCfg [[(31801001,10)],[(31801004,10)],[(31803001,1)]] [101,102,103,104,105]
ChaosDemonReward {103:1,102:3,101:5} 5_100|4_90|3_80|2_70|1_60 0*reExp {5:[(2406,1,1),(1141,1,1)],4:[(2407,1,1),(1140,1,1)],3:[(2408,1,1),(1139,1,1)],2:[(2409,1,1),(1138,1,1)],1:[(2410,1,1),(1137,1,1)]}
-ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 20 [200,600,1200,2000,3200,4800]
+ElderBattlefieldCfg {31601001:10,31601002:10,31601003:10,31602001:200,31602002:200,31602003:200} 300 {0:[12,8,20],1:[20,5,20],2:[20,5,20]} [200,600,1200,2000,3200,4800]
ElderBattlefieldPoint 500 500
ElderBattlefieldSys ['AncientBattlefield_2','AncientBattlefield_3','AncientBattlefield_4','AncientBattlefield_5','AncientBattlefield_6'] 20 10
ElderBattlefieldExp {1:'1700*reExp',2:'1800*reExp',3:'1900*reExp',4:'2000*reExp',5:'2200*reExp',6:'2400*reExp'}
+ElderBattlefieldRobot 20 {0:60103010,1:60103010,2:60103010} 20051 5 [111,112,113,114,115,116,117,118]
ElderBattlefieldTopAward [[2214,1,1]]
ElderBattlefieldBuff [23001,23002,23003,23004] 31609001 [102,105,106,107,108] 3
CornerPresentedMoney 0 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 8b3be37..8e56301 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1695,10 +1695,11 @@
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 40174 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 48037 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 56001 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-50913 起死回生 50913 1 1 2 2 0 7 0 0 8 1 10 0 0 100000 0 0 0 0 0 1000 1500 0 1 4028 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 50947 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
+50913 起死回生 50913 1 1 2 2 0 7 0 0 0 0 0 0 0 100000 0 0 0 0 0 4028 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 50947 50948 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
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 18 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
+50947 起死回生眩晕 50947 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 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
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
@@ -1716,16 +1717,16 @@
51850 阴阳化乾坤 51850 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 3720 0 0 0 0 0 0 0 0 0 0 0 0 0 0
51900 菩提守护 51900 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 3926 0 0 0 0 0 0 0 0 0 0 0 0 0 0
51950 回春祝福 51950 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 4133 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-30000 烈焰之灵(PVP) 30000 1 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 23072 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30001 烈焰之灵(PVP) 30000 2 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 1000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 46144 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30002 烈焰之灵(PVP) 30000 3 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 1500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 69216 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30003 烈焰之灵(PVP) 30000 4 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 2000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 92288 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30004 烈焰之灵(PVP) 30000 5 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 2500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 115360 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30005 烈焰之灵(PVP) 30000 6 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 3000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 138432 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30006 烈焰之灵(PVP) 30000 7 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 3500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 161504 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30007 烈焰之灵(PVP) 30000 8 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 4000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 184576 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30008 烈焰之灵(PVP) 30000 9 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 4500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 207648 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-30009 烈焰之灵(PVP) 30000 10 10 2 4 0 7 1 0 16 6 10 6 0 90000 0 0 0 0 0 1060 50105024 0 0 1013 5000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 230720 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30000 烈焰之灵(PVP) 30000 1 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 23072 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30001 烈焰之灵(PVP) 30000 2 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 1000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 46144 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30002 烈焰之灵(PVP) 30000 3 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 1500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 69216 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30003 烈焰之灵(PVP) 30000 4 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 2000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 92288 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30004 烈焰之灵(PVP) 30000 5 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 2500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 115360 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30005 烈焰之灵(PVP) 30000 6 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 3000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 138432 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30006 烈焰之灵(PVP) 30000 7 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 3500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 161504 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30007 烈焰之灵(PVP) 30000 8 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 4000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 184576 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30008 烈焰之灵(PVP) 30000 9 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 4500 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 207648 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+30009 烈焰之灵(PVP) 30000 10 10 2 4 0 7 1 0 16 6 10 6 0 120000 0 0 0 0 0 1060 50105024 0 0 1013 5000 0 0 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20600 0 0 0 0 0 0 0 2 230720 0 0 0 0 0 0 0 4 0 0 0 0 0 0
30050 炎蚀 30050 1 15 2 4 0 17 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 10000 0 0 9 50 4 0 10 50 4 0 1011 6 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20900 30000 6 0 10010 0 0 0 2 29993 0 0 0 0 0 0 0 4 0 50949 0 0 0 0
30051 炎蚀 30050 2 15 2 4 0 17 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 10000 0 0 9 100 4 0 10 100 4 0 1011 6 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20900 30000 6 0 10010 0 0 0 2 59986 0 0 0 0 0 0 0 4 0 50949 0 0 0 0
30052 炎蚀 30050 3 15 2 4 0 17 3 0 0 0 41 10 0 0 0 0 0 0 0 4004 10000 0 0 9 150 4 0 10 150 4 0 1011 6 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 20900 30000 6 0 10010 0 0 0 2 89979 0 0 0 0 0 0 0 4 0 50949 0 0 0 0
@@ -3107,10 +3108,11 @@
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 40174 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 48037 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 56001 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-55913 起死回生 55913 1 1 4 2 0 7 0 0 8 1 10 0 0 100000 0 0 0 0 0 1000 1500 0 1 4028 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 55947 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
+55913 起死回生 55913 1 1 4 2 0 7 0 0 0 0 0 0 0 100000 0 0 0 0 0 4028 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 55947 55948 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
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 18 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
+55947 起死回生眩晕 55947 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 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
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
@@ -3153,21 +3155,21 @@
35062 狂袭 35050 13 15 4 4 0 7 0 0 1 0 41 2 0 0 0 0 0 0 0 4062 6500 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 50900 35000 6 0 10010 0 0 0 2 389909 0 0 0 0 0 0 0 0 0 55949 0 0 0 0
35063 狂袭 35050 14 15 4 4 0 7 0 0 1 0 41 2 0 0 0 0 0 0 0 4062 7000 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 50900 35000 6 0 10010 0 0 0 2 419902 0 0 0 0 0 0 0 0 0 55949 0 0 0 0
35064 狂袭 35050 15 15 4 4 0 7 0 0 1 0 41 2 0 0 0 0 0 0 0 4062 7500 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 50900 35000 6 0 10010 0 0 0 2 449895 0 0 0 0 0 0 0 0 0 55949 0 0 0 0
-35100 暗灵 35100 1 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 300 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 51500 35050 9 0 10040 0 0 0 2 59987 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35101 暗灵 35100 2 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 600 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 51500 35050 9 0 10040 0 0 0 2 119974 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35102 暗灵 35100 3 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 900 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 51500 35050 9 0 10040 0 0 0 2 179961 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35103 暗灵 35100 4 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 1200 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 51500 35050 9 0 10040 0 0 0 2 239948 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35104 暗灵 35100 5 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 1500 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 51500 35050 9 0 10040 0 0 0 2 299935 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35105 暗灵 35100 6 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 1800 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 51500 35050 9 0 10040 0 0 0 2 359922 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35106 暗灵 35100 7 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 2100 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 51500 35050 9 0 10040 0 0 0 2 419909 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35107 暗灵 35100 8 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 2400 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 51500 35050 9 0 10040 0 0 0 2 479896 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35108 暗灵 35100 9 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 2700 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 51500 35050 9 0 10040 0 0 0 2 539883 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35109 暗灵 35100 10 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 3000 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 51500 35050 9 0 10040 0 0 0 2 599870 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35150 齐心协力 35150 1 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 400 35000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 92288 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35151 齐心协力 35150 2 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 800 35000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 184576 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35152 齐心协力 35150 3 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 1200 35000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 276864 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35153 齐心协力 35150 4 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 1600 35000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 369152 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
-35154 齐心协力 35150 5 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 2000 35000 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 461440 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35100 暗灵 35100 1 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 300 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 51500 35050 9 0 10040 0 0 0 2 59987 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35101 暗灵 35100 2 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 600 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 51500 35050 9 0 10040 0 0 0 2 119974 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35102 暗灵 35100 3 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 900 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 51500 35050 9 0 10040 0 0 0 2 179961 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35103 暗灵 35100 4 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 1200 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 51500 35050 9 0 10040 0 0 0 2 239948 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35104 暗灵 35100 5 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 1500 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 51500 35050 9 0 10040 0 0 0 2 299935 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35105 暗灵 35100 6 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 1800 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 51500 35050 9 0 10040 0 0 0 2 359922 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35106 暗灵 35100 7 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 2100 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 51500 35050 9 0 10040 0 0 0 2 419909 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35107 暗灵 35100 8 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 2400 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 51500 35050 9 0 10040 0 0 0 2 479896 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35108 暗灵 35100 9 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 2700 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 51500 35050 9 0 10040 0 0 0 2 539883 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35109 暗灵 35100 10 10 4 4 0 7 0 0 0 0 0 2 0 0 0 0 0 0 0 4010 3000 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 51500 35050 9 0 10040 0 0 0 2 599870 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35150 齐心协力 35150 1 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 400 35000 55949 0 0 0 0 0 0 0 0 0 0 0 0 10000 30000 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 92288 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35151 齐心协力 35150 2 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 800 35000 55949 0 0 0 0 0 0 0 0 0 0 0 0 10000 30000 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 184576 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35152 齐心协力 35150 3 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 1200 35000 55949 0 0 0 0 0 0 0 0 0 0 0 0 10000 30000 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 276864 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35153 齐心协力 35150 4 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 1600 35000 55949 0 0 0 0 0 0 0 0 0 0 0 0 10000 30000 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 369152 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
+35154 齐心协力 35150 5 5 4 4 0 7 0 0 16 6 10 6 0 30000 0 0 0 0 0 4022 10000 0 0 1011 3 1 0 4508 2000 35000 55949 0 0 0 0 0 0 0 0 0 0 0 0 10000 30000 0 0 0 0 51800 35100 6 0 10050 0 0 0 2 461440 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
35200 大虚幻世 35200 1 10 4 4 0 7 0 0 0 0 10 2 0 0 0 0 0 0 0 4054 1000 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 50600 0 0 0 0 0 0 0 2 23750 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
35201 大虚幻世 35200 2 10 4 4 0 7 0 0 0 0 10 2 0 0 0 0 0 0 0 4054 2000 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 50600 0 0 0 0 0 0 0 2 47500 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
35202 大虚幻世 35200 3 10 4 4 0 7 0 0 0 0 10 2 0 0 0 0 0 0 0 4054 3000 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 50600 0 0 0 0 0 0 0 2 71250 0 0 0 0 0 0 0 0 0 35000 0 0 0 0
@@ -3341,7 +3343,7 @@
35957 雪上加霜 35950 8 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4057 8000 6 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 51500 35900 9 0 20040 0 0 0 2 452208 0 0 0 0 0 0 0 0 0 0 0 0 0 0
35958 雪上加霜 35950 9 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4057 9000 6 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 51500 35900 9 0 20040 0 0 0 2 508734 0 0 0 0 0 0 0 0 0 0 0 0 0 0
35959 雪上加霜 35950 10 10 4 4 0 7 0 0 1 0 0 2 0 0 0 0 0 0 0 4057 10000 6 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 51500 35900 9 0 20040 0 0 0 2 565260 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-36000 不灭冰心(PVP) 36000 1 1 4 4 0 16 1 0 0 0 10 2 0 900000 0 0 0 0 0 4028 10000 0 0 4519 0 0 0 56 10000 1 0 9 8000 4 0 10 8000 4 0 0 0 0 0 10000 5000 0 0 0 0 51800 35950 6 0 20050 0 0 0 2 84790 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+36000 不灭冰心(PVP) 36000 1 1 4 4 0 16 1 0 0 0 10 2 0 90000 0 0 0 0 0 4028 10000 0 0 4519 0 0 0 56 10000 1 0 9 8000 4 0 10 8000 4 0 0 0 0 0 10000 5000 0 0 0 0 51800 35950 6 0 20050 0 0 0 2 84790 0 0 0 0 0 0 0 0 0 0 0 0 0 0
36050 闪避本能 36050 1 10 4 4 0 7 0 0 0 0 10 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 1274 0 0 0 0 0 0 0 0 0 0 0 0 0 0
36051 闪避本能 36050 2 10 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 1529 0 0 0 0 0 0 0 0 0 0 0 0 0 0
36052 闪避本能 36050 3 10 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 1784 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0