ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.py
@@ -652,7 +652,10 @@
                       ChConfig.AttrID_ParryRate:npcData.GetParryRate(), ChConfig.AttrID_ParryRateDef:npcData.GetParryRateDef(), 
                       ChConfig.AttrID_SuckHPPer:npcData.GetSuckHPPer(), ChConfig.AttrID_SuckHPPerDef:npcData.GetSuckHPPerDef(), 
                       }
        batAttrDict.update(npcData.GetSpecAttrInfo())
    exAttrDict = npcData.GetSpecAttrInfo()
    for attrIDStr, attrValue in exAttrDict.items():
        attrID = int(attrIDStr)
        batAttrDict[attrID] = batAttrDict.get(attrID, 0) + attrValue
        
    battleDict = {"NPCID":npcID,
                  "HeroID":heroID,
@@ -1402,7 +1405,7 @@
                        #GameWorld.DebugLog("    永久buff不处理! curID=%s,index=%s,skillID=%s" % (curID, index, skillID))
                        continue
                    calcTimeline = buff.GetCalcTime()
                    passTurn = __calcPassturn(calcTimeline, nowTimeline, False)
                    passTurn = __calcPassturn(calcTimeline, nowTimeline, True)
                    if passTurn <= 0:
                        #GameWorld.DebugLog("    passTurn <= 0 passTurn=%s,calcTimeline=%s,nowTimeline=%s,skillID=%s" % (passTurn, calcTimeline, nowTimeline, skillID))
                        continue
@@ -1421,7 +1424,7 @@
def __calcPassturn(calcTimeline, nowTimeline, equalOK):
    ## 计算已经过了的回合数
    # @param equalOK: 时间节点相同时是否算1回合,一般技能可以算,buff不算
    # @param equalOK: 时间节点相同时是否算1回合,一般技能可以算,buff可算可不算,具体看需求调整
    calcTurnNum = calcTimeline / TimelineSet
    calcTimeNode = calcTimeline % TimelineSet
    nowTurnNum = nowTimeline / TimelineSet
@@ -1559,7 +1562,7 @@
        if SkillCommon.isAngerSkill(useSkill):
            if curXP < xpMax:
                continue
            if curBatObj.IsInState(ChConfig.BatObjState_Sneer):
            if curBatObj.CheckInState(ChConfig.BatObjState_Sneer):
                GameWorld.DebugLog("嘲讽状态下,无法主动释放怒技!") # 可被动释放怒技,如怒技追击
                continue
            useCnt = -1 # xp技能优先释放