From d254a370d14e560470889eb69537bd21532bc254 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 02 三月 2026 18:58:56 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（郭嘉所有技能；增加触发类型62、63、64、65；增加效果6038；增加技能类型16-减益光环，对自己无效，原类型10为增益光环对自己有效；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 3f1689c..04d2139 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -755,7 +755,7 @@
#执行添加buff
#光环技能，需先添加施法者
- if useSkill.GetSkillType() == ChConfig.Def_SkillType_Halo:
+ if useSkill.GetSkillType() in ChConfig.Def_HaloSkill_List:
curID = curBatObj.GetID()
skillID = useSkill.GetSkillID()
GameWorld.DebugLogEx("光环技能先给施法者添加光源buff! skillID=%s,ownerID=%s", skillID, curID)
@@ -1640,6 +1640,7 @@
triggerOne = False
batType = useSkill.GetBatType()
isAttackDirect = (isUseSkill and SkillCommon.isAttackDirectSkill(useSkill)) # 是否直接攻击
+ objTriigerWayInfo = {} # 敌友已触发的列表，一般用于控制每人只触发一次的 {objID:{triggerWay:triggerCnt, ...}}
for tagObj in tagObjListAll:
tagID = tagObj.GetID()
@@ -1746,6 +1747,8 @@
# 连击
if batType == ChConfig.TurnBattleType_Combo:
+ if not triggerOne:
+ TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_ComboOne, tagObj, connSkill=useSkill)
TurnPassive.OnTriggerPassiveEffect(turnFight, curObj, ChConfig.TriggerWay_Combo, tagObj, connSkill=useSkill)
TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BeCombo, curObj, connSkill=useSkill)
if curMGObj and ChConfig.TriggerWay_Combo not in mgTriggerWayList:
@@ -1772,6 +1775,10 @@
if not lineupObj.IsAlive():
continue
+ if lineupObjID not in objTriigerWayInfo:
+ objTriigerWayInfo[lineupObjID] = {}
+ objTriigerWayCntDict = objTriigerWayInfo[lineupObjID]
+
# 直接攻击
if isAttackDirect:
if not triggerOne:
@@ -1783,17 +1790,26 @@
if not triggerOne:
TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendDotHurt, tagObj, connSkill=useSkill, byFriendObj=curObj)
- # 敌方被控时
+ # 敌方被控时 - 默认为友军造成的
if tagID in beControlledHardDict and lineupObj.GetFaction() != tagObj.GetFaction():
TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_EnemyBeControlledHard, tagObj, connSkill=useSkill)
-
+ tagBuff = beControlledHardDict[tagID]
+ # 敌方被冰冻
+ if tagBuff.GetCurBuffState() == ChConfig.BatObjState_Frozen:
+ if ChConfig.TriggerWay_FriendCausesFrozen not in objTriigerWayCntDict:
+ objTriigerWayCntDict[ChConfig.TriggerWay_FriendCausesFrozen] = 1
+ TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendCausesFrozen, tagObj, connSkill=useSkill)
+
# 连击
if batType == ChConfig.TurnBattleType_Combo:
TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendCombo, tagObj, connSkill=useSkill, byFriendObj=curObj)
-
+ if isAttackDirect:
+ TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendComboHurt, tagObj, connSkill=useSkill, byFriendObj=curObj)
# 追击
elif batType == ChConfig.TurnBattleType_Pursue:
TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendPursue, tagObj, connSkill=useSkill, byFriendObj=curObj)
+ if isAttackDirect:
+ TurnPassive.OnTriggerPassiveEffect(turnFight, lineupObj, ChConfig.TriggerWay_FriendPursueHurt, tagObj, connSkill=useSkill, byFriendObj=curObj)
triggerOne = True # 设置已经触发过一次
@@ -2455,6 +2471,7 @@
atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByBuffLayer, curSkill)
atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByDeadTeammate, curSkill)
atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByBuffState, curSkill)
+ atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByBeFrozenCnt, curSkill)
return atkSkillPer
def CanSuperHit(turnFight, atkObj, defObj, curSkill):
--
Gitblit v1.8.0