From 44640bf045f1ede41168f19b6b61d6366353044e Mon Sep 17 00:00:00 2001 From: CeHua_ZWJ <ceh@163.com> Date: 星期二, 20 十一月 2018 20:54:13 +0800 Subject: [PATCH] Merge branch '1.2' of http://192.168.0.87:10010/r/snxx_server into 1.2 --- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 8 ++++---- ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt index a7c55a2..b4eb2ae 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt @@ -108,7 +108,7 @@ #_100 前2座塔，等级碾压 "EVP_1_100" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(suppressLV,1)*0.2*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))", #_101 后10座塔，等级压制 - "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+min(max(suppressLV-10,0)*0.01,0.2)+min(max(suppressFightPower*1.0/suppressNPCFightPower-0,-0.02),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*10+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*15)-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+min(max((suppressLV-10)*0.01,0),0.25)*dMaxHP+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))", + "EVP_1_101" :"int(SuppressValueRealmRate/10000.0*max(((max((aMinAtk+aMaxAtk)/2.0*(1+min(max(suppressLV-10,0)*0.01,0.2)+min(max(suppressFightPower*1.0/suppressNPCFightPower-0,-0.02),0.05)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*10+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*15)-dDef,0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+suppressValueFP-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),aMaxAtk*0.05+rand*aMaxAtk*0.05))", #BOSS境界压制公式 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 2b28467..cec47ff 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -659,10 +659,10 @@ 60103006 2 0 残暴凶狼 56 0 175 175 0 0 0 0 10000 705 0 0 0 0 0 0 32456 100 2500 408070 17 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 17267 0 0 0 0 3 0 0 180 1 1 60103007 2 0 幽魂邪道 70 0 178 178 0 0 0 0 10000 795 0 0 0 0 0 0 51323 100 2500 453622 18 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 21440 0 0 0 0 3 0 0 180 1 1 60103008 2 0 狂躁巨猿 80 0 181 181 0 0 0 0 10000 886 0 0 0 0 0 0 71242 100 2500 505817 19 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 30932 0 0 0 0 3 0 0 180 1 1 -60103009 2 0 守塔剑士 90 0 503 503 0 0 0 0 40000 914 0 0 0 0 0 0 98451 101 2500 556113 20 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 47772 0 0 0 0 3 0 0 180 1 1 -60103010 2 0 巨剑师 100 0 610 610 0 0 0 0 40000 1010 0 0 0 0 0 0 116886 101 2500 608308 22 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 66969 0 0 0 0 3 0 0 180 1 1 -60103011 2 0 符塔剑魂 105 0 896 896 0 0 0 0 40000 1060 0 0 0 0 0 0 123634 101 2500 659554 23 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 81872 0 0 0 0 3 0 0 180 1 1 -60103012 2 0 符塔剑尊 110 0 1096 1096 0 0 0 0 40000 1110 0 0 0 0 0 0 137638 101 2500 710800 24 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 109859 0 0 0 0 3 0 0 180 1 1 +60103009 2 0 守塔剑士 90 0 503 503 0 0 0 0 40000 914 0 0 0 0 0 0 98451 100 2500 556113 20 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 47772 0 0 0 0 3 0 0 180 1 1 +60103010 2 0 巨剑师 100 0 610 610 0 0 0 0 40000 1010 0 0 0 0 0 0 116886 100 2500 608308 22 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 66969 0 0 0 0 3 0 0 180 1 1 +60103011 2 0 符塔剑魂 105 0 896 896 0 0 0 0 40000 1060 0 0 0 0 0 0 123634 100 2500 659554 23 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 81872 0 0 0 0 3 0 0 180 1 1 +60103012 2 0 符塔剑尊 110 0 1096 1096 0 0 0 0 40000 1110 0 0 0 0 0 0 137638 100 2500 710800 24 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 109859 0 0 0 0 3 0 0 180 1 1 60103013 2 0 守塔哨兵 115 0 1503 1503 0 0 0 0 40000 3498 0 0 0 0 0 0 161609 101 2500 344487 17 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 101405 0 0 0 0 3 0 0 180 1 1 60103014 2 0 仙人掌球球 120 0 1690 1690 0 0 0 0 40000 3819 0 0 0 0 0 0 191114 101 2500 358722 18 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 111697 0 0 0 0 3 0 0 180 1 1 60103015 2 0 封印花妖 125 0 1930 1930 0 0 0 0 40000 4260 0 0 0 0 0 0 240136 101 2500 372957 19 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 146065 0 0 0 0 3 0 0 180 1 1 -- Gitblit v1.8.0