From d4f85e034ed7301fd58cc29ecbb3b3f9b8302f34 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期三, 22 八月 2018 15:31:22 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagSuccess.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 32 ++++++++++++++++---------------- ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 9 +++++++++ 3 files changed, 26 insertions(+), 17 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/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt index 66145d9..575940c 100644 --- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt +++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt @@ -25,7 +25,7 @@ 108 49 1 2 0 2_10 0 0 105 10 201 1 70 0 0 2_10 0 0 106 10 202 36 1 60203003 0 2_10 0 0 106 10 -203 3 1 4000 0 2_10 0 0 106 10 +203 33 1 201|0 0 2_10 0 0 106 10 221 114 450 0 0 2_10 0 0 106 10 222 50 1 0 0 2_10 0 0 106 10 223 46 1 0 0 2_10 0 0 106 10 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 671d613..e20ace3 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -758,17 +758,17 @@ 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 61103000 2 0 境界·个人 80 2 970 970 210 1 0 0 10000 357 0 0 0 0 0 0 32406 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 75546 0 0 0 0 3 0 7 186 1 1 61103001 2 0 境界·个人 100 2 1509 1509 447 2 0 0 10000 578 0 0 0 0 0 0 67294 0 2500 355875 15 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 160819 0 0 0 0 3 0 8 186 1 1 -61103002 2 0 境界·个人 175 2 4047 4047 1888 3 0 0 10000 1550 0 0 0 0 0 0 319964 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1251688 0 0 0 0 3 0 9 186 1 1 -61103003 2 0 境界·个人 220 2 8322 8322 3363 5 0 0 10000 2971 0 0 0 0 0 0 851127 0 2500 845558 27 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3565386 0 0 0 0 3 0 10 186 1 1 -61103004 2 0 境界·个人 250 2 11832 11832 1631 6 0 0 10000 4015 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 12395118 0 0 0 0 3 0 11 186 1 1 -61103005 2 0 境界·个人 270 2 17182 17182 2351 7 0 0 10000 5474 0 0 0 0 0 0 2179851 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 26590847 0 0 0 0 3 0 12 186 1 1 -61103006 2 0 境界·个人 280 2 24475 24475 3309 9 0 0 10000 7686 0 0 0 0 0 0 3421372 0 2500 1395030 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 53204079 0 0 0 0 3 0 13 186 1 1 -61103007 2 0 境界·个人 310 2 33909 33909 4584 10 0 0 10000 10021 0 0 0 0 0 0 5512052 0 2500 1642719 38 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1986288 0 0 0 0 3 0 14 186 1 1 -61103008 2 0 境界·个人 320 2 38642 38642 5132 11 0 0 10000 11025 0 0 0 0 0 0 6325527 0 2500 1725282 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 26923343 0 0 0 0 3 0 15 186 1 1 -61103009 2 0 境界·个人 340 2 45829 45829 6213 13 0 0 10000 15161 0 0 0 0 0 0 8368191 0 2500 1890408 42 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 96578437 1 0 0 0 3 0 16 186 1 1 -61103010 2 0 境界·个人 350 2 50049 50049 6806 14 0 0 10000 17726 0 0 0 0 0 0 9370147 0 2500 1972971 43 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31342624 1 0 0 0 3 0 17 186 1 1 -61103011 2 0 境界·个人 370 2 65451 65451 8645 15 0 0 10000 31020 0 0 0 0 0 0 12521420 0 2500 2103933 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 65077135 2 0 0 0 3 0 18 186 1 1 -61103012 2 0 境界·个人 380 2 73726 73726 9617 17 0 0 10000 31910 0 0 0 0 0 0 13987212 0 2500 2118168 46 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13937338 4 0 0 0 3 0 19 186 1 1 +61103002 2 0 境界·个人 175 2 4047 4047 1888 4 0 0 10000 1550 0 0 0 0 0 0 319964 0 2500 582685 21 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1251688 0 0 0 0 3 0 9 186 1 1 +61103003 2 0 境界·个人 220 2 8322 8322 3363 6 0 0 10000 2971 0 0 0 0 0 0 851127 0 2500 845558 27 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3565386 0 0 0 0 3 0 10 186 1 1 +61103004 2 0 境界·个人 250 2 11832 11832 1631 8 0 0 10000 4015 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 12395118 0 0 0 0 3 0 11 186 1 1 +61103005 2 0 境界·个人 270 2 17182 17182 2351 10 0 0 10000 5474 0 0 0 0 0 0 2179851 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 26590847 0 0 0 0 3 0 12 186 1 1 +61103006 2 0 境界·个人 280 2 24475 24475 3309 11 0 0 10000 7686 0 0 0 0 0 0 3421372 0 2500 1395030 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 53204079 0 0 0 0 3 0 13 186 1 1 +61103007 2 0 境界·个人 310 2 33909 33909 4584 13 0 0 10000 10021 0 0 0 0 0 0 5512052 0 2500 1642719 38 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1986288 0 0 0 0 3 0 14 186 1 1 +61103008 2 0 境界·个人 320 2 38642 38642 5132 14 0 0 10000 11025 0 0 0 0 0 0 6325527 0 2500 1725282 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 26923343 0 0 0 0 3 0 15 186 1 1 +61103009 2 0 境界·个人 340 2 45829 45829 6213 16 0 0 10000 15161 0 0 0 0 0 0 8368191 0 2500 1890408 42 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 96578437 1 0 0 0 3 0 16 186 1 1 +61103010 2 0 境界·个人 350 2 50049 50049 6806 17 0 0 10000 17726 0 0 0 0 0 0 9370147 0 2500 1972971 43 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31342624 1 0 0 0 3 0 17 186 1 1 +61103011 2 0 境界·个人 370 2 65451 65451 8645 19 0 0 10000 31020 0 0 0 0 0 0 12521420 0 2500 2103933 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 65077135 2 0 0 0 3 0 18 186 1 1 +61103012 2 0 境界·个人 380 2 73726 73726 9617 20 0 0 10000 31910 0 0 0 0 0 0 13987212 0 2500 2118168 46 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13937338 4 0 0 0 3 0 19 186 1 1 61103013 2 0 境界·个人 360 2 123330 123330 13150 18 0 0 10000 46971 0 0 0 0 0 0 22509995 0 2500 2189343 51 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 72459983 5 0 0 0 3 0 20 186 1 1 61103014 2 0 境界·个人 380 2 128984 128984 13655 20 0 0 10000 47778 0 0 0 0 0 0 24495215 0 2500 2203578 52 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13502352 6 0 0 0 3 0 21 186 1 1 61103015 2 0 境界·个人 400 2 134342 134342 14276 21 0 0 10000 48542 0 0 0 0 0 0 26577560 0 2500 2217813 53 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 64594118 8 0 0 0 3 0 22 186 1 1 @@ -777,11 +777,11 @@ 61103018 2 0 境界·个人 430 2 153755 153755 16275 25 0 0 10000 51257 0 0 0 0 0 0 33486803 0 2500 2260518 56 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 43437054 10 0 0 0 3 0 25 186 1 1 61103019 2 0 境界·个人 440 2 158765 158765 16889 27 0 0 10000 51986 0 0 0 0 0 0 35665846 0 2500 2274753 57 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 88718048 10 0 0 0 3 0 26 186 1 1 61103020 2 0 境界·个人 450 2 164071 164071 17597 28 0 0 10000 52724 0 0 0 0 0 0 37828455 0 2500 2288988 58 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 38320562 7 0 0 0 3 0 27 186 1 1 -61203001 2 0 境界·组队 140 2 3472 3472 400 4 0 0 10000 1372 0 0 0 0 0 0 202286 0 2500 480194 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1009577 0 0 0 0 3 0 28 186 1 1 -61203002 2 0 境界·组队 200 2 5586 5586 872 8 0 0 10000 2092 0 0 0 0 0 0 478985 0 2500 710800 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3188114 0 0 0 0 3 0 29 186 1 1 -61203003 2 0 境界·组队 235 2 10150 10150 1408 12 0 0 10000 3528 0 0 0 0 0 0 1132621 0 2500 951846 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 9899933 0 0 0 0 3 0 30 186 1 1 -61203004 2 0 境界·组队 260 2 13650 13650 2128 16 0 0 10000 4507 0 0 0 0 0 0 1825117 0 2500 1188148 32 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 23279867 3 0 0 0 3 0 31 186 1 1 -61203005 2 0 境界·组队 300 2 32937 32937 4163 19 0 0 10000 9952 0 0 0 0 0 0 4961645 0 2500 1560156 37 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 94811187 6 0 0 0 3 0 32 186 1 1 +61203001 2 0 境界·组队 140 2 3472 3472 400 3 0 0 10000 1372 0 0 0 0 0 0 202286 0 2500 480194 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1009577 0 0 0 0 3 0 28 186 1 1 +61203002 2 0 境界·组队 200 2 5586 5586 872 5 0 0 10000 2092 0 0 0 0 0 0 478985 0 2500 710800 24 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3188114 0 0 0 0 3 0 29 186 1 1 +61203003 2 0 境界·组队 235 2 10150 10150 1408 7 0 0 10000 3528 0 0 0 0 0 0 1132621 0 2500 951846 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 9899933 0 0 0 0 3 0 30 186 1 1 +61203004 2 0 境界·组队 260 2 13650 13650 2128 9 0 0 10000 4507 0 0 0 0 0 0 1825117 0 2500 1188148 32 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 23279867 3 0 0 0 3 0 31 186 1 1 +61203005 2 0 境界·组队 300 2 32937 32937 4163 12 0 0 10000 9952 0 0 0 0 0 0 4961645 0 2500 1560156 37 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 94811187 6 0 0 0 3 0 32 186 1 1 61203006 2 0 境界·组队 330 2 45232 45232 5704 22 0 0 10000 13863 0 0 0 0 0 0 7353082 0 2500 1807845 40 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 71693508 8 0 0 0 3 0 33 186 1 1 61203007 2 0 境界·组队 360 2 60986 60986 7591 26 0 0 10000 26137 0 0 0 0 0 0 10734421 0 2500 2055534 44 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 99714635 10 0 0 0 3 0 34 186 1 1 61203008 2 0 境界·组队 400 2 89381 89381 10458 29 0 0 10000 38528 0 0 0 0 0 0 15423908 0 2500 2132403 47 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 85368194 40 0 0 0 3 0 35 186 1 1 -- Gitblit v1.8.0