From 11a8b1213819e3067ef079bffecf7542318b49f8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 30 十二月 2019 16:09:31 +0800
Subject: [PATCH] 8346 【恺英】【后端】协助系统（添加第一名无归属时原因日志）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 108 +++++++++++++++++++++++++++--------------------------
1 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 821d4e8..1e4371b 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -28,6 +28,7 @@
#"""Version = 2017-06-22 15:00"""
#---------------------------------------------------------------------
import GameWorld
+import PlayerDBOper
import IPY_GameServer
import IpyGameDataPY
import CrossRealmMsg
@@ -52,36 +53,43 @@
curPlayer.NotifyCode(msgMark, __GetNotifyCodeList(msgParamList))
return
-def NotifyCodeToClientServer(serverGroupIDList, playerID, msgMark, msgParamList=[]):
- dataMsg = {"Type":"Player", "ID":playerID, "Mark":msgMark, "Param":msgParamList}
- CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, dataMsg, serverGroupIDList)
+def CrossNotifyCode(serverGroupID, playerID, msgMark, msgParamList=[]):
+ crossNotifyList = [{"Type":ShareDefine.CrossNotify_Player, "Params":[playerID, msgMark, msgParamList]}]
+ CrossNotify([serverGroupID], crossNotifyList)
return
-def CrossServerMsg_Notify(notifyInfoDict):
- notifyType = notifyInfoDict["Type"]
- notifyID = notifyInfoDict["ID"]
- if notifyType == "Player":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(notifyID)
- if not curPlayer:
- return
- NotifyCode(curPlayer, notifyInfoDict["Mark"], notifyInfoDict["Param"])
+def GetCrossWorldNotifyInfo(country, msgMark, msgParamList=[]):
+ return {"Type":ShareDefine.CrossNotify_World, "Params":[country, msgMark, msgParamList]}
+
+def GetCrossFamilyNotifyInfo(familyID, msgMark, msgParamList=[]):
+ return {"Type":ShareDefine.CrossNotify_Family, "Params":[familyID, msgMark, msgParamList]}
+
+def CrossNotify(serverGroupIDList, crossNotifyList):
+ ''' 跨服广播信息提示，支持同步多条，同时也建议多条一起同步
+ @param serverGroupIDList: 需要同步到的目标服务器组ID列表
+ @param crossNotifyList: 信息提示列表，通过 GetCrossWorldNotifyInfo GetCrossFamilyNotifyInfo 函数获得返回值添加到列表
+ '''
+ CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_Notify, crossNotifyList, serverGroupIDList)
return
-## 跨服世界广播
-# @param country 提示的国家
-# @param msgMark 提示信息Mark
-# @param msgParamList 信息参数列表
-# @param mergeMinOSD 该提示针对跨服子服有效的最小开服天, >=0时有限制
-# @param mergeMaxOSD 该提示针对跨服子服有效的最大开服天, >=0时有限制
-# @param mergeMapInfo 该提示所属的跨服活动地图信息, 主要用于不同子服对应所跨的活动地图ID
-# @remarks
-def MergeWorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[], isMapNotify=0):
- # 非地图同步的广播才进行全服广播
- if not isMapNotify:
- GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
- notifyDict = {"country":country, "msgMark":msgMark, "msgParamList":msgParamList, "lineID":lineID,
- "mergeMinOSD":mergeMinOSD, "mergeMaxOSD":mergeMaxOSD, "mergeMapInfo":mergeMapInfo}
- #.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
+def CrossServerMsg_Notify(crossNotifyList):
+ GameWorld.DebugLog("收到跨服同步的广播提示内容: count=%s" % len(crossNotifyList))
+ for notifyInfo in crossNotifyList:
+ if "Type" not in notifyInfo or "Params" not in notifyInfo:
+ continue
+ notifyType = notifyInfo["Type"]
+ params = notifyInfo["Params"]
+ if notifyType == ShareDefine.CrossNotify_World:
+ country, msgMark, msgParamList = params
+ WorldNotify(country, msgMark, msgParamList)
+ elif notifyType == ShareDefine.CrossNotify_Family:
+ familyID, msgMark, msgParamList = params
+ FamilyNotify(familyID, msgMark, msgParamList)
+ elif notifyType == ShareDefine.CrossNotify_Player:
+ playerID, msgMark, msgParamList = params
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ NotifyCode(curPlayer, msgMark, msgParamList)
return
## 世界广播
@@ -91,10 +99,7 @@
# @return 无返回值
# @remarks
def WorldNotify(country, msgMark, msgParamList=[]):
- if GameWorld.IsCrossServer():
- MergeWorldNotify(country, msgMark, msgParamList)
- else:
- GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
+ GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
return
#---------------------------------------------------------------------
@@ -187,10 +192,16 @@
#------------------------------------------------------------------------------
+## 协助目标玩家ID
+def SetAssistTagPlayerID(curPlayer, value):
+ curPlayer.SetExAttr1(value)
+ SetMapServerPlayerAttrValue(curPlayer, "SetAssistTagPlayerID", value)
+ return
+def GetAssistTagPlayerID(curPlayer): return curPlayer.GetExAttr1()
-## 职业阶数
-def GetJobRank(curPlayer): return curPlayer.GetExAttr1()
-def SetJobRank(curPlayer, jobRank): return curPlayer.SetExAttr1(jobRank)
+## 副本功能线路ID
+def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID)
+def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()
##VIP到期时间
def GetVIPExpireTime(curPlayer): return curPlayer.GetExAttr9()
@@ -216,10 +227,6 @@
def GetChatBubbleBox(curPlayer): return curPlayer.GetExAttr10()
def SetChatBubbleBox(curPlayer, value): return curPlayer.SetExAttr10(value)
-##今日已获得仙缘币
-def GetTodayXianyuanCoin(curPlayer): return curPlayer.GetExAttr11()
-def SetTodayXianyuanCoin(curPlayer, value): return curPlayer.SetExAttr11(value)
-
##玩家主动退出仙盟时间(<100代表退出次数)
def SetLeaveFamilyTime(curPlayer, value, isSyncMap=True):
curPlayer.SetExAttr12(value)
@@ -231,6 +238,7 @@
## 玩家所属服务器组ID
def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
+def SetPlayerServerGroupID(curPlayer, groupID): return curPlayer.SetExAttr13(groupID)
## 是否脱机挂机状态
def GetIsTJG(curPlayer):
@@ -252,23 +260,16 @@
def GetGMForbidenTalk(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_ForbiddenTalk)
def SetGMForbidenTalk(curPlayer, value): curPlayer.SetDict(ChConfig.Def_ForbiddenTalk, value)
+# 玩家账号状态值
+def SetPlayerAccState(curPlayer, accState):
+ #curPlayer.SetAccState(accState)
+ curPlayer.SetExAttr17(accState)
+ #需要立即更新DB
+ PlayerDBOper.UpdateDBOper(PlayerDBOper.Table_DBPlayer, {"PlayerID":curPlayer.GetPlayerID()}, {"AccState":accState, "ExAttr17":accState})
+ return
#------------------------------------------------------------------------------
-
-## 设置新手指导员天数
-# @param curPlayer: 玩家实例
-# @param day: 天数
-# @return:
-def SetFreshmanGuiderDay(curPlayer, day):
- curPlayer.SetDict(ChConfig.Def_PlayerKey_FreshmanGuiderDay, day)
- return
-
-## 获取新手指导员天数
-# @param curPlayer: 玩家实例
-# @return: 天数
-def GetFreshmanGuiderDay(curPlayer):
- return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_FreshmanGuiderDay)
## 增加成就完成进度
# @param curPlayer
@@ -298,9 +299,10 @@
## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID
def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()
-def SetCrossMapID(curPlayer, value):
+def SetCrossMapID(curPlayer, value, isNotifyMapServer=True):
curPlayer.SetExAttr5(value)
- SetMapServerPlayerAttrValue(curPlayer, "SetExAttr5", value)
+ if isNotifyMapServer:
+ SetMapServerPlayerAttrValue(curPlayer, "SetExAttr5", value)
return
def SetMapServerPlayerAttrValue(curPlayer, attrName, value, exData=[]):
--
Gitblit v1.8.0