From 5dfc9bf567fdf69a0ee8899c4966ce64b4cfe5ad Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 12 三月 2026 12:07:54 +0800
Subject: [PATCH] 547 【红颜系统】新增红颜-服务端（新增激活方式8-定军阁层；新增红颜特殊效果5-遣散/吞噬额外返还；统一A801、0320物品获得标记；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 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 1a6b85b..3c974cf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -28,6 +28,7 @@
import PlayerControl
import PlayerOnline
import PlayerPreset
+import PlayerBeauty
import PlayerTask
import GameWorld
import ChConfig
@@ -413,6 +414,12 @@
for itemID, itemCount in dismissReturnItems:
returnCnt = max(1, int(itemCount * ratio / 100.0))
returnItemList.append([itemID, returnCnt])
+ returnItemExDict = {}
+ __calcHeroQualityReturnItemEx(curPlayer, qualityIpyData, returnItemExDict)
+ for key, itemCount in returnItemExDict.items():
+ itemID, isBind = key
+ returnItemList.append([itemID, itemCount, isBind])
+ GameWorld.DebugLog("吞噬额外总返还: %s" % returnItemList)
ItemControler.GivePlayerItemOrMail(curPlayer, returnItemList, event=["HeroStarUPReturn", False, {}])
OpenServerActivity.UpdOSA_HeroTrainBillboard(curPlayer) # 升星
@@ -1427,6 +1434,7 @@
ratio = IpyGameDataPY.GetFuncCfg("HeroRebirth", 5)
dismissItemList = []
returnItemDict = {}
+ returnItemExDict = {}
curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptHero)
for itemIndex in itemIndexList:
if itemIndex < 0 or itemIndex >= curPack.GetCount():
@@ -1469,6 +1477,7 @@
GameWorld.DebugLog(" 星级返还: quality=%s,heroStar=%s,ratio=%s,%s,总%s" % (quality, heroStar, ratio, dismissReturnItems, returnItemDict))
__calcHeroLVReturnitem(quality, heroLV, returnItemDict, ratio)
__calcHeroBreakReturnitem(quality, breakLV, returnItemDict, ratio)
+ __calcHeroQualityReturnItemEx(curPlayer, qualityIpyData, returnItemExDict)
dismissItemList.append([itemIndex, heroItem])
if not dismissItemList:
@@ -1479,10 +1488,34 @@
if returnItemDict:
returnItemList = [[k, v] for k, v in returnItemDict.items()]
+ for key, itemCount in returnItemExDict.items():
+ itemID, isBind = key
+ returnItemList.append([itemID, itemCount, isBind])
+ GameWorld.DebugLog("遣散总返还: %s" % returnItemList)
ItemControler.GivePlayerItemOrMail(curPlayer, returnItemList, event=["HeroDismiss", False, {}])
return
+def __calcHeroQualityReturnItemEx(curPlayer, qualityIpyData, returnItemExDict):
+ ## 其他功能额外返还
+
+ # 红颜特殊效果
+ beautyReturnItems = qualityIpyData.GetBeautyReturnItems()
+ if beautyReturnItems:
+ isBind = ItemControler.GetIsBindValue(srcSign=ChConfig.ItemSrcSign_BeautyEff)
+ retPer = PlayerBeauty.GetBeautyEffInfo(curPlayer, PlayerBeauty.EffType_HeroItemExPer)[0] # 红颜遣散/吞噬额外返还百分比
+ for itemID, itemCount in beautyReturnItems:
+ if not retPer:
+ break
+ key = (itemID, isBind)
+ retCnt = max(1, int(round(itemCount * retPer / 100.0)))
+ returnItemExDict[key] = returnItemExDict.get(key, 0) + retCnt
+ GameWorld.DebugLog(" 红颜返还: retPer=%s,%s,总%s" % (retPer, beautyReturnItems, returnItemExDict))
+
+ # 称号特殊效果
+
+ return
+
#// B4 12 战斗阵容预设保存 #tagCSHeroPresetSave
#
#struct tagCSHeroPresetPos
--
Gitblit v1.8.0