From 78f005e3fe86b6033255b37b03061cb491812dcb Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 24 一月 2019 15:07:35 +0800
Subject: [PATCH] 2936 【1.5.100】诛仙塔挑战失败也会给予奖励并扣除次数
---
ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py | 104 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
index cde4e6f..ec033a1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.py
@@ -22,6 +22,7 @@
import ChConfig
import PlayerControl
import PlayerViewCache
+import PlayerCompensation
import ChPyNetSendPack
import PlayerDBGSEvent
import NetPackCommon
@@ -45,7 +46,7 @@
# 获取玩家跨服服务器上的名字
def GetCrossPlayerName(curPlayer):
# 通过游戏账号中的平台标志获取名称，目前为spid
- playerName = curPlayer.GetPlayerName()
+ playerName = curPlayer.GetName()
opName = ReadChConfig.GetPyMongoConfig("Merge", "OpName_%s_%s" % (GameWorld.GetPlayerPlatform(curPlayer),
GameWorld.GetPlayerServerSID(curPlayer)))
@@ -100,7 +101,7 @@
curPlayer = playerManager.GetActivePlayerAt(i)
if curPlayer == None:
continue
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
curPlayer.Kick(0)
# 广播所有子服，本服务器进入维护
@@ -120,7 +121,7 @@
curPlayer = playerManager.GetActivePlayerAt(i)
if curPlayer == None:
continue
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
# 通知地图
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isOpen)
@@ -138,7 +139,7 @@
CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_ExitCrossServer, playerID, [serverGroupID])
# 设置非跨服状态，踢下线
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
curPlayer.Kick(0)
GameWorld.Log("PlayerExitCrossServer...serverGroupID=%s" % serverGroupID, playerID)
return
@@ -151,18 +152,18 @@
if not curPlayer:
GameWorld.Log(" 退出跨服时本服玩家不在线!", playerID)
return
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
return
-def SendCrossRealmReg(curPlayer, registerType, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
+def SendCrossRealmReg(curPlayer, registerMap, mapID=0, dataMapID=0, copyMapID=0, posX=0, posY=0):
# 发送跨服账号注册上传数据
# 设置上传数据的活动类型
- curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterType, registerType)
- sysMsg = str([registerType, mapID, dataMapID, copyMapID, posX, posY])
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, registerMap)
+ sysMsg = str([registerMap, mapID, dataMapID, copyMapID, posX, posY])
curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossRealmReg", sysMsg, len(sysMsg))
- GameWorld.Log("SendCrossRealmReg registerType=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
- % (registerType, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
+ GameWorld.Log("SendCrossRealmReg registerMap=%s,mapID=%s,dataMapID=%s,copyMapID=%s,posX=%s,posY=%s"
+ % (registerMap, mapID, dataMapID, copyMapID, posX, posY), curPlayer.GetPlayerID())
return
def OnCrossRealmRegOK(playerID, msgList, tick):
@@ -175,16 +176,16 @@
if not IsCrossServerOpen():
return
- registerType = msgList[0]
- playerRegisterType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterType)
- if playerRegisterType and registerType != playerRegisterType:
+ registerMap = msgList[0]
+ playerRegisterMap = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CrossRegisterMap)
+ if playerRegisterMap and registerMap != playerRegisterMap:
return
- curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterType, 0)
+ curPlayer.SetDict(ChConfig.Def_PlayerKey_CrossRegisterMap, 0)
- GameWorld.Log("跨服报名成功 , registerType=%s" % (registerType), playerID)
+ GameWorld.Log("跨服报名成功 , registerMap=%s" % (registerMap), playerID)
# 跨服PK上传数据完毕，通知跨服服务器，准备完毕
- if registerType == ChConfig.Def_FBMapID_CrossRealmPK:
+ if registerMap == ChConfig.Def_FBMapID_CrossRealmPK:
regVSRoomID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MergeRegisterRoomID)
vsRoomID = curPlayer.GetVsRoomId()
@@ -203,13 +204,13 @@
# 其他的，在上传数据完毕后，使用通用的通知可进入跨服
else:
- NotifyCanEnterMergeServer(curPlayer, registerType)
+ NotifyCanEnterMergeServer(curPlayer, registerMap)
# hxp 2015.09.10 跨服boss，后面的暂时不需要
return
-def NotifyCanEnterMergeServer(curPlayer, registerType):
+def NotifyCanEnterMergeServer(curPlayer, registerMap):
# 通用包，通知客户端可进入跨服服务器
return
@@ -225,7 +226,7 @@
'''
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
GameWorld.ErrLog("某些异常情况下，前端强制发包退出跨服状态! ", curPlayer.GetPlayerID())
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
return
#// C0 02 查看跨服玩家信息 #tagCGViewCrossPlayerInfo
@@ -315,10 +316,71 @@
sendPack.ItemDataSize = len(sendPack.ItemData)
sendPack.PlusData = PlusData
sendPack.PlusDataSize = len(sendPack.PlusData)
- sendPack.CrossPlayer = 1
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
-
+def CrossServerMsg_PutInItem(itemInfo):
+ ## 跨服获得物品
+ GameWorld.DebugLog("收到跨服服务器获得物品!")
+ playerID = itemInfo["PlayerID"]
+ itemData = itemInfo["ItemData"]
+ event = itemInfo["Event"]
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if curPlayer:
+ # 在线的话推到MapServer处理
+ itemMsg = str(itemInfo)
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossPutInItem", itemMsg, len(itemMsg))
+ return
+ # 离线的话直接发邮件
+ GameWorld.Log("收到跨服获得物品，玩家不在线，直接发邮件! itemInfo=%s" % str(itemInfo), playerID)
+ itemID, itemCount, isBind, itemUserData = itemData
+ addItemList = [{"ItemID":itemID, "Count":itemCount, "IsBind":isBind, "UserData":itemUserData}]
+ PlayerCompensation.SendMailByKey("", [playerID], addItemList, detail={"CrossPutInItem":1, "Event":event})
+ return
+
+def CrossServerMsg_GiveMoney(msgInfo):
+ ## 跨服获得货币
+
+ playerID = msgInfo["PlayerID"]
+ curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(playerID)
+ if not curPlayer:
+ GameWorld.ErrLog("跨服获得货币时玩家不在线! msgInfo=%s" % str(msgInfo), playerID)
+ return
+ msgInfo = str(msgInfo)
+ curPlayer.MapServer_QueryPlayerResult(0, 0, "CrossGiveMoney", msgInfo, len(msgInfo))
+ return
+
+def SetCrossPlayerAttrValue(msgInfo, tick):
+ ## 设置跨服玩家属性值
+ playerID, setType, setDict, isDelay = msgInfo
+ if not PyGameData.g_crossSetPlayerAttr:
+ GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick)
+ playerSetInfoList = PyGameData.g_crossSetPlayerAttr.get(playerID, [])
+ playerSetInfoList.append([setType, setDict])
+ PyGameData.g_crossSetPlayerAttr[playerID] = playerSetInfoList
+ if not isDelay:
+ __SendCrossServerSetPlayerAttr(0)
+ return
+
+def OnCrossProcess(tick):
+ __SendCrossServerSetPlayerAttr(tick)
+ return
+
+def __SendCrossServerSetPlayerAttr(tick):
+ if not PyGameData.g_crossSetPlayerAttr:
+ return
+
+ if tick:
+ # 延迟10秒一次性同步，主要是比如OnDay的时候当多个玩家同时跨服时，减少同步次数，延迟统一发送
+ if tick - GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick) < 10 * 1000:
+ return
+ GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_CrossSetPlayerAttrTick, tick)
+
+ CrossRealmMsg.SendMsgToCrossServer(ShareDefine.ClientServerMsg_SetPlayerAttrValue, PyGameData.g_crossSetPlayerAttr)
+ PyGameData.g_crossSetPlayerAttr = {}
+ return
+
+
+
\ No newline at end of file
--
Gitblit v1.8.0