From e36d3d08ba14c81bfc159a2797d7c36b5f159ebc Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 18 十月 2019 13:29:08 +0800
Subject: [PATCH] 4597 【主干】拍品装备无法兑换活跃令（拍品改为可兑换）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 147 +++++++++++++++++++++---------------------------
1 files changed, 64 insertions(+), 83 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 9486609..d43cfd5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -23,15 +23,14 @@
# @change: "2015-07-14 21:00" xdh 聊天信息原附加值改为Extras
# @change: "2015-10-28 00:00" hxp 增加设置对战房间ID
# @change: "2015-11-05 12:00" hxp 增加跨服全服广播
-# @change: "2015-11-06 16:30" hxp 增加GetMergePlayerName
# @change: "2017-06-22 15:00" hxp 跨服广播增加条件过滤子服是否提醒；跨服服务器全服广播同步子服
#---------------------------------------------------------------------
#"""Version = 2017-06-22 15:00"""
#---------------------------------------------------------------------
import GameWorld
import IPY_GameServer
-import MergeBroadcast
import IpyGameDataPY
+import CrossRealmMsg
import ShareDefine
import ChConfig
import types
@@ -52,22 +51,44 @@
curPlayer.NotifyCode(msgMark, __GetNotifyCodeList(msgParamList))
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}
- MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
+
+def CrossNotifyCode(serverGroupID, playerID, msgMark, msgParamList=[]):
+ crossNotifyList = [{"Type":ShareDefine.CrossNotify_Player, "Params":[playerID, msgMark, msgParamList]}]
+ CrossNotify([serverGroupID], crossNotifyList)
+ return
+
+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
+
+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
## 世界广播
@@ -77,10 +98,7 @@
# @return 无返回值
# @remarks
def WorldNotify(country, msgMark, msgParamList=[]):
- if GameWorld.IsMergeServer():
- MergeWorldNotify(country, msgMark, msgParamList)
- else:
- GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
+ GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
return
#---------------------------------------------------------------------
@@ -173,23 +191,6 @@
#------------------------------------------------------------------------------
-## 设置玩家跨服预赛排位
-# @param curPlayer: 玩家实例
-# @param value: 威望值
-# @return:
-def SetMergeWarRank(curPlayer, value):
- return
-
-
-## 获取玩家跨服预赛排位
-# @param curPlayer: 玩家实例
-# @return: 威望值
-def GetMergeWarRank(curPlayer):
- return 0
-
-## 职业阶数
-def GetJobRank(curPlayer): return curPlayer.GetExAttr1()
-def SetJobRank(curPlayer, jobRank): return curPlayer.SetExAttr1(jobRank)
##VIP到期时间
def GetVIPExpireTime(curPlayer): return curPlayer.GetExAttr9()
@@ -220,8 +221,17 @@
def SetTodayXianyuanCoin(curPlayer, value): return curPlayer.SetExAttr11(value)
##玩家主动退出仙盟时间(<100代表退出次数)
-def SetLeaveFamilyTime(curPlayer, value): return curPlayer.SetExAttr12(value)
+def SetLeaveFamilyTime(curPlayer, value, isSyncMap=True):
+ curPlayer.SetExAttr12(value)
+ if isSyncMap:
+ sysMsg = '%s'%value
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "SetLeaveFamilyTime", sysMsg, len(sysMsg))
+ return
def GetLeaveFamilyTime(curPlayer):return curPlayer.GetExAttr12()
+
+## 玩家所属服务器组ID
+def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13()
+def SetPlayerServerGroupID(curPlayer, groupID): return curPlayer.SetExAttr13(groupID)
## 是否脱机挂机状态
def GetIsTJG(curPlayer):
@@ -247,20 +257,6 @@
#------------------------------------------------------------------------------
-## 设置新手指导员天数
-# @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
# @param successType: 成就类型
@@ -283,38 +279,23 @@
curPlayer.SetVsRoomId(roomID)
if isSetMergeRegRoomID:
curPlayer.SetDict(ChConfig.Def_PlayerKey_MergeRegisterRoomID, roomID)
-
- battleIDStr = str(roomID)
GameWorld.Log("SetVSRoomID playerID=%s, roomID=%s" % (curPlayer.GetPlayerID(), roomID))
- curPlayer.MapServer_QueryPlayerResult(0, 0, 'CreatePlayerRoomID', battleIDStr, len(battleIDStr))
+ SetMapServerPlayerAttrValue(curPlayer, "SetVsRoomId", roomID)
return
-## 根据子服账号及名称获取跨服角色名
-def GetMergePlayerName(playerAccID, playerName):
- orgPlayerName = playerName.strip()
-
- #取帐号后缀作为区服标识
- parserList = playerAccID.split('@')
- serverSign = ""
- if len(parserList) >= 2:
- serverSign = parserList[-1]
-
- parserList2 = orgPlayerName.split('-')
- orgNameServerSign = ""
- nameNotServerSign = parserList2[0]
- if len(parserList2) >= 2:
- orgNameServerSign = parserList2[-1]
-
- if orgNameServerSign:
- if orgNameServerSign == serverSign:
- return orgPlayerName
- else:
- return "%s-%s" % (nameNotServerSign, serverSign)
-
- if serverSign:
- return "%s-%s" % (nameNotServerSign, serverSign)
-
- return orgPlayerName
+## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID
+def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()
+def SetCrossMapID(curPlayer, value, isNotifyMapServer=True):
+ curPlayer.SetExAttr5(value)
+ if isNotifyMapServer:
+ SetMapServerPlayerAttrValue(curPlayer, "SetExAttr5", value)
+ return
+
+def SetMapServerPlayerAttrValue(curPlayer, attrName, value, exData=[]):
+ ## 设置地图服务器玩家对应属性值
+ setAttrInfo = str([attrName, value] + exData)
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "SetPlayerAttr", setAttrInfo, len(setAttrInfo))
+ return
## 地图服务器扣物品
# @param curPlayer
--
Gitblit v1.8.0