From 761192f47fd211ed3be69f0bc0e24d06f3f4e052 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 22 七月 2024 18:42:33 +0800
Subject: [PATCH] 10223 【越南】【砍树】【主干】【港台】秘境寻宝（修复每X次必出配0时寻宝报错；）
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 77 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 11 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 9d78eee..e992c1a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -113,6 +113,8 @@
import CrossBillboard
import CrossChampionship
import GameWorldMineArea
+import GameWorship
+import os
#---------------------------------------------------------------------
#---------------------------------------------------------------------
@@ -186,6 +188,8 @@
PlayerLove.DoOnDay()
# 云购
CrossLuckyCloudBuy.DoOnDay()
+ # 膜拜
+ GameWorship.DoOnDay()
return
def OnDayEx(tick):
@@ -416,6 +420,13 @@
return
def OnReloadConfig():
+
+ if GameWorld.IsCrossServer():
+ # 跨服重读时重推跨服相关数据
+ tick = GameWorld.GetGameWorld().GetTick()
+ CrossRealmMsg.Sync_CrossServerInitDataToClientServer(tick, serverGroupID=0) # 这里设置为0，广播所有子服务器组
+ return
+
return
#---------------------------------------------------------------------
@@ -1257,7 +1268,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)
#初始话开服时间、星期几
@@ -1273,8 +1284,8 @@
GameWorld.GetGameWorld().GetDBGoldOrderFormMgr().Sort()
#排序排行榜
PlayerBillboard.SortServerBillboard()
- #排序仙盟
- PlayerFamily.DoFamilySort()
+ #仙盟
+ PlayerFamily.OnGameServerInitOK()
GameWorldActionControl.Dispose_FBStateTime()
#仙盟联赛
GameWorldFamilyWar.OnGameServerInitOK()
@@ -1329,6 +1340,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):
@@ -1427,6 +1452,7 @@
if not GameWorld.GetGameWorld().GetDictByKey(ChConfig.Def_WorldKey_IsGameWorldInit):
GameWorld.Log("AllMapServerInitOK时GameServer还未启动好!")
return
+ __CheckAllMapInitOK()
#通知所有地图服务器初始化成功, 同步时间
GameWorld.GetGameWorld().Notify_AllMapServerInitOK(GameWorld.GetCurrentDataTimeStr())
@@ -1520,6 +1546,41 @@
GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
return
+def __CheckAllMapInitOK():
+ ## 检查所有地图是否启动成功
+ rootPath = ChConfig.GetServerRootPath()
+ mapIDTxtPath = os.path.join(rootPath, "ZoneServerGroup\map1_8G\MapServer\MapServerData\Map\MapID.txt")
+ if not os.path.isfile(mapIDTxtPath):
+ GameWorld.ErrLog("MapID.txt不存在: %s" % mapIDTxtPath)
+ return
+ fileObj = open(mapIDTxtPath, 'rb')
+ content = fileObj.read()
+ fileObj.close()
+
+ mapInfoDict = {}
+ mapInfoList = content.split('\r\n')
+ for info in mapInfoList:
+ mapInfo = info.split('\t')
+ if len(mapInfo) < 3:
+ continue
+ mapInfoDict[GameWorld.ToIntDef(mapInfo[1])] = mapInfo[2]
+
+ gameMapManager = GameWorld.GetGameWorld().GetGameMapManager()
+ for i in range(0, gameMapManager.GetCount()):
+ curMap = gameMapManager.GetAt(i)
+ mapID = curMap.GetID()
+ state = curMap.GetState()
+ if mapID in mapInfoDict and state == IPY_GameServer.mssRunning:
+ mapInfoDict.pop(mapID)
+
+ if not mapInfoDict:
+ #GameWorld.Log("都启动成功了")
+ return
+ # 汇报没有启动启动成功的地图ID信息
+ errorMapIDList = mapInfoDict.keys()
+ GameWorld.SendGameError("AllMapInitError", "未启动成功地图:%s" % (str(errorMapIDList)))
+ return
+
## 服务器合服首次启动数据加载处理
# @param None
# @return None
@@ -1546,14 +1607,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