From e5a52d63b822c0c8624ef45a05a3656fae22d303 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 08 十二月 2020 18:54:10 +0800
Subject: [PATCH] 8605 【港台】【BT】【长尾】【后端】新增限时集字活动

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index e2e204c..8860fd5 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状态通知
@@ -83,7 +82,6 @@
 import GameWorldAverageLv
 import PlayerDBOper
 import PlayerGeTui
-#import PlayerManorWar
 import GameWorldBoss
 import PlayerCompensation
 import ReadChConfig
@@ -94,9 +92,11 @@
 import CrossRealmPlayer
 import PlayerFBHelpBattle
 import PlayerFamilyRedPacket
+import PlayerFairyDomain
 import IpyGameDataPY
 import PlayerFamilyParty
 import GameWorldFamilyWar
+import GameWorldArena
 import AuctionHouse
 import PlayerXMZZ
 import PlayerTeam
@@ -125,6 +125,7 @@
     GameLogInfo.Set_Server_Hour()
     
     PlayerFamily.FamilyOnHour()
+    ChPlayer.CheckOnedayJobPlayerLoginoffTimeout()
     return
 
 ## 触发每日事件(参数 -> 当前时间)
@@ -163,7 +164,7 @@
     #GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ServerDay, openServerDay)
     #清理过期补偿
     PlayerCompensation.ClearUpTimeOutCompensation()
-    PlayerGeTui.ClearFMTGeTuiLimit()
+    #PlayerGeTui.ClearFMTGeTuiLimit()
     import PlayerBourse
     PlayerBourse.OverTimeItemsDeal()
     # 仙盟联赛
@@ -178,6 +179,8 @@
     
     #仙魔之争
     PlayerXMZZ.XMZZOndayEx()
+    #boss复活
+    GameWorldBoss.BossRebornOnDayEx()
     return
 
 ## 触发每周事件(参数 -> 当前时间)
@@ -293,8 +296,8 @@
     CrossRealmPK.OnPKMatchProcess(tick)
     
     GameWorldBoss.DoCheckWorldBossReborn(tick)
-    GameWorldBoss.ProcessBossGeTui(tick)
-    PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
+    #GameWorldBoss.ProcessBossGeTui(tick)
+    #PlayerGeTui.ProcessNewGuyCallBackGeTui(tick)
     #组队副本版本
     PlayerTeam.DoTeamProcess(tick)
     
@@ -302,7 +305,7 @@
     PlayerDBOper.PyDBProccess(tick)
     
     #拍卖行
-    AuctionHouse.OnAuctionItemTimeProcess(curTime)
+    AuctionHouse.OnAuctionItemTimeProcess(curTime, tick)
     
     #每整分钟处理一次
     curDateTime = datetime.datetime.today()
@@ -353,10 +356,10 @@
     GameWorldAverageLv.OpenWorldAverageLv()
     #倒计时离队处理
     PlayerTeam.DoCountdownLeaveTeamLogic(tick)
-    #副本助战
-    PlayerFBHelpBattle.OnMinuteProcess()
     #红包
     PlayerFamilyRedPacket.OnRedPacketMinuteProcess()
+    #拍卖行
+    AuctionHouse.OnAuctionItemMinuteProcess(tick)
     #每5分钟触发一次仙盟总战力更新
     if curMinute % 5 == 0:
         PlayerFamily.UpdFamilyTotalFightPower()
@@ -1232,6 +1235,8 @@
     ChPlayer.LoadPlayerLVData()
     #加载助战信息
     PlayerFBHelpBattle.OnServerStart()
+    #本服竞技场
+    GameWorldArena.OnServerStart()
     #跨服PK
     CrossRealmPK.OnGameServerInitOK()
     #世界boss被杀次数重置
@@ -1251,6 +1256,7 @@
         GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
     GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_GameWorldInitOK, 1)
     
+    AuctionHouse.OnGameServerInitOK()
     # 注意:跨服相关信息的调用需放在最后,不然可能导致服务器未启动功能或者功能未加载成功导致跨服服务器与子服之间的数据同步可能出现异常的情况
     CrossRealmMsg.OnGameServerInitOK()
     return
@@ -1400,8 +1406,6 @@
     
     # 仙盟联赛
     GameWorldFamilyWar.OnMapServerInitOK()
-    # 领地争夺战
-    #PlayerManorWar.OnMapServerInitOK()
     
     # 跨服服务器状态
     isCrossServerOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
@@ -1410,13 +1414,16 @@
     
     # 跨服PK
     CrossRealmPK.OnMapServerInitOK()
+    # 本服竞技场
+    GameWorldArena.SendMapServerArenaInfo()
     
     SendAllMapGlobalDropInfo() # 全局掉落控制
     
     SendMapCommMapLinePlayerCount(True) # 同步一次普通地图线路人数信息
     #随机假仙盟
     PlayerFamily.RandomFakeFamily()
-    
+    #缥缈仙域
+    PlayerFairyDomain.OnMapServerInitOK()
     # 记录服务器是否正常开启完毕
     getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl") + "?Type=MapInit&MapCount=%s"%GameWorld.GetGameWorld().GetGameMapManager().GetCount()
     GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
@@ -1923,6 +1930,7 @@
     PlayerTeam.OnServerClose(tick)
     ChPlayer.SavePlayerLVData()
     PlayerFBHelpBattle.OnServerClose()
+    GameWorldArena.OnServerClose()
     GameWorld.Log("通知C++关服!")
     GameWorld.GetGameWorld().OnServerClose()
     

--
Gitblit v1.8.0