From 98abb070ad5f6d1082b89dc13bdc35c56519b23c Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期六, 22 十二月 2018 10:37:49 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 4 ++-- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 db/PyMongoDataServer/SysDB/tagChinItem.txt | 6 ++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt index 4abdfa0..41cfbe1 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/NPCLogic/NPCAttrStrengthen.txt @@ -66,10 +66,10 @@ ["Miss","ReHit*MissRate/10000.0/(0.95-MissRate/10000.0)"], ["IceAtk","IceAtkCoefficient/10000.0*ReIceAtk"], ["IceDef","IceDefCoefficient/10000.0*ReIceDef"], - ["MinAtk","DefCoefficient/10000.0*ReDef+AtkReplyCoefficient"], - ["MaxAtk","DefCoefficient/10000.0*ReDef+AtkReplyCoefficient"], + ["MinAtk","((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0/40.0"], + ["MaxAtk","((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0/40.0"], ["Def","ReAtk*AtkCoefficient/10000.0"], - ["FireAtk","(RePotionReply/(RePotionCD*1.0)+LostHPPerSecond)/(MonterNum*1.0)*(1-AdjustCoefficient/10000.0)*AtkInterval/(1+SkillAtkRate/10000.0)+ReFinalHurtReduce/(MonterNum*1.0)*AtkInterval"], + ["FireAtk","0"], ["MaxHP","((ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))+max((RePetAtk-Def)*(1+RePetDamPer/10000.0)*RePetSkillAtkRate/10000.0,0)+max((ReIceAtk-IceDef)*ReSkillAtkRate/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0)),0)+ReFinalHurt)*HitTime/100.0*math.sqrt((ReAtkSpeed+10000)/10000.0)+(ReAtk-Def*(1-ReIgnoreDefRate/10000.0))*ReBleedDamage/10000.0*(1+ReDamagePer/10000.0)*(1-ReLuckyHitRate/10000.0+ReLuckyHitRate/10000.0*(1.2+ReLuckyHit/10000.0))*HitTime/100.0"], ], diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 6ab0762..0dd9893 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt index 0eda2d8..3fe4b60 100644 --- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt +++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt @@ -115,8 +115,8 @@ 31403008 0 0 2 0 1900 10000 0 8000 3 9900 50 1 0 0 50 0 31401009 0 0 2 0 2000 10000 0 8000 3 9900 50 12 0 0 0 0 31604001 0 0 4 0 800 10000 0 8000 1 9900 50 1 0 0 0 10000 -33409001 0 1 2 0 800 10000 0 8000 1 9900 50 1 0 0 5 0 -33409002 0 1 2 0 800 10000 0 8000 1 9900 50 1 0 0 0 0 +33409001 0 1 2 0 400 10000 0 8000 1 9900 50 1 0 0 5 0 +33409002 0 1 2 0 1 10000 0 8000 1 9900 50 1 0 0 0 0 33402001 0 0 2 0 400 10000 0 8000 1 9900 50 12 0 0 0 0 33403001 0 0 2 0 1500 10000 0 8000 1 9900 50 1 0 0 0 0 33402002 0 0 2 0 700 10000 0 8000 1 9900 50 12 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt index 7338d08..0d49405 100644 --- a/db/PyMongoDataServer/SysDB/tagChinItem.txt +++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt @@ -143,6 +143,9 @@ 600 1 0 时装1 91 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 5 0 1 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 601 1 0 时装2 92 0 0 0 0 999 120 1 1 0 1 0 0 0 0 0 1 1 0 50 0 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 602 1 0 时装3 93 0 1 0 0 999 1 1 1 0 1 0 0 0 0 0 1 1 0 5 0 1 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +700 1 0 魂尘 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 20 0 1 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +701 1 0 聚魂碎片 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 150 0 20 0 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +702 1 0 核心环 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 300 0 20 0 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 800 1 0 1200万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 240 0 20 0 1 0 0 201 12000000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 801 1 0 2500万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 500 0 20 0 1 0 0 201 25000000 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 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 802 1 0 200万铜钱 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 40 0 20 0 1 0 0 201 2000000 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 @@ -155,6 +158,9 @@ 855 1 0 15绑定仙玉 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 20 0 1 0 0 202 15 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 880 1 0 50修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 150 0 20 0 1 0 0 238 50 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 881 1 0 100修行点 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 300 0 20 0 1 0 0 238 100 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +891 1 0 魂尘 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 10 0 20 0 1 0 0 239 1 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 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +892 1 0 聚魂碎片 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 150 0 20 0 1 0 0 240 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +893 1 0 核心环 1 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 300 0 20 0 1 0 0 241 1 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 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 901 1 0 气血散（小） 9 0 1 0 0 300 1 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6000 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 902 25 0 气血散（中） 9 0 1 0 0 300 25 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6001 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 903 50 0 气血散（大） 9 0 1 0 0 300 50 1 1 0 1 0 0 0 1 10000 1 1 0 5 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6002 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -- Gitblit v1.8.0