From ab3c1e29995e5bae442a06bbd8c4ae821efe88d0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 27 十一月 2025 11:11:46 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（优化被动buff触发有效效果逻辑；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 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 824d3d5..04cd13e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.py
@@ -732,7 +732,7 @@
curBatObj.SetHarmSelfHP(harmHP) # 无视实际扣血量，直接更新
# 单独通知前端表现
- hurtTypes = pow(2, ChConfig.HurtType_HarmSelf)
+ hurtTypes = pow(2, ChConfig.HurtAtkType_HarmSelf)
diffType, diffValue = 0, lostHP
skillID = relatedSkillID = useSkill.GetSkillID()
Sync_PropertyRefreshView(turnFight, curBatObj, ChConfig.AttrID_HP, updHP, diffValue, diffType, skillID, relatedSkillID, hurtTypes)
@@ -872,7 +872,7 @@
tagBatObj.SetRevive(cureHP)
hurtObj = useSkill.AddHurtObj(dID)
- hurtObj.AddHurtType(ChConfig.HurtType_Revive)
+ hurtObj.AddHurtType(ChConfig.HurtAtkType_Revive)
hurtObj.SetHurtHP(cureHP)
hurtObj.SetLostHP(cureHP)
hurtObj.SetCurHP(tagBatObj.GetHP())
@@ -892,8 +892,9 @@
for tagBatObj, cureHP, poisonCureOwner in calcCureResults:
# 汇总毒奶
if poisonCureOwner:
- hurtTypes = pow(2, ChConfig.HurtTYpe_Cure)
- hurtTypes |= pow(2, ChConfig.HurtType_PoisonCureHurt)
+ hurtTypes = pow(2, ChConfig.HurtAtkType_Cure)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_Hurt)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_PoisonCureHurt)
hurtValue = cureHP
hurtValue, hurtTypes, immuneHurt = CalcHurtWithBuff(turnFight, atkObj, tagBatObj, hurtValue, hurtTypes)
calcHurtResults.append([tagBatObj, hurtValue, hurtTypes, immuneHurt])
@@ -909,7 +910,7 @@
tagBatObj.SetHP(remainHP)
hurtObj = curSkill.AddHurtObj(dID)
- hurtObj.AddHurtType(ChConfig.HurtTYpe_Cure)
+ hurtObj.AddHurtType(ChConfig.HurtAtkType_Cure)
hurtObj.SetHurtHP(cureHP)
hurtObj.SetLostHP(realCureHP)
hurtObj.SetCurHP(tagBatObj.GetHP())
@@ -977,8 +978,9 @@
if poisonCureOwner:
GameWorld.DebugLog("本次治疗为毒奶: cureHP=%s" % cureHP)
hurtValue = cureHP
- hurtTypes = pow(2, ChConfig.HurtTYpe_Cure)
- hurtTypes |= pow(2, ChConfig.HurtType_PoisonCureHurt)
+ hurtTypes = pow(2, ChConfig.HurtAtkType_Cure)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_Hurt)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_PoisonCureHurt)
hurtValue, hurtTypes, immuneHurt = CalcHurtWithBuff(turnFight, poisonCureOwner, defObj, hurtValue, hurtTypes)
calcHurtResults = [[defObj, hurtValue, hurtTypes, immuneHurt]]
DoSkillHurtHP(turnFight, poisonCureOwner, useSkill, calcHurtResults, "PoisonCOT")
@@ -988,7 +990,7 @@
defObj.SetHP(remainHP)
hurtObj = useSkill.AddHurtObj(defID)
- hurtObj.AddHurtType(ChConfig.HurtTYpe_Cure)
+ hurtObj.AddHurtType(ChConfig.HurtAtkType_Cure)
hurtObj.SetHurtHP(cureHP)
hurtObj.SetLostHP(realCureHP)
hurtObj.SetCurHP(defObj.GetHP())
@@ -1195,7 +1197,7 @@
for hurtObj in useSkill.GetHurtObjListAll():
if hurtObj.GetObjID() != tagID:
continue
- if hurtObj.HaveHurtType(ChConfig.HurtType_Parry): # 格挡时可反击
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Parry): # 格挡时可反击
canAtkBack = True
break
@@ -1289,39 +1291,39 @@
tagObj = batObjMgr.getBatObj(hurtObjID)
if not tagObj:
continue
- if not hurtObj.HaveHurtType(ChConfig.HurtTYpe_Cure) and not hurtObj.HaveHurtType(ChConfig.HurtType_Immune) \
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Hurt) and not hurtObj.HaveHurtType(ChConfig.HurtAtkType_Immune) \
and (isTurnNormalSkill or isAngerSkill) and tagObj.IsAlive():
__doSkillHurtAnger(tagObj, hurtObj.GetLostHP(), useSkill)
- if hurtObj.HaveHurtType(ChConfig.HurtType_Normal):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Hurt):
totalHurtValue += hurtObj.GetHurtHP()
if hurtObj.GetLostHP() > 0: # 有掉血的
if hurtObjID not in beHurtObjIDList:
beHurtObjIDList.append(hurtObjID)
- if hurtObj.HaveHurtType(ChConfig.HurtType_Miss):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Miss):
if hurtObjID not in missObjIDList:
missObjIDList.append(hurtObjID)
DoHeroSpecialty(turnFight, tagObj, ChConfig.HeroSpecialty_Miss, relatedSkillID)
- if hurtObj.HaveHurtType(ChConfig.HurtType_Revive):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Revive):
if tagObj not in reviveObjList:
reviveObjList.append(tagObj)
- if hurtObj.HaveHurtType(ChConfig.HurtType_Immune):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Immune):
if hurtObjID not in immuneObjIDList:
immuneObjIDList.append(hurtObjID)
- if hurtObj.HaveHurtType(ChConfig.HurtType_Parry):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Parry):
DoHeroSpecialty(turnFight, tagObj, ChConfig.HeroSpecialty_Parry, relatedSkillID)
if hurtObjID not in parryObjIDList:
parryObjIDList.append(hurtObjID)
- if hurtObj.HaveHurtType(ChConfig.HurtType_SuperHit):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_SuperHit):
if hurtObjID not in superHitObjIDList:
superHitObjIDList.append(hurtObjID)
- if hurtObj.HaveHurtType(ChConfig.HurtType_Stun):
+ if hurtObj.HaveHurtType(ChConfig.HurtAtkType_Stun):
if hurtObjID not in stunObjIDList:
stunObjIDList.append(hurtObjID)
@@ -1781,9 +1783,9 @@
if GameWorld.CanHappen(missRate):
GameWorld.DebugLog("闪避了! missRate=%s,dMissRate=%s,aMissRateDef=%s,missNum=%s" % (missRate, dMissRate, aMissRateDef, missNum))
curSkill.SetTagMissNum(defID, missRate + 1)
- return 0, pow(2, ChConfig.HurtType_Miss)
+ return 0, pow(2, ChConfig.HurtAtkType_Miss)
- hurtTypes = pow(2, ChConfig.HurtType_Normal)
+ hurtTypes = pow(2, ChConfig.HurtAtkType_Hurt)
isSuperHit, isParry, isStun = False, False, False
aSuperDamPer, dSuperDamPerDef = 0, 0
@@ -1797,7 +1799,7 @@
isStun = CanStun(turnFight, atkObj, defObj, curSkill) # 是否击晕
if isSuperHit:
- hurtTypes |= pow(2, ChConfig.HurtType_SuperHit)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_SuperHit)
aSuperDamPer = IpyGameDataPY.GetFuncCfg("SuperHitCfg", 2) * 10000
aSuperDamPer += atkObj.GetBatAttrValue(ChConfig.AttrID_SuperDamPer)
aSuperDamPer += TurnPassive.GetTriggerEffectValue(turnFight, atkObj, defObj, ChConfig.AttrID_SuperDamPer, curSkill)
@@ -1806,14 +1808,14 @@
GameWorld.DebugLog("aSuperDamPer=%s,dSuperDamPerDef=%s" % (aSuperDamPer, dSuperDamPerDef))
if isParry:
- hurtTypes |= pow(2, ChConfig.HurtType_Parry)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_Parry)
if ignoreDef:
GameWorld.DebugLog("无视防御/真实伤害!")
- hurtTypes |= pow(2, ChConfig.HurtType_IgnoreDef)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_IgnoreDef)
if isStun:
- hurtTypes |= pow(2, ChConfig.HurtType_Stun)
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_Stun)
#参与运算的数值
#rand = random.random() #种子数 0~1
@@ -2040,7 +2042,7 @@
hurtValue = int(hurtValue)
if defObj.CheckInState(ChConfig.BatObjState_Wudi):
- hurtTypes |= pow(2, ChConfig.HurtType_Immune) # 添加免疫
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_Immune) # 添加免疫
immuneHurt = hurtValue
hurtValue = 0
return hurtValue, hurtTypes, immuneHurt
@@ -2169,7 +2171,7 @@
immuneHurt = max(int(immuneHurtDict.pop(tagID, 0)), 0) # 因为有标记-1值，所以加max
# 主要目标的免疫标记外层已经处理，仅额外处理标记曹仁防护
if caorenProtectID == tagID:
- hurtTypes |= pow(2, ChConfig.HurtType_CaorenProtect) # 标记受到曹仁防护，前端表现需要
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_CaorenProtect) # 标记受到曹仁防护，前端表现需要
finalHurtResults.append([tagObj, finalHurt, hurtTypes, immuneHurt])
finalHurtTotal = finalHurtTotal + finalHurt + immuneHurt
GameWorld.DebugLog("得出主要目标分摊后的最终伤害: tagID=%s,finalHurt=%s,hurtTypes=%s,immuneHurt=%s,finalHurtTotal=%s" % (tagID, finalHurt, hurtTypes, immuneHurt, finalHurtTotal))
@@ -2181,11 +2183,11 @@
tagObj = batObjMgr.getBatObj(tagID)
if not tagObj:
continue
- hurtTypes = pow(2, ChConfig.HurtType_Normal)
+ hurtTypes = pow(2, ChConfig.HurtAtkType_Hurt)
finalHurt = int(hurtValueDict.pop(tagID, 0))
immuneHurt = max(int(immuneHurtDict.pop(tagID, 0)), 0)
if immuneHurt > 0:
- hurtTypes |= pow(2, ChConfig.HurtType_Immune) # 添加免疫
+ hurtTypes |= pow(2, ChConfig.HurtAtkType_Immune) # 添加免疫
finalHurtTotal = finalHurtTotal + finalHurt + immuneHurt
GameWorld.DebugLog("得出额外目标分摊后的最终伤害: tagID=%s,finalHurt=%s,hurtTypes=%s,immuneHurt=%s,finalHurtTotal=%s" % (tagID, finalHurt, hurtTypes, immuneHurt, finalHurtTotal))
if finalHurt > 0 or immuneHurt > 0: # 额外目标有受伤或免疫才算
@@ -2496,7 +2498,7 @@
GameWorld.DebugLog(" 本次吸血为毒奶: suckHP=%s,hurtValue=%s" % (suckHP, hurtValue))
DoLostHP(turnFight, atkObj, defObj, hurtValue, curSkill, "PoisonSuckBlood", hpCanNegative=True, immuneHurt=immuneHurt) # 吸血毒奶生命允许负值
- hurtObj.AddHurtType(ChConfig.HurtType_PoisonCureSuck)
+ hurtObj.AddHurtType(ChConfig.HurtAtkType_PoisonCureSuck)
hurtObj.SetSuckHP(hurtValue) # 如果前端有需要表现免疫吸血毒奶，可以判断吸血毒奶下该值为0代表免疫
return
--
Gitblit v1.8.0