From 46f1b3554ca7c3eeea118aaf80fe756bebdfde93 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 09 二月 2026 13:46:54 +0800
Subject: [PATCH] 121 【武将】武将系统-服务端（修复武将修改皮肤战斗时不生效bug；Hero命令增加切换皮肤；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 82 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index a51bd7d..cf93f29 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -400,6 +400,7 @@
Sync_OpenServerDay(curPlayer)
#通知玩家基本信息
curPlayer.Sync_ClientPlayerLogin() #01 02 玩家初始化#tagCDBPlayer
+ SyncSettingData(curPlayer)
# 屏蔽跨服下关闭和子服重复的数据的发送 pushsend接口， notifyall正常发送
# ！！！必要发送的数据要注意位置
@@ -481,7 +482,7 @@
EventReport.WriteEvent_login(curPlayer)
# 合服首登处理
- __DoMixServerFirstLogin(curPlayer)
+ #__DoMixServerFirstLogin(curPlayer)
PlayerBillboard.BillboardOnLogin(curPlayer)
#玩家扩展信息
@@ -579,8 +580,6 @@
PlayerActTask.OnPlayerLogin(curPlayer)
# 运势活动
PlayerActYunshi.OnPlayerLogin(curPlayer)
- # 轮回殿活动
- PlayerActLunhuidian.OnPlayerLogin(curPlayer)
# 登录活动
PlayerActLoginNew.OnPlayerLogin(curPlayer)
# 节日登录活动
@@ -686,6 +685,7 @@
OpenServerActivity.OnPlayerLogin(curPlayer)
PlayerPreset.OnPlayerLogin(curPlayer)
CrossPlayer.OnPlayerLogin(curPlayer)
+ PlayerActLunhuidian.OnPlayerLogin(curPlayer)
__OnFixVersion(curPlayer) # 修正线上玩家数据用，暂时放最后
# 上线查询一次充值订单
@@ -2267,6 +2267,76 @@
curPlayer.SetSetting(setting)
return
+#// A1 31 前端自定义保存设置内容 #tagCSSettingData
+#
+#struct tagCSSettingData
+#{
+# tagHead Head;
+# BYTE KeyNum; // 自定义key编号，后端使用数字key存储，前端自行进行转换定义，限制100个
+# BYTE DataLen;
+# char SetData[DataLen]; //自定义保存的内容
+#};
+def OnSettingData(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ playerID = curPlayer.GetPlayerID()
+
+ keyNum = clientData.KeyNum
+ setData = clientData.SetData
+ setData = setData.replace(" ", "") # 去空格
+ keyStr = str(keyNum)
+
+ gameRecMgr = DBDataMgr.GetGameRecMgr()
+ preSetRecMgr = gameRecMgr.GetRecTypeIDMgr(ShareDefine.Def_GameRecType_Setting, playerID)
+ recData = preSetRecMgr.GetOneRecData(True)
+ if not recData:
+ return
+ dataDict = recData.GetUserDict()
+
+ if not setData:
+ dataDict.pop(keyStr, None)
+ else:
+ keyMax = 100
+ if keyStr not in dataDict:
+ if len(dataDict) >= keyMax:
+ GameWorld.ErrLog("存储个数达到上限! keyMax=%s" % keyMax)
+ return
+ dataDict[keyStr] = setData
+
+ SyncSettingData(curPlayer, keyStr)
+ return
+
+def SyncSettingData(curPlayer, keyStr=""):
+ playerID = curPlayer.GetPlayerID()
+ gameRecMgr = DBDataMgr.GetGameRecMgr()
+ preSetRecMgr = gameRecMgr.GetRecTypeIDMgr(ShareDefine.Def_GameRecType_Setting, playerID)
+ recData = preSetRecMgr.GetOneRecData()
+ if not recData:
+ return
+ dataDict = recData.GetUserDict()
+
+ settingDataList = []
+ syncKeyList = [keyStr] if keyStr else dataDict.keys()
+ for keyStr in syncKeyList:
+ if keyStr in dataDict:
+ setData = dataDict[keyStr]
+ else:
+ setData = ""
+ keyNum = GameWorld.ToIntDef(keyStr, None)
+ if keyNum == None:
+ continue
+ sData = ChPyNetSendPack.tagSCSettingData()
+ sData.KeyNum = keyNum
+ sData.SetData = setData
+ sData.DataLen = len(sData.SetData)
+ settingDataList.append(sData)
+ if not settingDataList:
+ return
+ clientPack = ChPyNetSendPack.tagSCSettingDataInfo()
+ clientPack.SettingDataList = settingDataList
+ clientPack.DataCnt = len(clientPack.SettingDataList)
+ NetPackCommon.SendFakePack(curPlayer, clientPack)
+ return
+
#// A2 29 设置小助手 #tagCMSetLittleHelper
#
#struct tagCMSetLittleHelper
@@ -3328,6 +3398,9 @@
# 开服庆典积分阶段奖励
elif rewardType == ChConfig.Def_RewardType_OSACelebrationPointAward:
OpenServerActivity.GetOSACelebrationPointAward(curPlayer, dataEx)
+ # 轮回殿奖励
+ elif rewardType == ChConfig.Def_RewardType_LunhuidianAward:
+ PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr)
# 每日免费直购礼包
@@ -3384,9 +3457,6 @@
# 寻宝累计次数奖励
elif rewardType == ChConfig.Def_RewardType_TreasureCntAward:
PlayerTreasure.GetTreasureCntAward(curPlayer, dataEx, dataExStr)
- # 轮回殿奖励
- elif rewardType == ChConfig.Def_RewardType_LunhuidianAward:
- PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr)
#历史累计充值领取
elif rewardType == ChConfig.Def_RewardType_HistoryChargeAward:
PlayerGoldGift.OnGetHistoryRechargeAward(curPlayer, dataEx)
--
Gitblit v1.8.0