From a4e451de69657fba79075bb68dba5ea2ea084747 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 27 十二月 2018 11:24:16 +0800
Subject: [PATCH] 860312 任务输出
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 39 ++++++++++++---------------------------
1 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 399b9ed..2e3eac3 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -83,10 +83,7 @@
import GameWorldAverageLv
import PlayerDBOper
import PlayerGeTui
-#import MergeBroadcast
#import GameWorldMixServerCampaign
-#import GameWorldMergeKing
-#import GameWorldMergePK
#import PlayerManorWar
import GameWorldBoss
#import GameWorldActionTeHui
@@ -96,8 +93,7 @@
import ReadChConfig
import EventReport
#import ReloadModule
-import MergeChildMsg
-#import MergePlayer
+import CrossRealmPK
import PlayerFBHelpBattle
import PlayerFamilyRedPacket
import IpyGameDataPY
@@ -130,6 +126,8 @@
#__ClearTreasureDropCount()
#记录当前时间
GameLogInfo.Set_Server_Hour()
+
+ PlayerFamily.FamilyOnHour()
return
## 触发每日事件(参数 -> 当前时间)
@@ -293,12 +291,8 @@
# 帮主弹劾时钟调用
PlayerFamily.OnLeaderImpeachTick(tick)
- #跨服广播
- #MergeBroadcast.OnBroadcastProccee(tick)
#跨服PK匹配
- #GameWorldMergePK.OnPKMatchProcess(tick)
- #跨服王者争霸
- #GameWorldMergeKing.OnMergeKingProcess(tick)
+ CrossRealmPK.OnPKMatchProcess(tick)
GameWorldBoss.DoCheckWorldBossReborn(tick)
GameWorldBoss.ProcessBossGeTui(tick)
@@ -350,14 +344,16 @@
GameWorldActionControl.Dispose_OperationActionState()
GameWorldActionControl.Dispose_DailyActionState()
GameWorldActionControl.Dispose_FBStateTime()
-
+ #跨服PK
+ CrossRealmPK.OnMinuteProcess()
#处理重开服务器后, 活动继续开启逻辑根据天数
#GameWorldActionControl.Dispose_Action_GoOn_ByDay(tick)
#触发世界等级
GameWorldAverageLv.OpenWorldAverageLv()
#倒计时离队处理
PlayerTeam.DoCountdownLeaveTeamLogic(tick)
-
+ #副本助战
+ PlayerFBHelpBattle.OnMinuteProcess()
#每5分钟触发一次仙盟总战力更新
if curMinute % 5 == 0:
PlayerFamily.UpdFamilyTotalFightPower()
@@ -387,8 +383,6 @@
DisposeGameWorldGame(tick)
#回报数据库当前在线玩家数
DisposeGameActivePlayer(tick)
- #统计跨服服务器在线玩家
- #MergePlayer.DisposeMergeServerOnlinePlayer()
#同步地图服务器时间
Dispose_MapServer_Time(tick)
#保存玩家数据
@@ -1248,15 +1242,8 @@
#GameWorldBoss.CheckResetBossKilledCntOnServerInit()
#GameWorldActionTeHui.OnGameServerInitOK() # 特惠活动初始化
#子服启动成功告知跨服主服
- #===========================================================================
- # serverGroupID = GameWorld.GetServerGroupID()
- # if GameWorld.IsMergeOpen() and not GameWorld.IsMergeServer():
- # GameWorld.Log("通知跨服主服务器启动成功, 可接收最新跨服活动状态及数据...")
- # dataMsg = {"Platform":GameWorld.GetPlatform(), "ServerID":GameWorld.GetServerSID(), "ServerGroupID":serverGroupID}
- # MergeChildMsg.SendMergerChildToCenterStringData(ChConfig.Def_ClientServerInitOK, dataMsg)
- #
- # GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
- #===========================================================================
+ serverGroupID = GameWorld.GetServerGroupID()
+ GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
return
def DoCheckNewServerOpen(tick):
@@ -1417,8 +1404,7 @@
#GameWorldShopItem.OnMapServerInitOK()
# 跨服PK
- #GameWorldMergePK.OnMapServerInitOK()
- #GameWorldMergeKing.OnMapServerInitOK()
+ CrossRealmPK.OnMapServerInitOK()
SendAllMapGlobalDropInfo() # 全局掉落控制
@@ -1446,7 +1432,6 @@
# 清除指定通用数据
universalRecMgr = GameWorld.GetUniversalRecMgr()
delRecTypeList = [ShareDefine.Def_UniversalGameRecType_ManorWarInfo,
- #ShareDefine.Def_UniversalGameRecType_MergeRegister,
]
GameWorld.DebugLog(" 清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList))
for delRecType in delRecTypeList:
@@ -1471,7 +1456,7 @@
# 删除过期的通用数据
curTime = int(time.time())
GameWorld.Log("执行删除过期的通用数据, curTime=%s" % curTime)
- delOutofdayRecDataDict = {ShareDefine.Def_UniversalGameRecType_MergeRegister:31 * 24 * 3600,
+ delOutofdayRecDataDict = {
}
for otDayRecType, otTime in delOutofdayRecDataDict.items():
otRecDataList = universalRecMgr.GetTypeList(otDayRecType)
--
Gitblit v1.8.0