From 416c1dc316df0be2aafa00657350ffca525c868f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 31 十月 2025 10:48:43 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（词条技能：增加属性类技能支持；增加触发方式24-掉血时触发；增加效果7009-限制技能最多触发次数；效果5011增加验证当前生命支持；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 533 ++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 439 insertions(+), 94 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 0e8ae44..c3fe775 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -59,16 +59,18 @@
if not skillID:
return
- if not curBatObj.CanAction():
- return
+ objID = curBatObj.GetID()
- buffStateLimit = useSkill.GetBuffStateLimit()
- if buffStateLimit:
- limitState = curBatObj.IsInBuffStateGroup(buffStateLimit)
+ buffStateGroups = useSkill.GetBuffStateLimit()
+ if buffStateGroups:
+ limitState = curBatObj.IsInBuffStateGroup(buffStateGroups)
if limitState:
- GameWorld.DebugLog("技能使用处于buff状态限制中! skillID=%s,buffStateLimit=%s,limitState=%s" % (skillID, buffStateLimit, limitState))
+ GameWorld.DebugLog("技能使用处于buff状态限制中! skillID=%s,buffStateGroups=%s,limitState=%s" % (skillID, buffStateGroups, limitState))
return
+ if CheckSkillUseCntLimit(curBatObj, useSkill):
+ return
+
#没有指定目标，则按技能自身的目标逻辑
if not tagObjList:
tagObjList = GetSkillTags(turnFight, curBatObj, useSkill)
@@ -81,9 +83,9 @@
if not tagObjList:
# 可扩展其他目标选择，如复活技能没有死亡单位时则使用另外的效果
+ GameWorld.ErrLog("找不到技能目标! skillID=%s,mapID=%s,funcLineID=%s" % (skillID, turnFight.mapID, turnFight.funcLineID), turnFight.playerID)
return
- objID = curBatObj.GetID()
oneActionUseCnt = turnFight.GetOneActionUseSkillCnt(objID)
if oneActionUseCnt >= 20:
GameWorld.ErrLog("单次行动累计使用技能达到上限! objID=%s,oneActionUseCnt=%s" % (objID, oneActionUseCnt), turnFight.playerID)
@@ -124,21 +126,19 @@
curBatObj.SetMainTagIDList(tagIDList)
useTag = ""
-
+ if IsNeedSyncSkill(useSkill):
+ # 因为可能触发连击，所以标记需带上累计使用技能次数，确保唯一
+ useTag = "Skill_%s_%s_%s" % (objID, skillID, curBatObj.GetSkillUseCnt(skillID) + 1)
+ clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCTurnFightTag)
+ clientPack.Tag = useTag
+ clientPack.Len = len(clientPack.Tag)
+ clientPack.Sign = 0
+ turnFight.addBatPack(clientPack)
+
#这个技能是Buff
if SkillCommon.IsBuff(useSkill):
__doAddBuff(turnFight, curBatObj, useSkill)
else:
- # 主技能额外触发的技能可不下发，前端视为仅释放一个主技能
- if batType != ChConfig.TurnBattleType_Enhance:
- # 因为可能触发连击，所以标记需带上累计使用技能次数，确保唯一
- useTag = "Skill_%s_%s_%s" % (objID, skillID, curBatObj.GetSkillUseCnt(skillID) + 1)
- clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCTurnFightTag)
- clientPack.Tag = useTag
- clientPack.Len = len(clientPack.Tag)
- clientPack.Sign = 0
- turnFight.addBatPack(clientPack)
-
__doUseSkill(turnFight, curBatObj, useSkill)
DoAttackResult(turnFight, curBatObj, useSkill)
@@ -161,6 +161,36 @@
poolMgr.release(useSkill)
return True
+def CheckSkillUseCntLimit(batObj, useSkill):
+ ## 检查技能使用次数是否受限
+ # @return: 是否受限
+ if not hasattr(useSkill, "GetEffectByID"):
+ return
+ effect = useSkill.GetEffectByID(ChConfig.SkillEff_SkillUseCntLimit)
+ if not effect:
+ return
+ useCntLimit = effect.GetEffectValue(0) # 每场战斗最大次数，0不限
+ turnUseCntLimit = effect.GetEffectValue(1) # 每大回合最大次数，0不限
+
+ skillID = useSkill.GetSkillID()
+ if useCntLimit:
+ useCnt = batObj.GetSkillUseCnt(skillID)
+ if useCnt >= useCntLimit:
+ GameWorld.DebugLog("技能每场战斗使用次数受限! skillID=%s,useCnt=%s >= %s" % (skillID, useCnt, useCntLimit))
+ return True
+
+ if turnUseCntLimit:
+ turnUseCnt = batObj.GetSkillTurnUseCnt(skillID)
+ if turnUseCnt >= turnUseCntLimit:
+ GameWorld.DebugLog("技能每大回合使用次数受限! skillID=%s,turnUseCnt=%s >= %s" % (skillID, turnUseCnt, turnUseCntLimit))
+ return True
+
+ return
+
+def IsNeedSyncSkill(useSkill):
+ ## 使用需要同步B427使用技能
+ return useSkill.GetSkillType() in [ChConfig.Def_SkillType_Atk, ChConfig.Def_SkillType_Cure, ChConfig.Def_SkillType_CleanBuff]
+
def GetSkillTags(turnFight, curBatObj, useSkill):
## 获取技能目标
# @return: [主目标, 目标2, ...]
@@ -170,8 +200,13 @@
tagAffect = useSkill.GetTagAffect()
tagCount = useSkill.GetTagCount()
- curFaction = curBatObj.GetFaction()
-
+ lineupNumSet = None
+ changeRet = CheckChangeTagEff(turnFight, curBatObj, useSkill)
+ if changeRet:
+ lineupNumSet, changeTagSet = changeRet
+ GameWorld.DebugLog("强制修改技能目标: lineupNumSet=%s, changeTagSet=%s" % (lineupNumSet, changeTagSet))
+ tagAim, tagFriendly, tagAffect, tagCount = changeTagSet
+
# 自己，直接返回
if tagAim == ChConfig.SkillTagAim_Self:
return [curBatObj]
@@ -184,6 +219,7 @@
# 混乱: 随机敌友; 不打自己，只剩自己随机后是己方时不释放技能
# 嘲讽: 目标是敌方时强制目标一定包含施法者
+ curFaction = curBatObj.GetFaction()
sneerObj = None # 嘲讽目标
sneerObjID, sneerObjPosNum = 0, 0
if tagFriendly:
@@ -202,7 +238,9 @@
posNum = curBatObj.GetPosNum()
batFaction = turnFight.getBatFaction(tagFaction)
- if tagFaction == curFaction:
+ if lineupNumSet != None and not tagFriendly:
+ lineupNumList = [lineupNumSet] # 已经有指定敌方的某一阵容
+ elif tagFaction == curFaction:
lineupNumList = [lineupNum] # 友方暂时仅限制自己阵容
else:
lineupNumList = [lineupNum] # 敌方优先对位阵容，再其他阵容
@@ -210,6 +248,7 @@
if tagNum not in lineupNumList:
lineupNumList.append(tagNum)
+ batLineup = None
aimObjList = [] # 先筛选出范围目标
for num in lineupNumList:
batLineup = batFaction.getBatlineup(num)
@@ -306,7 +345,27 @@
sneerObjFirst = False
aimObjList.sort(key=lambda o:(o.IsInControlled()))
GameWorld.DebugLog("未被控制优先: %s" % [[o.GetID(), o.IsInControlled()] for o in aimObjList])
+
+ # 灼烧/玄火目标优先
+ elif tagAffect == ChConfig.SkillTagAffect_Burn:
+ relativeObj = __GetRelativeObjDefault(batObjMgr, curBatObj, posNum, batLineup)
+ sortObjList = [] # 优先灼烧目标，再对位
+ for aimObj in aimObjList:
+ sortValue = 0
+ buffMgr = aimObj.GetBuffManager()
+ if buffMgr.FindBuffListByState(ChConfig.BatObjState_Burn) or buffMgr.FindBuffListByState(ChConfig.BatObjState_BurnPlus):
+ sortValue = 2
+ elif relativeObj and relativeObj.GetID() == aimObj.GetID():
+ sortValue = 1
+ sortObjList.append([sortValue, aimObj])
+ sortObjList.sort(reverse=True)
+ aimObjList = [s[1] for s in sortObjList]
+ # 仅焚血（毒奶）目标
+ elif tagAffect == ChConfig.SkillTagAffect_PoisonCure:
+ for aimObj in aimObjList[::-1]:
+ if not aimObj.CheckInState(ChConfig.BatObjState_PoisonCure):
+ aimObjList.remove(aimObj)
else:
# 范围目标超过个数，则随机取
if tagCount and len(aimObjList) > tagCount:
@@ -327,6 +386,38 @@
aimObjList = aimObjList[:tagCount]
return aimObjList
+
+def CheckChangeTagEff(turnFight, curBatObj, useSkill):
+ ## 技能自身设定强制修改目标，目前暂定优先级最高，无视软控
+ # IPY_Skill 没有 GetEffectByID，暂不做支持，目前小乔怒技专用，以后有用于别的再说
+ if not hasattr(useSkill, "GetEffectByID"):
+ return
+ cureWayExEff = useSkill.GetEffectByID(ChConfig.SkillEff_ChangeTag)
+ if not cureWayExEff:
+ return
+ changeTagSet = cureWayExEff.GetEffectValue(0)
+ checkInStates = cureWayExEff.GetEffectValue(1)
+ if not checkInStates:
+ return None, changeTagSet
+
+ curFaction = curBatObj.GetFaction()
+ tagFaction = ChConfig.Def_FactionB if curFaction == ChConfig.Def_FactionA else ChConfig.Def_FactionA
+ batFaction = turnFight.getBatFaction(tagFaction)
+
+ lineupNum = curBatObj.GetLineupNum()
+ lineupNumList = [lineupNum] # 敌方优先对位阵容，再其他阵容
+ for tagNum in batFaction.lineupDict.keys():
+ if tagNum not in lineupNumList:
+ lineupNumList.append(tagNum)
+
+ batObjMgr = BattleObj.GetBatObjMgr()
+ for num in lineupNumList:
+ batLineup = batFaction.getBatlineup(num)
+ for tagID in batLineup.posObjIDDict.values():
+ tagObj = batObjMgr.getBatObj(tagID)
+ if tagObj.IsAlive() and tagObj.CheckInState(checkInStates):
+ return lineupNum, changeTagSet
+ return
def __getRowAimObjList(batObjMgr, posNum, sneerObj, batLineup, tagAffect, rowReverse):
## 获取行排目标对象列表
@@ -410,7 +501,8 @@
def __GetRelativeObjDefault(batObjMgr, curBatObj, posNum, batLineup):
## 获取在某一阵营中的默认对位目标
-
+ if not batLineup:
+ return
tagAffect = ChConfig.SkillTagAffect_None # 默认对位目标不需要细分目标，默认规则即可
inColNum = ChConfig.GetInColNum(posNum) # 玩家所在纵列
# 优先自己所在纵
@@ -458,6 +550,9 @@
atkType = useSkill.GetAtkType()
GameWorld.DebugLog("__doUseSkill: curID=%s,skillID=%s,atkType=%s" % (curBatObj.GetID(), useSkill.GetSkillID(), atkType))
+
+ __doHarmSelf(turnFight, curBatObj, useSkill)
+
# 通用攻击
if atkType == 1:
SkillModule_1(turnFight, curBatObj, useSkill)
@@ -470,9 +565,9 @@
# 多次攻击（锁目标多次伤害，非前端的多段飘血）
elif atkType == 4:
pass
- # 弹射（多次攻击，切换目标）
+ # 弹射攻击
elif atkType == 5:
- pass
+ SkillModule_5(turnFight, curBatObj, useSkill)
# 怒气增
elif atkType == 6:
SkillModule_6(turnFight, curBatObj, useSkill, "Increase")
@@ -482,7 +577,40 @@
# 怒气偷
elif atkType == 8:
SkillModule_6(turnFight, curBatObj, useSkill, "Steal")
+ # 弹射治疗
+ elif atkType == 9:
+ SkillModule_9(turnFight, curBatObj, useSkill)
+ return
+
+def __doHarmSelf(turnFight, curBatObj, useSkill):
+ harmEff = useSkill.GetEffectByID(ChConfig.SkillEff_UseSkillHarmSelf)
+ if not harmEff:
+ return
+ harmPer = harmEff.GetEffectValue(0) # 自残百分比
+ noEnoughDo = harmEff.GetEffectValue(1) # 不足时扣除方式 0-不扣；1-自杀；2-扣剩1点
+ curHP = curBatObj.GetHP()
+ maxHP = curBatObj.GetMaxHP()
+ harmHP = int(maxHP * harmPer / 100.0)
+ lostHP = harmHP
+ if curHP <= harmHP:
+ if noEnoughDo == 0:
+ lostHP = 0
+ elif noEnoughDo == 2:
+ lostHP -= 1
+
+ updHP = max(curHP - lostHP, 0)
+ curBatObj.SetHP(updHP, False)
+ GameWorld.DebugLog("使用技能时自残: curHP=%s/%s,harmPer=%s,harmHP=%s,lostHP=%s,updHP=%s,noEnoughDo=%s"
+ % (curHP, maxHP, harmPer, harmHP, lostHP, updHP, noEnoughDo))
+
+ curBatObj.SetHarmSelfHP(harmHP) # 无视实际扣血量，直接更新
+
+ # 单独通知前端表现
+ hurtTypes = pow(2, ChConfig.HurtType_HarmSelf)
+ diffType, diffValue = 0, lostHP
+ skillID = relatedSkillID = useSkill.GetSkillID()
+ Sync_PropertyRefreshView(turnFight, curBatObj, ChConfig.AttrID_HP, updHP, diffValue, diffType, skillID, relatedSkillID, hurtTypes)
return
def SkillModule_1(turnFight, curBatObj, useSkill):
@@ -493,32 +621,146 @@
return
+def SkillModule_5(turnFight, curBatObj, useSkill):
+ ## 弹射（多次攻击，切换目标，单目标可多次）
+
+ ricochetObjList = GetRicochetObjList(turnFight, curBatObj, useSkill)
+ for tagBatObj in ricochetObjList:
+ __doSkillHurtHP(turnFight, curBatObj, tagBatObj, useSkill)
+
+ return
+
+def GetRicochetObjList(turnFight, curBatObj, useSkill):
+ ## 获取弹射目标队列
+ ricochetCnt = useSkill.GetTagCount() # 弹射次数，默认取技能目标数
+ randEffect = useSkill.GetEffectByID(ChConfig.SkillEff_RandRicochetCnt)
+ if randEffect:
+ valueA = randEffect.GetEffectValue(0)
+ valueB = max(randEffect.GetEffectValue(1), valueA)
+ ricochetCnt = random.randint(valueA, valueB)
+ GameWorld.DebugLog("随机弹射次数: %s,valueA=%s,valueB=%s" % (ricochetCnt, valueA, valueB))
+ ricochetCnt += TurnPassive.GetTriggerEffectValue(turnFight, curBatObj, None, ChConfig.PassiveEff_AddRicochetCnt, useSkill)
+ GameWorld.DebugLog("弹射次数: %s" % (ricochetCnt))
+
+ # 弹射：优先弹射次数少的目标，相同目标可弹射多次
+ tagObjList = useSkill.GetTagObjList()
+ random.shuffle(tagObjList)
+ objCnt = len(tagObjList)
+ ricochetObjList = []
+ for index in range(ricochetCnt):
+ tagObj = tagObjList[index % objCnt]
+ ricochetObjList.append(tagObj)
+ return ricochetObjList
+
def SkillModule_2(turnFight, curBatObj, useSkill):
## 治疗
- skillID = useSkill.GetSkillID()
for tagBatObj in useSkill.GetTagObjList():
- cureHP = CalcCureHP(turnFight, curBatObj, tagBatObj, useSkill, largeNum=True)
- if cureHP <= 0:
- continue
+ __doCureObj(turnFight, curBatObj, tagBatObj, useSkill)
- dHP = tagBatObj.GetHP()
- dMapHP = tagBatObj.GetMaxHP()
+ return
+
+def SkillModule_9(turnFight, curBatObj, useSkill):
+ ## 弹射治疗（多次治疗，切换目标，单目标可多次）
+
+ ricochetObjList = GetRicochetObjList(turnFight, curBatObj, useSkill)
+ for tagBatObj in ricochetObjList:
+ __doCureObj(turnFight, curBatObj, tagBatObj, useSkill)
- remainHP = min(dHP + cureHP, dMapHP)
+ return
+
+def __doCureObj(turnFight, curBatObj, tagBatObj, useSkill):
+ cureHP = CalcCureHP(turnFight, curBatObj, tagBatObj, useSkill, largeNum=True)
+ if cureHP <= 0:
+ return
+
+ dID = tagBatObj.GetID()
+ hurtObj = useSkill.AddHurtObj(dID)
+ if DoPoisonCure(turnFight, tagBatObj, cureHP, hurtObj, useSkill):
+ return
+
+ skillID = useSkill.GetSkillID()
+ dHP = tagBatObj.GetHP()
+ dMapHP = tagBatObj.GetMaxHP()
+
+ remainHP = min(dHP + cureHP, dMapHP)
+ realCureHP = max(remainHP - dHP, 0)
+ tagBatObj.SetHP(remainHP)
+
+ hurtObj.AddHurtType(ChConfig.HurtTYpe_Recovery)
+ hurtObj.SetHurtHP(cureHP)
+ hurtObj.SetLostHP(realCureHP)
+ hurtObj.SetCurHP(tagBatObj.GetHP())
+ GameWorld.DebugLog(" 治疗: dID=%s,cureHP=%s,realCureHP=%s,%s/%s" % (dID, cureHP, realCureHP, tagBatObj.GetHP(), dMapHP))
+
+ TurnAttack.AddTurnObjCureHP(tagBatObj, curBatObj, cureHP, realCureHP, skillID)
+ return
+
+def DoCureOfTime(turnFight, batObj, curBuff, cureHP, **kwargs):
+ ## 执行持续治疗单次逻辑
+ skillID = curBuff.GetSkillID()
+ skillIpyData = IpyGameDataPY.GetIpyGameData("Skill", skillID)
+ if not skillIpyData:
+ return
+ buffID = curBuff.GetBuffID()
+ ownerID = curBuff.GetOwnerID()
+ buffOwner = BattleObj.GetBatObjMgr().getBatObj(ownerID) # 治疗方
+ if not buffOwner:
+ return
+
+ atkObj = buffOwner
+ defObj = batObj
+
+ atkID = ownerID
+ defID = defObj.GetID()
+ tagObjList = [defObj]
+
+ poolMgr = ObjPool.GetPoolMgr()
+ useSkill = poolMgr.acquire(BattleObj.PySkill, skillIpyData, atkID)
+ useSkill.SetTagObjList(tagObjList)
+ useSkill.ClearHurtObj()
+ hurtObj = useSkill.AddHurtObj(defID)
+ hurtObj.AddHurtType(ChConfig.HurtTYpe_Recovery)
+
+ dHP = defObj.GetHP()
+ dMaxHP = defObj.GetMaxHP()
+ GameWorld.DebugLog("结算持续治疗: atkID=%s,defID=%s,buffID=%s,skillID=%s,ownerID=%s,cureHP=%s,dHP=%s/%s"
+ % (atkID, defID, buffID, skillID, ownerID, cureHP, dHP, dMaxHP))
+ layer = curBuff.GetLayer()
+ if layer > 0:
+ cureHP *= layer
+ GameWorld.DebugLog(" 多层buff: cureHP=%s,layer=%s" % (cureHP, layer))
+ #if "FinalDamPer" in kwargs:
+ # FinalDamPer = kwargs["FinalDamPer"]
+ # hurtValue *= (10000 + FinalDamPer) / 10000.0
+ # GameWorld.DebugLog(" 增伤: hurtValue=%s,FinalDamPer=%s" % (hurtValue, FinalDamPer))
+
+ if DoPoisonCure(turnFight, defObj, cureHP, hurtObj, useSkill):
+ remainHP = defObj.GetHP()
+ diffType = 0
+ diffValue = hurtObj.GetHurtHP()
+ else:
+ remainHP = min(dHP + cureHP, dMaxHP)
realCureHP = max(remainHP - dHP, 0)
- tagBatObj.SetHP(remainHP)
+ defObj.SetHP(remainHP)
- dID = tagBatObj.GetID()
- hurtObj = useSkill.AddHurtObj(dID)
- hurtObj.AddHurtType(ChConfig.HurtTYpe_Recovery)
hurtObj.SetHurtHP(cureHP)
hurtObj.SetLostHP(realCureHP)
- hurtObj.SetCurHP(tagBatObj.GetHP())
- GameWorld.DebugLog(" 治疗: dID=%s,cureHP=%s,realCureHP=%s,%s/%s" % (dID, cureHP, realCureHP, tagBatObj.GetHP(), dMapHP))
+ hurtObj.SetCurHP(defObj.GetHP())
+ GameWorld.DebugLog(" 治疗: dID=%s,cureHP=%s,realCureHP=%s,%s/%s" % (defID, cureHP, realCureHP, defObj.GetHP(), dMaxHP))
- TurnAttack.AddTurnObjCureHP(tagBatObj, curBatObj, cureHP, realCureHP, skillID)
+ TurnAttack.AddTurnObjCureHP(defObj, atkObj, cureHP, realCureHP, skillID)
+ diffType = 1
+ diffValue = cureHP
+
+ hurtTypes = hurtObj.GetHurtTypes()
+ Sync_PropertyRefreshView(turnFight, defObj, ChConfig.AttrID_HP, remainHP, diffValue, diffType=diffType, skillID=skillID, hurtTypes=hurtTypes)
+
+ DoBeAttackResult(turnFight, atkObj, useSkill)
+
+ useSkill.ResetUseRec()
+ poolMgr.release(useSkill)
return
def SkillModule_6(turnFight, curBatObj, useSkill, opType):
@@ -599,11 +841,10 @@
skillID = useSkill.GetSkillID()
curBatObj.AddSkillUseCnt(skillID)
if useSkill.GetCoolDownTime():
- useSkill.SetCalcTime(turnFight.getTimeline())
useSkill.SetRemainTime(useSkill.GetCoolDownTime())
# 需先技能使用 - 前端按顺序优先表现技能释放内容，前端需要动作或有伤血则通知
- if useSkill.GetSkillMotionName() or len(useSkill.GetHurtObjList()):
+ if IsNeedSyncSkill(useSkill):
Sync_UseSkill(turnFight, curBatObj, useSkill)
__doCostZhanchui(turnFight, curBatObj, useSkill)
@@ -630,7 +871,13 @@
纵排： 优先前面的单位
'''
+ if turnFight.winFaction:
+ return
+
if not useSkill.ComboEnable():
+ return
+
+ if not atkObj.IsAlive():
return
tagFriendly = useSkill.GetTagFriendly()
@@ -677,10 +924,11 @@
if not tagObj:
return
- if not tagObj.IsAlive():
+ tagID = tagObj.GetID()
+ if not tagObj.CanAction():
+ GameWorld.DebugLog("当前状态无法反击! tagID=%s" % (tagID))
return
- tagID = tagObj.GetID()
canAtkbackDictTypeList = IpyGameDataPY.GetFuncEvalCfg("ParryCfg", 2)
if tagObj.GetAtkDistType() not in canAtkbackDictTypeList:
GameWorld.DebugLog("该远近类型武将不可反击! tagID=%s,AtkDistType=%s not in %s" % (tagID, tagObj.GetAtkDistType(), canAtkbackDictTypeList))
@@ -757,7 +1005,8 @@
# 统计伤血，可能单个技能对同一目标造成多次伤害
totalHurtValue = 0
isSuperHit, isStun, isSuckHP = False, False, False
- missObjIDList, immuneObjIDList = [], []
+ missObjIDList, immuneObjIDList = [], [] # 闪避、免疫对象ID列表
+ beHurtObjIDList = [] # 受伤的对象ID列表
for hurtObj in useSkill.GetHurtObjList():
hurtObjID = hurtObj.GetObjID()
tagObj = batObjMgr.getBatObj(hurtObjID)
@@ -769,7 +1018,10 @@
if hurtObj.HaveHurtType(ChConfig.HurtType_Normal):
totalHurtValue += hurtObj.GetHurtHP()
-
+ if hurtObj.GetLostHP() > 0: # 有掉血的
+ if hurtObjID not in beHurtObjIDList:
+ beHurtObjIDList.append(hurtObjID)
+
if hurtObj.HaveHurtType(ChConfig.HurtType_Miss):
if hurtObjID not in missObjIDList:
missObjIDList.append(hurtObjID)
@@ -791,8 +1043,10 @@
if hurtObj.GetSuckHP() > 0:
isSuckHP = True
- curObj.SetLastHurtValue(totalHurtValue) # 记录最后一次总伤害
-
+ # 记录最后一次总伤害，有伤害目标才记录
+ if useSkill.GetHurtObjList():
+ curObj.SetLastHurtValue(totalHurtValue)
+
# 群攻只触发一次特长
if isSuperHit:
DoHeroSpecialty(turnFight, curObj, ChConfig.HeroSpecialty_SuperHit, relatedSkillID)
@@ -807,6 +1061,7 @@
FBLogic.OnPlayerLineupAttackResult(curPlayer, curObj, killObjList, useSkill, turnFight.mapID, turnFight.funcLineID)
effIgnoreObjIDList = missObjIDList + immuneObjIDList
+ useSkill.SetEffIgnoreObjIDList(effIgnoreObjIDList)
# 优先触发本技能额外效果，注：仅该技能释放后该技能的额外效果视为主技能的效果，优先级最高
__DoCurSkillEff(turnFight, curObj, useSkill, effIgnoreObjIDList, isUseSkill)
@@ -832,6 +1087,10 @@
if tagID in effIgnoreObjIDList:
continue
+ # 掉血时
+ if tagID in beHurtObjIDList:
+ TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BeHurt, curObj, connSkill=useSkill)
+
# 直接攻击
if isAttackDirect:
if not triggerOne:
@@ -855,6 +1114,10 @@
TurnPassive.OnTriggerPassiveEffect(turnFight, tagObj, ChConfig.TriggerWay_BePursue, curObj, connSkill=useSkill)
triggerOne = True # 设置已经触发过一次
+
+ # 有击杀时验证是否结算，最后处理
+ if killObjList:
+ turnFight.checkOverByKilled()
return
@@ -988,6 +1251,14 @@
if not enhanceSkillData:
return
+ killObjList = useSkill.GetKillObjList()
+ if killObjList:
+ invalidSkillID = TurnPassive.GetTriggerEffectValue(turnFight, curBatObj, None, ChConfig.PassiveEff_SkillInvalid, useSkill,
+ triggerWay=ChConfig.TriggerWay_KillOneObj)
+ if invalidSkillID and invalidSkillID == enhanceSkillID:
+ GameWorld.DebugLog("有击杀目标时该技能无效! enhanceSkillID=%s" % enhanceSkillID)
+ return
+
# 继承主技能目标
if enhanceSkillData.GetTagAim() == ChConfig.SkillTagAim_MainSkill:
GameWorld.DebugLog("继承主技能目标! enhanceSkillID=%s" % enhanceSkillID)
@@ -1129,7 +1400,7 @@
CalcBounceHP(turnFight, atkObj, defObj, hurtObj, curSkill)
#吸血
- CalcSuckBlood(atkObj, defObj, hurtObj, curSkill)
+ CalcSuckBlood(turnFight, atkObj, defObj, hurtObj, curSkill)
return
def CalcHurtHP(turnFight, atkObj, defObj, curSkill, atkSkillValue, atkSkillPer, **kwargs):
@@ -1156,14 +1427,16 @@
angerOverflow = 0 # 怒气溢出值
mustHit = False # 是否必命中
- if isAngerSkill:
+ if not isTurnNormalSkill: # 仅普攻判断是否闪避
mustHit = True
+
+ if isAngerSkill:
curXP = atkObj.GetXP()
angerOverflow = max(atkObj.GetXP() - IpyGameDataPY.GetFuncCfg("AngerXP", 2), 0)
- GameWorld.DebugLog("XP必命中! curXP=%s,angerOverflow=%s" % (curXP, angerOverflow))
+ GameWorld.DebugLog("怒技攻击! curXP=%s,angerOverflow=%s" % (curXP, angerOverflow))
#命中公式 攻击方类型不同，公式不同
- if isTurnNormalSkill and not mustHit and not defObj.IsInControlledHard():
+ if not mustHit and not curSkill.GetEffectByID(ChConfig.SkillEff_MustHit) and not defObj.IsInControlledHard():
aMissRateDef = atkObj.GetBatAttrValue(ChConfig.AttrID_MissRateDef) #atkObj.GetHit() # 抗闪避率 - 命中
dMissRate = defObj.GetBatAttrValue(ChConfig.AttrID_MissRate) # 闪避率
missNum = curSkill.GetTagMissNum(defID)
@@ -1189,12 +1462,15 @@
if isSuperHit:
hurtTypes |= pow(2, ChConfig.HurtType_SuperHit)
aSuperDamPer = atkObj.GetBatAttrValue(ChConfig.AttrID_SuperDamPer)
+ aSuperDamPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.AttrID_SuperDamPer, curSkill)
+
dSuperDamPerDef = atkObj.GetBatAttrValue(ChConfig.AttrID_SuperDamPerDef)
if isParry:
hurtTypes |= pow(2, ChConfig.HurtType_Parry)
if ignoreDef:
+ GameWorld.DebugLog("无视防御/真实伤害!")
hurtTypes |= pow(2, ChConfig.HurtType_IgnoreDef)
if isStun:
@@ -1222,9 +1498,11 @@
aAngerSkillPer, dAngerSkillPerDef = 0, 0
if isAngerSkill:
- aAngerSkillPer = atkObj.GetBatAttrValue(ChConfig.AttrID_AngerSkillPer) # 普技增伤
- dAngerSkillPerDef = defObj.GetBatAttrValue(ChConfig.AttrID_AngerSkillPerDef) # 普技减伤
-
+ aAngerSkillPer = atkObj.GetBatAttrValue(ChConfig.AttrID_AngerSkillPer) # 怒技增伤
+ aAngerSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddAngerSkillPerByXP, curSkill)
+
+ dAngerSkillPerDef = defObj.GetBatAttrValue(ChConfig.AttrID_AngerSkillPerDef) # 怒技减伤
+
aAddSkillPer = 0 # 技能增伤
aAddSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.AttrID_SkillPer, curSkill)
@@ -1262,16 +1540,16 @@
if calcType != ChConfig.Def_Calc_Attack:
aAtk = GetCalcBaseValue(calcType, atkObj, defObj, curSkill)
- GameWorld.DebugLog("伤血计算: atkID=%s,defID=%s,skillID=%s,atkSkillPer=%s,calcType=%s,aAtk=%s,dDef=%s,dHP=%s/%s,hurtTypes=%s,aAddSkillPer=%s"
- % (atkID, defID, skillID, atkSkillPer, calcType, aAtk, dDef, dHP, dMaxHP, hurtTypes, aAddSkillPer))
+ GameWorld.DebugLog("伤血计算: atkID=%s,defID=%s,skillID=%s,atkSkillPer=%s,calcType=%s,aAtk=%s,dDef=%s,dHP=%s/%s,hurtTypes=%s,aAddSkillPer=%s,aFinalDamPer=%s"
+ % (atkID, defID, skillID, atkSkillPer, calcType, aAtk, dDef, dHP, dMaxHP, hurtTypes, aAddSkillPer, aFinalDamPer))
# 持续性伤害
if isTurnNormalSkill:
hurtValue = eval(IpyGameDataPY.GetFuncCompileCfg("HurtFormula", 1))
- GameWorld.DebugLog(" 普攻技能伤害=%s" % (hurtValue))
+ GameWorld.DebugLog(" 普攻技能伤害=%s,aNormalSkillPer=%s,dNormalSkillPerDef=%s" % (hurtValue, aNormalSkillPer, dNormalSkillPerDef))
elif isAngerSkill:
hurtValue = eval(IpyGameDataPY.GetFuncCompileCfg("HurtFormula", 2))
- GameWorld.DebugLog(" 怒气技能伤害=%s" % (hurtValue))
+ GameWorld.DebugLog(" 怒气技能伤害=%s,aAngerSkillPer=%s,dAngerSkillPerDef=%s" % (hurtValue, aAngerSkillPer, dAngerSkillPerDef))
elif isDot:
hurtValue = eval(IpyGameDataPY.GetFuncCompileCfg("DOTFormula", 1))
GameWorld.DebugLog(" 持续技能伤害=%s" % (hurtValue))
@@ -1319,6 +1597,7 @@
atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByHP, curSkill)
atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByJob, curSkill)
atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByBuffLayer, curSkill)
+ atkSkillPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddSkillPerByDeadTeammate, curSkill)
return atkSkillPer
def CanSuperHit(turnFight, atkObj, defObj, curSkill):
@@ -1379,17 +1658,14 @@
if hurtValue <= 0:
return 0, 0, hurtTypes
- if defObj.CheckInState(ChConfig.BatObjState_Wudi):
+ hurtValue = int(hurtValue)
+ buffMgr = defObj.GetBuffManager()
+ wudiBuffList = buffMgr.FindBuffListByState(ChConfig.BatObjState_Wudi)
+ if wudiBuffList:
hurtTypes |= pow(2, ChConfig.HurtType_Immune) # 添加免疫
- buffMgr = defObj.GetBuffManager()
- for index in range(buffMgr.GetBuffCount()):
- buff = buffMgr.GetBuffByIndex(index)
- if not buff:
- continue
+ for buff in wudiBuffList:
skillData = buff.GetSkillData()
- if skillData.GetCurBuffState() != ChConfig.BatObjState_Wudi:
- continue
- # 记录免疫的积攒伤害
+ # 记录免疫积攒的伤害
buffValue = buff.GetValue1() + buff.GetValue2() * ChConfig.Def_PerPointValue
updBuffValue = buffValue + hurtValue
buff.SetValue1(updBuffValue % ChConfig.Def_PerPointValue)
@@ -1400,57 +1676,71 @@
# 减伤盾减伤， 会改变 hurtValue
hurtValue = max(0, hurtValue)
-
+
# 承伤盾承伤，剩余时间短的优先承伤，承伤不影响输出，相当于额外的HP，仅用于抵扣掉血，仅 改变 realHurtHP
realHurtHP = hurtValue
shieldBuffList = []
- buffMgr = defObj.GetBuffManager()
- for index in range(buffMgr.GetBuffCount()):
- buff = buffMgr.GetBuffByIndex(index)
+ for buff in buffMgr.FindBuffListByState(ChConfig.BatObjState_DamShield):
skillData = buff.GetSkillData()
- # 承伤盾
- if SkillCommon.isDamageShieldSkill(skillData):
- remainTime = buff.GetRemainTime() # 剩余回合
- if not skillData.GetLastTime():
- remainTime = 999 # 永久盾
- buffValue = buff.GetValue1() + buff.GetValue2() * ChConfig.Def_PerPointValue # 剩余盾值
- shieldBuffList.append([remainTime, buffValue, buff])
-
+ remainTime = buff.GetRemainTime() # 剩余回合
+ if not skillData.GetLastTime():
+ remainTime = 999 # 永久盾
+ buffValue = buff.GetValue1() + buff.GetValue2() * ChConfig.Def_PerPointValue # 剩余盾值
+ shieldBuffList.append([remainTime, buffValue, buff])
+
if shieldBuffList:
+ #可能需要同步盾伤跟实际扣血值给前端，具体看前端护盾怎么处理再优化
+ shieldHurtPer = 10000 # 对护盾伤害比
+ shieldHurtPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.PassiveEff_AddShieldHurtPer, curSkill)
+ shieldHurtPer /= 10000.0
+ shieldHurtValue = int(hurtValue * shieldHurtPer) # 对护盾伤害
+ GameWorld.DebugLog(" 对护盾总伤害: shieldHurtValue=%s,shieldHurtPer=%s,hurtValue=%s" % (shieldHurtValue, shieldHurtPer, hurtValue))
shieldBuffList.sort()
for _, buffValue, buff in shieldBuffList:
- if realHurtHP <= 0:
+ if shieldHurtValue <= 0:
break
buffID = buff.GetBuffID()
- if realHurtHP < buffValue:
- damageShieldValue = realHurtHP
+ buffSkillID = buff.GetSkillID()
+ if shieldHurtValue < buffValue:
+ decShieldValue = shieldHurtValue
else:
- damageShieldValue = buffValue
- GameWorld.DebugLog(" 承伤盾: buffID=%s,buffValue=%s,realHurtHP=%s,damageShieldValue=%s" % (buffID, buffValue, realHurtHP, damageShieldValue))
- realHurtHP -= damageShieldValue # 承伤值
- if damageShieldValue >= buffValue:
- GameWorld.DebugLog(" 删除盾: buffID=%s,realHurtHP=%s" % (buffID, realHurtHP))
+ decShieldValue = buffValue
+ GameWorld.DebugLog(" 承伤盾抵扣: buffID=%s,skillID=%s,buffValue=%s,剩余盾伤=%s,扣除盾值=%s" % (buffID, buffSkillID, buffValue, shieldHurtValue, decShieldValue))
+ shieldHurtValue -= decShieldValue # 承伤值
+ if decShieldValue >= buffValue:
+ GameWorld.DebugLog(" 删除盾: buffID=%s,剩余盾伤=%s" % (buffID, shieldHurtValue))
TurnBuff.DoBuffDel(turnFight, defObj, buff, relatedSkill=curSkill, afterLogic=True, tagObj=atkObj)
else:
- updShieldValue = buffValue - damageShieldValue
- GameWorld.DebugLog(" 更新盾值: updShieldValue=%s,realHurtHP=%s" % (updShieldValue, realHurtHP))
+ updShieldValue = buffValue - decShieldValue
+ GameWorld.DebugLog(" 更新盾: updShieldValue=%s,剩余盾伤=%s" % (updShieldValue, shieldHurtValue))
buff.SetValue1(updShieldValue % ChConfig.Def_PerPointValue)
buff.SetValue2(updShieldValue / ChConfig.Def_PerPointValue)
curSkill.AddAfterLogic(ChConfig.AfterLogic_SyncBuff, [defObj, buff, atkObj, "ReduceShieldValue"])
+ realHurtHP = int(shieldHurtValue / shieldHurtPer)
+ GameWorld.DebugLog(" 承伤后剩余伤血: realHurtHP=%s" % (realHurtHP))
return hurtValue, max(0, realHurtHP), hurtTypes
def CalcBounceHP(turnFight, atkObj, defObj, hurtObj, curSkill):
'''计算反弹反弹伤害
+ 注：反伤/荆棘暂不做属性支持，仅做buff效果支持
'''
if not atkObj.GetCanAttack():
return
- bounceHP = int(hurtObj.GetHurtHP() * random.uniform(0.1, 0.2))
+ damBackPer = 0
+ buffMgr = defObj.GetBuffManager()
+ for buff in buffMgr.FindBuffListByState(ChConfig.BatObjState_DamBackShield):
+ damBackPer += buff.GetValue1()
+
+ if damBackPer <= 0:
+ return
+
+ bounceHP = int(hurtObj.GetHurtHP() * damBackPer / 10000.0)
if bounceHP <= 0:
return
- GameWorld.DebugLog(" 反弹伤害=%s,%s/%s" % (bounceHP, atkObj.GetHP(), atkObj.GetMaxHP()))
+ GameWorld.DebugLog(" 反弹伤害=%s,%s/%s, damBackPer=%s" % (bounceHP, atkObj.GetHP(), atkObj.GetMaxHP(), damBackPer))
bounceHP, realBounceHP, _ = CalcHurtHPWithBuff(turnFight, defObj, atkObj, curSkill, bounceHP)
if bounceHP <= 0:
GameWorld.DebugLog(" bounceHP=%s" % (bounceHP))
@@ -1465,7 +1755,7 @@
TurnAttack.AddTurnObjHurtValue(defObj, atkObj, bounceHP, realBounceHP, isBounce=True)
return
-def CalcSuckBlood(atkObj, defObj, hurtObj, curSkill):
+def CalcSuckBlood(turnFight, atkObj, defObj, hurtObj, curSkill):
'''计算吸血
'''
@@ -1477,6 +1767,9 @@
dSuckHPPerDef = defObj.GetBatAttrValue(ChConfig.AttrID_SuckHPPerDef)
suckHP = int(eval(IpyGameDataPY.GetFuncCompileCfg("SuckHPCfg", 1)))
if suckHP <= 0:
+ return
+
+ if DoPoisonCure(turnFight, atkObj, suckHP, hurtObj, curSkill, True):
return
curHP = atkObj.GetHP()
@@ -1491,6 +1784,39 @@
# 吸血暂定算治疗
TurnAttack.AddTurnObjCureHP(atkObj, atkObj, suckHP, cureHP)
return
+
+def DoPoisonCure(turnFight, curObj, cureHP, hurtObj, curSkill, isSuck=False):
+ ## 毒奶逻辑
+ buffMgr = curObj.GetBuffManager()
+ poisonCureBuff = buffMgr.FindBuffByState(ChConfig.BatObjState_PoisonCure) # 毒奶暂定唯一
+ if not poisonCureBuff:
+ return
+ ownerID = poisonCureBuff.GetOwnerID()
+ buffOwner = BattleObj.GetBatObjMgr().getBatObj(ownerID) # 攻击方
+ if not buffOwner:
+ return
+ atkObj, defObj = buffOwner, curObj
+
+ hurtTypes = hurtObj.GetHurtTypes()
+ hurtValue, realHurtHP, hurtTypes = CalcHurtHPWithBuff(turnFight, atkObj, defObj, curSkill, cureHP, hurtTypes)
+
+ dHP = defObj.GetHP()
+ remainHP = max(0, dHP - realHurtHP) # 剩余血量
+ lostHP = dHP - remainHP # 实际掉血量
+ defObj.SetHP(remainHP)
+ GameWorld.DebugLog(" 毒奶: hurtValue=%s,realHurtHP=%s,lostHP=%s,%s/%s,isSuck=%s" % (hurtValue, realHurtHP, lostHP, defObj.GetHP(), defObj.GetMaxHP(), isSuck))
+
+ if isSuck:
+ hurtTypes |= pow(2, ChConfig.HurtType_PoisonCureSuck)
+ hurtObj.SetSuckHP(hurtValue)
+ else:
+ hurtTypes |= pow(2, ChConfig.HurtType_PoisonCureHurt)
+ hurtObj.SetHurtHP(hurtValue)
+ hurtObj.SetLostHP(lostHP)
+ hurtObj.SetHurtTypes(hurtTypes)
+
+ TurnAttack.AddTurnObjHurtValue(atkObj, defObj, hurtValue, lostHP, curSkill.GetSkillID())
+ return True
def CalcCureHP(turnFight, userObj, tagObj, curSkill, largeNum=False):
''' 计算治疗值
@@ -1510,6 +1836,12 @@
GameWorld.DebugLog("额外计算治疗方式: cureType=%s,skillPer=%s" % (cureType, skillPer))
cureHPEx = __calcCureHP(turnFight, userObj, tagObj, curSkill, cureType, skillPer, largeNum)
cureHP += cureHPEx
+
+ hurtShareEff = curSkill.GetEffectByID(ChConfig.SkillEff_HurtShare)
+ if hurtShareEff:
+ tagCnt = max(1, len(curSkill.GetTagObjList()))
+ cureHP = cureHP / tagCnt
+ GameWorld.DebugLog(" 目标均摊治疗: cureHP=%s,tagCnt=%s" % (cureHP, tagCnt))
return max(1, int(cureHP)) # 保底1点
@@ -1561,9 +1893,13 @@
if byBuff:
baseValue = byBuff.GetValue1() + byBuff.GetValue2() * ChConfig.Def_PerPointValue
GameWorld.DebugLog("根据buff值: %s" % baseValue)
+ elif calcType == ChConfig.Def_Calc_HarmSelfHP:
+ baseValue = curObj.GetHarmSelfHP()
+ GameWorld.DebugLog("根据自残值: %s" % baseValue)
+
return baseValue
-def DoDOTAttack(turnFight, batObj, curBuff, hurtValue, hurtTypes):
+def DoDOTAttack(turnFight, batObj, curBuff, hurtValue, hurtTypes, **kwargs):
## 执行单次dot逻辑
skillID = curBuff.GetSkillID()
skillIpyData = IpyGameDataPY.GetIpyGameData("Skill", skillID)
@@ -1591,9 +1927,15 @@
dHP = defObj.GetHP()
GameWorld.DebugLog("结算dot: atkID=%s,defID=%s,buffID=%s,skillID=%s,ownerID=%s,hurtValue=%s,hurtTypes=%s,dHP=%s"
% (atkID, defID, buffID, skillID, ownerID, hurtValue, hurtTypes, dHP))
+ layer = curBuff.GetLayer()
+ if layer > 0:
+ hurtValue *= layer
+ GameWorld.DebugLog(" 多层buff伤害: hurtValue=%s,layer=%s" % (hurtValue, layer))
+ if "FinalDamPer" in kwargs:
+ FinalDamPer = kwargs["FinalDamPer"]
+ hurtValue *= (10000 + FinalDamPer) / 10000.0
+ GameWorld.DebugLog(" 增伤: hurtValue=%s,FinalDamPer=%s" % (hurtValue, FinalDamPer))
hurtValue, realHurtHP, hurtTypes = CalcHurtHPWithBuff(turnFight, atkObj, defObj, useSkill, hurtValue, hurtTypes)
-
- # dot的反弹、吸血待定
remainHP = max(0, dHP - realHurtHP) # 剩余血量
lostHP = dHP - remainHP # 实际掉血量
@@ -1618,6 +1960,8 @@
def Sync_UseSkill(turnFight, curBatObj, useSkill):
## 通知释放技能
+ bySkill = useSkill.GetBySkill()
+ relatedSkillID = bySkill.GetSkillID() if bySkill else 0
poolMgr = ObjPool.GetPoolMgr()
clientPack = poolMgr.acquire(ChPyNetSendPack.tagSCUseSkill)
clientPack.ObjID = curBatObj.GetID()
@@ -1626,6 +1970,7 @@
clientPack.CurHP = curBatObj.GetHP() % ChConfig.Def_PerPointValue
clientPack.CurHPEx = curBatObj.GetHP() / ChConfig.Def_PerPointValue
clientPack.SkillID = useSkill.GetSkillID()
+ clientPack.RelatedSkillID = relatedSkillID
clientPack.HurtList = []
for hurtObj in useSkill.GetHurtObjList():
hurt = poolMgr.acquire(ChPyNetSendPack.tagSCUseSkillHurt)
--
Gitblit v1.8.0