417 【武将】吞噬返还优化（固定额外返还一个本体遣散道具；优化吞噬星级溢出逻辑；）

hxp

2026-02-28 95c731d5e1a9aadb610ac9f6ecbc6b74b919ab60

417 【武将】吞噬返还优化（固定额外返还一个本体遣散道具；优化吞噬星级溢出逻辑；）

 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.py

@@ -205,7 +205,7 @@
    elif value == "s":

        addStar = msgList[2] if len(msgList) > 2 else 1

        curStar = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)

        starMax = PlayerHero.GetHeroStarMax(heroItem)

        starMax = PlayerHero.GetHeroStarMax(heroID, heroItem)

        if curStar >= starMax:

            GameWorld.DebugAnswer(curPlayer, "武将已满星: %s,itemIndex=%s" % (curStar, itemIndex))

            return

@@ -326,7 +326,7 @@
    PlayerHero.SetHeroBreakLV(curPlayer, heroItem, breakLV, False)

    

    # 星级

    starMax = PlayerHero.GetHeroStarMax(heroItem)

    starMax = PlayerHero.GetHeroStarMax(heroID, heroItem)

    if setStar != None:

        updStar = min(setStar, starMax)

    else:


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

@@ -296,7 +296,7 @@
    if not awardIpyDataList:

        return

    

    heroStar = PlayerHero.GetHeroItemStarMax(curPlayer, starHeroID)

    heroStar = PlayerHero.GetHeroIDStar(curPlayer, starHeroID)

    

    awardItemList = []

    updStarAward = starAward = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ActHeroAppearStarAward % actNum)


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

@@ -384,7 +384,7 @@
    quality = heroIpyData.GetQuality()

    star = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)

    awakeLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroAwakeLV)

    starMax = GetHeroStarMax(heroItem)

    starMax = GetHeroStarMax(heroID, heroItem)

    GameWorld.DebugLog("heroID=%s,star=%s,quality=%s,awakeLV=%s,starMax=%s" % (heroID, star, quality, awakeLV, starMax), playerID)

    if star >= starMax:

        GameWorld.DebugLog("该武将已满星！starMax=%s" % (starMax), playerID)

@@ -398,11 +398,24 @@
    DoHeroUpdStar(curPlayer, heroItem, updStar)

    

    PlayerOnline.GetOnlinePlayer(curPlayer).OnHeroItemUpate(heroItem) # 升星

    
    # 固定返还一个遣散本体材料

    qualityIpyData = IpyGameDataPY.GetIpyGameData("HeroQuality", quality)

    if qualityIpyData:

        ratio = IpyGameDataPY.GetFuncCfg("HeroRebirth", 5)

        returnItemList = []

        dismissReturnItems = qualityIpyData.GetDismissReturnItems()

        for itemID, itemCount in dismissReturnItems:

            returnCnt = max(1, int(itemCount * ratio / 100.0))

            returnItemList.append([itemID, returnCnt])

        ItemControler.GivePlayerItemOrMail(curPlayer, returnItemList, event=["HeroStarUPReturn", False, {}])

        
    return



def GetHeroStarMax(heroItem):

    ## 获取武将当前最大星级

    heroID = heroItem.GetItemTypeID()

def GetHeroStarMax(heroID, heroItem=None):

    ## 获取武将卡物品当前最大星级

    # @param heroItem: 传入武将物品时，则取本物品当前觉醒对应的最大星级

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

    if not heroIpyData:

        return 0

@@ -412,8 +425,10 @@
        return 0

    InitStarUpper = qualityIpyData.GetInitStarUpper()

    

    awakeLV = 99999

    if heroItem:

    awakeLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroAwakeLV)

    if not awakeLV:

    if awakeLV <= 0:

        return InitStarUpper

    

    addStarUpper = 0

@@ -430,7 +445,11 @@


def DoHeroUpdStar(curPlayer, heroItem, updStar, isSync=True):

    ## 执行武将星级更新

    #heroID = heroItem.GetItemTypeID()

    heroID = heroItem.GetItemTypeID()

    versionStarMax = GetHeroStarMax(heroID) # 版本理论最大星级

    if updStar > versionStarMax:

        updStar = versionStarMax

        GameWorld.DebugLog("不超过版本最大武将星级: heroID=%s,versionStarMax=%s" % (heroID, versionStarMax))

    curStar = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)

    addStar = updStar - curStar

    item = heroItem.GetItem()

@@ -563,8 +582,8 @@
        singleItem.AddUserAttr(ShareDefine.Def_IudetHeroTalentIDLV, lvList[index])

    return



def GetHeroItemStarMax(curPlayer, heroID):

    ## 获取某个武将ID当前最大星级

def GetHeroIDStar(curPlayer, heroID):

    ## 获取某个武将ID当前星级，同时存在多张卡时取最大的星级

    starMax = 0

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

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

@@ -823,21 +842,51 @@
        idList.append(talentID)

        lvList.append(talentLV)

        

    commTalentSlot = IpyGameDataPY.GetFuncCfg("HeroStarTalent", 1) # 常规天赋槽个数

    if idCount < commTalentSlot:

        idList += [0] * (commTalentSlot - idCount)

        lvList += [0] * (commTalentSlot - idCount)

        
    if selectTalentID in idList:

        GameWorld.ErrLog("选择天赋ID不能重复! heroID=%s,selectIndex=%s,selectTalentID=%s in %s" 

                         % (heroID, selectIndex, selectTalentID, idList), playerID)

        return

    commTalentSlot = IpyGameDataPY.GetFuncCfg("HeroStarTalent", 1) # 常规天赋槽个数

    talentMaxLV = IpyGameDataPY.GetFuncCfg("HeroStarTalent", 2) # 每个天赋最大等级

    idCount = len(idList)

    GameWorld.DebugLog("选择天赋: heroID=%s,selectTalentID=%s,idList=%s,lvList=%s" % (heroID, selectTalentID, idList, lvList))

    
    if idCount < commTalentSlot:

        idList += [0] * (commTalentSlot - idCount)

        lvList += [0] * (commTalentSlot - idCount)

        
        selectTalentLV = 1

        GameWorld.DebugLog("常规槽位未全部解锁，觉醒槽位默认1级天赋")

        
    else:

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

        if not heroIpyData:

            return

        quality = heroIpyData.GetQuality()

        qualityIpyData = IpyGameDataPY.GetIpyGameData("HeroQuality", quality)

        if not qualityIpyData:

            return

        InitStarUpper = qualityIpyData.GetInitStarUpper()

        heroAwakeIpyDataList = IpyGameDataPY.GetIpyGameDataListNotLog("HeroAwake", heroID)

        if not heroAwakeIpyDataList:

            return

        preSlotStarMax = 0 # 上一档槽位最大星级

        preSlotStarMax += InitStarUpper

        for ipyData in heroAwakeIpyDataList:

            if idCount < ipyData.GetUnlockTalentSlot():

                break

            preSlotStarMax += ipyData.GetAddStarUpper()

            
        curStar = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)

        GameWorld.DebugLog("常规槽位已全部解锁, idCount=%s,preSlotStarMax=%s,curStar=%s" % (idCount, preSlotStarMax, curStar))

        overflowStar = curStar - preSlotStarMax # 溢出星级 = 当前星级 - 上一档槽位最大星级

        selectTalentLV = max(1, min(overflowStar + 1, talentMaxLV)) # 保底1级 + 溢出星级

    

    idList.append(selectTalentID)

    lvList.append(1)

    lvList.append(selectTalentLV)

    singleItem.ClearUserAttr(ShareDefine.Def_IudetHeroTalentIDAwakeRand)

    

    GameWorld.DebugLog("更新选择天赋: selectTalentID=%s,idList=%s,lvList=%s" % (selectTalentID, idList, lvList))

    GameWorld.DebugLog("selectTalentID=%s,selectTalentLV=%s,idList=%s,lvList=%s" % (selectTalentID, selectTalentLV, idList, lvList))

    singleItem.ClearUserAttr(ShareDefine.Def_IudetHeroTalentID)

    singleItem.ClearUserAttr(ShareDefine.Def_IudetHeroTalentIDLV)

    for index, talentID in enumerate(idList):


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

@@ -636,7 +636,7 @@
    star = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)

    breakLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroBreakLV)

    

    starMax = PlayerHero.GetHeroStarMax(heroItem)

    starMax = PlayerHero.GetHeroStarMax(heroID, heroItem)

    addPer = qualityIpyData.GetInitAddPer()

    addPer += qualityIpyData.GetLVAddPer() * max(0, heroLV - 1)

    addPer += qualityIpyData.GetBreakLVAddPer() * breakLV