129 【战斗】战斗系统-服务端（吕布所有技能；优化效果5501支持同国层级；7002效果支持配置学习x技能生效；增加效果5511；）

hxp

2025-12-30 fe40f1881045b901bd5e7365673e3a2b677f7e7f

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py

@@ -43,6 +43,7 @@
    Sync_PlayerHeroInfo(curPlayer)

    Sync_LineupRecommendInfo(curPlayer)

    Sync_HeroFatesInfo(curPlayer)

    __CheckOSAHeroStar(curPlayer)

    return



def OnPlayerFirstLogin(curPlayer):

@@ -605,6 +606,28 @@
            break

        singleItem.AddUserAttr(ShareDefine.Def_IudetHeroTalentID, talentID)

        singleItem.AddUserAttr(ShareDefine.Def_IudetHeroTalentIDLV, lvList[index])

    return



def GetHeroStarTotal(curPlayer):

    ## 武将总星级

    totalStar = 0

    curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptHero)

    for index in range(curPack.GetCount()):

        heroItem = curPack.GetAt(index)

        if not heroItem or heroItem.IsEmpty():

            continue

        totalStar += heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)

    return totalStar



def __CheckOSAHeroStar(curPlayer):

    ## 线上bug临时处理

    osaHeroStar = PlayerSuccess.GetSuccValue(curPlayer, ShareDefine.SuccType_OSAHeroStarUP, [])

    starTotal = GetHeroStarTotal(curPlayer)

    addStar = starTotal - osaHeroStar

    if addStar <= 0:

        return

    GameWorld.Log("上线修正庆典武将升星成就进度! addStar=%s,starTotal=%s" % (addStar, starTotal))

    PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAHeroStarUP, addStar)

    return



#// B2 32 武将突破 #tagCSHeroBreak

@@ -1263,13 +1286,13 @@
        qualityBreakIpyData = IpyGameDataPY.GetIpyGameData("HeroQualityBreak", quality, retBreakLV)

        if not qualityBreakIpyData:

            continue

        costItemInfo = qualityBreakIpyData.GetUPCostItem()

        if not costItemInfo:

        costItemList = qualityBreakIpyData.GetUPCostItemList()

        if not costItemList:

            continue

        costItemID, costItemCount = costItemInfo

        costItemCount = max(1, int(costItemCount * ratio / 100.0))

        returnItemDict[costItemID] = returnItemDict.get(costItemID, 0) + costItemCount

        returnDict[costItemID] = returnDict.get(costItemID, 0) + costItemCount

        for costItemID, costItemCount in costItemList:

            costItemCount = max(1, int(costItemCount * ratio / 100.0))

            returnItemDict[costItemID] = returnItemDict.get(costItemID, 0) + costItemCount

            returnDict[costItemID] = returnDict.get(costItemID, 0) + costItemCount

    GameWorld.DebugLog("    突破返还: quality=%s,breakLV=%s,ratio=%s,%s,总%s" % (quality, breakLV, ratio, returnDict, returnItemDict))

    return



@@ -1584,6 +1607,7 @@
        return

    needStarTotal = qualityLVIpyData.GetNeedStarTotal()

    needHeroCnt = qualityLVIpyData.GetNeedHeroCnt()

    needQuality = qualityLVIpyData.GetNeedQuality()

    

    costItemList = []

    heroStarDict = {}

@@ -1597,7 +1621,7 @@
        

        # 材料卡

        if index in useIndexList:

            if __checkHeroFatesLVUPItem(olPlayer, fatesQuality, index, heroItem, heroID):

            if __checkHeroFatesLVUPItem(olPlayer, needQuality, index, heroItem, heroID):

                costItemList.append(heroItem)

                

        if heroID not in heroIDList:

@@ -1628,15 +1652,15 @@
    RefreshLordAttr(curPlayer) # 宿缘

    return



def __checkHeroFatesLVUPItem(olPlayer, fatesQuality, itemIndex, heroItem, heroID):

def __checkHeroFatesLVUPItem(olPlayer, needQuality, itemIndex, heroItem, heroID):

    ## 检查宿缘材料卡可否使用

    heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID)

    if not heroIpyData:

        return

    

    quality = heroIpyData.GetQuality()

    if quality != fatesQuality:

        GameWorld.DebugLog("    与宿缘品质不同的卡无法使用: itemIndex=%s,heroID=%s,quality=%s != %s" % (itemIndex, heroID, quality, fatesQuality))

    if quality != needQuality:

        GameWorld.DebugLog("    与宿缘所需品质不同的卡无法使用: itemIndex=%s,heroID=%s,quality=%s != %s" % (itemIndex, heroID, quality, needQuality))

        return

    

    #未生效、未上阵、未锁定、未进行过升级、突破、升星、觉醒