From 8d701c0d36c2f4ed0948ea485d10506f9ae86ef8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 20 十二月 2025 14:01:21 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（修复关羽潜能触发怒气追击会消耗怒气bug；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
index adc7c25..b6da081 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -59,9 +59,10 @@
if not skillID:
return
+ skillType = useSkill.GetSkillType()
byTriggerWay = kwargs["byTriggerWay"] if "byTriggerWay" in kwargs else 0 # 不使用参数名 triggerWay, 防止传递过程中参数混乱
if not curBatObj.IsAlive():
- if useSkill.GetSkillType() == ChConfig.Def_SkillType_Revive and useSkill.GetTagAim() == ChConfig.SkillTagAim_Self:
+ if skillType == ChConfig.Def_SkillType_Revive and useSkill.GetTagAim() == ChConfig.SkillTagAim_Self:
GameWorld.DebugLogEx("死亡时使用复活自己的技能! skillID=%s", skillID)
else:
if byTriggerWay in ChConfig.DeadCanTriggerWayList:
@@ -103,10 +104,16 @@
if not tagObjList and isRemove:
return
+ if tagObjList and skillType == ChConfig.Def_SkillType_Revive:
+ for tagObj in tagObjList[::-1]:
+ if tagObj.CheckInState(ChConfig.BatObjState_RebornLimit):
+ GameWorld.DebugLogEx(" 目标被禁止复活不处理! tagID=%s", tagObj.GetID())
+ tagObjList.remove(tagObj)
+
if not tagObjList:
# 可扩展其他目标选择，如复活技能没有死亡单位时则使用另外的效果
GameWorld.DebugLogEx("找不到技能目标! skillID=%s,mapID=%s,funcLineID=%s", skillID, turnFight.mapID, turnFight.funcLineID, turnFight.getReqPlayerID())
- if useSkill.GetSkillType() == ChConfig.Def_SkillType_Revive:
+ if skillType == ChConfig.Def_SkillType_Revive and not isinstance(useSkill, IpyGameDataPY.IPY_Skill):
otherEff = useSkill.GetEffectByID(ChConfig.SkillEff_ReviveNoUse)
if otherEff:
otherSkillID = otherEff.GetEffectValue(0)
@@ -1165,7 +1172,7 @@
if IsNeedSyncSkill(useSkill):
Sync_UseSkill(turnFight, curBatObj, useSkill)
- __doSkillUserAnger(turnFight, curBatObj, useSkill)
+ __doSkillUserAnger(turnFight, curBatObj, useSkill, **kwargs)
DoBeAttackResult(turnFight, curBatObj, useSkill)
return
@@ -1637,10 +1644,14 @@
return
-def __doSkillUserAnger(turnFight, curBatObj, useSkill):
+def __doSkillUserAnger(turnFight, curBatObj, useSkill, **kwargs):
## 技能释放者怒气相关
if SkillCommon.isAngerSkill(useSkill):
- curBatObj.SetXP(0)
+ if "noUseXP" in kwargs:
+ kwargs.pop("noUseXP")
+ GameWorld.DebugLogEx("本次不消耗怒气")
+ else:
+ curBatObj.SetXP(0)
elif SkillCommon.isTurnNormalSkill(useSkill) and useSkill.GetBatType() == ChConfig.TurnBattleType_Normal:
addXP = IpyGameDataPY.GetFuncCfg("AngerXP", 3)
AddFightXP(curBatObj, addXP, "skillID:%s" % useSkill.GetSkillID())
--
Gitblit v1.8.0