From 5685e4d493ef5b7570bc20b6037fc2c8603cab85 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期三, 13 二月 2019 14:41:57 +0800 Subject: [PATCH] 6211 【后端】【1.6】合服任务单(删除旧合服相关内容) --- ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py | 22 +++++++--------------- 1 files changed, 7 insertions(+), 15 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py index caec13b..1825715 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldProcess.py @@ -83,7 +83,6 @@ import GameWorldAverageLv import PlayerDBOper import PlayerGeTui -#import GameWorldMixServerCampaign #import PlayerManorWar import GameWorldBoss #import GameWorldActionTeHui @@ -1215,7 +1214,6 @@ GameWorld.GetFamilyManager().SetFamilyUpperLimitCount(ChConfig.Def_Family_MaxCnt) #排序元宝交易平台 GameWorld.GetGameWorld().GetDBGoldOrderFormMgr().Sort() - PlayerBillboard.ClearBillboardOnServerInit() #排序排行榜 PlayerBillboard.SortServerBillboard() #排序仙盟 @@ -1365,8 +1363,6 @@ #触发节假日活动 #GameWorldActionHoliday.ActionHoliday_OpenAndClose(tick, True) - #合服活动 - #GameWorldMixServerCampaign.UpdateMixServerCampaignState(True) #通知世界等级 worldLv = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv) @@ -1389,9 +1385,6 @@ # 上次合服时的开服天数 lastMixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerDay) GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_LastMixServerDay, lastMixServerDay) - # 上次清除排行榜的标记 - lastSign = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_ClearBillboardSign) - GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ClearBillboardSign, lastSign) # 通知战盟相关活动开启状态 fadState = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_FamilyActivityDayState) @@ -1447,16 +1440,15 @@ GameWorld.DebugLog("合服首次启动加载已经处理过!") return - GameWorld.DebugLog("合服首次启动加载处理...") + GameWorld.Log("合服首次启动加载处理...") - # 清除指定通用数据 + # 清除指定通用数据,一般是合服工具删,这里可以再做个补充 universalRecMgr = GameWorld.GetUniversalRecMgr() - delRecTypeList = [ShareDefine.Def_UniversalGameRecType_ManorWarInfo, - ] - GameWorld.DebugLog(" 清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList)) + delRecTypeList = [] + GameWorld.Log("清除指定通用数据 delRecTypeList=%s" % str(delRecTypeList)) for delRecType in delRecTypeList: universalRecMgr.Delete(delRecType) - + # 删除过期的通用数据 __DelOutofdayRecData(universalRecMgr) @@ -1469,15 +1461,15 @@ # 设置本次合服时的开服天数 serverDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_LastMixServerDay, serverDay) - GameWorld.DebugLog(" 合服首次启动加载成功...") + GameWorld.Log(" 合服首次启动加载成功!") return def __DelOutofdayRecData(universalRecMgr): # 删除过期的通用数据 curTime = int(time.time()) - GameWorld.Log("执行删除过期的通用数据, curTime=%s" % curTime) delOutofdayRecDataDict = { } + GameWorld.Log("执行删除过期的通用数据, curTime=%s,delOutofdayRecDataDict=%s" % (curTime, delOutofdayRecDataDict)) for otDayRecType, otTime in delOutofdayRecDataDict.items(): otRecDataList = universalRecMgr.GetTypeList(otDayRecType) if not otRecDataList: -- Gitblit v1.8.0