From be35331b8931d2829f014749a827a1c37c78feff Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 29 五月 2019 17:11:18 +0800
Subject: [PATCH] 6997 【后端】【2.0】战力计算整理

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py |   42 +++++++++++++++---------------------------
 1 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
index 99604a1..c7e35b6 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/ClearOpenServerDay.py
@@ -27,10 +27,12 @@
 import PlayerEventCounter
 import ShareDefine
 import PlayerBillboard
-import GameWorldMixServerCampaign
 import PlayerUniversalGameRec
-import GameWorldActionTeHui
+import GameWorldProcess
+import GameWorldBoss
 import GMCommon
+
+import time
 #---------------------------------------------------------------------
 ## 执行逻辑
 #  @param curPlayer 当前玩家
@@ -57,34 +59,15 @@
     GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_ServerDay, 0)
     GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_IsMixServer, 0)
     GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_MixServerDay, 0)
-
-    if curPlayer:
-        PlayerEventCounter.Sync_OpenServerDay(curPlayer)
     
-    # 重置数据记录及领奖状态
-    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)
+    curTime = int(time.time())
+    PlayerDBGSEvent.SetInitOpenServerTime(curTime)
+    openServerWeekday = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OpenServerWeekday)
+    GameWorld.SendMapServerMsgEx(ShareDefine.Def_Notify_WorldKey_OpenServerWeekday, openServerWeekday)
     
-    # 通知开服活动状态
-    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 = []
@@ -97,9 +80,14 @@
     tick = GameWorld.GetGameWorld().GetTick()
     GMCommon.ActionControlRefresh(tick)
     
+    # 广播分流boss状态
+    GameWorldBoss.Sync_BossShuntLineInfo()
+    
     if curPlayer:
-        GameWorld.DebugAnswer(curPlayer, '清除开服天数成功, 当前开服天数:%s, 是否合服:%s, 当前合服天数:%s'%\
-                              (PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1,
+        PlayerEventCounter.Sync_OpenServerDay(curPlayer)
+        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))
     return

--
Gitblit v1.8.0