From b4d41e5535da64559813c78c341af6776d53237c Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 23 一月 2025 17:12:57 +0800
Subject: [PATCH] 10302 【越南】【英语】【砍树】【bt】修复无法领取幻境阁基金奖励bug；
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 242 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 218 insertions(+), 24 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 1e4371b..7034a64 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -12,7 +12,6 @@
#
# @change: "2011-02-23 14:20" panwei 系统提示函数重写
# @change: "2011-07-15 19:30" Alee 队伍通知
-# @change: "2011-09-02 16:20" panwei 新增竞技场设置和获取决斗值接口
# @change: "2012-11-06 15:00" jiang 新增竞威望设置和获取威望设接口
# @change: "2012-11-07 17:30" wdb 新增跨服预选赛排位信息
# @change: "2012-11-14 12:00" jiang 修改扩展属性字段记录的属性类型必须和MapServer一致
@@ -29,12 +28,18 @@
#---------------------------------------------------------------------
import GameWorld
import PlayerDBOper
+import PyDataManager
import IPY_GameServer
+import PlayerDBGSEvent
+import CrossChampionship
+import GameWorldMineArea
import IpyGameDataPY
import CrossRealmMsg
import ShareDefine
+import PyGameData
import ChConfig
import types
+import time
#---------------------------------------------------------------------
#系统提示参数列表
NotifyCodeList = IPY_GameServer.IPY_NotifyCodeList()
@@ -54,8 +59,17 @@
return
def CrossNotifyCode(serverGroupID, playerID, msgMark, msgParamList=[]):
+ NotifyCodeCross(serverGroupID, playerID, msgMark, msgParamList)
+ return
+
+def NotifyCodeCross(serverGroupID, playerID, msgMark, msgParamList=[]):
crossNotifyList = [{"Type":ShareDefine.CrossNotify_Player, "Params":[playerID, msgMark, msgParamList]}]
CrossNotify([serverGroupID], crossNotifyList)
+ return
+
+def WorldNotifyCross(serverGroupIDList, country, msgMark, msgParamList=[]):
+ crossNotifyList = [GetCrossWorldNotifyInfo(country, msgMark, msgParamList)]
+ CrossNotify(serverGroupIDList, crossNotifyList)
return
def GetCrossWorldNotifyInfo(country, msgMark, msgParamList=[]):
@@ -72,16 +86,54 @@
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, crossNotifyList, serverGroupIDList)
return
+def CrossNotifyEx(serverGroupIDList, crossNotifyList):
+ ''' 跨服广播信息提示，支持同步多条，同时也建议多条一起同步
+ @param serverGroupIDList: 需要同步到的目标服务器组ID列表
+ @param crossNotifyList: 信息提示列表，[[notifyType, paramsList, 自定义扩展信息], ...] notifyType 如 ShareDefine.CrossNotify_CrossAct
+ '''
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, crossNotifyList, serverGroupIDList)
+ return
+
def CrossServerMsg_Notify(crossNotifyList):
GameWorld.DebugLog("收到跨服同步的广播提示内容: count=%s" % len(crossNotifyList))
for notifyInfo in crossNotifyList:
- if "Type" not in notifyInfo or "Params" not in notifyInfo:
+ if isinstance(notifyInfo, dict):
+ if "Type" not in notifyInfo or "Params" not in notifyInfo:
+ continue
+ notifyType = notifyInfo["Type"]
+ params = notifyInfo["Params"]
+ elif isinstance(notifyInfo, list) and len(notifyInfo) >= 2:
+ notifyType, params = notifyInfo[:2]
+ else:
continue
- notifyType = notifyInfo["Type"]
- params = notifyInfo["Params"]
+
if notifyType == ShareDefine.CrossNotify_World:
country, msgMark, msgParamList = params
+ openServerDayLimit = IpyGameDataPY.GetFuncCfg("CrossRealmCfg", 1)
+ if msgMark.startswith("CrossBattlefield"):
+ openServerDayLimit = IpyGameDataPY.GetFuncCfg("CrossRealmCfg", 2)
+ openServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
+ if openServerDay < openServerDayLimit:
+ GameWorld.DebugLog("开服天不足，不处理该跨服广播! openServerDay=%s < %s" % (openServerDay, openServerDayLimit))
+ continue
WorldNotify(country, msgMark, msgParamList)
+ elif notifyType == ShareDefine.CrossNotify_CrossAct:
+ country, msgMark, msgParamList = params
+ serverIDRangeList = notifyInfo[2]
+ playerManager = GameWorld.GetPlayerManager()
+ for i in xrange(playerManager.GetPlayerCount()):
+ curPlayer = playerManager.GetPlayerByIndex(i)
+ if curPlayer == None or not curPlayer.GetInitOK() or GetIsTJG(curPlayer):
+ continue
+ if not serverIDRangeList:
+ NotifyCode(curPlayer, msgMark, msgParamList)
+ return
+ playerServerID = GameWorld.GetPlayerServerID(curPlayer)
+ for serverIDA, serverIDB in serverIDRangeList:
+ if serverIDA <= playerServerID <= serverIDB:
+ NotifyCode(curPlayer, msgMark, msgParamList)
+ break
+
elif notifyType == ShareDefine.CrossNotify_Family:
familyID, msgMark, msgParamList = params
FamilyNotify(familyID, msgMark, msgParamList)
@@ -157,24 +209,12 @@
return NotifyCodeList
-
+#------------------------------------------------------------------------------
+def GetDBPlayerAccIDByID(playerID):
+ ## 获取玩家表账号ID - 根据玩家ID， 可用于判断是否本服玩家
+ return PyGameData.g_dbPlayerIDMap.get(playerID, "")
#waring:以下使用的扩展属性字段记录的属性类型必须和MapServer一致
-#------------------------------------------------------------------------------
-##设置决斗值(竞技场用)
-# @param curPlayer 玩家
-# @param value 数值
-# @return None
-def SetVsFightValue(curPlayer, value):
- return
-
-
-##获取决斗值(竞技场用)
-# @param curPlayer 玩家
-# @return 决斗值
-def GetVsFightValue(curPlayer):
- return 0
-
#------------------------------------------------------------------------------
## 设置威望
# @param curPlayer: 玩家实例
@@ -190,6 +230,11 @@
def GetPrestige(curPlayer):
return 0
+##总战斗力
+def GetFightPower(curPlayer): return curPlayer.GetFightPowerEx() * ChConfig.Def_PerPointValue + curPlayer.GetFightPower()
+def SetFightPower(curPlayer, value):
+ curPlayer.SetFightPower(value % ChConfig.Def_PerPointValue, value / ChConfig.Def_PerPointValue)
+ return
#------------------------------------------------------------------------------
## 协助目标玩家ID
@@ -201,11 +246,12 @@
## 副本功能线路ID
def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID)
-def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()
+def GetFBFuncMapID(curPlayer): return curPlayer.GetExAttr3() / 1000
+def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3() % 1000
##VIP到期时间
-def GetVIPExpireTime(curPlayer): return curPlayer.GetExAttr9()
-def SetVIPExpireTime(curPlayer, expireTime): return curPlayer.SetExAttr9(expireTime)
+def GetVIPExpireTime(curPlayer): return 0
+def SetVIPExpireTime(curPlayer, expireTime): return
def GetValidVIPLV(curPlayer):
# @return: 返回当前有效的VIP等级
# vipTime = GetVIPExpireTime(curPlayer)
@@ -216,7 +262,9 @@
## 根据特权ID 和 VIP等级获得特权值
def GetPrivilegeValue(vipLV, privilegeID):
- if privilegeID not in ChConfig.VIPPrivilegeList:
+ #if privilegeID not in ChConfig.VIPPrivilegeList:
+ # return 0
+ if not privilegeID:
return 0
vipMsg = IpyGameDataPY.GetIpyGameData('VipPrivilege', privilegeID)
if not vipMsg:
@@ -235,6 +283,9 @@
curPlayer.MapServer_QueryPlayerResult(0, 0, "SetLeaveFamilyTime", sysMsg, len(sysMsg))
return
def GetLeaveFamilyTime(curPlayer):return curPlayer.GetExAttr12()
+##玩家离开仙盟时间（主动或被踢都算）
+def GetLeaveFamilyTimeEx(curPlayer):return curPlayer.GetExAttr19()
+def SetLeaveFamilyTimeEx(curPlayer, value):return curPlayer.SetExAttr19(value)
## 玩家所属服务器组ID
def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
@@ -270,6 +321,18 @@
#------------------------------------------------------------------------------
+def MapServer_QueryPlayer_DoLogic(tagPlayer, callName, cmdInfo, srcPlayerID=0, queryType=0):
+ ## 通知目标玩家地图执行 DoLogic
+ tagPlayerID = tagPlayer.GetPlayerID()
+ tagMapID = tagPlayer.GetRealMapID()
+ if tagMapID:
+ cmdStr = str(cmdInfo)
+ GameWorld.Log("MapServer_QueryPlayer_DoLogic: %s, cmdInfo=%s,tagPlayerID=%s,tagMapID=%s"
+ % (callName, cmdInfo, tagPlayerID, tagMapID), srcPlayerID)
+ #MapServer_QueryPlayer(int srcPlayerID, int queryType, int queryID, int mapID, char *callName, char *cmd,WORD cmdLen, int RouteServerIndex)
+ GameWorld.GetPlayerManager().MapServer_QueryPlayer(srcPlayerID, 0, tagPlayerID, tagMapID, callName,
+ cmdStr, len(cmdStr), tagPlayer.GetRouteServerIndex())
+ return
## 增加成就完成进度
# @param curPlayer
@@ -319,6 +382,12 @@
curPlayer.MapServer_QueryPlayerResult(0, 0, "DelItem", result, len(result))
return
+def MapServerGiveAward(curPlayer, eventName, moneyInfo={}, itemList=[], drDict={}):
+ ## 地图给奖励
+ result = str([eventName, moneyInfo, itemList, drDict])
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "GiveAward", result, len(result))
+ return
+
## 增加仙盟活跃
# @param curPlayer
# @param successType: 成就类型
@@ -340,3 +409,128 @@
return ipyData.GetLimitLV()
+# 因为MapServer玩家属性变更通知GameServer与功能开启通知触发时机有先后顺序，可能导致判断功能开启不准确，所以暂时记录该信息，临时用
+g_playerOpenFuncInfo = {} # 玩家触发功能开启功能ID信息，{playerID:[funcID, ...], ...}
+## 功能是否可用，该函数并不能确保百分百正确，只能大致判断，仅判断部分条件，如包含未判断的条件则不能确保百分百正确
+def GetFuncCanUse(curPlayer, funcID):
+ playerID = curPlayer.GetPlayerID()
+ if playerID in g_playerOpenFuncInfo:
+ if funcID in g_playerOpenFuncInfo[playerID]:
+ return True
+
+ ipyData = IpyGameDataPY.GetIpyGameData("FuncOpenLV", funcID)
+ if not ipyData:
+ return False
+
+ if ipyData.GetLimitLV() and ipyData.GetLimitLV() > curPlayer.GetLV():
+ return False
+
+ if ipyData.GetLimiRealmLV() and ipyData.GetLimiRealmLV() > curPlayer.GetOfficialRank():
+ return False
+
+ if ipyData.GetLimitVIPLV() and ipyData.GetLimitVIPLV() > curPlayer.GetVIPLv():
+ return False
+
+ return True
+
+def DoFuncOpenLogic(curPlayer, funcIDList):
+ global g_playerOpenFuncInfo
+ if GameWorld.IsCrossServer():
+ return
+ playerID = curPlayer.GetPlayerID()
+ FuncOpenLogicDict = {
+ ShareDefine.GameFuncID_Championship:lambda curObj:CrossChampionship.DoChampionshipOpen(curObj),
+ ShareDefine.GameFuncID_MineArea:lambda curObj:GameWorldMineArea.DoMineAreaFuncOpen(curObj),
+ }
+ for funcID in funcIDList:
+ if funcID in FuncOpenLogicDict:
+ if playerID not in g_playerOpenFuncInfo:
+ g_playerOpenFuncInfo[playerID] = []
+ openFuncIDList = g_playerOpenFuncInfo[playerID]
+ if funcID not in openFuncIDList:
+ openFuncIDList.append(funcID)
+ GameWorld.DebugLog("触发功能开启逻辑! funcID=%s" % funcID, playerID)
+ FuncOpenLogicDict[funcID](curPlayer)
+ return
+
+def AddOfflineUnprocessed(playerID, eventName, eventData, outtimeDays=30):
+ '''添加玩家离线未处理的事件
+ @param eventName: 事件名
+ @param eventData: 事件数据，由功能自定定义，任意格式
+ @param outtimeDays: 过期天数，0-永久, >0-指定天数, 默认30天
+ '''
+ playerRecMgr = PyDataManager.GetDBPlayerRecDataManager()
+ recData = playerRecMgr.AddPlayerRecData(ShareDefine.Def_PlayerRecType_OfflineUnprocessed, playerID)
+ recData.SetValue1(outtimeDays)
+ recData.SetUserDataByKey("eventName", eventName)
+ recData.SetUserDataByKey("eventData", eventData)
+ GameWorld.Log("添加玩家离线未处理的事件: %s, %s, %s" % (eventName, outtimeDays, eventData), playerID)
+ return
+
+def DoOfflineUnprocessed(curPlayer, eventName, dofunc):
+ '''执行处理玩家离线未处理的事件
+ @param dofunc: 执行函数，参数[curPlayer, recData, eventName, eventData]
+ '''
+ if not dofunc:
+ return
+ playerID = curPlayer.GetPlayerID()
+ playerRecMgr = PyDataManager.GetDBPlayerRecDataManager()
+ recDataList = playerRecMgr.GetPlayerRecDataList(ShareDefine.Def_PlayerRecType_OfflineUnprocessed, playerID)
+ delRecDataList = []
+ # 需按添加顺序执行逻辑
+ for recData in recDataList:
+ if recData.GetUserDataByKey("eventName") != eventName:
+ continue
+ eventData = recData.GetUserDataByKey("eventData")
+ GameWorld.Log("执行玩家上次离线前未处理事件: %s, %s" % (eventName, eventData), playerID)
+ dofunc(curPlayer, recData, eventName, eventData)
+ delRecDataList.append(recData)
+
+ # 执行完后再统一删除
+ for recData in delRecDataList:
+ playerRecMgr.DelRecData(recData)
+ return
+
+def DelOfflineUnprocessed(eventName):
+ ## 删除玩家离线未处理的事件
+ playerRecMgr = PyDataManager.GetDBPlayerRecDataManager()
+ recDict = playerRecMgr.GetPlayerRecDataDict(ShareDefine.Def_PlayerRecType_OfflineUnprocessed)
+ if not recDict:
+ return
+
+ delCnt = 0
+ for recDataList in recDict.values():
+ for recData in recDataList[::-1]: # 倒序处理删除到期
+ if recData.GetUserDataByKey("eventName") != eventName:
+ continue
+ playerRecMgr.DelRecData(recData)
+ delCnt += 1
+
+ GameWorld.DebugLog("删除玩家离线未处理的事件: %s, delCnt=%s" % (eventName, delCnt))
+ return
+
+def DelOuttimeOfflineUnprocessed():
+ ## 删除过期玩家离线未处理的事件
+ playerRecMgr = PyDataManager.GetDBPlayerRecDataManager()
+ recDict = playerRecMgr.GetPlayerRecDataDict(ShareDefine.Def_PlayerRecType_OfflineUnprocessed)
+ if not recDict:
+ return
+
+ curTime = int(time.time())
+ for recDataList in recDict.values():
+ for recData in recDataList[::-1]: # 倒序处理删除到期
+ recTime = recData.GetTime()
+ outtimeDays = recData.GetValue1()
+ if not outtimeDays:
+ continue
+ diffDays = GameWorld.GetDiff_Day(curTime, recTime) + 1
+ if diffDays <= outtimeDays:
+ continue
+ playerRecMgr.DelRecData(recData)
+
+ GameWorld.DebugLog("删除玩家离线未处理的过期事件: %s, %s" % (outtimeDays, recData.GetUserData()), recData.GetPlayerID())
+ return
+
+def DoOnDay():
+ DelOuttimeOfflineUnprocessed()
+ return
--
Gitblit v1.8.0