From 8fb9e4743e0779a3116825513dfbae89e910a2a1 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期三, 22 八月 2018 14:50:04 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt                                                |  104 +++++++++++++++++-----------------
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                                       |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc            |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                        |   58 +++++++++---------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    9 +++
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                                    |    0 
 6 files changed, 91 insertions(+), 82 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index f0eea81..8fd346f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -42,6 +42,8 @@
 #	aIceAtkSuperHit			真实伤害暴击倍值	倍值, 默认1
 #
 # 防守方:
+#	dMinAtk		最低攻击
+#	dMaxAtk		最高攻击
 #	dLV						等级				固定值
 #	dLuckyHitReduce			会心一击伤害减少	万分率, 默认0, 会心一击时有值
 #	dSuperHitReduce			暴击伤害减少		万分率, 默认0, 暴击时有值
@@ -111,6 +113,13 @@
 	"PVE_1_31110"	:"int(max(min((SuppressValueRealmRate/10000.0-1)*2,0.5)+1,0.5)*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
 	"EVP_1_31110"	:"int(max(min((SuppressValueRealmRate/10000.0-1)*2,0.5)+1,0.5)*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
 
+	#麒麟之府
+	"PVE_1_31190"	:"int(max(min((SuppressValueRealmRate/10000.0-1)*2,0.5)+1,0.5)*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
+	"EVP_1_31190"	:"int(max(min((SuppressValueRealmRate/10000.0-1)*2,0.5)+1,0.5)*max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+
+	#火炬特殊伤害
+	"EVP_1_31110"	:"max((1250-(dMinAtk+dMaxAtk)/2.0)*20,1)+max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
+
 }
 
 )
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index b0c6497..5669c23 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index 3fd1e6b..4a3a729 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
index 2ae3ce0..89d0583 100644
--- a/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
+++ b/db/PyMongoDataServer/PySysDB/tagEquipSuitAttr.txt
@@ -1,65 +1,65 @@
 groupType	suiteType	suiteLV	job	count1	propList1	propValueList1	count2	propList2	propValueList2	count3	propList3	propValueList3
 2	1	1	0	1	6|18	2220|250	2	7|20	111|250	3	6|7|18	2220|111|500
-2	2	1	0	1	6|18	6216|500	2	7|20	311|500	3	6|7|18	6216|311|1000
 2	1	2	0	1	6|18	4504|250	2	7|20	225|250	3	6|7|18	4504|225|500
-2	2	2	0	1	6|18	14133|500	2	7|20	706|500	3	6|7|18	14133|706|1000
 2	1	3	0	1	6|18	6847|250	2	7|20	342|250	3	6|7|18	6847|342|500
-2	2	3	0	1	6|18	21633|500	2	7|20	1081|500	3	6|7|18	21633|1081|1000
 2	1	4	0	1	6|18	10567|250	2	7|20	528|250	3	6|7|18	10567|528|500
-2	2	4	0	1	6|18	33909|500	2	7|20	1695|500	3	6|7|18	33909|1695|1000
 2	1	5	0	1	6|18	16564|250	2	7|20	828|250	3	6|7|18	16564|828|500
-2	2	5	0	1	6|18	53466|500	2	7|20	2673|500	3	6|7|18	53466|2673|1000
 2	1	6	0	1	6|18	26171|250	2	7|20	1308|250	3	6|7|18	26171|1308|500
-2	2	6	0	1	6|18	84942|500	2	7|20	4247|500	3	6|7|18	84942|4247|1000
 2	1	7	0	1	6|18	41599|250	2	7|20	2080|250	3	6|7|18	41599|2080|500
-2	2	7	0	1	6|18	135399|500	2	7|20	6770|500	3	6|7|18	135399|6770|1000
 2	1	8	0	1	6|18	66349|250	2	7|20	3317|250	3	6|7|18	66349|3317|500
-2	2	8	0	1	6|18	216399|500	2	7|20	10820|500	3	6|7|18	216399|10820|1000
 1	1	1	1	2	7|51	103|400	3	6|18|20	4100|400|400	5	7|18	103|600
-1	2	1	1	2	7|51	154|500	3	6|18|20	6150|500|600	5	7|18	154|750
+1	1	2	1	2	7|51	284|400	3	6|18|20	11346|400|400	5	7|18	284|600
+1	1	3	1	2	7|51	497|400	3	6|18|20	19874|400|400	5	7|18	497|600
+1	1	4	1	2	7|51	766|400	3	6|18|20	30616|400|400	5	7|18	766|600
+1	1	5	1	2	7|51	1134|400	3	6|18|20	45333|400|400	5	7|18	1134|600
+1	1	6	1	2	7|51	1705|400	3	6|18|20	68193|400|400	5	7|18	1705|600
+1	1	7	1	2	7|51	2570|400	3	6|18|20	102773|400|400	5	7|18	2570|600
+1	1	8	1	2	7|51	3928|400	3	6|18|20	157112|400|400	5	7|18	3928|600
 1	1	1	2	2	7|51	103|400	3	6|18|20	4100|400|400	5	7|18	103|600
-1	2	1	2	2	7|51	154|500	3	6|18|20	6150|500|600	5	7|18	154|750
+1	1	2	2	2	7|51	284|400	3	6|18|20	11346|400|400	5	7|18	284|600
+1	1	3	2	2	7|51	497|400	3	6|18|20	19874|400|400	5	7|18	497|600
+1	1	4	2	2	7|51	766|400	3	6|18|20	30616|400|400	5	7|18	766|600
+1	1	5	2	2	7|51	1134|400	3	6|18|20	45333|400|400	5	7|18	1134|600
+1	1	6	2	2	7|51	1705|400	3	6|18|20	68193|400|400	5	7|18	1705|600
+1	1	7	2	2	7|51	2570|400	3	6|18|20	102773|400|400	5	7|18	2570|600
+1	1	8	2	2	7|51	3928|400	3	6|18|20	157112|400|400	5	7|18	3928|600
 1	1	1	3	2	7|51	103|400	3	6|18|20	4100|400|400	5	7|18	103|600
+1	1	2	3	2	7|51	284|400	3	6|18|20	11346|400|400	5	7|18	284|600
+1	1	3	3	2	7|51	497|400	3	6|18|20	19874|400|400	5	7|18	497|600
+1	1	4	3	2	7|51	766|400	3	6|18|20	30616|400|400	5	7|18	766|600
+1	1	5	3	2	7|51	1134|400	3	6|18|20	45333|400|400	5	7|18	1134|600
+1	1	6	3	2	7|51	1705|400	3	6|18|20	68193|400|400	5	7|18	1705|600
+1	1	7	3	2	7|51	2570|400	3	6|18|20	102773|400|400	5	7|18	2570|600
+1	1	8	3	2	7|51	3928|400	3	6|18|20	157112|400|400	5	7|18	3928|600
+2	2	1	0	1	6|18	6216|500	2	7|20	311|500	3	6|7|18	6216|311|1000
+2	2	2	0	1	6|18	14133|500	2	7|20	706|500	3	6|7|18	14133|706|1000
+2	2	3	0	1	6|18	21633|500	2	7|20	1081|500	3	6|7|18	21633|1081|1000
+2	2	4	0	1	6|18	33909|500	2	7|20	1695|500	3	6|7|18	33909|1695|1000
+2	2	5	0	1	6|18	53466|500	2	7|20	2673|500	3	6|7|18	53466|2673|1000
+2	2	6	0	1	6|18	84942|500	2	7|20	4247|500	3	6|7|18	84942|4247|1000
+2	2	7	0	1	6|18	135399|500	2	7|20	6770|500	3	6|7|18	135399|6770|1000
+2	2	8	0	1	6|18	216399|500	2	7|20	10820|500	3	6|7|18	216399|10820|1000
+1	2	1	1	2	7|51	154|500	3	6|18|20	6150|500|600	5	7|18	154|750
+1	2	2	1	2	7|51	426|500	3	6|18|20	17019|500|600	5	7|18	426|750
+1	2	3	1	2	7|51	746|500	3	6|18|20	29811|500|600	5	7|18	746|750
+1	2	4	1	2	7|51	1149|500	3	6|18|20	45924|500|600	5	7|18	1149|750
+1	2	5	1	2	7|51	1701|500	3	6|18|20	68000|500|600	5	7|18	1701|750
+1	2	6	1	2	7|51	2558|500	3	6|18|20	102290|500|600	5	7|18	2558|750
+1	2	7	1	2	7|51	3855|500	3	6|18|20	154160|500|600	5	7|18	3855|750
+1	2	8	1	2	7|51	5892|500	3	6|18|20	235668|500|600	5	7|18	5892|750
+1	2	1	2	2	7|51	154|500	3	6|18|20	6150|500|600	5	7|18	154|750
+1	2	2	2	2	7|51	426|500	3	6|18|20	17019|500|600	5	7|18	426|750
+1	2	3	2	2	7|51	746|500	3	6|18|20	29811|500|600	5	7|18	746|750
+1	2	4	2	2	7|51	1149|500	3	6|18|20	45924|500|600	5	7|18	1149|750
+1	2	5	2	2	7|51	1701|500	3	6|18|20	68000|500|600	5	7|18	1701|750
+1	2	6	2	2	7|51	2558|500	3	6|18|20	102290|500|600	5	7|18	2558|750
+1	2	7	2	2	7|51	3855|500	3	6|18|20	154160|500|600	5	7|18	3855|750
+1	2	8	2	2	7|51	5892|500	3	6|18|20	235668|500|600	5	7|18	5892|750
 1	2	1	3	2	7|51	154|500	3	6|18|20	6150|500|600	5	7|18	154|750
-1	1	2	1	2	7|51	284|400	3	6|18|20	11331|400|400	5	7|18	284|600
-1	2	2	1	2	7|51	426|500	3	6|18|20	16997|500|600	5	7|18	426|750
-1	1	2	2	2	7|51	284|400	3	6|18|20	11331|400|400	5	7|18	284|600
-1	2	2	2	2	7|51	426|500	3	6|18|20	16997|500|600	5	7|18	426|750
-1	1	2	3	2	7|51	284|400	3	6|18|20	11331|400|400	5	7|18	284|600
-1	2	2	3	2	7|51	426|500	3	6|18|20	16997|500|600	5	7|18	426|750
-1	1	3	1	2	7|51	497|400	3	6|18|20	19859|400|400	5	7|18	497|600
-1	2	3	1	2	7|51	745|500	3	6|18|20	29789|500|600	5	7|18	745|750
-1	1	3	2	2	7|51	497|400	3	6|18|20	19859|400|400	5	7|18	497|600
-1	2	3	2	2	7|51	745|500	3	6|18|20	29789|500|600	5	7|18	745|750
-1	1	3	3	2	7|51	497|400	3	6|18|20	19859|400|400	5	7|18	497|600
-1	2	3	3	2	7|51	745|500	3	6|18|20	29789|500|600	5	7|18	745|750
-1	1	4	1	2	7|51	764|400	3	6|18|20	30562|400|400	5	7|18	764|600
-1	2	4	1	2	7|51	1146|500	3	6|18|20	45843|500|600	5	7|18	1146|750
-1	1	4	2	2	7|51	764|400	3	6|18|20	30562|400|400	5	7|18	764|600
-1	2	4	2	2	7|51	1146|500	3	6|18|20	45843|500|600	5	7|18	1146|750
-1	1	4	3	2	7|51	764|400	3	6|18|20	30562|400|400	5	7|18	764|600
-1	2	4	3	2	7|51	1146|500	3	6|18|20	45843|500|600	5	7|18	1146|750
-1	1	5	1	2	7|51	1131|400	3	6|18|20	45212|400|400	5	7|18	1131|600
-1	2	5	1	2	7|51	1696|500	3	6|18|20	67818|500|600	5	7|18	1696|750
-1	1	5	2	2	7|51	1131|400	3	6|18|20	45212|400|400	5	7|18	1131|600
-1	2	5	2	2	7|51	1696|500	3	6|18|20	67818|500|600	5	7|18	1696|750
-1	1	5	3	2	7|51	1131|400	3	6|18|20	45212|400|400	5	7|18	1131|600
-1	2	5	3	2	7|51	1696|500	3	6|18|20	67818|500|600	5	7|18	1696|750
-1	1	6	1	2	7|51	1702|400	3	6|18|20	68072|400|400	5	7|18	1702|600
-1	2	6	1	2	7|51	2553|500	3	6|18|20	102108|500|600	5	7|18	2553|750
-1	1	6	2	2	7|51	1702|400	3	6|18|20	68072|400|400	5	7|18	1702|600
-1	2	6	2	2	7|51	2553|500	3	6|18|20	102108|500|600	5	7|18	2553|750
-1	1	6	3	2	7|51	1702|400	3	6|18|20	68072|400|400	5	7|18	1702|600
-1	2	6	3	2	7|51	2553|500	3	6|18|20	102108|500|600	5	7|18	2553|750
-1	1	7	1	2	7|51	2566|400	3	6|18|20	102639|400|400	5	7|18	2566|600
-1	2	7	1	2	7|51	3849|500	3	6|18|20	153959|500|600	5	7|18	3849|750
-1	1	7	2	2	7|51	2566|400	3	6|18|20	102639|400|400	5	7|18	2566|600
-1	2	7	2	2	7|51	3849|500	3	6|18|20	153959|500|600	5	7|18	3849|750
-1	1	7	3	2	7|51	2566|400	3	6|18|20	102639|400|400	5	7|18	2566|600
-1	2	7	3	2	7|51	3849|500	3	6|18|20	153959|500|600	5	7|18	3849|750
-1	1	8	1	2	7|51	3923|400	3	6|18|20	156900|400|400	5	7|18	3923|600
-1	2	8	1	2	7|51	5884|500	3	6|18|20	235350|500|600	5	7|18	5884|750
-1	1	8	2	2	7|51	3923|400	3	6|18|20	156900|400|400	5	7|18	3923|600
-1	2	8	2	2	7|51	5884|500	3	6|18|20	235350|500|600	5	7|18	5884|750
-1	1	8	3	2	7|51	3923|400	3	6|18|20	156900|400|400	5	7|18	3923|600
-1	2	8	3	2	7|51	5884|500	3	6|18|20	235350|500|600	5	7|18	5884|750
+1	2	2	3	2	7|51	426|500	3	6|18|20	17019|500|600	5	7|18	426|750
+1	2	3	3	2	7|51	746|500	3	6|18|20	29811|500|600	5	7|18	746|750
+1	2	4	3	2	7|51	1149|500	3	6|18|20	45924|500|600	5	7|18	1149|750
+1	2	5	3	2	7|51	1701|500	3	6|18|20	68000|500|600	5	7|18	1701|750
+1	2	6	3	2	7|51	2558|500	3	6|18|20	102290|500|600	5	7|18	2558|750
+1	2	7	3	2	7|51	3855|500	3	6|18|20	154160|500|600	5	7|18	3855|750
+1	2	8	3	2	7|51	5892|500	3	6|18|20	235668|500|600	5	7|18	5892|750
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index e55bde3..093b4f7 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -58,7 +58,7 @@
 60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[10,1800,50,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
 31160	0	31160	110	250	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311601,311603]		{1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
 31160	1	31160	251	300	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311604,311605]		{1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
-31160	2	31160	301	350	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311606,311607]		{1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
+31160	2	31160	301	500	0	0	0	0	0	0	0	[[91,18],[136,49],[100,59],[65,88],[67,134],[16,108]]	1800	[311606,311607]		{1:[[103,1],[105,2]], 2:[[103,1],[105,1],[104,4]],3 :[[102,3],[101,2],[105,1],[104,2]], 4:[[102,3],[105,1],[104,1]], 5:[[102,2],[104,5]], 6:[[102,2],[104,3]]}
 31250	0	31250	0	0	0	0	0	0	0	0	0	[30,18]	[0,300,10]	[312501,312502,312503]		[0,4235]
 52010	0	52020	20	0	0	0	0	0	0	0	0	[17,19,8]	10	[520101,520102,520103,520104]		
 52010	1	52020	40	0	0	0	0	0	0	0	0	[17,19,8]	10	[520105,520106,520107,520108]		
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index c17104a..671d613 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -611,19 +611,19 @@
 31803003	2	0	玄界独角狮	360	0	16342	16342	12316	0	0	0	10000	4800	0	1	0	0	0	0	0	0	2000	512460	46	0	300	2	6	23010	20001	20002	0	0	0	0	0	0	20	2	95469773	3	0	0	0	5	0	0	186	1	1
 31803004	2	0	死亡之灵	380	0	20081	20081	15380	0	0	0	10000	5281	0	1	0	0	0	0	0	0	2000	540930	48	0	300	2	6	23010	20003	20004	0	0	0	0	0	0	20	2	36697361	5	0	0	0	5	0	0	186	1	1
 31803005	2	0	玄界古妖	400	0	24917	24917	17900	0	0	0	10000	5634	0	1	0	0	0	0	0	0	2000	569400	50	0	300	2	6	23010	20001	20002	0	0	0	0	0	0	20	2	48355262	7	0	0	0	5	0	0	186	1	1
-31903001	2	0	逍遥城主	150	0	1273	1273	734	1	0	0	10000	499	0	0	0	0	0	0	0	0	3000	582685	21	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	1097139	0	0	0	0	3	0	0	1	1	1
-31903002	2	0	极寒之心	200	0	2459	2459	1655	2	0	0	10000	989	0	0	0	0	0	0	0	0	3000	880671	27	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	2962807	0	0	0	0	3	0	0	1	1	1
-31903003	2	0	潮汐巨兽	250	0	4093	4093	2853	3	0	0	10000	1709	0	0	0	0	0	0	0	0	3000	1270711	33	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	8495308	0	0	0	0	3	0	0	1	1	1
-31903004	2	0	极炎巨兽	300	0	9193	9193	6491	5	0	0	10000	3466	0	0	0	0	0	0	0	0	3000	1683526	39	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	26472904	0	0	0	0	3	0	0	1	1	1
-31903005	2	0	白泽	350	0	15989	15989	12066	8	0	0	10000	5611	0	0	0	0	0	0	0	0	3000	2096341	45	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	64642293	0	0	0	0	3	0	0	1	1	1
-31903006	2	0	山寨天枢	400	0	29038	29038	19125	12	0	0	10000	8805	0	0	0	0	0	0	0	0	3000	2167516	50	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	42294584	1	0	0	0	3	0	0	1	1	1
-31903007	2	0	山寨天枢	450	0	48065	48065	27488	17	0	0	10000	12585	0	0	0	0	0	0	0	0	3000	2238691	55	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	78921359	2	0	0	0	3	0	0	1	1	1
+31903001	2	0	逍遥城主	150	0	1273	1273	734	2	0	0	10000	499	0	0	0	0	0	0	0	0	3000	582685	21	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	1097139	0	0	0	0	3	0	0	1	1	1
+31903002	2	0	极寒之心	200	0	2459	2459	1655	3	0	0	10000	989	0	0	0	0	0	0	0	0	3000	880671	27	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	2962807	0	0	0	0	3	0	0	1	1	1
+31903003	2	0	潮汐巨兽	250	0	4093	4093	2853	6	0	0	10000	1709	0	0	0	0	0	0	0	0	3000	1270711	33	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	8495308	0	0	0	0	3	0	0	1	1	1
+31903004	2	0	极炎巨兽	300	0	9193	9193	6491	10	0	0	10000	3466	0	0	0	0	0	0	0	0	3000	1683526	39	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	26472904	0	0	0	0	3	0	0	1	1	1
+31903005	2	0	白泽	350	0	15989	15989	12066	14	0	0	10000	5611	0	0	0	0	0	0	0	0	3000	2096341	45	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	64642293	0	0	0	0	3	0	0	1	1	1
+31903006	2	0	山寨天枢	400	0	29038	29038	19125	19	0	0	10000	8805	0	0	0	0	0	0	0	0	3000	2167516	50	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	42294584	1	0	0	0	3	0	0	1	1	1
+31903007	2	0	山寨天枢	450	0	48065	48065	27488	21	0	0	10000	12585	0	0	0	0	0	0	0	0	3000	2238691	55	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	78921359	2	0	0	0	3	0	0	1	1	1
 31903008	2	0	山寨天枢	500	0	59982	59982	35414	21	0	0	10000	15901	0	0	0	0	0	0	0	0	3000	2309866	60	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	28427855	4	0	0	0	3	0	0	1	1	1
-31903009	2	0	山寨天枢	550	0	66712	66712	38423	0	0	0	10000	18295	0	0	0	0	0	0	0	0	3000	2381041	65	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	19494464	5	0	0	0	3	0	0	1	1	1
-31903010	2	0	山寨天枢	600	0	59896	59896	36123	0	0	0	10000	20930	0	0	0	0	0	0	0	0	3000	2452216	70	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	58180902	5	0	0	0	3	0	0	1	1	1
-31903011	2	0	山寨天枢	650	0	9000	9000	0	0	0	0	10000	9000	0	0	0	0	0	0	0	0	3000	0	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	3	0	0	1	1	1
-31903012	2	0	山寨天枢	700	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	3	0	0	1	1	1
-31903013	2	0	山寨天枢	780	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	3	0	0	1	1	1
+31903009	2	0	山寨天枢	550	0	66712	66712	38423	21	0	0	10000	18295	0	0	0	0	0	0	0	0	3000	2381041	65	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	19494464	5	0	0	0	3	0	0	1	1	1
+31903010	2	0	山寨天枢	600	0	59896	59896	36123	21	0	0	10000	20930	0	0	0	0	0	0	0	0	3000	2452216	70	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	58180902	5	0	0	0	3	0	0	1	1	1
+31903011	2	0	山寨天枢	650	0	9000	9000	0	21	0	0	10000	9000	0	0	0	0	0	0	0	0	3000	0	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	3	0	0	1	1	1
+31903012	2	0	山寨天枢	700	0	0	0	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	3	0	0	1	1	1
+31903013	2	0	山寨天枢	780	0	0	0	0	21	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	0	0	0	0	0	3	0	0	1	1	1
 32501001	2	0	强盗	32	0	62	66	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	3000	854099	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	2115	0	0	0	0	0	0	0	1	1	1
 32502001	2	0	笼子	100	0	1	1	0	0	0	0	10000	0	0	0	0	0	0	0	0	0	2000	939508	0	0	300	2	6	0	0	0	0	0	0	0	0	1	10	2	3000	0	0	0	0	1	0	0	201	1	1
 32503001	2	0	强盗首领	32	0	131	131	0	0	0	0	10000	55	0	0	0	0	0	0	0	0	2000	1033458	0	0	300	2	6	0	0	0	0	0	0	0	0	0	10	2	9517	0	0	0	0	3	0	0	1	1	1
@@ -736,23 +736,23 @@
 60204010	8	0	我是渣渣辉	25	1	905	922	0	0	0	0	7500	57	0	0	0	0	0	0	0	0	1200	63582	7	0	300	0	6	0	0	0	0	0	0	0	0	0	10	2	100000	100	0	0	0	0	0	0	186	1	1
 60204011	8	0	电动小马达	25	1	964	972	0	0	0	0	7500	59	0	0	0	0	0	0	0	0	1200	63582	7	0	300	0	6	0	0	0	0	0	0	0	0	0	10	2	100000	100	0	0	0	0	0	0	186	1	1
 60204012	8	0	战神浅夏	25	1	877	888	0	0	0	0	7500	51	0	0	0	0	0	0	0	0	1200	63582	7	0	300	0	6	0	0	0	0	0	0	0	0	0	10	2	100000	100	0	0	0	0	0	0	186	1	1
-60203001	18	0	魔坛巨熊	20	2	54	54	0	0	0	0	10000	63	0	0	0	0	0	0	0	0	2500	87307	3	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	31000000	41	0	0	0	5	0	0	186	1	1
-60203002	18	0	魔坛巨猿	40	2	200	200	0	0	0	0	10000	67	0	0	0	0	0	0	0	0	2500	147095	6	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	68850000	82	0	0	0	5	0	0	186	1	1
-60203003	18	0	魔坛牙刃	70	2	330	330	0	0	0	0	10000	130	0	0	0	0	0	0	0	0	2500	209729	9	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	7892980	234	0	0	0	5	0	0	186	1	1
-60203004	18	0	魔坛左翼	85	2	489	489	0	1	0	0	10000	143	0	0	0	0	0	0	0	0	2500	279006	12	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	47626349	517	0	0	0	5	0	0	186	1	1
-60203005	18	0	魔坛右翼	85	2	565	565	0	1	0	0	10000	208	0	0	0	0	0	0	0	0	2500	353028	14	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	21584929	672	0	0	0	5	0	0	186	1	1
-60203006	18	0	魔坛龙王	110	2	1400	1400	0	1	0	0	10000	242	0	0	0	0	0	0	0	0	2500	453622	18	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	63565856	1025	0	0	0	5	0	0	186	1	1
-60203007	18	0	魔坛秘影	130	2	1687	1687	0	2	0	0	10000	363	0	0	0	0	0	0	0	0	2500	582685	21	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	78291474	1465	0	0	0	5	0	0	186	1	1
-60203008	18	0	魔坛帝皇	155	2	4014	4014	0	3	0	0	10000	572	0	0	0	0	0	0	0	0	2500	710800	24	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	76601484	2454	0	0	0	5	0	0	186	1	1
-60203009	18	0	魔坛暗影	180	2	4745	4745	0	4	0	0	10000	845	0	0	0	0	0	0	0	0	2500	880671	27	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	90904815	4141	0	0	0	5	0	0	186	1	1
-60203010	18	0	魔坛麒麟	205	2	9209	9209	0	5	0	0	10000	1077	0	0	0	0	0	0	0	0	2500	1064778	30	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	44215040	7261	0	0	0	5	0	0	186	1	1
-60203011	18	0	魔坛石人	230	2	11979	11979	0	6	0	0	10000	1686	0	0	0	0	0	0	0	0	2500	1270711	33	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	73316764	12131	0	0	0	5	0	0	186	1	1
-60203012	18	0	魔坛水怪	255	2	17680	17680	0	8	0	0	10000	2252	0	0	0	0	0	0	0	0	2500	1477593	36	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	290790	20397	0	0	0	5	0	0	186	1	1
-60203013	18	0	魔坛古妖	280	2	26816	26816	0	10	0	0	10000	3050	0	0	0	0	0	0	0	0	2500	1683526	39	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	96875345	37649	0	0	0	5	0	0	186	1	1
-60203014	18	0	魔坛妖龙	305	2	36495	36495	0	12	0	0	10000	3666	0	0	0	0	0	0	0	0	2500	1890408	42	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	28743399	57573	0	0	0	5	0	0	186	1	1
-60203015	18	0	魔坛海王	330	2	44892	44892	0	14	0	0	10000	5094	0	0	0	0	0	0	0	0	2500	2096341	45	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	71444839	91876	0	0	0	5	0	0	186	1	1
-60203016	18	0	魔坛冰魔	355	2	55895	55895	0	17	0	0	10000	5773	0	0	0	0	0	0	0	0	2500	2132403	47	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	62544180	142746	0	0	0	5	0	0	186	1	1
-60203017	18	0	魔坛白泽	380	2	84671	84671	0	19	0	0	10000	7264	0	0	0	0	0	0	0	0	2500	2167516	50	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	42699321	202646	0	0	0	5	0	0	186	1	1
+60203001	18	0	魔坛巨熊	20	2	54	54	0	1	0	0	10000	63	0	0	0	0	0	0	0	0	2500	87307	3	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	31000000	41	0	0	0	5	0	0	186	1	1
+60203002	18	0	魔坛巨猿	40	2	200	200	0	1	0	0	10000	67	0	0	0	0	0	0	0	0	2500	147095	6	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	68850000	82	0	0	0	5	0	0	186	1	1
+60203003	18	0	魔坛牙刃	70	2	330	330	0	1	0	0	10000	130	0	0	0	0	0	0	0	0	2500	209729	9	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	7892980	234	0	0	0	5	0	0	186	1	1
+60203004	18	0	魔坛左翼	85	2	489	489	0	2	0	0	10000	143	0	0	0	0	0	0	0	0	2500	279006	12	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	47626349	517	0	0	0	5	0	0	186	1	1
+60203005	18	0	魔坛右翼	85	2	565	565	0	4	0	0	10000	208	0	0	0	0	0	0	0	0	2500	353028	14	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	21584929	672	0	0	0	5	0	0	186	1	1
+60203006	18	0	魔坛龙王	110	2	1400	1400	0	5	0	0	10000	242	0	0	0	0	0	0	0	0	2500	453622	18	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	63565856	1025	0	0	0	5	0	0	186	1	1
+60203007	18	0	魔坛秘影	130	2	1687	1687	0	6	0	0	10000	363	0	0	0	0	0	0	0	0	2500	582685	21	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	78291474	1465	0	0	0	5	0	0	186	1	1
+60203008	18	0	魔坛帝皇	155	2	4014	4014	0	8	0	0	10000	572	0	0	0	0	0	0	0	0	2500	710800	24	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	76601484	2454	0	0	0	5	0	0	186	1	1
+60203009	18	0	魔坛暗影	180	2	4745	4745	0	10	0	0	10000	845	0	0	0	0	0	0	0	0	2500	880671	27	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	90904815	4141	0	0	0	5	0	0	186	1	1
+60203010	18	0	魔坛麒麟	205	2	9209	9209	0	12	0	0	10000	1077	0	0	0	0	0	0	0	0	2500	1064778	30	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	44215040	7261	0	0	0	5	0	0	186	1	1
+60203011	18	0	魔坛石人	230	2	11979	11979	0	14	0	0	10000	1686	0	0	0	0	0	0	0	0	2500	1270711	33	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	73316764	12131	0	0	0	5	0	0	186	1	1
+60203012	18	0	魔坛水怪	255	2	17680	17680	0	16	0	0	10000	2252	0	0	0	0	0	0	0	0	2500	1477593	36	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	290790	20397	0	0	0	5	0	0	186	1	1
+60203013	18	0	魔坛古妖	280	2	26816	26816	0	19	0	0	10000	3050	0	0	0	0	0	0	0	0	2500	1683526	39	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	96875345	37649	0	0	0	5	0	0	186	1	1
+60203014	18	0	魔坛妖龙	305	2	36495	36495	0	21	0	0	10000	3666	0	0	0	0	0	0	0	0	2500	1890408	42	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	28743399	57573	0	0	0	5	0	0	186	1	1
+60203015	18	0	魔坛海王	330	2	44892	44892	0	21	0	0	10000	5094	0	0	0	0	0	0	0	0	2500	2096341	45	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	71444839	91876	0	0	0	5	0	0	186	1	1
+60203016	18	0	魔坛冰魔	355	2	55895	55895	0	21	0	0	10000	5773	0	0	0	0	0	0	0	0	2500	2132403	47	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	62544180	142746	0	0	0	5	0	0	186	1	1
+60203017	18	0	魔坛白泽	380	2	84671	84671	0	21	0	0	10000	7264	0	0	0	0	0	0	0	0	2500	2167516	50	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	42699321	202646	0	0	0	5	0	0	186	1	1
 60203018	18	0	魔坛巨兽	405	2	111128	111128	0	21	0	0	10000	8142	0	0	0	0	0	0	0	0	2500	2203578	52	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	53075605	280626	0	0	0	5	0	0	186	1	1
 60203019	18	0	魔坛炎兽	430	2	168371	168371	0	21	0	0	10000	9455	0	0	0	0	0	0	0	0	2500	2238691	55	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	80306981	391553	0	0	0	5	0	0	186	1	1
 60203020	18	0	刑天之主	455	2	303827	303827	0	21	0	0	10000	10546	0	0	0	0	0	0	0	0	2500	2274753	57	0	300	0	6	23010	0	0	0	0	0	0	0	1	10	2	72283925	477365	0	0	0	5	0	0	186	1	1

--
Gitblit v1.8.0