From 72824c1c25d8eb65f0e9b6f9253c96147c596d59 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期五, 21 十二月 2018 14:16:47 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 18 +++++++++--------- CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt | 12 ++++++------ ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt index 081e9c2..d66c57b 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt @@ -2,12 +2,12 @@ 10403001 10040 int(240*(1-0.089*min(max(yesterdayCnt-1,0),9))) [115,155] 40 5 2000 100 世界BOSS 20103001 21070 int(300*(1-0.089*min(max(yesterdayCnt-1,0),9))) [115,175] 40 5 2005 100 世界BOSS 20103002 21070 int(360*(1-0.089*min(max(yesterdayCnt-1,0),9))) [125,195] 40 5 2006 100 世界BOSS -20103003 21070 int(600*(1-0.058*min(max(yesterdayCnt-5,0),15))) [140,170] 40 5 2007 100 世界BOSS -20103004 21070 int(900*(1-0.039*min(max(yesterdayCnt-8,0),22))) [160,190] 40 5 2008 100 世界BOSS -10503001 10050 int(900*(1-0.021*min(max(yesterdayCnt-10,0),40))) [180,230] 40 5 2001 100 世界BOSS -20103005 21070 int(1200*(1-0.012*min(max(yesterdayCnt-30,0),70))) [195,225] 40 5 2009 100 世界BOSS -20103006 21070 int(1500*(1-0.007*min(max(yesterdayCnt-30,0),120))) [210,240] 40 5 2010 100 世界BOSS -10603001 10060 int(1500*(1-0.016*min(max(yesterdayCnt-30,0),50))) [230,300] 40 5 2002 100 世界BOSS +20103003 21070 int(600*(1-0.058*min(max(yesterdayCnt-5,0),15))) [130,180] 40 5 2007 100 世界BOSS +20103004 21070 int(900*(1-0.039*min(max(yesterdayCnt-8,0),22))) [150,200] 40 5 2008 100 世界BOSS +10503001 10050 int(900*(1-0.021*min(max(yesterdayCnt-10,0),40))) [170,230] 40 5 2001 100 世界BOSS +20103005 21070 int(1200*(1-0.012*min(max(yesterdayCnt-10,0),70))) [185,235] 40 5 2009 100 世界BOSS +20103006 21070 int(1500*(1-0.012*min(max(yesterdayCnt-10,0),70))) [200,250] 40 5 2010 100 世界BOSS +10603001 10060 int(1500*(1-0.011*min(max(yesterdayCnt-10,0),70))) [220,280] 40 5 2002 100 世界BOSS 20203001 21100 int(3300*(1-0.015*min(max(yesterdayCnt-25,0),55))) [235,265] 40 5 2012 100 世界BOSS 20203002 21100 int(3600*(1-0.008*min(max(yesterdayCnt-25,0),95))) [240,270] 40 5 2013 100 世界BOSS 20103007 21070 int(2400*(1-0.008*min(max(yesterdayCnt-25,0),95))) [245,275] 40 5 2011 100 世界BOSS diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt index 1fd3cd5..79efe38 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt @@ -126,8 +126,8 @@ "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))", #助战机器人：参数: suppressNPCFightPower-助战玩家战力; fbFightPower-副本战力; fbBaseHurt-保底伤害 - "HelpRobot_Atk" :"int(fbBaseHurt*suppressNPCFightPower*1.0/fbFightPower)", - "HelpRobot_Def" :"int(fbBaseHurt*fbFightPower/(suppressNPCFightPower if suppressNPCFightPower else fbFightPower))", + "HelpRobot_Atk" :"max(int(fbBaseHurt*suppressNPCFightPower*1.0/max(fbFightPower,1.0)),1)", + "HelpRobot_Def" :"max(int(fbBaseHurt*fbFightPower*1.0/max((suppressNPCFightPower if suppressNPCFightPower else fbFightPower),1.0)),1)", } ) diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt index 1353f50..76be66d 100644 --- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt +++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt @@ -117,15 +117,15 @@ 31604001 0 4 0 800 10000 0 8000 1 9900 50 1 0 0 0 10000 33409001 0 2 0 800 10000 0 8000 1 9900 50 1 0 0 5 0 33409002 0 2 0 800 10000 0 8000 1 9900 50 1 0 0 0 0 -33402001 0 2 0 800 10000 0 8000 1 9900 50 12 0 0 0 0 +33402001 0 2 0 600 10000 0 8000 1 9900 50 12 0 0 0 0 33403001 0 2 0 2000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402002 0 2 0 1500 10000 0 8000 1 9900 50 12 0 0 0 0 -33403002 0 2 0 5000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402002 0 2 0 800 10000 0 8000 1 9900 50 12 0 0 0 0 +33403002 0 2 0 2500 10000 0 8000 1 9900 50 1 0 0 0 0 33402003 0 2 0 300 10000 0 8000 1 9900 50 12 0 0 0 0 33403003 0 2 0 1000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402004 0 2 0 1500 10000 0 8000 1 9900 50 12 0 0 0 0 -33403004 0 2 0 5000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402005 0 2 0 2000 10000 0 8000 1 9900 50 12 0 0 0 0 -33403005 0 2 0 6000 10000 0 8000 1 9900 50 1 0 0 0 0 -33402006 0 2 0 3000 10000 0 8000 1 9900 50 12 0 0 0 0 -33403006 0 2 0 7000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402004 0 2 0 900 10000 0 8000 1 9900 50 12 0 0 0 0 +33403004 0 2 0 2600 10000 0 8000 1 9900 50 1 0 0 0 0 +33402005 0 2 0 1200 10000 0 8000 1 9900 50 12 0 0 0 0 +33403005 0 2 0 3000 10000 0 8000 1 9900 50 1 0 0 0 0 +33402006 0 2 0 1600 10000 0 8000 1 9900 50 12 0 0 0 0 +33403006 0 2 0 4000 10000 0 8000 1 9900 50 1 0 0 0 0 -- Gitblit v1.8.0