From ba4dd9775177975f46867fa979c06e92089511d6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 01 三月 2019 09:48:09 +0800
Subject: [PATCH] 3036 【主干】【1.6】集市上架物品可以复制物品
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 98f9b51..26de2a6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -1426,6 +1426,10 @@
SendMapCommMapLinePlayerCount(True) # 同步一次普通地图线路人数信息
#随机假仙盟
PlayerFamily.RandomFakeFamily()
+
+ # 记录服务器是否正常开启完毕
+ getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl") + "?Type=MapInit&MapCount=%s"%GameWorld.GetGameWorld().GetGameMapManager().GetCount()
+ GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
return
## 服务器合服首次启动数据加载处理
@@ -1832,14 +1836,27 @@
gameMapManager = GameWorld.GetGameWorld().GetGameMapManager()
curMap = gameMapManager.Find(mapServerPack.GetRouteServerIndex(), mapServerPack.GetMapID())
-
if curMap == None:
return
+ if mapServerPack.GetState() not in [0,1,2,3] and curMap.GetState() != mapServerPack.GetState():
+ # 记录服务器是否正常开启完毕, 避免重复发送
+ GameWorld.DebugLog("MapServer_RunningStateRefresh--_%s"%([mapServerPack.GetState(), curMap.GetState(), mapServerPack.GetMapID(), curMap.GetID()]))
+ SendGameError("MapError")
+
curMap.SetState(mapServerPack.GetState())
curMap.SetRefreshTick(tick)
+
return
+
+def SendGameError(state):
+ getUrl = ReadChConfig.GetPyMongoConfig("EventReport", "OpenStateUrl")
+ groupID = ReadChConfig.GetPyMongoConfig("platform", "GroupID")
+ userDBName = ReadChConfig.GetPyMongoConfig("connect", "USER_DB_NAME")
+ getUrl = getUrl + "?Type=%s&groupID=%s&userDBName=%s"%(state, groupID, userDBName)
+ GameWorld.GetGameWorld().EventReport_EventReport("", "", "", "", 0, getUrl)
+
## 刷新地图服务器状态, 如果1分钟没有状态回报, 刷新为消失状态
# @param tick 当前时间
# @return None
@@ -1851,6 +1868,7 @@
gameMapManager = GameWorld.GetGameWorld().GetGameMapManager()
+ isSendMapClose = False
for i in range(0, gameMapManager.GetCount()):
curMap = gameMapManager.GetAt(i)
@@ -1861,8 +1879,12 @@
if tick - curMap.GetRefreshTick() < ChConfig.Def_Tick_MapServer_MssNone:
#间隔未到
continue
-
+
curMap.SetState(IPY_GameServer.mssNone)
+ if not isSendMapClose:
+ # 避免多地图发送过多邮件, 如关服的时候
+ SendGameError("MapDisconnect") # 状态报告
+ isSendMapClose = True
return
#---------------------------------------------------------------------
@@ -1914,3 +1936,10 @@
GameWorld.Log("通知C++关服！")
GameWorld.GetGameWorld().OnServerClose()
+
+def ChangeGameServerState(state):
+ # 只接收大于等于mssPyError
+ GameWorld.DebugLog("ChangeGameServerState:%s"%state)
+ SendGameError("GameServerError")
+
+
\ No newline at end of file
--
Gitblit v1.8.0