Project_SG_ServerCode.git

			@@ -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,19 +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)
			@@ -159,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, ...]
			@@ -168,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]
			@@ -182,6 +219,7 @@
			# 混乱: 随机敌友; 不打自己，只剩自己随机后是己方时不释放技能
			# 嘲讽: 目标是敌方时强制目标一定包含施法者

			curFaction = curBatObj.GetFaction()
			sneerObj = None # 嘲讽目标
			sneerObjID, sneerObjPosNum = 0, 0
			if tagFriendly:
			@@ -200,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] # 敌方优先对位阵容，再其他阵容
			@@ -208,6 +248,7 @@
			if tagNum not in lineupNumList:
			lineupNumList.append(tagNum)

			batLineup = None
			aimObjList = [] # 先筛选出范围目标
			for num in lineupNumList:
			batLineup = batFaction.getBatlineup(num)
			@@ -304,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:
			@@ -325,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):
			## 获取行排目标对象列表
			@@ -408,7 +501,8 @@

			def __GetRelativeObjDefault(batObjMgr, curBatObj, posNum, batLineup):
			## 获取在某一阵营中的默认对位目标

			if not batLineup:
			return
			tagAffect = ChConfig.SkillTagAffect_None # 默认对位目标不需要细分目标，默认规则即可
			inColNum = ChConfig.GetInColNum(posNum) # 玩家所在纵列
			# 优先自己所在纵
			@@ -456,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)
			@@ -468,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")
			@@ -480,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):
			@@ -491,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):
			@@ -567,7 +811,7 @@
			else:
			diffType = 1
			tagXP = tagBatObj.GetXP()
			diffValue = calcValue
			diffValue = GetEnhanceXP(tagBatObj, calcValue)
			updValue = tagXP + diffValue
			tagBatObj.SetXP(updValue, False)
			GameWorld.DebugLog(" 加怒气: tagID=%s,diffValue=%s,tagXP=%s,updXP=%s" % (tagID, diffValue, tagXP, updValue))
			@@ -576,10 +820,10 @@
			if curStealTotal > 0:
			diffType = 1
			curXP = curBatObj.GetXP()
			diffValue = curStealTotal
			diffValue = GetEnhanceXP(tagBatObj, curStealTotal)
			updValue = curXP + diffValue
			curBatObj.SetXP(updValue, False)
			GameWorld.DebugLog(" 加总怒气: curID=%s,curStealTotal=%s,curXP=%s,updXP=%s" % (curID, curStealTotal, curXP, updValue))
			GameWorld.DebugLog(" 加总怒气: curID=%s,curStealTotal=%s,curXP=%s,diffValue=%s,updXP=%s" % (curID, curStealTotal, curXP, diffValue, updValue))
			Sync_PropertyRefreshView(turnFight, curBatObj, attrID, updValue, diffValue, diffType, skillID, relatedSkillID)

			return
			@@ -597,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)
			@@ -628,7 +871,13 @@
			纵排：优先前面的单位
			'''

			if turnFight.winFaction:
			return

			if not useSkill.ComboEnable():
			return

			if not atkObj.IsAlive():
			return

			tagFriendly = useSkill.GetTagFriendly()
			@@ -675,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))
			@@ -755,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)
			@@ -767,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)
			@@ -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

			@@ -923,6 +1186,7 @@
			if posNum <= 0:
			#非主战单位不加
			return
			addXP = GetEnhanceXP(gameObj, addXP)
			curXP = gameObj.GetXP()
			updXP = curXP + addXP
			gameObj.SetXP(updXP)
			@@ -937,12 +1201,24 @@
			if str(specialty) not in specialtyAddXPDict:
			return
			addXP = specialtyAddXPDict[str(specialty)]
			addXP = GetEnhanceXP(gameObj, addXP)
			curXP = gameObj.GetXP()
			updXP = curXP + addXP
			gameObj.SetXP(updXP, False)
			GameWorld.DebugLog(" 特长加XP: curID=%s,curXP=%s,addXP=%s,updXP=%s,特性=%s" % (gameObj.GetID(), curXP, addXP, updXP, specialty))
			Sync_PropertyRefreshView(turnFight, gameObj, ChConfig.AttrID_XP, updXP, addXP, diffType=1, relatedSkillID=relatedSkillID)
			return

			def GetEnhanceXP(gameObj, addXP):
			## 获取提升后的xp值
			addPer = gameObj.GetBatAttrValue(ChConfig.AttrID_XPRecoverPer)
			# 其他强化、弱化
			if addPer == 0:
			return addXP
			objID = gameObj.GetID()
			updAddXP = int(addXP * max(10000 + addPer, 0) / 10000.0)
			GameWorld.DebugLog("怒气恢复提升: objID=%s,addXP=%s,addPer=%s,updAddXP=%s" % (objID, addXP, addPer, updAddXP))
			return updAddXP

			def __DoCurSkillEff(turnFight, curObj, useSkill, effIgnoreObjIDList, isUseSkill):
			## 执行本技能/buff释放后额外效果
			@@ -988,6 +1264,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 +1413,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 +1440,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 +1475,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 +1511,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 +1553,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 +1610,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,6 +1671,7 @@
			if hurtValue <= 0:
			return 0, 0, hurtTypes

			hurtValue = int(hurtValue)
			buffMgr = defObj.GetBuffManager()
			wudiBuffList = buffMgr.FindBuffListByState(ChConfig.BatObjState_Wudi)
			if wudiBuffList:
			@@ -1396,7 +1689,7 @@

			# 减伤盾减伤，会改变 hurtValue
			hurtValue = max(0, hurtValue)


			# 承伤盾承伤，剩余时间短的优先承伤，承伤不影响输出，相当于额外的HP，仅用于抵扣掉血，仅改变 realHurtHP
			realHurtHP = hurtValue
			shieldBuffList = []
			@@ -1409,27 +1702,36 @@
			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):
			@@ -1466,7 +1768,7 @@
			TurnAttack.AddTurnObjHurtValue(defObj, atkObj, bounceHP, realBounceHP, isBounce=True)
			return

			def CalcSuckBlood(atkObj, defObj, hurtObj, curSkill):
			def CalcSuckBlood(turnFight, atkObj, defObj, hurtObj, curSkill):
			'''计算吸血
			'''

			@@ -1478,6 +1780,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()
			@@ -1492,6 +1797,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):
			''' 计算治疗值
			@@ -1568,9 +1906,23 @@
			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)
			elif calcType == ChConfig.Def_Calc_AtkedSkillHurtHP:
			bySkill = curSkill.GetBySkill()
			bySkillID = 0
			if bySkill:
			bySkillID = bySkill.GetSkillID()
			curID = curObj.GetID()
			for hurtObj in bySkill.GetHurtObjList():
			if curID == hurtObj.GetObjID():
			baseValue += hurtObj.GetHurtHP()
			GameWorld.DebugLog("根据最后受击技能伤害: %s,bySkillID=%s" % (baseValue, bySkillID))

			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)
			@@ -1602,9 +1954,11 @@
			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 # 实际掉血量
			@@ -1629,6 +1983,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()
			@@ -1637,6 +1993,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)
			@@ -1694,3 +2051,15 @@
			clientPack.RelatedSkillID = relatedSkillID
			turnFight.addBatPack(clientPack)
			return

			def Sync_HPRefresh(turnFight, curBatObj):
			hp, maxHP = curBatObj.GetHP(), curBatObj.GetMaxHP()
			clientPack = ObjPool.GetPoolMgr().acquire(ChPyNetSendPack.tagSCObjHPRefresh)
			clientPack.ObjID = curBatObj.GetID()
			clientPack.HP = hp % ShareDefine.Def_PerPointValue
			clientPack.HPEx = hp / ShareDefine.Def_PerPointValue
			clientPack.MaxHP = maxHP % ShareDefine.Def_PerPointValue
			clientPack.MaxHPEx = maxHP / ShareDefine.Def_PerPointValue
			turnFight.addBatPack(clientPack)
			return