From ca212ad097edfe324b5b6035e64cfbcf5146b044 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 十二月 2025 10:50:22 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端(突破单独配置所需武将等级,不需要满级才能突破;突破消耗物品改为支持多种物品;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py |   22 ++++++++++------------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py     |    6 ++++--
 PySysDB/PySysDBPY.h                                                                      |    3 ++-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index a53edd5..ce3399e 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -229,7 +229,8 @@
 	DWORD		_Quality;	//品质
 	DWORD		_BreakLV;	//突破等级
 	WORD		LVMax;	// 等级上限
-	list		UPCostItem;	// 突破到下级消耗道具
+	WORD		UPLVNeed;	// 突破到下级需要等级
+	list		UPCostItemList;	// 突破到下级消耗道具
 };
 
 //武将品质觉醒表
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index 7f0b599..03bdf94 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -233,7 +233,8 @@
                         ("DWORD", "Quality", 1),
                         ("DWORD", "BreakLV", 1),
                         ("WORD", "LVMax", 0),
-                        ("list", "UPCostItem", 0),
+                        ("WORD", "UPLVNeed", 0),
+                        ("list", "UPCostItemList", 0),
                         ),
 
                 "HeroQualityAwake":(
@@ -2468,7 +2469,8 @@
     def GetQuality(self): return self.attrTuple[0] # 品质 DWORD
     def GetBreakLV(self): return self.attrTuple[1] # 突破等级 DWORD
     def GetLVMax(self): return self.attrTuple[2] #  等级上限 WORD
-    def GetUPCostItem(self): return self.attrTuple[3] #  突破到下级消耗道具 list
+    def GetUPLVNeed(self): return self.attrTuple[3] #  突破到下级需要等级 WORD
+    def GetUPCostItemList(self): return self.attrTuple[4] #  突破到下级消耗道具 list
 
 # 武将品质觉醒表
 class IPY_HeroQualityAwake():
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 a5c64c1..1f308e9 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -638,26 +638,24 @@
     ipyData = IpyGameDataPY.GetIpyGameData("HeroQualityBreak", quality, breakLV)
     if not ipyData:
         return
-    LVMax = ipyData.GetLVMax()
-    if heroLV < LVMax:
-        GameWorld.DebugLog("未满级,无法突破: heroLV=%s < %s" % (heroLV, LVMax), playerID)
+    UPLVNeed = ipyData.GetUPLVNeed()
+    if heroLV < UPLVNeed:
+        GameWorld.DebugLog("武将等级不足,无法突破: heroLV=%s < %s" % (heroLV, UPLVNeed), playerID)
         return
     nextBreakLV = breakLV + 1
     if not IpyGameDataPY.GetIpyGameData("HeroQualityBreak", quality, nextBreakLV):
         GameWorld.DebugLog("突破等级已满级: quality=%s,breakLV=%s" % (quality, breakLV), playerID)
         return
-    costItemInfo = ipyData.GetUPCostItem()
-    if not costItemInfo:
-        return
-    costItemID, costItemCount = costItemInfo
-    if not costItemID or not costItemCount:
+    costItemList = ipyData.GetUPCostItemList()
+    if not costItemList:
         return
     itemPack = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptItem)
-    hasEnough, itemIndexList = ItemCommon.GetItem_FromPack_ByID(costItemID, itemPack, costItemCount)
-    if not hasEnough:
-        GameWorld.DebugLog("材料不足,武将无法突破! costItemID=%s, costItemCount=%s" % (costItemID, costItemCount))
+    lackItemDict, delInfoDict = ItemCommon.GetCostItemIndexList(costItemList, itemPack)
+    if lackItemDict:
+        GameWorld.DebugLog("材料不足,武将无法突破! quality=%s,breakLV=%s,lackItemDict=%s" % (quality, breakLV, lackItemDict), playerID)
         return
-    ItemCommon.ReduceItem(curPlayer, itemPack, itemIndexList, costItemCount, True, "HeroBreak")
+    ItemCommon.DelCostItem(curPlayer, itemPack, delInfoDict, "HeroBreak")
+    
     GameWorld.DebugLog("武将突破: itemIndex=%s,heroID=%s,nextBreakLV=%s" % (itemIndex, heroID, nextBreakLV), playerID)
     SetHeroBreakLV(curPlayer, heroItem, nextBreakLV)
     

--
Gitblit v1.8.0