From 0a68c40ddc76e30e749ca02d44b42b9865d151b3 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 10 十二月 2018 16:13:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 13 +++++++------ ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt index 0e423e6..3ef8bbf 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt @@ -124,7 +124,7 @@ #抢boss "PVE_1_5" :"int((wReFightPower/15.0+SuppressValueRealmRate/10000.0*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)+aNPCHurtAddPer/10000.0*(aMinAtk+aMaxAtk)/2.0,(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))*(1+aFinalHurtPer/10000.0))", - "PetVE_5":"max(((aMinAtk + aMaxAtk)/2.0-dDef)*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)*(1+aFinalHurtPer/10000.0),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)", + "PetVE_1_5":"max(((aMinAtk + aMaxAtk)/2.0-dDef)*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)*(1+aFinalHurtPer/10000.0),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)", #助战机器人：参数: suppressNPCFightPower-助战玩家战力; fbFightPower-副本战力; fbBaseHurt-保底伤害 "HelpRobot_Atk" :"int(fbBaseHurt*suppressNPCFightPower*1.0/fbFightPower)", diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index d7da389..432f0b5 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -313,10 +313,11 @@ 10046 极寒冰心技能圆预警 10046 1 1 0 0 3500 1 0 0 2 6 40 4 0 35000 0 0 0 0 0 1010 80000 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 0 0 0 0 0 0 0 10047 潮汐巨兽技能圆眩晕 10047 1 1 0 0 3500 1 0 0 2 6 40 4 0 25000 0 0 0 0 0 1010 30000 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 10049 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 10048 潮汐巨兽技能圆预警 10048 1 1 0 0 3500 1 0 0 2 6 40 4 0 35000 0 0 0 0 0 1010 80000 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 0 0 0 0 0 0 0 -20001 极寒冰心技能圆眩晕 20001 1 1 0 0 3500 1 0 0 2 6 40 4 0 25000 0 0 0 0 0 1010 30000 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 10049 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 -20002 极寒冰心技能圆预警 20002 1 1 0 0 3500 1 0 0 2 6 40 4 0 35000 0 0 0 0 0 1010 200000 15000 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 0 0 0 0 0 0 0 -20003 潮汐巨兽技能圆眩晕 20003 1 1 0 0 3500 1 0 0 2 6 40 4 0 25000 0 0 0 0 0 1010 30000 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 10049 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 -20004 潮汐巨兽技能圆预警 20004 1 1 0 0 3500 1 0 0 2 6 40 4 0 35000 0 0 0 0 0 1010 200000 15000 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 0 0 0 0 0 0 0 +20001 混乱妖域技能圆眩晕 20001 1 1 0 0 3500 1 0 0 2 6 40 4 0 25000 0 0 0 0 0 1010 100000 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 10049 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 +20002 混乱妖域技能圆沉默 20002 1 1 0 0 3500 1 0 0 2 6 40 4 0 35000 0 0 0 0 0 1010 100000 15000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 20005 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 +20003 混乱妖域技能护盾 20003 1 1 0 1 0 5 0 0 0 0 10 0 0 60000 0 0 0 0 0 808 2000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 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 +20004 潮汐巨兽技能圆预警 20004 1 1 0 0 3500 1 0 0 2 6 40 4 0 35000 0 0 0 0 0 1010 100000 15000 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 0 0 0 0 0 0 0 +20005 沉默 10050 1 1 0 0 0 14 0 0 6 6 40 10 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 10049 眩晕 10049 1 1 0 0 0 14 3 0 6 6 40 10 0 0 0 0 0 0 0 4012 7 0 0 1200 6 0 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 0 0 0 0 3 511 511 3 2 0 0 0 0 0 0 10050 龙雀环技能无预警 10050 1 1 0 0 0 1 0 0 1 0 41 6 0 6000 0 0 0 0 0 1010 15000 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 0 0 0 0 0 0 0 10051 龙雀环普攻 10051 1 1 0 0 0 1 0 0 1 0 41 6 0 2600 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 0 0 0 0 0 0 0 @@ -1847,7 +1848,7 @@ 30263 烈火之威 30250 14 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4058 0 0 0 4508 0 0 0 1011 1 1 0 74 60000 1 0 1065 29100 4000 0 0 0 0 0 10000 0 0 0 0 0 21200 0 0 0 10025 25 0 0 2 598514 0 0 0 0 0 0 0 4 0 50900 0 0 0 0 30264 烈火之威 30250 15 15 2 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4058 0 0 0 4508 0 0 0 1011 1 1 0 74 60000 1 0 1065 29100 5000 0 0 0 0 0 10000 0 0 0 0 0 21200 0 0 0 10025 25 0 0 2 641265 0 0 0 0 0 0 0 4 0 50900 0 0 0 0 29100 嘲讽 29100 1 10 2 4 0 18 3 0 0 0 41 10 0 0 0 0 0 0 0 4012 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 2000 0 0 0 0 0 0 9 0 0 0 0 0 2 0 0 0 0 2 510 510 2 4 0 50900 0 0 0 0 -30300 风之讽 30300 1 15 2 4 0 18 3 0 6 6 40 10 0 0 0 0 0 0 0 4058 0 0 0 4012 6 0 0 1200 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 400 600 0 0 0 0 20600 0 9 0 0 0 0 0 2 22167 0 0 0 2 510 510 2 4 0 50800 0 0 0 0 +30300 风之讽 30300 1 15 2 4 0 18 3 0 6 6 40 10 0 0 0 0 0 0 0 4058 0 0 0 4012 6 0 0 1200 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 400 600 0 0 0 0 20600 50800 9 0 0 0 0 0 2 22167 0 0 0 2 510 510 2 4 0 50800 0 0 0 0 30301 风之讽 30300 2 15 2 4 0 18 3 0 6 6 40 10 0 0 0 0 0 0 0 4058 0 0 0 4012 6 0 0 1200 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 500 600 0 0 0 0 20600 0 9 0 0 0 0 0 2 44334 0 0 0 2 510 510 2 4 0 50800 0 0 0 0 30302 风之讽 30300 3 15 2 4 0 18 3 0 6 6 40 10 0 0 0 0 0 0 0 4058 0 0 0 4012 6 0 0 1200 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 600 600 0 0 0 0 20600 0 9 0 0 0 0 0 2 66501 0 0 0 2 510 510 2 4 0 50800 0 0 0 0 30303 风之讽 30300 4 15 2 4 0 18 3 0 6 6 40 10 0 0 0 0 0 0 0 4058 0 0 0 4012 6 0 0 1200 6 0 0 0 0 0 0 0 0 0 0 0 0 0 0 700 600 0 0 0 0 20600 0 9 0 0 0 0 0 2 88668 0 0 0 2 510 510 2 4 0 50800 0 0 0 0 @@ -3260,7 +3261,7 @@ 35263 烈火之源 35250 14 15 4 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4058 0 0 0 4508 0 0 0 1011 1 1 0 74 60000 1 0 1065 29500 4000 0 0 0 0 0 10000 0 0 0 0 0 51500 0 0 0 10025 0 0 0 2 598514 0 0 0 0 0 0 0 0 0 55900 0 0 0 0 35264 烈火之源 35250 15 15 4 4 0 16 0 0 0 0 10 0 0 0 0 0 0 0 0 4058 0 0 0 4508 0 0 0 1011 1 1 0 74 60000 1 0 1065 29500 5000 0 0 0 0 0 10000 0 0 0 0 0 51500 0 0 0 10025 0 0 0 2 641265 0 0 0 0 0 0 0 0 0 55900 0 0 0 0 29500 中毒 29500 1 1 4 4 0 4 0 0 36 16 40 8 0 0 0 0 0 0 0 1033 10000 0 5 9999 1000 0 0 4012 14 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 -35300 霜之源 35300 1 15 4 4 0 17 0 0 6 8 40 8 0 0 0 0 0 0 0 4004 10000 0 0 16 250 4 0 1011 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 50600 0 0 0 0 0 0 0 2 22167 0 0 0 0 0 0 0 0 0 55801 0 0 0 0 +35300 霜之源 35300 1 15 4 4 0 17 0 0 6 8 40 8 0 0 0 0 0 0 0 4004 10000 0 0 16 250 4 0 1011 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 50600 55800 0 0 0 0 0 0 2 22167 0 0 0 0 0 0 0 0 0 55801 0 0 0 0 35301 霜之源 35300 2 15 4 4 0 17 0 0 6 8 40 8 0 0 0 0 0 0 0 4004 10000 0 0 16 375 4 0 1011 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 50600 0 0 0 0 0 0 0 2 44334 0 0 0 0 0 0 0 0 0 55801 0 0 0 0 35302 霜之源 35300 3 15 4 4 0 17 0 0 6 8 40 8 0 0 0 0 0 0 0 4004 10000 0 0 16 500 4 0 1011 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 50600 0 0 0 0 0 0 0 2 66501 0 0 0 0 0 0 0 0 0 55801 0 0 0 0 35303 霜之源 35300 4 15 4 4 0 17 0 0 6 8 40 8 0 0 0 0 0 0 0 4004 10000 0 0 16 625 4 0 1011 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 3000 0 0 0 0 50600 0 0 0 0 0 0 0 2 88668 0 0 0 0 0 0 0 0 0 55801 0 0 0 0 -- Gitblit v1.8.0