From c82fbbbef94382c376daa71693034b788118013d Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期一, 07 一月 2019 15:31:21 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 14 +++++++------- CoreServerGroup/GameServer/PySysDB/tagChinMap.txt | 4 ++-- CoreServerGroup/GameServer/PySysDB/tagFBLine.txt | 2 ++ db/PyMongoDataServer/PySysDB/tagFBLine.txt | 2 ++ ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt | 2 +- CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt | 1 + db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt | 12 ++++++------ db/PyMongoDataServer/PySysDB/tagFBFunc.txt | 1 + db/PyMongoDataServer/SysDB/tagChinMap.txt | 4 ++-- 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt index 47b7a88..dd82d27 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt @@ -43,5 +43,5 @@ 32013 跨服竞技场 10 0 32014 跨服竞技场 10 0 31340 幽暗迷森 1 0 -32020 蓬莱仙境 0 0 -32021 蓬莱仙境 0 0 +32020 蓬莱仙境 8 0 +32021 蓬莱仙境 8 0 diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt index eab41db..887ee3d 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFBFunc.txt @@ -23,3 +23,4 @@ 31010 0 31340 0 32010 0 +32020 0 diff --git a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt index 52ba958..7d5a81c 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFBLine.txt @@ -100,3 +100,5 @@ 32010 2 32012 32010 3 32013 32010 4 32014 +32020 0 32020 +32020 1 32021 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt index 0653c5d..2ff59d8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt @@ -123,7 +123,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))", + "PVE_1_5" :"int((wReFightPower/12.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)*0.8)*(1+aFinalHurtPer/10000.0))", #助战机器人：参数: suppressNPCFightPower-助战玩家战力; fbFightPower-副本战力; fbBaseHurt-保底伤害 "HelpRobot_Atk" :"max(int(fbBaseHurt*suppressNPCFightPower*1.0/max(fbFightPower,1.0)),1)", diff --git a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt index 0497179..93e4ee9 100644 --- a/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt +++ b/db/PyMongoDataServer/PySysDB/tagCrossPenglaiZone.txt @@ -1,6 +1,6 @@ -ZoneID ServerGroupIDList MapID CopyMapID -1 [(1,50)] 32020 0 -2 [(51,100)] 32020 1 -3 [(101,150)] 32021 0 -4 [(151,200)] 32021 1 -5 [(201,250)] 32021 2 +ZoneID ServerGroupIDList MapID CopyMapID PosX PosY +1 [(1,50)] 32020 0 199 380 +2 [(51,100)] 32020 1 199 380 +3 [(101,150)] 32021 0 199 380 +4 [(151,200)] 32021 1 199 380 +5 [(201,250)] 32021 2 199 380 diff --git a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt index 83d4cf5..5426622 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBFunc.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBFunc.txt @@ -23,3 +23,4 @@ 31010 3 2 0 0 0 0 0 0 0 180 0 0 0 31340 2 2 0 0 0 0 0 0 1 0 0 0 0 32010 0 2 0 0 0 0 0 0 0 0 0 0 0 +32020 0 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt index 6ff8e78..dcf260a 100644 --- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt +++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt @@ -100,3 +100,5 @@ 32010 2 32012 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10] 32010 3 32013 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10] 32010 4 32014 150 0 0 0 0 0 0 0 0 [26,6] [180,3,10] +32020 0 32020 150 0 0 0 0 0 0 0 0 +32020 1 32021 150 0 0 0 0 0 0 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt index dd494f3..755b607 100644 --- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt +++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt @@ -92,13 +92,13 @@ 61203006 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61203007 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 61203008 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -50103001 1 0 3 1 232800 10000 0 8000 2 9900 50 1 0 0 1311 0 -50103002 1 0 3 1 251400 10000 0 8000 2 9900 50 1 0 0 1238 0 -50103003 1 0 3 1 279300 10000 0 8000 2 9900 50 1 0 0 1165 0 -50103004 1 0 3 1 325900 10000 0 8000 2 9900 50 1 0 0 1092 0 -50103005 1 0 3 1 372500 10000 0 8000 2 9900 50 1 0 0 1020 0 -50103006 1 0 3 1 419000 10000 0 8000 2 9900 50 1 0 0 947 0 -50103007 1 0 3 1 465600 10000 0 8000 2 9900 50 1 0 0 874 0 +50103001 1 0 3 1 290300 10000 0 8000 2 9900 50 1 0 0 1311 0 +50103002 1 0 3 1 309700 10000 0 8000 2 9900 50 1 0 0 1238 0 +50103003 1 0 3 1 338700 10000 0 8000 2 9900 50 1 0 0 1165 0 +50103004 1 0 3 1 387100 10000 0 8000 2 9900 50 1 0 0 1092 0 +50103005 1 0 3 1 435500 10000 0 8000 2 9900 50 1 0 0 1020 0 +50103006 1 0 3 1 483900 10000 0 8000 2 9900 50 1 0 0 947 0 +50103007 1 0 3 1 580600 10000 0 8000 2 9900 50 1 0 0 874 0 31401002 0 0 2 0 2400 10000 0 8000 3 9900 50 24 0 0 0 0 31403002 0 0 2 0 5800 10000 0 8000 3 9900 50 1 0 0 50 0 31401003 0 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt index 7de97ec..1a097b7 100644 --- a/db/PyMongoDataServer/SysDB/tagChinMap.txt +++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt @@ -43,5 +43,5 @@ 32013 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2 32014 跨服竞技场 1 0 900000 10 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 1 2 31340 幽暗迷森 1 0 3600000 1 1 0 0 0 0 0 0 0 1 1 10000 50 50 0 1 0 0 1 -32020 蓬莱仙境 1 260 0 0 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 -32021 蓬莱仙境 1 260 0 0 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 +32020 蓬莱仙境 1 260 0 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 +32021 蓬莱仙境 1 260 0 8 0 0 0 0 0 0 0 0 1 1 10000 50 50 1 1 0 5 35 -- Gitblit v1.8.0