From 67449627d6db97ca0cbe2c910a261bd253c3094d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 03 一月 2019 17:30:58 +0800
Subject: [PATCH] 5660 【后端】【1.4.100】老版绝世武器绝版属性同步
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 92 ++++++++++++++++++++++------------------------
1 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 9486609..6215b85 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,7 +51,22 @@
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)
+ 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"])
+ return
+
## 跨服世界广播
# @param country 提示的国家
# @param msgMark 提示信息Mark
@@ -67,7 +81,7 @@
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)
+ #.SendBroadcastMerge(ChConfig.Def_MergeWorldNotify, 0, notifyDict, False)
return
## 世界广播
@@ -77,7 +91,7 @@
# @return 无返回值
# @remarks
def WorldNotify(country, msgMark, msgParamList=[]):
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
MergeWorldNotify(country, msgMark, msgParamList)
else:
GameWorld.GetPlayerManager().CountryNotifyCode(country, msgMark, __GetNotifyCodeList(msgParamList))
@@ -173,19 +187,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()
@@ -220,8 +221,16 @@
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 GetIsTJG(curPlayer):
@@ -283,38 +292,25 @@
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
+## 跨服状态: 0-非跨服状态，1-跨服状态
+def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5()
+def SetCrossRealmState(curPlayer, value):
+ ''' 设置玩家跨服状态
+ @param isExitCrossRealm: 非跨服状态时是否通知前端退出跨服服务器
+ '''
+ curPlayer.SetExAttr5(value)
+ 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