From 858ee8dd80555d802f2b6ffaa47012fe7fc2c19e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 07 一月 2019 09:45:49 +0800
Subject: [PATCH] 2831 【BUG】【1.5】跨服pk，跨服重连中会被本服玩家打死
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
index 74ee805..c0472d1 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py
@@ -94,6 +94,7 @@
import EventReport
#import ReloadModule
import CrossRealmPK
+import CrossRealmMsg
import PlayerFBHelpBattle
import PlayerFamilyRedPacket
import IpyGameDataPY
@@ -1211,7 +1212,8 @@
if initOpenServerTime <= 0 or openServerWeekday <= 0:
#记录首次开发时间(现实时间戳)
PlayerDBGSEvent.SetInitOpenServerTime(initOpenServerTime if initOpenServerTime else int(time.time()))
-
+
+ CrossRealmMsg.OnGameServerInitOK()
#初始化家族数量
GameWorld.GetFamilyManager().SetFamilyUpperLimitCount(ChConfig.Def_Family_MaxCnt)
#排序元宝交易平台
@@ -1238,12 +1240,20 @@
ChPlayer.LoadPlayerLVData()
#加载助战信息
PlayerFBHelpBattle.OnServerStart()
+ #跨服PK
+ CrossRealmPK.OnGameServerInitOK()
#世界boss被杀次数重置
#GameWorldBoss.CheckResetBossKilledCntOnServerInit()
#GameWorldActionTeHui.OnGameServerInitOK() # 特惠活动初始化
- #子服启动成功告知跨服主服
- serverGroupID = GameWorld.GetServerGroupID()
- GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
+ isCrossServer = GameWorld.IsCrossServer()
+ if isCrossServer:
+ isServerClose = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_CrossServerClose)
+ isServerOpen = 0 if isServerClose else 1
+ GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isServerOpen)
+ GameWorld.Log("跨服服务器启动成功: isServerOpen=%s" % isServerOpen)
+ else:
+ serverGroupID = GameWorld.GetServerGroupID()
+ GameWorld.Log("服务器启动成功: ServerGroupID=%s" % serverGroupID)
return
def DoCheckNewServerOpen(tick):
@@ -1403,6 +1413,10 @@
# 商店信息
#GameWorldShopItem.OnMapServerInitOK()
+ # 跨服服务器状态
+ isCrossServerOpen = GameWorld.GetGameWorld().GetDictByKey(ShareDefine.Def_Notify_WorldKey_CrossServerOpen)
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_CrossServerOpen, isCrossServerOpen)
+
# 跨服PK
CrossRealmPK.OnMapServerInitOK()
@@ -1432,7 +1446,6 @@
# 清除指定通用数据
universalRecMgr = GameWorld.GetUniversalRecMgr()
delRecTypeList = [ShareDefine.Def_UniversalGameRecType_ManorWarInfo,
- #ShareDefine.Def_UniversalGameRecType_MergeRegister,
]
GameWorld.DebugLog(" 清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList))
for delRecType in delRecTypeList:
@@ -1457,7 +1470,7 @@
# 删除过期的通用数据
curTime = int(time.time())
GameWorld.Log("执行删除过期的通用数据, curTime=%s" % curTime)
- delOutofdayRecDataDict = {ShareDefine.Def_UniversalGameRecType_MergeRegister:31 * 24 * 3600,
+ delOutofdayRecDataDict = {
}
for otDayRecType, otTime in delOutofdayRecDataDict.items():
otRecDataList = universalRecMgr.GetTypeList(otDayRecType)
--
Gitblit v1.8.0