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 | 66 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 6 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 00bb300..3c974cf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -22,11 +22,13 @@
import ItemControler
import PlayerSuccess
import ChPyNetSendPack
+import OpenServerActivity
import PlayerActivity
import NetPackCommon
import PlayerControl
import PlayerOnline
import PlayerPreset
+import PlayerBeauty
import PlayerTask
import GameWorld
import ChConfig
@@ -114,6 +116,8 @@
singleItem.SetUserAttr(ShareDefine.Def_IudetHeroAwakeLV, 0)
if singleItem.GetUserAttr(ShareDefine.Def_IudetHeroSkin):
singleItem.SetUserAttr(ShareDefine.Def_IudetHeroSkin, 0)
+ if singleItem.GetUserAttr(ShareDefine.Def_IudetHeroSkinAttr):
+ singleItem.SetUserAttr(ShareDefine.Def_IudetHeroSkinAttr, 0)
if singleItem.GetUserAttrCount(ShareDefine.Def_IudetHeroTalentID):
singleItem.ClearUserAttr(ShareDefine.Def_IudetHeroTalentID)
@@ -188,6 +192,7 @@
#首次获得图鉴额外逻辑 ...
Sync_HeroInfo(curPlayer, [heroID])
PlayerOnline.GetOnlinePlayer(curPlayer).OnHeroItemUpate(heroItem) # 首次获得
+ OpenServerActivity.UpdOSA_HeroTrainBillboard(curPlayer) # 首次获得
return
@@ -319,6 +324,7 @@
PlayerActivity.AddDailyTaskValue(curPlayer, ChConfig.DailyTask_HeroLVUP, 1)
PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_HeroLVUP)
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_OSAHeroLVUP, 1)
+ OpenServerActivity.UpdOSA_HeroTrainBillboard(curPlayer) # 升级
return
def GetHeroLVMax(heroItem):
@@ -408,8 +414,15 @@
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) # 升星
return
def GetHeroStarMax(heroID, heroItem=None):
@@ -665,6 +678,7 @@
SetHeroBreakLV(curPlayer, heroItem, nextBreakLV)
PlayerOnline.GetOnlinePlayer(curPlayer).OnHeroItemUpate(heroItem) # 突破
+ OpenServerActivity.UpdOSA_HeroTrainBillboard(curPlayer) # 突破
return
def SetHeroBreakLV(curPlayer, heroItem, breakLV, isSync=True):
@@ -731,6 +745,7 @@
SetHeroAwakeLV(heroItem, nextAwakeLV)
PlayerOnline.GetOnlinePlayer(curPlayer).OnHeroItemUpate(heroItem) # 觉醒
+ OpenServerActivity.UpdOSA_HeroTrainBillboard(curPlayer) # 觉醒
return
def SetHeroAwakeLV(heroItem, awakeLV, isSync=True):
@@ -1008,6 +1023,8 @@
heroItem.Sync_Item()
GameWorld.DebugLog("武将洗炼结果! itemIndex=%s,heroID=%s,washIDList=%s,lockTalentIndexs=%s"
% (itemIndex, heroID, washIDList, lockTalentIndexs))
+ OpenServerActivity.AddOSAValue(curPlayer, ShareDefine.Def_BT_OSA_HeroTrain, washCostItemCount)
+ OpenServerActivity.UpdOSA_HeroTrainBillboard(curPlayer) # 洗炼
return
def HeroTalentWashReplace(curPlayer, itemIndex, heroItem):
@@ -1042,7 +1059,7 @@
# tagHead Head;
# DWORD HeroID; //武将ID
# DWORD SkinID; //时装ID
-# BYTE OPType; //操作 1-激活；2-佩戴；3-升星
+# BYTE OPType; //操作 1-激活；2-选择形象；3-升星；4-选择属性
# WORD ItemIndex; //武将物品所在武将背包位置索引，仅佩戴时有效
#};
def OnHeroSkinOP(index, clientData, tick):
@@ -1064,12 +1081,15 @@
if opType == 1:
ActiveHeroSkin(curPlayer, heroID, skinID)
elif opType == 2:
- DoHeroWearSkin(curPlayer, itemIndex, skinIndex)
+ DoHeroWearSkin(curPlayer, itemIndex, skinIndex, False)
elif opType == 3:
DoHeroSkinStarUP(curPlayer, heroID, skinID)
+ elif opType == 4:
+ DoHeroWearSkin(curPlayer, itemIndex, skinIndex, True)
return
-def DoHeroWearSkin(curPlayer, itemIndex, skinIndex):
+def DoHeroWearSkin(curPlayer, itemIndex, skinIndex, isSkinAttr):
+ # @param isSkinAttr: 是否是选择属性的，反之则为选择皮肤形象
heroItem = GetHeroItem(curPlayer, itemIndex)
if not heroItem:
return
@@ -1086,9 +1106,17 @@
if not GetHeroSkinState(curPlayer, skinID):
GameWorld.DebugLog("该武将皮肤未解锁! heroID=%s,skinIndex=%s" % (heroID, skinIndex))
return
- heroItem.SetUserAttr(ShareDefine.Def_IudetHeroSkin, skinIndex)
-
- PlayerOnline.GetOnlinePlayer(curPlayer).OnHeroItemUpate(heroItem) # 切换皮肤
+
+ GameWorld.DebugLog("切换武将皮肤! heroID=%s,skinIndex=%s,isSkinAttr=%s" % (heroID, skinIndex, isSkinAttr))
+ item = heroItem.GetItem()
+ if not isSkinAttr:
+ item.SetUserAttr(ShareDefine.Def_IudetHeroSkin, skinIndex)
+ else:
+ # 选属性同步修改形象
+ item.SetUserAttr(ShareDefine.Def_IudetHeroSkin, skinIndex)
+ item.SetUserAttr(ShareDefine.Def_IudetHeroSkinAttr, skinIndex)
+ PlayerOnline.GetOnlinePlayer(curPlayer).OnHeroItemUpate(heroItem) # 切换皮肤属性
+ heroItem.Sync_Item()
return True
def GMSetHeroSkin(curPlayer, heroID, skinIndex, isActive=1):
@@ -1406,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():
@@ -1448,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:
@@ -1458,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