From ea6dff19b5877d55473d445788e1a2ff5789f6b9 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 17 三月 2026 10:01:57 +0800
Subject: [PATCH] 526 【挑战】PVP群英榜-后端(战斗日志Value1增加存储ServerID;群英榜单10的UserData增加Json格式存储FightPower;)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 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 3c974cf..b46800b 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHero.py
@@ -30,10 +30,12 @@
import PlayerPreset
import PlayerBeauty
import PlayerTask
+import PlayerHJG
import GameWorld
import ChConfig
import random
+import math
def PlayerOnDay(curPlayer):
if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_HeroAwakeRebirthCnt):
@@ -1124,7 +1126,7 @@
if not heroIpyData:
return
skinIDList = heroIpyData.GetSkinIDList()
- if not skinIDList or len(skinIDList) >= skinIndex:
+ if not skinIDList or skinIndex >= len(skinIDList):
return
skinID = skinIDList[skinIndex]
__onHeroSkinActive(curPlayer, heroID, skinID, isActive)
@@ -1186,6 +1188,62 @@
Sync_HeroInfo(curPlayer, [heroID])
RefreshLordAttr(curPlayer) # 时装升星 - 全体属性
return
+
+def AutoChangeToSkinPoint(curPlayer, curItem, eventName):
+ ## 获得皮肤时自动转化为皮肤碎片
+ # @return: 是否成功转化
+ itemID = curItem.GetItemTypeID()
+ itemIDSkinIDDict = GetItemHeroSkinIDDict()
+ if itemID not in itemIDSkinIDDict:
+ #GameWorld.DebugLog("非武将皮肤物品不处理! itemID=%s not in %s" % (itemID, itemIDSkinIDDict))
+ return
+ skinID = itemIDSkinIDDict[itemID]
+ if not GetHeroSkinState(curPlayer, skinID):
+ #GameWorld.DebugLog("该武将皮肤未激活不处理转化: itemID=%s,skinID=%s" % (itemID, skinID))
+ return
+ curStar = GetHeroSkinStar(curPlayer, skinID)
+ ipyData = IpyGameDataPY.GetIpyGameData("HeroSkinAttr", skinID)
+ if not ipyData:
+ return
+ starMax = ipyData.GetStarMax()
+ if starMax and curStar < starMax:
+ #GameWorld.DebugLog("武将皮肤未满星暂不转化! itemID=%s,skinID=%s,curStar=%s < %s" % (itemID, skinID, curStar, starMax))
+ return
+ skinQuality = ipyData.GetSkinQuality()
+ skinQualityPointDict = IpyGameDataPY.GetFuncEvalCfg("HeroSkin", 1, {})
+ if str(skinQuality) not in skinQualityPointDict:
+ return
+ changePoint = skinQualityPointDict[str(skinQuality)]
+ itemCount = ItemControler.GetItemCount(curItem)
+ addDataDict = {"ItemID":itemID, "ItemCount":itemCount, "SkinID":skinID}
+ moneyType = ShareDefine.TYPE_Price_SkinPoint
+ 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, eventName, addDataDict, notifyAward=False):
+ return
+ curItem.Clear()
+
+ if eventName:
+ isBind = ItemControler.GetIsBindValue(srcSign=ChConfig.ItemSrcSign_HeroSkinChange)
+ ItemControler.NotifyGiveAwardInfo(curPlayer, [], eventName, moneyInfo={moneyType:[moneyValue, isBind]}, dataEx=itemID)
+
+ return True
+
+def GetItemHeroSkinIDDict():
+ ## 获取物品ID对应皮肤ID信息
+ itemIDSkinIDDict = IpyGameDataPY.GetConfigEx("itemIDSkinIDDict")
+ if not itemIDSkinIDDict:
+ itemIDSkinIDDict = {}
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in range(ipyDataMgr.GetHeroSkinAttrCount()):
+ ipyData = ipyDataMgr.GetHeroSkinAttrByIndex(index)
+ skinID = ipyData.GetSkinID()
+ skinItemID = ipyData.GetNeedItemID()
+ itemIDSkinIDDict[skinItemID] = skinID
+ IpyGameDataPY.SetConfigEx("itemIDSkinIDDict", itemIDSkinIDDict)
+ GameWorld.DebugLog("加载物品ID对应武将皮肤ID: %s" % itemIDSkinIDDict)
+ return itemIDSkinIDDict
#// B2 37 武将图鉴激活升级 #tagCSHeroBookUP
#
@@ -1499,21 +1557,32 @@
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] # 红颜遣散/吞噬额外返还百分比
+ 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)))
+ 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))
- # 称号特殊效果
-
+ # 称号特殊效果: 遣散/吞噬额外返还百分比
+ 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))
+
return
#// B4 12 战斗阵容预设保存 #tagCSHeroPresetSave
--
Gitblit v1.8.0