From 11692fc9b47b4fc2dd079a2e019d980ff67d1003 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 17 三月 2026 19:57:53 +0800
Subject: [PATCH] 541 【幻境阁】新增称号加成效果-服务端(废弃红颜额外返还字段,统一使用称号额外返还;)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py | 57 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 27 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 9300215..9aab297 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -1189,7 +1189,7 @@
RefreshLordAttr(curPlayer) # 时装升星 - 全体属性
return
-def AutoChangeToSkinPoint(curPlayer, curItem, notifyAward=True):
+def AutoChangeToSkinPoint(curPlayer, curItem, eventName):
## 获得皮肤时自动转化为皮肤碎片
# @return: 是否成功转化
itemID = curItem.GetItemTypeID()
@@ -1220,10 +1220,14 @@
moneyValue = changePoint * itemCount
GameWorld.DebugLog("武将皮肤不需要再升星了自动转化为皮肤碎片! itemID=%s,skinID=%s,skinQuality=%s,moneyValue=%s,itemCount=%s"
% (itemID, skinID, skinQuality, moneyValue, itemCount))
- if not PlayerControl.GiveMoney(curPlayer, moneyType, moneyValue, "HeroSkinChange", addDataDict, notifyAward=False):
+ if not PlayerControl.GiveMoney(curPlayer, moneyType, moneyValue, eventName, addDataDict, notifyAward=False):
return
curItem.Clear()
- ItemControler.NotifyGiveAwardInfo(curPlayer, [], "HeroSkinChange", moneyInfo={moneyType:moneyValue}, dataEx=itemID)
+
+ if eventName:
+ isBind = ItemControler.GetIsBindValue(srcSign=ChConfig.ItemSrcSign_HeroSkinChange)
+ ItemControler.NotifyGiveAwardInfo(curPlayer, [], eventName, moneyInfo={moneyType:[moneyValue, isBind]}, dataEx=itemID)
+
return True
def GetItemHeroSkinIDDict():
@@ -1553,32 +1557,31 @@
def __calcHeroQualityReturnItemEx(curPlayer, qualityIpyData, returnItemExDict):
## 其他功能额外返还
+ returnItemsEx = qualityIpyData.GetReturnItemsEx()
+ if not returnItemsEx:
+ return
+
# 红颜特殊效果: 遣散/吞噬额外返还百分比
- 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(math.ceil(itemCount * retPer / 100.0)))
- returnItemExDict[key] = returnItemExDict.get(key, 0) + retCnt
- GameWorld.DebugLog(" 红颜返还: retPer=%s,%s,总%s" % (retPer, beautyReturnItems, returnItemExDict))
-
+ isBind = ItemControler.GetIsBindValue(srcSign=ChConfig.ItemSrcSign_BeautyEff)
+ retPer = PlayerBeauty.GetBeautyEffInfo(curPlayer, PlayerBeauty.EffType_HeroItemExPer)[0]
+ for itemID, itemCount in returnItemsEx:
+ if not retPer:
+ break
+ key = (itemID, isBind)
+ retCnt = max(1, int(math.ceil(itemCount * retPer / 100.0)))
+ returnItemExDict[key] = returnItemExDict.get(key, 0) + retCnt
+ GameWorld.DebugLog(" 红颜返还: retPer=%s,%s,总%s" % (retPer, returnItemsEx, returnItemExDict))
+
# 称号特殊效果: 遣散/吞噬额外返还百分比
- titleReturnItems = qualityIpyData.GetTitleReturnItems()
- if titleReturnItems:
- isBind = ItemControler.GetIsBindValue(srcSign=ChConfig.ItemSrcSign_TitleEff)
- retPer = PlayerHJG.GetTitleEffInfo(curPlayer, PlayerHJG.TitleEff_HeroItemExPer)[0]
- for itemID, itemCount in titleReturnItems:
- if not retPer:
- break
- key = (itemID, isBind)
- retCnt = max(1, int(math.ceil(itemCount * retPer / 100.0)))
- returnItemExDict[key] = returnItemExDict.get(key, 0) + retCnt
- GameWorld.DebugLog(" 称号返还: retPer=%s,%s,总%s" % (retPer, titleReturnItems, returnItemExDict))
-
+ isBind = ItemControler.GetIsBindValue(srcSign=ChConfig.ItemSrcSign_TitleEff)
+ retPer = PlayerHJG.GetTitleEffInfo(curPlayer, PlayerHJG.TitleEff_HeroItemExPer)[0]
+ for itemID, itemCount in returnItemsEx:
+ if not retPer:
+ break
+ key = (itemID, isBind)
+ retCnt = max(1, int(math.ceil(itemCount * retPer / 100.0)))
+ returnItemExDict[key] = returnItemExDict.get(key, 0) + retCnt
+ GameWorld.DebugLog(" 称号返还: retPer=%s,%s,总%s" % (retPer, returnItemsEx, returnItemExDict))
return
#// B4 12 战斗阵容预设保存 #tagCSHeroPresetSave
--
Gitblit v1.8.0