From 18df4f587c3e6782da7c83ee27db78482b674c34 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 09 十二月 2025 10:13:54 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端（生效卡牌逻辑修改： 主阵容中的优先生效；生效中的卡牌无法遣散；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 8d22386..a5c64c1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -302,6 +302,14 @@
return posNum
return 0
+def InMainLineup(heroItem):
+ ## 是否在主阵容中
+ for lpIndex in range(heroItem.GetUserAttrCount(ShareDefine.Def_IudetHeroLineup)):
+ lineupValue = heroItem.GetUserAttrByIndex(ShareDefine.Def_IudetHeroLineup, lpIndex)
+ if GetLineupValue(lineupValue)[0] == ShareDefine.Lineup_Main:
+ return True
+ return False
+
#// B2 30 武将升级 #tagCSHeroLVUP
#
#struct tagCSHeroLVUP
@@ -1305,6 +1313,7 @@
ratio = IpyGameDataPY.GetFuncCfg("HeroRebirth", 5)
dismissItemList = []
returnItemDict = {}
+ olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptHero)
for itemIndex in itemIndexList:
if itemIndex < 0 or itemIndex >= curPack.GetCount():
@@ -1325,6 +1334,10 @@
GameWorld.DebugLog("上阵中的武将无法遣散! itemIndex=%s,lineupValueList=%s" % (itemIndex, lineupValueList))
continue
heroID = heroItem.GetItemTypeID()
+ _, effItemIndex, _ = olPlayer.GetHeroEffectiveCard(heroID)
+ if itemIndex == effItemIndex:
+ GameWorld.DebugLog("生效中的卡牌无法遣散! itemIndex=%s,heroID=%s,effItemIndex=%s" % (itemIndex, heroID, effItemIndex))
+ continue
heroIpyData = IpyGameDataPY.GetIpyGameData("Hero", heroID)
if not heroIpyData:
continue
@@ -1445,8 +1458,13 @@
for syncItem in syncItemDict.values():
syncItem.Sync_Item()
- lineup = PlayerOnline.GetOnlinePlayer(curPlayer).GetLineup(lineupID, False)
+ olPlayer = PlayerOnline.GetOnlinePlayer(curPlayer)
+ lineup = olPlayer.GetLineup(lineupID, False)
lineup.UpdLineup(heroItemDict, shapeType)
+
+ # 主阵容调整，重载生效的卡牌
+ if lineupID == ShareDefine.Lineup_Main:
+ PlayerOnline.reloadEffHeroCard(curPlayer, olPlayer)
return
def ComLineupValue(lineupID, shapeType, posNum): return lineupID * 10000 + shapeType * 100 + posNum
--
Gitblit v1.8.0