From 46f92bbf96e0c0b64beb2239aa210b287b3ec02e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 02 三月 2026 20:07:00 +0800
Subject: [PATCH] 501 【武将】武将时装-服务端（穿戴时同步修改形象；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
index 2beb13d..ba6ac1c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.py
@@ -29,12 +29,12 @@
import GameLogic_Dingjunge
import PlayerMingge
import PlayerBeauty
-import PlayerFamily
import PlayerHorse
import PlayerGubao
import PlayerHero
import PlayerHJG
import GameWorld
+import ChPlayer
import ChConfig
import ChEquip
@@ -80,6 +80,10 @@
if not isReload: # 非重读阵容的视为变更
self.isHeroChange = True
reloadEffHeroCard(curPlayer, self) # 更新武将阵容强制重刷生效卡牌
+ return
+
+ def OnSwitch(self):
+ self.isHeroChange = True
return
def IsHeroItemIn(self, itemIndex): return itemIndex in self.heroItemDict
@@ -361,8 +365,6 @@
effCardAddPerAft = heroPreset.GetEffCardAddPer()
- if effCardAddPerBef == effCardAddPerAft:
- continue
heroPresetID = heroPreset.heroPresetID
GameWorld.DebugLog("武将物品变化影响: itemIndex=%s,heroPresetID=%s,effCardAddPerBef=%s,effCardAddPerAft=%s"
% (itemIndex, heroPresetID, effCardAddPerBef, effCardAddPerAft), self.playerID)
@@ -634,7 +636,7 @@
star = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroStar)
breakLV = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroBreakLV)
- starMax = PlayerHero.GetHeroStarMax(heroItem)
+ starMax = PlayerHero.GetHeroStarMax(heroID, heroItem)
addPer = qualityIpyData.GetInitAddPer()
addPer += qualityIpyData.GetLVAddPer() * max(0, heroLV - 1)
addPer += qualityIpyData.GetBreakLVAddPer() * breakLV
@@ -748,6 +750,7 @@
countryHeroInfo = {} # 国家武将统计 {country:[heroID, ...], ...}
fetterHeroInfo = {} # 阵容羁绊武将统计信息 {fetterID:[heroID, ...], ...}
heroSelfAttrInfo = {} # 武将自身属性 {heroID:{attrID:value, ...}, ...}
+ heroSkinAttrInfo = {} # 武将时装属性 {heroID:{attrID:value, ...}, ...}
heroLVAttrInfo = {} # 武将等级属性 {heroID:{attrID:value, ...}, ...}
heroStarTalentInfo = {} # 武将星级天赋属性 {heroID:{attrID:value, ...}, ...}
heroBreakAttrInfo = {} # 武将突破潜能属性 {heroID:{attrID:value, ...}, ...}
@@ -778,9 +781,9 @@
skinID = 0
skinIDList = heroIpyData.GetSkinIDList()
if skinIndex < 0 or skinIndex >= len(skinIDList):
- skinID = skinIDList[skinIndex]
- elif skinIDList:
skinID = skinIDList[0]
+ elif skinIDList:
+ skinID = skinIDList[skinIndex]
lineupHero = presetLineup.GetLineupHero(posNum)
#if False:
@@ -806,6 +809,27 @@
for k, v in heroIpyData.GetBatAttrDict().items():
selfAttrDict[int(k)] = v
heroSelfAttrInfo[heroID] = selfAttrDict
+
+ # 时装属性
+ attrSkinID = 0
+ attrSkinIndex = heroItem.GetUserAttr(ShareDefine.Def_IudetHeroSkinAttr)
+ if attrSkinIndex < 0 or attrSkinIndex >= len(skinIDList):
+ attrSkinID = skinIDList[0]
+ elif skinIDList:
+ attrSkinID = skinIDList[attrSkinIndex]
+ heroSkinAttrDict = {}
+ skinIpyData = IpyGameDataPY.GetIpyGameDataNotLog("HeroSkinAttr", attrSkinID)
+ if skinIpyData:
+ skinStar = PlayerHero.GetHeroSkinStar(curPlayer, attrSkinID)
+ wearAttrIDList = skinIpyData.GetWearAttrIDList()
+ wearAttrValueList = skinIpyData.GetWearAttrValueList()
+ wearAttrPerStarAddList = skinIpyData.GetWearAttrPerStarAddList()
+ for i in range(min(len(wearAttrIDList), len(wearAttrValueList))):
+ attrID = wearAttrIDList[i]
+ attrValuePerStar = wearAttrPerStarAddList[i] if len(wearAttrPerStarAddList) > i else 0
+ attrValue = wearAttrValueList[i] + attrValuePerStar * skinStar
+ heroSkinAttrDict[attrID] = heroSkinAttrDict.get(attrID, 0) + attrValue
+ heroSkinAttrInfo[heroID] = heroSkinAttrDict
# 等级属性
heroLVAttrDict = {}
@@ -948,6 +972,7 @@
lvAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_LV)
equipAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_MainEquip)
fatesAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HeroFates)
+ skinAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HeroSkin)
realmAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Realm)
gubaoAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_Gubao)
hjgAttrDict = olPlayer.GetCalcAttr(ChConfig.Def_CalcAttr_HJG)
@@ -960,6 +985,7 @@
GameWorld.DebugLog(" 国家武将统计=%s" % countryHeroInfo, playerID)
GameWorld.DebugLog(" 羁绊武将统计=%s" % fetterHeroInfo, playerID)
GameWorld.DebugLog(" 武将自身属性=%s" % heroSelfAttrInfo, playerID)
+ GameWorld.DebugLog(" 穿戴时装属性=%s" % heroSkinAttrInfo, playerID)
GameWorld.DebugLog(" 武将等级属性=%s" % heroLVAttrInfo, playerID)
GameWorld.DebugLog(" 武将吞噬属性=%s" % heroStarTalentInfo, playerID)
GameWorld.DebugLog(" 武将突破潜能=%s" % heroBreakAttrInfo, playerID)
@@ -970,6 +996,7 @@
GameWorld.DebugLog(" 主公等级属性=%s" % lvAttrDict, playerID)
GameWorld.DebugLog(" 主公装备属性=%s" % equipAttrDict, playerID)
GameWorld.DebugLog(" 主公宿缘属性=%s" % fatesAttrDict, playerID)
+ GameWorld.DebugLog(" 主公全体时装=%s" % skinAttrDict, playerID)
GameWorld.DebugLog(" 主公官职属性=%s" % realmAttrDict, playerID)
GameWorld.DebugLog(" 主公古宝属性=%s" % gubaoAttrDict, playerID)
GameWorld.DebugLog(" 主幻境阁属性=%s" % hjgAttrDict, playerID)
@@ -1009,6 +1036,7 @@
lineupHero.heroBatAttrDict = {}
lineupHero.fightPower = 0
+ heroSkinAttrDict = heroSkinAttrInfo.get(heroID, {})
heroLVAttrDict = heroLVAttrInfo.get(heroID, {})
starTalentAttrDict = heroStarTalentInfo.get(heroID, {})
breakAttrDict = heroBreakAttrInfo.get(heroID, {})
@@ -1029,6 +1057,9 @@
fatesValue = fatesAttrDict.get(attrID, 0)
fatesPer = fatesAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
+
+ skinValue = skinAttrDict.get(attrID, 0)
+ skinPer = skinAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
realmValue = realmAttrDict.get(attrID, 0)
realmPer = realmAttrDict.get(attrPerID, 0) / 10000.0 if attrPerID else 0
@@ -1060,6 +1091,7 @@
lineupHaloValue, lineupHaloPer = lineupHaloAttrInfo.get(attrID, 0), 0
fetterValue, fetterPer = fetterAttrDict.get(attrID, 0), 0
+ heroSkinValue, heroSkinPer = heroSkinAttrDict.get(attrID, 0), 0
heroLVValue, heroLVPer = heroLVAttrDict.get(attrID, 0), 0
starTalentValue, starTalentPer = starTalentAttrDict.get(attrID, 0), 0
breakLVValue, breakLVPer = breakAttrDict.get(attrID, 0), 0
@@ -1068,6 +1100,7 @@
heroSelfPer = selfAttrDict.get(attrPerID, 0) / 10000.0
lineupHaloPer = lineupHaloAttrInfo.get(attrPerID, 0) / 10000.0
fetterPer = fetterAttrDict.get(attrPerID, 0) / 10000.0
+ heroSkinPer = heroSkinAttrDict.get(attrPerID, 0) / 10000.0
heroLVPer = heroLVAttrDict.get(attrPerID, 0) / 10000.0
starTalentPer = starTalentAttrDict.get(attrPerID, 0) / 10000.0
breakLVPer = breakAttrDict.get(attrPerID, 0) / 10000.0
@@ -1076,18 +1109,26 @@
# 计算
attrParamDict = {"lvValue":lvValue, "equipValue":equipValue, "realmValue":realmValue, "realmPer":realmPer, "cardPer":cardPer,
"gubaoValue":gubaoValue, "gubaoPer":gubaoPer, "hjgValue":hjgValue, "hjgPer":hjgPer, "horseValue":horseValue, "horsePer":horsePer,
- "beautyValue":beautyValue, "beautyPer":beautyPer, "fatesValue":fatesValue, "fatesPer":fatesPer,
+ "beautyValue":beautyValue, "beautyPer":beautyPer, "fatesValue":fatesValue, "fatesPer":fatesPer, "skinValue":skinValue, "skinPer":skinPer,
"dingjungeValue":dingjungeValue, "dingjungePer":dingjungePer, "minggeValue":minggeValue, "minggePer":minggePer,
- "heroSelfValue":heroSelfValue, "heroSelfPer":heroSelfPer, "inheritPer":inheritPer, "heroLVValue":heroLVValue, "heroLVPer":heroLVPer,
+ "heroSelfValue":heroSelfValue, "heroSelfPer":heroSelfPer, "inheritPer":inheritPer, "heroLVValue":heroLVValue, "heroLVPer":heroLVPer,
+ "heroSkinValue":heroSkinValue, "heroSkinPer":heroSkinPer,
"lineupHaloValue":lineupHaloValue, "lineupHaloPer":lineupHaloPer, "fetterValue":fetterValue, "fetterPer":fetterPer,
"starTalentValue":starTalentValue, "starTalentPer":starTalentPer, "breakLVValue":breakLVValue, "breakLVPer":breakLVPer,
"awakeTalentValue":awakeTalentValue, "awakeTalentPer":awakeTalentPer,
}
-
+ #testDict = {'lineupHaloPer': 0.1, 'minggeValue': 43685, 'heroLVValue': 836851, 'cardPer': 72.276, 'realmValue': 9878456, 'fetterPer': 0.15, 'horseValue': 5040, 'equipValue': 18381400, 'inheritPer': 1.4, 'lvValue': 53600}
+ #testDict = {'inheritPer': 1, 'minggeValue': 905, 'equipValue': 796}
+ #for k in attrParamDict.keys():
+ # v = testDict.get(k, 0)
+ # exec("%s = %s" % (k, v))
+ # attrParamDict[k] = v
if attrID in ChConfig.BaseAttrIDList:
- attrValue = FormulaControl.Eval("baseAttrFormula", baseAttrFormula, attrParamDict, toInt=False, ndigits=3)
+ attrValue = FormulaControl.Eval("baseAttrFormula", baseAttrFormula, attrParamDict, toInt=False, ndigits=2)
+ #GameWorld.DebugLog(" evalValue=%s,attrValue=%s" % (eval(baseAttrFormula), attrValue))
else:
- attrValue = FormulaControl.Eval("otherAttrFormula", otherAttrFormula, attrParamDict, toInt=False, ndigits=3)
+ attrValue = FormulaControl.Eval("otherAttrFormula", otherAttrFormula, attrParamDict, toInt=False, ndigits=2)
+ #GameWorld.DebugLog(" evalValue=%s,attrValue=%s" % (eval(otherAttrFormula), attrValue))
# 前端对比刷属性明细时需要
if g_calcDetail and attrValue > 0:
calcParamDict = {}
@@ -1187,7 +1228,4 @@
else:
GameWorld.DebugLog("主线阵容没有在战斗中，不需要处理", playerID)
- PlayerFamily.RefreshFamilyMember(curPlayer) # 更新公会
- # 更新排行榜
-
return
--
Gitblit v1.8.0