From 95d8352b83382782d6dfca638fc779ea7887eb96 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 31 一月 2019 09:57:38 +0800
Subject: [PATCH] 6105 【后端】【1.5.200】诛仙宝石开发（屏蔽满级获得经验日志输出）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py | 121 ++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 60 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
index 6a9ef00..928b0f9 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.py
@@ -708,61 +708,63 @@
return zoneIpyData.GetZoneID()
return 0
-def OnPlayerLogin(curPlayer):
-
- # 本服登录处理
- if not GameWorld.IsCrossServer():
- # 本服没有分配赛区不处理
- if not GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID):
- return
- __OnLoginNotifyPKOverInfo(curPlayer)
-
- # 同步所有赛区赛季信息
- zoneSeasonInfo = ChPyNetSendPack.tagGCCrossRealmPKSeasonInfo()
- zoneSeasonInfo.ZoneList = []
- ipyDataMgr = IpyGameDataPY.IPY_Data()
- for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):
- zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)
- zoneID = zoneIpyData.GetZoneID()
- zoneInfo = ChPyNetSendPack.tagGCCrossRealmPKZone()
- zoneInfo.ZoneID = zoneID
- zoneInfo.ZoneName = zoneIpyData.GetZoneName().decode(ShareDefine.Def_Game_Character_Encoding).encode(GameWorld.GetCharacterEncoding())
- zoneInfo.ZoneNameLen = len(zoneInfo.ZoneName)
- zoneInfo.SeasonList = []
- seasonList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", zoneID)
- seasonList = [] if not seasonList else seasonList
- for seasonIpyData in seasonList:
- seasonInfo = ChPyNetSendPack.tagGCCrossRealmPKSeason()
- seasonInfo.SeasonID = seasonIpyData.GetSeasonID()
- seasonInfo.StartDate = seasonIpyData.GetStartDate()
- seasonInfo.EndDate = seasonIpyData.GetEndDate()
- seasonInfo.EndTime = seasonIpyData.GetEndTime()
- zoneInfo.SeasonList.append(seasonInfo)
- zoneInfo.SeasonCount = len(zoneInfo.SeasonList)
- zoneSeasonInfo.ZoneList.append(zoneInfo)
- zoneSeasonInfo.ZoneCount = len(zoneSeasonInfo.ZoneList)
- NetPackCommon.SendFakePack(curPlayer, zoneSeasonInfo)
-
- # 同步本服赛季状态
- gameWorld = GameWorld.GetGameWorld()
- seasonStatePack = ChPyNetSendPack.tagGCCrossRealmPKSeasonState()
- seasonStatePack.ZoneID = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
- seasonStatePack.SeasonID = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
- seasonStatePack.SeasonState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)
- seasonStatePack.MatchState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)
- NetPackCommon.SendFakePack(curPlayer, seasonStatePack)
-
+def OnPlayerLoginCrossServer(curPlayer):
# 跨服登录处理
- else:
- mapID = curPlayer.GetMapID()
- mapIDList = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 4)
- if mapID not in mapIDList:
- return
-
- GameWorld.Log("玩家登录跨服PK地图, mapID=%s" % mapID, curPlayer.GetPlayerID())
- if not __CheckCanLoginCrossServerPKMap(curPlayer):
- CrossRealmPlayer.PlayerExitCrossServer(curPlayer)
- return
+
+ mapID = curPlayer.GetMapID()
+ mapIDList = IpyGameDataPY.GetFuncCfg("CrossRealmPKMatch", 4)
+ if mapID not in mapIDList:
+ return
+
+ GameWorld.Log("玩家登录跨服PK地图, mapID=%s" % mapID, curPlayer.GetPlayerID())
+ if not __CheckCanLoginCrossServerPKMap(curPlayer):
+ CrossRealmPlayer.PlayerExitCrossServer(curPlayer)
+ return
+
+ return
+
+def OnPlayerLogin(curPlayer):
+ # 本服登录处理
+
+ # 本服没有分配赛区不处理
+ if not GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID):
+ return
+ __OnLoginNotifyPKOverInfo(curPlayer)
+
+ # 同步所有赛区赛季信息
+ zoneSeasonInfo = ChPyNetSendPack.tagGCCrossRealmPKSeasonInfo()
+ zoneSeasonInfo.ZoneList = []
+ ipyDataMgr = IpyGameDataPY.IPY_Data()
+ for index in xrange(ipyDataMgr.GetCrossRealmPKZoneCount()):
+ zoneIpyData = ipyDataMgr.GetCrossRealmPKZoneByIndex(index)
+ zoneID = zoneIpyData.GetZoneID()
+ zoneInfo = ChPyNetSendPack.tagGCCrossRealmPKZone()
+ zoneInfo.ZoneID = zoneID
+ zoneInfo.ZoneName = zoneIpyData.GetZoneName().decode(ShareDefine.Def_Game_Character_Encoding).encode(GameWorld.GetCharacterEncoding())
+ zoneInfo.ZoneNameLen = len(zoneInfo.ZoneName)
+ zoneInfo.SeasonList = []
+ seasonList = IpyGameDataPY.GetIpyGameDataList("CrossRealmPKSeason", zoneID)
+ seasonList = [] if not seasonList else seasonList
+ for seasonIpyData in seasonList:
+ seasonInfo = ChPyNetSendPack.tagGCCrossRealmPKSeason()
+ seasonInfo.SeasonID = seasonIpyData.GetSeasonID()
+ seasonInfo.StartDate = seasonIpyData.GetStartDate()
+ seasonInfo.EndDate = seasonIpyData.GetEndDate()
+ seasonInfo.EndTime = seasonIpyData.GetEndTime()
+ zoneInfo.SeasonList.append(seasonInfo)
+ zoneInfo.SeasonCount = len(zoneInfo.SeasonList)
+ zoneSeasonInfo.ZoneList.append(zoneInfo)
+ zoneSeasonInfo.ZoneCount = len(zoneSeasonInfo.ZoneList)
+ NetPackCommon.SendFakePack(curPlayer, zoneSeasonInfo)
+
+ # 同步本服赛季状态
+ gameWorld = GameWorld.GetGameWorld()
+ seasonStatePack = ChPyNetSendPack.tagGCCrossRealmPKSeasonState()
+ seasonStatePack.ZoneID = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKZoneID)
+ seasonStatePack.SeasonID = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonID)
+ seasonStatePack.SeasonState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossPKSeasonState)
+ seasonStatePack.MatchState = gameWorld.GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossDailyActionState % ShareDefine.DailyActionID_CrossReamPK)
+ NetPackCommon.SendFakePack(curPlayer, seasonStatePack)
return
@@ -816,7 +818,7 @@
# return
vsRoomID = curPlayer.GetVsRoomId()
- if vsRoomID and PlayerControl.GetCrossRealmState(curPlayer) == 1:
+ if vsRoomID and PlayerControl.GetCrossMapID(curPlayer) == ChConfig.Def_FBMapID_CrossRealmPK:
GameWorld.DebugLog("玩家跨服PK状态，不能取消匹配！vsRoomID=%s" % vsRoomID, curPlayer.GetPlayerID())
return
@@ -1702,7 +1704,6 @@
def CrossServerMsg_PKMatchResult(vsRoomDict):
## 跨服PK匹配结果
curServerGroupID = GameWorld.GetServerGroupID()
- actionType = ShareDefine.Def_CrossAction_PK
mapPosList = IpyGameDataPY.GetFuncEvalCfg("CrossRealmPKMatch", 5)
GameWorld.DebugLog("=== 收到PK匹配结果处理 === curServerGroupID=%s" % curServerGroupID)
if not mapPosList:
@@ -1727,7 +1728,7 @@
PlayerControl.SetVsRoomId(player, roomID, True)
# 通知地图玩家匹配成功, 上传数据, 准备进入跨服服务器
posX, posY = mapPosList[i] if len(mapPosList) > i else mapPosList[0]
- CrossRealmPlayer.SendCrossRealmReg(player, actionType, mapID, mapID, 0, posX, posY)
+ CrossRealmPlayer.SendCrossRealmReg(player, ChConfig.Def_FBMapID_CrossRealmPK, mapID, mapID, 0, posX, posY)
return
@@ -1773,7 +1774,7 @@
matchPlayer.MaxProDef = readyPlayerInfo["MaxProDef"]
break
- PlayerControl.SetCrossRealmState(player, 1)
+ PlayerControl.SetCrossMapID(player, ChConfig.Def_FBMapID_CrossRealmPK)
SetIsCrossPKMatching(player, 0)
# 通知匹配成功，可进入跨服
@@ -1816,7 +1817,7 @@
GameWorld.DebugLog(" 房间ID不同, playerID=%s" % (playerID))
continue
player.SetDict(ChConfig.Def_PlayerKey_IsLoginToMergeServer, 0)
- PlayerControl.SetCrossRealmState(player, 0)
+ PlayerControl.SetCrossMapID(player, 0)
return
@@ -1907,7 +1908,7 @@
overInfoData = PyDataManager.GetCrossPKUnNotifyOverInfoManager().GetPlayerUnNotifyOverInfo(playerID)
if not overInfoData:
return
- PlayerControl.SetCrossRealmState(curPlayer, 0)
+ PlayerControl.SetCrossMapID(curPlayer, 0)
PlayerControl.SetVsRoomId(curPlayer, 0)
zoneID = overInfoData.ZoneID
--
Gitblit v1.8.0