From b31e57a8079f5bf8fae3dc607929d72939e7e7c0 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 一月 2021 18:25:05 +0800
Subject: [PATCH] 8677 【BT】【后端】跨服冲榜活动; 新增跨服活动时间管理模块、跨服榜单；跨服邮件；跨服广播优化；相关GM命令、后台工具；（冲突补同步）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index bebae61..fc51542 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -25,7 +25,6 @@
# @change: "2014-02-27 12:00" hxp 增加世界boss逻辑
# @change: "2014-04-26 19:30" hxp 增加领地战活动
# @change: "2014-06-21 15:20" hxp 增加特惠活动
-# @change: "2014-08-04 17:30" xmnathan 天梯每日更新
# @change: "2014-08-15 17:00" xmnathan 修改OnDay函数内的执行顺序
# @change: "2014-10-08 10:30" xmnathan add 定时清理过期补偿
# @change: "2014-10-29 22:00" hxp MapServerInitOK增加扩展key状态通知
@@ -91,12 +90,14 @@
import CrossRealmPK
import CrossRealmMsg
import CrossRealmPlayer
+import CrossActionControl
import PlayerFBHelpBattle
import PlayerFamilyRedPacket
import PlayerFairyDomain
import IpyGameDataPY
import PlayerFamilyParty
import GameWorldFamilyWar
+import GameWorldArena
import AuctionHouse
import PlayerXMZZ
import PlayerTeam
@@ -125,6 +126,7 @@
GameLogInfo.Set_Server_Hour()
PlayerFamily.FamilyOnHour()
+ ChPlayer.CheckOnedayJobPlayerLoginoffTimeout()
return
## 触发每日事件(参数 -> 当前时间)
@@ -163,7 +165,7 @@
#GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ServerDay, openServerDay)
#清理过期补偿
PlayerCompensation.ClearUpTimeOutCompensation()
- PlayerGeTui.ClearFMTGeTuiLimit()
+ #PlayerGeTui.ClearFMTGeTuiLimit()
import PlayerBourse
PlayerBourse.OverTimeItemsDeal()
# 仙盟联赛
@@ -178,6 +180,8 @@
#仙魔之争
PlayerXMZZ.XMZZOndayEx()
+ #boss复活
+ GameWorldBoss.BossRebornOnDayEx()
return
## 触发每周事件(参数 -> 当前时间)
@@ -293,8 +297,8 @@
CrossRealmPK.OnPKMatchProcess(tick)
GameWorldBoss.DoCheckWorldBossReborn(tick)
- GameWorldBoss.ProcessBossGeTui(tick)
- PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
+ #GameWorldBoss.ProcessBossGeTui(tick)
+ #PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
#组队副本版本
PlayerTeam.DoTeamProcess(tick)
@@ -353,12 +357,10 @@
GameWorldAverageLv.OpenWorldAverageLv()
#倒计时离队处理
PlayerTeam.DoCountdownLeaveTeamLogic(tick)
- #副本助战
- PlayerFBHelpBattle.OnMinuteProcess()
#红包
PlayerFamilyRedPacket.OnRedPacketMinuteProcess()
#拍卖行
- AuctionHouse.OnAuctionItemMinuteProcess()
+ AuctionHouse.OnAuctionItemMinuteProcess(tick)
#每5分钟触发一次仙盟总战力更新
if curMinute % 5 == 0:
PlayerFamily.UpdFamilyTotalFightPower()
@@ -1234,6 +1236,8 @@
ChPlayer.LoadPlayerLVData()
#加载助战信息
PlayerFBHelpBattle.OnServerStart()
+ #本服竞技场
+ GameWorldArena.OnServerStart()
#跨服PK
CrossRealmPK.OnGameServerInitOK()
#世界boss被杀次数重置
@@ -1253,6 +1257,7 @@
GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_GameWorldInitOK, 1)
+ AuctionHouse.OnGameServerInitOK()
# 注意：跨服相关信息的调用需放在最后，不然可能导致服务器未启动功能或者功能未加载成功导致跨服服务器与子服之间的数据同步可能出现异常的情况
CrossRealmMsg.OnGameServerInitOK()
return
@@ -1410,6 +1415,8 @@
# 跨服PK
CrossRealmPK.OnMapServerInitOK()
+ # 本服竞技场
+ GameWorldArena.SendMapServerArenaInfo()
SendAllMapGlobalDropInfo() # 全局掉落控制
@@ -1924,6 +1931,8 @@
PlayerTeam.OnServerClose(tick)
ChPlayer.SavePlayerLVData()
PlayerFBHelpBattle.OnServerClose()
+ CrossActionControl.OnServerClose()
+ GameWorldArena.OnServerClose()
GameWorld.Log("通知C++关服！")
GameWorld.GetGameWorld().OnServerClose()
--
Gitblit v1.8.0