From fbf3fe5655d97c67db3bf07706ab5af232dcc9a5 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期四, 18 九月 2025 19:17:48 +0800 Subject: [PATCH] 129 【战斗】战斗系统-服务端(甘夫人技能;增加连击、追击增伤减伤属性;) --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py | 80 ++++----------------------------------- 1 files changed, 9 insertions(+), 71 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py index 76ed1de..f1d7758 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py @@ -46,13 +46,9 @@ import BuffSkill import PlayerState import ChPyNetSendPack -import NPCHurtManager import NetPackCommon -import FamilyRobBoss import FBCommon import ChNPC -import BossHurtMng -import NPCHurtMgr import ChNetSendPack import TurnAttack @@ -437,28 +433,6 @@ #NPC读表取 return attack.GetHurtType() -def GetAtkDistType(curObj): - ## 获取是近战还是远程,默认近战 - if curObj.GetGameObjType() != IPY_GameWorld.gotNPC: - return ChConfig.AtkDistType_Short - - playerID = curObj.GetDictByKey(ChConfig.Def_Obj_Dict_LineupPlayerID) - if not playerID: - return ChConfig.AtkDistType_Short - - heroID = curObj.GetDictByKey(ChConfig.Def_Obj_Dict_HeroID) - if heroID: - heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID) - if heroIpyData: - return heroIpyData.GetAtkDistType() - - npcID = curObj.GetNPCID() - npcDataEx = NPCCommon.GetNPCDataPy(npcID) - if npcDataEx: - return npcDataEx.GetAtkDistType() - - return ChConfig.AtkDistType_Short - #-------------------------------------------------------------------------- ## 设置玩家进入战斗状态 # @param defender 当前玩家(被攻击了) @@ -637,19 +611,11 @@ curObjType = curObj.GetGameObjType() if curObjType == IPY_GameWorld.gotPlayer: - #BossHurtMng.BossAddPlayerInHurtList(curObj, curTagObj, hurtHP) - FamilyRobBoss.OnPlayerHurtFamilyOwnerBoss(curObj, curTagObj, hurtHP) if curTagObj.GetGameObjType() == IPY_GameWorld.gotNPC: FBLogic.DoFB_Player_HurtNPC(curObj, curTagObj, hurtHP) if GameObj.GetHP(curTagObj) == 0: curTagObj.SetDict(ChConfig.Def_PlayerKey_LastHurt, curObj.GetPlayerID()) - if NPCHurtManager.AddHurtValue(curObj, curTagObj, hurtHP, isBounce): - return - - if NPCHurtMgr.AddHurtValue(curObj, curTagObj, hurtHP, isBounce): - return - curTeam = curObj.GetTeam() if curTeam == None: #无队伍,添加个人伤害 @@ -715,10 +681,6 @@ #if not CheckAttackNPCByCnt(attacker, defender): # return False - #击杀次数判断 - if not NPCHurtManager.IsAssistPlayer(attacker.GetPlayerID(), defender) and not CheckKillNPCByCnt(attacker, defender): - return False - #仙盟归属NPC判断 if not CheckCanAttackFamilyOwnerNPC(attacker, defender): return False @@ -729,10 +691,6 @@ #if not CheckAttackNPCByCnt(defender, attacker, False): # return False - #击杀次数判断 - if not CheckKillNPCByCnt(defender, attacker, False) and not NPCHurtManager.IsAssistPlayer(defender.GetPlayerID(), attacker): - return False - #仙盟归属NPC判断 if not CheckCanAttackFamilyOwnerNPC(defender, attacker, False): return False @@ -740,11 +698,11 @@ # NPC打NPC elif atkObjType == IPY_GameWorld.gotNPC and defObjType == IPY_GameWorld.gotNPC: if PetControl.IsPet(attacker) or attacker.GetGameNPCObjType()== IPY_GameWorld.gnotSummon: - #击杀次数判断 - if not CheckKillNPCByCnt(attacker, defender, False): - ownerPlayer = GetAttackPlayer(attacker)[0] - if ownerPlayer and not NPCHurtManager.IsAssistPlayer(ownerPlayer.GetPlayerID(), defender): - return False + ##击杀次数判断 + #if not CheckKillNPCByCnt(attacker, defender, False): + # ownerPlayer = GetAttackPlayer(attacker)[0] + # if ownerPlayer and not NPCHurtManager.IsAssistPlayer(ownerPlayer.GetPlayerID(), defender): + # return False #仙盟归属NPC判断 if not CheckCanAttackFamilyOwnerNPC(attacker, defender, False): @@ -857,20 +815,7 @@ if not GameFuncComm.GetFuncCanUse(atkPlayer, funcID): PlayerControl.NotifyCode(atkPlayer, funcSysMark) return - canKillCnt = BossHurtMng.GetCanKillBossCnt(atkPlayer, index)[0] - - if canKillCnt <= 0: - #if BossHurtMng.GetPlayerBossHurt(atkPlayer, defender): - # GameWorld.DebugLog("攻击过该boss可继续攻击") - # return True - #次数不足 - # 实际攻击者类型None则需要提示玩家 - if npcObjType is None: - if isNotify: - sysMark = IpyGameDataPY.GetFuncEvalCfg('KillBossCntLimit', 3, {}).get(index, '') - PlayerControl.NotifyCode(atkPlayer, sysMark) - return False - + #npcDataEx = NPCCommon.GetNPCDataPy(npcID) #if npcDataEx and npcDataEx.GetFightPowerLackAtkLimit(): # if npcDataEx.GetSuppressFightPower() > PlayerControl.GetFightPower(atkPlayer): @@ -905,9 +850,6 @@ hasAttackCnt = atkPlayer.NomalDictGetProperty(ChConfig.Def_PDict_WorldBoss_HurtCnt, 0) if hasAttackCnt >= limitCnt: - #if BossHurtMng.GetPlayerBossHurt(atkPlayer, defender): - # GameWorld.DebugLog("攻击过该boss可继续攻击") - # return True #次数不足 # 实际攻击者类型None则需要提示玩家 if npcObjType is None: @@ -2329,9 +2271,9 @@ # GameWorld.DebugLog("不能攻击,不反弹") # return #杀怪次数判断 - if not CheckKillNPCByCnt(defObj, atkObj, False) and not NPCHurtManager.IsAssistPlayer(defObj.GetPlayerID(), atkObj): - #GameWorld.DebugLog("不能攻击,不反弹") - return + #if not CheckKillNPCByCnt(defObj, atkObj, False) and not NPCHurtManager.IsAssistPlayer(defObj.GetPlayerID(), atkObj): + # #GameWorld.DebugLog("不能攻击,不反弹") + # return #没有反弹退出 defObj_DamageBackRate = defObj.GetDamageBackRate() @@ -2610,10 +2552,6 @@ elif curPlayerAttackMode == IPY_GameWorld.amAll: pass - # 协助关系不可攻击 - if NPCHurtManager.IsAssistRelation(curPlayer, tagPlayer): - return ChConfig.Type_Relation_Friend, ChConfig.Def_PASysMessage_NotAttackTeam - # 以下为所属区域的一些特殊处理 #普通区 if curPlayerAreaType == IPY_GameWorld.gatNormal: -- Gitblit v1.8.0