From 215a4edca77b43f1a60cf43c07049eb0a133d43a Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 13 二月 2019 14:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
index 76e9dda..c950223 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
@@ -27,10 +27,10 @@
import PlayerEventCounter
import ShareDefine
import PlayerBillboard
-import GameWorldMixServerCampaign
import PlayerUniversalGameRec
import GameWorldActionTeHui
import GameWorldProcess
+import GameWorldBoss
import GMCommon
import time
@@ -63,24 +63,13 @@
curTime = int(time.time())
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())
@@ -100,6 +89,9 @@
tick = GameWorld.GetGameWorld().GetTick()
GMCommon.ActionControlRefresh(tick)
+ # 广播分流boss状态
+ GameWorldBoss.Sync_BossShuntLineInfo()
+
if curPlayer:
PlayerEventCounter.Sync_OpenServerDay(curPlayer)
GameWorld.DebugAnswer(curPlayer, '开服星期%s, 天数:%s 是否合服:%s, 合服天数:%s'%\
--
Gitblit v1.8.0