From 46dbf29a22bd25d8e9c6ea4c34fea35a4828d712 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 31 十二月 2025 12:13:01 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(武将重置突破支持消耗货币;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py |   85 +++++++++++++++++++++++++++++++++---------
 1 files changed, 66 insertions(+), 19 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
index c46a34c..a5cddd1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/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
@@ -1174,10 +1197,16 @@
 #{
 #    tagHead        Head;
 #    WORD        ItemIndex;    //武将物品所在武将背包位置索引
+#    BYTE        LVReset;        //重置等级
+#    BYTE        BreakReset;    //重置突破
+#    BYTE        AwakeReset;    //重置觉醒
 #};
 def OnHeroRebirth(index, clientData, tick):
     curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
     itemIndex = clientData.ItemIndex
+    lvReset =  clientData.LVReset
+    breakReset = clientData.BreakReset or lvReset # 突破受等级限制,所以等级重置突破必重置
+    awakeReset = clientData.AwakeReset
     heroItem = GetHeroItem(curPlayer, itemIndex)
     if not heroItem:
         return
@@ -1188,7 +1217,7 @@
         GameWorld.DebugLog("该武将未进行过等级突破觉醒培养,不需要重生! itemIndex=%s" % (itemIndex))
         return
     
-    if awakeLV:
+    if awakeReset and awakeLV:
         rebirthCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroAwakeRebirthCnt)
         rebirthCntMax = IpyGameDataPY.GetFuncCfg("HeroRebirth", 2)
         if rebirthCntMax and rebirthCnt >= rebirthCntMax:
@@ -1200,38 +1229,55 @@
     if not heroIpyData:
         return
     quality = heroIpyData.GetQuality()
-    qualityAwakeIpyData = IpyGameDataPY.GetIpyGameDataNotLog("HeroQualityAwake", quality, awakeLV)
-    awakeCostMoney = qualityAwakeIpyData.GetRebirthCostMoney() if qualityAwakeIpyData else 0
+    
+    lvCostMoney = 0
+    breakCostMoney = 0
+    awakeCostMoney = 0
     moneyType = IpyGameDataPY.GetFuncCfg("HeroRebirth", 1)
-    lvCostMoney = int(eval(IpyGameDataPY.GetFuncCompileCfg("HeroRebirth", 3)))
-    costMoneyTotal = lvCostMoney + awakeCostMoney
-    GameWorld.DebugLog("武将重生: itemIndex=%s,heroID=%s,quality=%s,heroLV=%s,breakLV=%s,awakeLV=%s,costMoneyTotal=%s(%s+%s)" 
-                       % (itemIndex, heroID, quality, heroLV, breakLV, awakeLV, costMoneyTotal, lvCostMoney, awakeCostMoney))
+    if awakeReset and awakeLV:
+        qualityAwakeIpyData = IpyGameDataPY.GetIpyGameDataNotLog("HeroQualityAwake", quality, awakeLV)
+        awakeCostMoney = qualityAwakeIpyData.GetRebirthCostMoney() if qualityAwakeIpyData else 0
+        
+    if lvReset:
+        lvCostMoney = int(max(0, eval(IpyGameDataPY.GetFuncCompileCfg("HeroRebirth", 3))))
+        
+    if breakReset:
+        breakCostMoney = int(max(0, eval(IpyGameDataPY.GetFuncCompileCfg("HeroRebirth2", 1))))
+        
+    costMoneyTotal = lvCostMoney + awakeCostMoney + breakCostMoney
+    GameWorld.DebugLog("武将重生: itemIndex=%s,heroID=%s,quality=%s,heroLV=%s,breakLV=%s,awakeLV=%s,costMoneyTotal=%s(lv:%s+b:%s+a:%s),lvReset=%s,breakReset=%s,awakeReset=%s" 
+                       % (itemIndex, heroID, quality, heroLV, breakLV, awakeLV, costMoneyTotal, lvCostMoney, breakCostMoney, awakeCostMoney, lvReset, breakReset, awakeReset))
     if moneyType and costMoneyTotal and not PlayerControl.HaveMoney(curPlayer, moneyType, costMoneyTotal):
         return
     
     # 验证通过,可以重生
     ratio = IpyGameDataPY.GetFuncCfg("HeroRebirth", 4)
     returnItemDict = {}
-    __calcHeroLVReturnitem(quality, heroLV, returnItemDict, ratio)
-    __calcHeroBreakReturnitem(quality, breakLV, returnItemDict, ratio)
-    __calcHeroAwakeReturnitem(quality, awakeLV, returnItemDict, ratio)
-    
+    if lvReset:
+        __calcHeroLVReturnitem(quality, heroLV, returnItemDict, ratio)
+    if breakReset:
+        __calcHeroBreakReturnitem(quality, breakLV, returnItemDict, ratio)
+    if awakeReset:
+        __calcHeroAwakeReturnitem(quality, awakeLV, returnItemDict, ratio)
+        
     if moneyType and costMoneyTotal and not PlayerControl.PayMoney(curPlayer, moneyType, costMoneyTotal, "HeroRebirth"):
         return
     
     # 执行重生
     item = heroItem.GetItem()
-    item.SetUserAttr(ShareDefine.Def_IudetHeroLV, 1)
-    item.SetUserAttr(ShareDefine.Def_IudetHeroBreakLV, 0)
-    item.SetUserAttr(ShareDefine.Def_IudetHeroAwakeLV, 0)
+    if lvReset:
+        item.SetUserAttr(ShareDefine.Def_IudetHeroLV, 1)
+    if breakReset:
+        item.SetUserAttr(ShareDefine.Def_IudetHeroBreakLV, 0)
+    if awakeReset:
+        item.SetUserAttr(ShareDefine.Def_IudetHeroAwakeLV, 0)
     heroItem.Sync_Item()
     
     if returnItemDict:
         returnItemList = [[k, v] for k, v in returnItemDict.items()]
         ItemControler.GivePlayerItemOrMail(curPlayer, returnItemList, event=["HeroRebirth", False, {}])
         
-    if awakeLV:
+    if awakeReset and awakeLV:
         rebirthCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroAwakeRebirthCnt)
         PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_HeroAwakeRebirthCnt, rebirthCnt + 1)
         Sync_PlayerHeroInfo(curPlayer)
@@ -1584,6 +1630,7 @@
         return
     needStarTotal = qualityLVIpyData.GetNeedStarTotal()
     needHeroCnt = qualityLVIpyData.GetNeedHeroCnt()
+    needQuality = qualityLVIpyData.GetNeedQuality()
     
     costItemList = []
     heroStarDict = {}
@@ -1597,7 +1644,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 +1675,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
     
     #未生效、未上阵、未锁定、未进行过升级、突破、升星、觉醒

--
Gitblit v1.8.0