From 3a3ad99a1761438e31bc6860e94b43cb4f165513 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 10:52:19 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（删除旧跨服代码）
---
/dev/null | 123 -----------------------------------------
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py | 3
ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py | 6 --
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 3
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 7 --
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 7 --
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py | 6 --
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py | 10 ---
ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py | 2
9 files changed, 2 insertions(+), 165 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py b/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
index 8a921f3..42ad582 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/DataRecordPack.py
@@ -453,12 +453,6 @@
SendEventPack("UpdatePlayerName", dataDict, curPlayer)
return
-def DR_MergePlayerEvent(playerID, eventType, eventTime, eventData, opType):
- # 跨服玩家记录事件流向
- dataDict = {'PlayerID':playerID, "EventType":eventType, "EventTime":eventTime, 'EventData':eventData}
- SendEventPack("MergePlayerEvent_%s" % opType, dataDict)
- return
-
#-------------------------------------
#↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓交易所↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
## 添加交易所物品数据到流向记录用字典
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
index 08c9e57..5b1a8ae 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py
@@ -25,7 +25,6 @@
import ShareDefine
#import PlayerExam
import PlayerDBGSEvent
-import MergeBroadcast
#import PlayerManorWar
#import GameWorldShopItem
#import GameWorldActionTeHui
@@ -1240,7 +1239,7 @@
# @return: None
def SendBroadcastMergeOpenActionDay():
mergeServerOpenActionDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MergeServerOpenActionDay)
- MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeServerOpenActionDay, 0, {"Day":mergeServerOpenActionDay})
+ #.SendBroadcastMerge(ChConfig.Def_MergeServerOpenActionDay, 0, {"Day":mergeServerOpenActionDay})
return
#-------------------------------------------------------------------------------
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
index 733998b..c1fae3c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.py
@@ -38,7 +38,6 @@
import PlayerUniversalGameRec
import PlayerCompensation
import IpyGameDataPY
-import MergePlayer
import PyGameDataStruct
import PyDataManager
import PlayerControl
@@ -580,15 +579,6 @@
if lvLimit[0] <= findLV <= lvLimit[1]:
playerCntDict[bossid] = playerCntDict.get(bossid, 0) + 1
GameWorld.DebugLog(' boss等级信息对应本服在线人数 %s' % playerCntDict)
-
- # 此处需要统计累加当前在跨服服务器的玩家
- mergeServerOnlinePlayerDict = MergePlayer.GetMergeServerOnlinePlayerInfo()
- for playerInfo in mergeServerOnlinePlayerDict.values():
- findLV = playerInfo[MergePlayer.Def_MSOLPlayer_LV]
- for bossid, lvLimit in bossRebornDict.items():
- if lvLimit[0] <= findLV <= lvLimit[1]:
- playerCntDict[bossid] = playerCntDict.get(bossid, 0) + 1
- GameWorld.DebugLog(' boss等级信息对应本服及跨服在线人数 %s' % playerCntDict)
for bossid, curOnlineCnt in playerCntDict.items():
SetBossOnlineHeroCnt(bossid, curOnlineCnt)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index b4d9c5b..74ee805 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -83,7 +83,6 @@
import GameWorldAverageLv
import PlayerDBOper
import PlayerGeTui
-#import MergeBroadcast
#import GameWorldMixServerCampaign
#import PlayerManorWar
import GameWorldBoss
@@ -94,9 +93,7 @@
import ReadChConfig
import EventReport
#import ReloadModule
-import CrossRealmMsg
import CrossRealmPK
-#import MergePlayer
import PlayerFBHelpBattle
import PlayerFamilyRedPacket
import IpyGameDataPY
@@ -294,8 +291,6 @@
# 帮主弹劾时钟调用
PlayerFamily.OnLeaderImpeachTick(tick)
- #跨服广播
- #MergeBroadcast.OnBroadcastProccee(tick)
#跨服PK匹配
CrossRealmPK.OnPKMatchProcess(tick)
@@ -388,8 +383,6 @@
DisposeGameWorldGame(tick)
#回报数据库当前在线玩家数
DisposeGameActivePlayer(tick)
- #统计跨服服务器在线玩家
- #MergePlayer.DisposeMergeServerOnlinePlayer()
#同步地图服务器时间
Dispose_MapServer_Time(tick)
#保存玩家数据
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 704810f..2481af4 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -45,7 +45,6 @@
import PlayerTruck
import HighLadder
import EventReport
-import MergePlayer
import PlayerCompensation
import PlayerFamilyRedPacket
import PlayerFamilyStore
@@ -493,7 +492,6 @@
# 设置家族成员离线时间
SetPlayerOfflineTime(curPlayer)
- #MergePlayer.OnPlayerLeaveGotoMergeServer(curPlayer, tick)
#------------镖车逻辑
#TruckPlayerDisconnectProcess(curPlayer, tick)
return
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/MergeBroadcast.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/MergeBroadcast.py
deleted file mode 100644
index 159076e..0000000
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/MergeBroadcast.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#---------------------------------------------------------------------
-#
-#---------------------------------------------------------------------
-##@package MergeBroadcast.py
-# 跨服赛服务器广播
-#
-# @author wdb
-# @date 2012-10-31 16:50
-# @version 1.1
-# @note
-# @change: "2012-12-12 15:00" wdb 跨服广播修改
-#---------------------------------------------------------------------
-"""Version = 2012-12-12 15:00"""
-#---------------------------------------------------------------------
-import IPY_GameServer
-import GameWorld
-import ChConfig
-#---------------------------------------------------------------------
-# 要跨服广播的信息内容
-g_broadcastMsgList= []
-
-# 重复广播3次
-Def_MaxBroadcastCnt = 3
-
-
-## 广播信息到子服务器上
-# @param sendType 广播类型
-# @param infoDict 广播信息字典
-# @return None
-def SendBroadcastMerge(operType, mapID, dataDict, isRepeat=True):
- global g_broadcastMsgList
-
- sendDict = {'Oper':operType, 'MapID':mapID, 'Data':dataDict}
- GameWorld.Log("SendBroadcastMerge=>isRepeat:%s, sendDict%s"%(isRepeat, sendDict))
- # 需要加入重复广播信息列表
- if isRepeat:
- g_broadcastMsgList.append((0, operType, mapID, dataDict))
-
- # 直接发送
- else:
- GameWorld.GetGameWorld().SendBroadcastMergeClient(str(sendDict))
- return
-
-
-## 时钟调用处理
-# @param tick: 时钟tick
-# @return None
-def OnBroadcastProccee(tick):
- global g_broadcastMsgList
- tempMsgList = []
-
- #间隔未到
- if not GameWorld.SetWorldDictKey(ChConfig.TYPE_MergeBroadcastTick, tick):
- return
-
- # 要跨服广播的信息内容
- for msgInfo in g_broadcastMsgList:
-
- broadcastCnt, operType, mapID, dataDict = msgInfo
- # 达到重复广播次数
- if broadcastCnt >= Def_MaxBroadcastCnt:
- continue
-
- # 广播信息到子服务器上
- SendBroadcastMerge(operType, mapID, dataDict, False)
- # 更新广播次数
- tempMsgList.append((broadcastCnt + 1, operType, mapID, dataDict))
-
- g_broadcastMsgList = tempMsgList[:]
- return
-
-
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/MergePlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/MergePlayer.py
deleted file mode 100644
index 70d8660..0000000
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/MergePlayer.py
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-##@package MergePlayer
-#
-# @todo:跨服玩家
-# @author hxp
-# @date 2017-05-24
-# @version 1.0
-#
-# 详细描述: 跨服玩家
-#
-#-------------------------------------------------------------------------------
-#"""Version = 2017-05-24 16:00"""
-#-------------------------------------------------------------------------------
-import GameWorld
-import MergeBroadcast
-import PlayerMergeRegister
-import datetime
-import ChConfig
-
-__g_mergeServerOLPlayerInfo = {} # 跨服服务器在线玩家信息 {playerID:[玩家信息列表], ...}
-
-(
-Def_MSOLPlayer_LV, # 等级
-) = range(1)
-
-def __GetMergeServerPlayerInfo(curPlayer):
- return [curPlayer.GetLV()]
-
-def DisposeMergeServerOnlinePlayer():
- if not GameWorld.IsMergeServer():
- return
-
- # 每整5分钟统计一次
- if datetime.datetime.today().minute % 5 != 0:
- return
-
- olPlayerDict = {}
- playerManager = GameWorld.GetPlayerManager()
- for index in xrange(playerManager.GetPlayerCount()):
- player = playerManager.GetPlayerByIndex(index)
- if player == None or not player.GetInitOK():
- continue
- olPlayerDict[player.GetPlayerID()] = __GetMergeServerPlayerInfo(player)
-
- MergeBroadcast.SendBroadcastMerge(ChConfig.Def_MergeOnLinePlayer, 0, olPlayerDict, False)
- return
-
-def OnRecvMergeServerOLPlayerInfo(onlinePlayerDict):
- '''接收跨服服务器同步的在跨服服务器的玩家信息
- '''
- global __g_mergeServerOLPlayerInfo
- __g_mergeServerOLPlayerInfo = {} # 每次收到同步后清空、重新记录
-
- playerMgr = GameWorld.GetPlayerManager()
- for playerID, playerInfo in onlinePlayerDict.items():
- regRecData = PlayerMergeRegister.GetRegisterPlayerRec(playerID)
- # 不是本服玩家
- if not regRecData:
- continue
-
- # 已经在本服的不处理
- player = playerMgr.FindPlayerByID(playerID)
- if player:
- continue
- __g_mergeServerOLPlayerInfo[playerID] = playerInfo
-
- GameWorld.DebugLog("跨服服务器本服在线玩家信息: %s" % __g_mergeServerOLPlayerInfo)
- return
-
-def OnPlayerLogin(curPlayer):
- global __g_mergeServerOLPlayerInfo
-
- # 只处理子服
- if GameWorld.IsMergeServer():
- return
-
- playerID = curPlayer.GetPlayerID()
- if playerID in __g_mergeServerOLPlayerInfo:
- __g_mergeServerOLPlayerInfo.pop(playerID)
- GameWorld.DebugLog("玩家登录本服移除跨服服务器在线信息: %s" % __g_mergeServerOLPlayerInfo, playerID)
-
- return
-
-def OnPlayerLeaveGotoMergeServer(curPlayer, tick):
- global __g_mergeServerOLPlayerInfo
-
- # 只处理子服
- if GameWorld.IsMergeServer():
- return
-
- playerID = curPlayer.GetPlayerID()
- leaveTick = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_OnGotoMergeServerTick)
- if not leaveTick:
- return
- if tick - leaveTick > 60000:
- return
- __g_mergeServerOLPlayerInfo[playerID] = __GetMergeServerPlayerInfo(curPlayer)
- GameWorld.DebugLog("玩家登录到跨服服务器, 添加跨服服务器在线玩家信息: tick=%s,leaveTick=%s, %s"
- % (tick, leaveTick, __g_mergeServerOLPlayerInfo), playerID)
- return
-
-#// C0 15 通知即将登录跳转到跨服服务器 #tagCGGotoMergeServer
-#
-#struct tagCGGotoMergeServer
-#{
-# tagHead Head;
-#};
-def OnGotoMergeServer(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- curPlayer.SetDict(ChConfig.Def_PlayerKey_OnGotoMergeServerTick, tick)
- GameWorld.DebugLog("玩家即将登录跳转到跨服服务器: tick=%s" % (tick), curPlayer.GetPlayerID())
- return
-
-
-def GetMergeServerOnlinePlayerInfo(): return __g_mergeServerOLPlayerInfo
-def GetMergeServerOnlinePlayerByID(playerID):
- if playerID in __g_mergeServerOLPlayerInfo:
- return __g_mergeServerOLPlayerInfo[playerID]
- return
-
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
index 3860e58..c9fecb5 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerControl.py
@@ -29,7 +29,6 @@
#---------------------------------------------------------------------
import GameWorld
import IPY_GameServer
-import MergeBroadcast
import IpyGameDataPY
import CrossRealmMsg
import ShareDefine
@@ -82,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
## 世界广播
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index deb04fc..083e90c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -52,7 +52,6 @@
import PlayerFamilyBoss
import PlayerManorWar
import GameWorldBoss
-import MergeBroadcast
import GameWorldFamilyWar
#import PlayerFamilyTech
import PlayerFamilyRedPacket
@@ -526,12 +525,6 @@
# 用于记录全服充值的点券数
if callName == "RecordChangeCoin":
GameDataRecord.ChangeCoinCnt(eval(resultName))
- return
-
- #跨服广播子服
- if callName == 'SendBroadcastMergeClient':
- operType, mapID, dataDict, isRepeat = eval(resultName)
- MergeBroadcast.SendBroadcastMerge(operType, mapID, dataDict, isRepeat)
return
#跨服匹配PK战斗结算
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
index d922fde..c6ad77e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/DataRecordPack.py
@@ -1270,12 +1270,6 @@
SendEventPack("PlayerGetReward", dataDict, curPlayer)
return
-def DR_MergePlayerEvent(playerID, eventType, eventTime, eventData, opType):
- # 跨服玩家记录事件流向
- dataDict = {'PlayerID':playerID, "EventType":eventType, "EventTime":eventTime, 'EventData':eventData}
- SendEventPack("MergePlayerEvent_%s" % opType, dataDict)
- return
-
## 申请加入贵宾俱乐部
# @param curPlayer
# @param hasRegister: 之前是否已报名
--
Gitblit v1.8.0