From 68dc66d3523c073907ad4b5d83fb8d95df26a30e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 07 一月 2020 14:45:10 +0800
Subject: [PATCH] 8360 【主干】仙界秘境修改(评级经验同步修改;提升百分比修改为相对包含评级经验的总经验)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index e2e204c..b56a04f 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 PlayerManorWar
 import GameWorldBoss
 import PlayerCompensation
 import ReadChConfig
@@ -94,6 +93,7 @@
 import CrossRealmPlayer
 import PlayerFBHelpBattle
 import PlayerFamilyRedPacket
+import PlayerFairyDomain
 import IpyGameDataPY
 import PlayerFamilyParty
 import GameWorldFamilyWar
@@ -125,6 +125,7 @@
     GameLogInfo.Set_Server_Hour()
     
     PlayerFamily.FamilyOnHour()
+    ChPlayer.CheckOnedayJobPlayerLoginoffTimeout()
     return
 
 ## 触发每日事件(参数 -> 当前时间)
@@ -302,7 +303,7 @@
     PlayerDBOper.PyDBProccess(tick)
     
     #拍卖行
-    AuctionHouse.OnAuctionItemTimeProcess(curTime)
+    AuctionHouse.OnAuctionItemTimeProcess(curTime, tick)
     
     #每整分钟处理一次
     curDateTime = datetime.datetime.today()
@@ -353,10 +354,10 @@
     GameWorldAverageLv.OpenWorldAverageLv()
     #倒计时离队处理
     PlayerTeam.DoCountdownLeaveTeamLogic(tick)
-    #副本助战
-    PlayerFBHelpBattle.OnMinuteProcess()
     #红包
     PlayerFamilyRedPacket.OnRedPacketMinuteProcess()
+    #拍卖行
+    AuctionHouse.OnAuctionItemMinuteProcess(tick)
     #每5分钟触发一次仙盟总战力更新
     if curMinute % 5 == 0:
         PlayerFamily.UpdFamilyTotalFightPower()
@@ -1251,6 +1252,7 @@
         GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
     GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_GameWorldInitOK, 1)
     
+    AuctionHouse.OnGameServerInitOK()
     # 注意:跨服相关信息的调用需放在最后,不然可能导致服务器未启动功能或者功能未加载成功导致跨服服务器与子服之间的数据同步可能出现异常的情况
     CrossRealmMsg.OnGameServerInitOK()
     return
@@ -1400,8 +1402,6 @@
     
     # 仙盟联赛
     GameWorldFamilyWar.OnMapServerInitOK()
-    # 领地争夺战
-    #PlayerManorWar.OnMapServerInitOK()
     
     # 跨服服务器状态
     isCrossServerOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
@@ -1416,7 +1416,8 @@
     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)

--
Gitblit v1.8.0