From 65cc6607f70da938ad5d64e382ece1d37d74fa02 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 07 十二月 2021 14:38:48 +0800
Subject: [PATCH] 9341 【BT5】【主干】【后端】情缘系统（优化已结婚伴侣离线时也可以直接提亲直接成亲）
---
ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py | 46 +++++++++++++++-------------------------------
1 files changed, 15 insertions(+), 31 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
index 3fa96c6..717ac12 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
@@ -13,11 +13,9 @@
#
# @change: "2012-07-20 19:00" whx 世界等级和开服天书有关，也要清除
# @change: "2013-12-06 15:00" hxp 增加通知MapServer开服天数
-# @change: "2014-11-27 16:30" hxp 增加开服活动数据重置相关; 增加清除竞技场数据
# @change: "2014-12-02 11:30" hxp 增加合服状态及天数；强制刷新全服活动
# @change: "2014-12-03 14:30" hxp 增加合服活动重置
# @change: "2015-01-21 16:00" hxp 增加重置合服寻宝活动
-# @change: "2015-06-16 15:00" hxp 屏蔽清除竞技场数据; 玩家允许None
#
#------------------------------------------------------------------------------
#"""Version = 2015-06-16 15:00"""
@@ -27,10 +25,10 @@
import PlayerEventCounter
import ShareDefine
import PlayerBillboard
-import GameWorldMixServerCampaign
import PlayerUniversalGameRec
-import GameWorldActionTeHui
import GameWorldProcess
+import GameWorldArena
+import GameWorldBoss
import GMCommon
import time
@@ -62,36 +60,16 @@
GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_MixServerDay, 0)
curTime = int(time.time())
- PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_InitOpenServerTime, curTime)
- PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_SetOpenServerTime, curTime)
+ PlayerDBGSEvent.SetInitOpenServerTime(curTime)
+ openServerWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OpenServerWeekday)
+ GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_OpenServerWeekday, openServerWeekday)
- # 重置数据记录及领奖状态
- for campaignType in ShareDefine.Def_Campaign_Type_List:
- GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_MixServerCampaignSaveData % campaignType, 0)
- GameWorld.GetGameWorld().SetDict(ShareDefine.Def_Notify_WorldKey_MixServerCampaignGetAward % campaignType, 0)
-
- # 通知开服活动状态
- GameWorldMixServerCampaign.UpdateMixServerCampaignState(True)
# 清除开服活动相关排行榜
for oscBillboardType in ShareDefine.Def_Campaign_Billboard_Dict.values():
PlayerBillboard.ClearBillboardByIndex(oscBillboardType)
-
- # 清除合服活动相关排行榜
- for copyType in GameWorldMixServerCampaign.Def_MixAward_Billboard_Copy_Dict.values():
- PlayerBillboard.ClearBillboardByIndex(copyType)
- for billboardCampaignType in ShareDefine.Def_MixCampaign_Billboard_Dict.values():
- PlayerBillboard.ClearBillboardByIndex(billboardCampaignType)
-
- # 清除竞技场数据
-# GameWorld.GetHightLadderMgr().ClearAllPlayer()
-# HighLadder.Sync_HightLadderCanFightPlayer(curPlayer, curPlayer.GetPlayerID())
-# curPlayer.Sync_HightLadderTopPlayer(3)
-
- # 清除特惠活动数据
- GameWorldActionTeHui.OnGMClearTeHui()
# 清除Rec
- delRecTypeList = []
+ delRecTypeList = [ShareDefine.Def_UniversalGameRecType_BossFirstKill]
universalRecMgr = GameWorld.GetUniversalRecMgr()
for recType in delRecTypeList:
universalRecMgr.Delete(recType)
@@ -101,11 +79,17 @@
tick = GameWorld.GetGameWorld().GetTick()
GMCommon.ActionControlRefresh(tick)
+ # 广播分流boss状态
+ GameWorldBoss.Sync_BossShuntLineInfo()
+
+ # 竞技场重置
+ PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ArenaOSSeasonState, 0)
+ GameWorldArena.__DoArenaSeasonReset("GMReset")
+
if curPlayer:
PlayerEventCounter.Sync_OpenServerDay(curPlayer)
- GameWorld.DebugAnswer(curPlayer, '开服时间:%s, 星期%s, 天数:%s 是否合服:%s, 合服天数:%s'%\
- (GameWorld.ChangeTimeNumToStr(PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_InitOpenServerTime)),
- GameWorldProcess.GetOpenServerWeekday(),
+ GameWorld.DebugAnswer(curPlayer, '开服星期%s, 天数:%s 是否合服:%s, 合服天数:%s'%\
+ (GameWorldProcess.GetOpenServerWeekday(),
PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1,
PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer),
PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1))
--
Gitblit v1.8.0