From 4e6e4d465f427db411fb1d430acc943c24277525 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 24 六月 2024 17:12:54 +0800
Subject: [PATCH] 10185 【越南】【港台】【主干】BOSS凭证修改(修复本服未开放仙盟榜活动时结算报错;)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 59dfaa4..d0be780 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -97,6 +97,7 @@
 import PlayerFairyDomain
 import IpyGameDataPY
 import PlayerFamilyParty
+import PlayerFamilyZhenfa
 import GameWorldFamilyWar
 import GameWorldArena
 import CrossLuckyCloudBuy
@@ -111,6 +112,7 @@
 import GameWorldOpenServerCampaign
 import CrossBillboard
 import CrossChampionship
+import GameWorldMineArea
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -325,6 +327,9 @@
     #情缘
     PlayerLove.OnTimeProcess(curTime, tick)
     
+    #福地
+    GameWorldMineArea.OnMineItemTimeProcess(curTime, tick)
+    
     #每整分钟处理一次
     curDateTime = datetime.datetime.today()
     curMinute = curDateTime.minute
@@ -383,6 +388,8 @@
     PlayerFamilyRedPacket.OnRedPacketMinuteProcess()
     #拍卖行
     AuctionHouse.OnAuctionItemMinuteProcess(tick)
+    #福地
+    GameWorldMineArea.OnProcessOnMinute()
     #每5分钟触发一次仙盟总战力更新
     if curMinute % 5 == 0:
         PlayerFamily.UpdFamilyTotalFightPower()
@@ -1250,7 +1257,7 @@
 def InitGameWorld(tick):
     #标记GameWorld初始化完成
     GameWorld.GetGameWorld().SetDict(ChConfig.Def_WorldKey_IsGameWorldInit, int(time.time()))
-    PlayerControl.LoadDBPlayer()
+    LoadDBPlayer()
     #初始化游戏时钟
     GameWorld.GetGameWorld().SetTickTypeCount(ChConfig.TYPE_Tick_Count)
     #初始话开服时间、星期几
@@ -1266,8 +1273,8 @@
     GameWorld.GetGameWorld().GetDBGoldOrderFormMgr().Sort()
     #排序排行榜
     PlayerBillboard.SortServerBillboard()
-    #排序仙盟
-    PlayerFamily.DoFamilySort()
+    #仙盟
+    PlayerFamily.OnGameServerInitOK()
     GameWorldActionControl.Dispose_FBStateTime()
     #仙盟联赛
     GameWorldFamilyWar.OnGameServerInitOK()
@@ -1322,6 +1329,20 @@
         GameWorld.SendGameError("GameWarning", "InitGameWorld later than AllMapServerInitOK")
         AllMapServerInitOK(tick)
         
+    return
+
+def LoadDBPlayer():
+    if GameWorld.IsCrossServer():
+        return
+    PlayerDBOper.FindDBOper(PlayerDBOper.Table_DBPlayer, {}, {"PlayerID":1, "AccID":1, "_id":0}, LoadDBPlayerRet)
+    return
+
+def LoadDBPlayerRet(resultSetList, extendValueList):
+    for resultDict in resultSetList:
+        PyGameData.g_dbPlayerIDMap[resultDict["PlayerID"]] = resultDict["AccID"]
+    GameWorld.Log("启动服务器加载DBPlayer玩家账号ID对应关系! %s, %s" % (len(PyGameData.g_dbPlayerIDMap), PyGameData.g_dbPlayerIDMap))
+    
+    PlayerFamily.OnLoadDBPlayerOK()
     return
 
 def DoCheckNewServerOpen(tick):
@@ -1502,6 +1523,8 @@
     SendMapCommMapLinePlayerCount(True) # 同步一次普通地图线路人数信息
     #随机假仙盟
     PlayerFamily.RandomFakeFamily()
+    #仙盟阵法
+    PlayerFamilyZhenfa.OnMapServerInitOK()
     #缥缈仙域
     PlayerFairyDomain.OnMapServerInitOK()
     #情侣信息
@@ -1537,14 +1560,8 @@
     # 删除过期的通用数据
     __DelOutofdayRecData(universalRecMgr)
     
-    # 仙盟联赛重置
-    GameWorldFamilyWar.DoFamilyWarReset()
-    # 重置所有仙盟联赛评级
-    familyManager = GameWorld.GetFamilyManager()
-    for i in xrange(familyManager.GetCount()):
-        family = familyManager.GetAt(i)
-        PlayerFamily.SetFamilyWarRank(family, 0)
-    PlayerFamily.DoFamilySort()
+    # 仙盟
+    PlayerFamily.OnMixServerInit()
     
     # 设置合服首次启动加载成功
     PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServerInitOK, 1)

--
Gitblit v1.8.0