5424 【后端】【1.4】跨服竞技场开发（删除旧跨服代码）

hxp

2018-12-26 3a3ad99a1761438e31bc6860e94b43cb4f165513

5424 【后端】【1.4】跨服竞技场开发（删除旧跨服代码）

 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



#-------------------------------------

#↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓交易所↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓

## 添加交易所物品数据到流向记录用字典


 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



#-------------------------------------------------------------------------------


 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)


 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)

    #保存玩家数据


 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


 ServerPython/CoreServerGroup/GameServer/Script/Player/MergeBroadcast.py

File was deleted

 ServerPython/CoreServerGroup/GameServer/Script/Player/MergePlayer.py

File was deleted

 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

    

## 世界广播


 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战斗结算


 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: 之前是否已报名