From a12e7727b0e4abcfab2daf8abfbc760da9ae9d17 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期六, 11 八月 2018 16:57:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 22 +++++++++++----------- db/PyMongoDataServer/PySysDB/tagTreasureUp.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt index 16cd553..aee966b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt @@ -68,8 +68,8 @@ "SuppressValueLV_1":"(min(max(suppressLV-10,0),10)*0.01+min(max(suppressLV-15,0),5)*0.03+min(max(suppressLV-20,0),5)*0.05+min(max(suppressLV-25,0),5)*0.07+max(suppressLV-30,0)*0.1)", "SuppressValueFP_0":"min(max(suppressFightPower*1.0/suppressNPCFightPower-0,0),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*10", "SuppressValueFP_1":"min(max(suppressFightPower*1.0/suppressNPCFightPower-0,0),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*10", - "PVPSuppressValueRealm":"max(5000, 10000+max(suppressRealm,-6)*1000)", - "PVESuppressValueRealm":"max(5000, 10000+max(suppressRealm,-6)*1000)", + "PVPSuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)", + "PVESuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)", "PVP_1" :"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))- dDef*(1-max(aIgnoreDefRate - dIgnoreDefRateReduce,0)/10000.0),0))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+ (aSuperHit*max(1-dSuperHitReduce/10000.0,0) if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+max(aSkillAtkRate-dSkillAtkRateReduce,0)/10000.0)*(1+(aDamagePer+aDamagePerPVP)/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamagePerPVPReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))", diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index 5d153e3..439a90a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt index 97d57ab..079b24b 100644 --- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt +++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt @@ -67,3 +67,4 @@ 305 0 0 46_3000 306 0 0 19_2000 307 0 0 60_3000 +308 0 0 18_2000 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index e830f5b..7344d61 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -681,8 +681,8 @@ 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 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 +48355 九黎真身 48355 1 1 0 6 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 509 5 1000 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 60000 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 @@ -720,7 +720,7 @@ 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 +49150 驭灵 49150 1 1 0 5 0 17 0 0 0 0 10 8 0 25000 0 0 0 0 0 4004 4000 0 0 13 2000 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 @@ -1424,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 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 +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 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 65142 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 @@ -2196,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 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 +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 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 65142 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