From dc0b92c1e2fe9f3d24c183b325dad54d088735c1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 10 七月 2025 17:01:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_ServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py
index e5d250c..dc9a2e1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.py
@@ -15,9 +15,22 @@
 #"""Version = 2017-09-05 21:30"""
 #-------------------------------------------------------------------------------
 
-g_initGameTime = 0 # 初始化游戏时间戳
+g_loadDataOK = False # 是否成功加载数据,备档、db数据
+g_lastRTBTime = 0 # 上一次备档时间戳
+g_initGameTime = 0 # 开始初始化服务器时间戳
+g_serverInitOK = False # 服务器是否启动成功
+g_highProcessTick = 0 # 每秒触发一次,上次Tick
+g_minuteProcess = -1 # 每分钟触发一次,上次处理的分钟
+g_serverClosing = 0 # 是否关服中 0-非关服中;1-关服中;2-关服结束
+g_closeSaveDataOK = False # 关服数据入库是否成功
 
 g_pyGameDataManager = None
+
+g_dbPlayerIDMap = {} # 本服DBPlayer玩家表ID映射关系 {playerID:accID, ...}
+
+g_onlineMgr = None
+
+g_turnFightMgr = None
 
 g_mapIDTxtInfo = {} # MapID.txt 加载的信息
 g_realmDiffPlayerDict = {} # 境界难度玩家信息 {realm:[playerID, ...], ...}
@@ -26,7 +39,6 @@
 g_playerReqEnterFBEx = {} # 请求进入地图额外信息 {playerID:[...], ...}
 g_commMapLinePlayerCountDict = {} # 常规地图分线人数 {mapID:{lineID:人数, ...}}
 g_needRefreshMapServerState = True # 常规地图分线人数是否有变更需要通知
-g_mapLastProcess_Minute = -1 # 地图上次处理的分钟
 g_ipyDataRecycleCheckTime = 0 # 地图IpyData数据回收检查time
 
 InitPyItem = False # 是否加载过物品表所需要的Py数据, 每张地图只在启动时执行一次
@@ -49,9 +61,6 @@
 g_teamPlayerDict = {} # 地图队伍对应玩家ID列表,含离线玩家 {teamID:[playerID, ...], ...}
 g_teamPlayerInfoDict = {} # 地图队伍对应玩家ID信息 {teamID:{playerID:{k:v, ...}, ...}
 
-g_funcTeamPlayerDict = {} # 功能队伍玩家ID列表 {(zoneID, funcMapID): {teamID:[playerID, ...], ...}, ...}
-
-g_unLoginOKPlayerMailInfo = {} # GameServer 未登录成功前需要发送的邮件缓存,防止登录失败不存db导致重复发送邮件 {playerID:[[待发送邮件内容信息], ...], ...}
 g_disconnectPlayer = {} # 在本地图离线的玩家信息 {playerID:[tick, posX, posY], ...}
 g_lastExitFBType = {} # 最后一个离开副本信息 {fbIndex:[exitType, tick], ...} exitType: 1-掉线,2-主动退出
 

--
Gitblit v1.8.0