From 10668d5c705391df124a600de234008e91c6d9ea Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 05 十一月 2018 19:49:23 +0800
Subject: [PATCH] 4574 【后端】【1.2】开服前14天活动定制优化(如果开服前14天的活动配置开始时间在14天之内而结束时间超过第14天,那么该活动不开启)

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.py b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.py
index 5223e63..1325f03 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.py
@@ -13,8 +13,9 @@
 # @change: "2014-12-01 12:30" hxp 增加合服状态及天数
 #
 #------------------------------------------------------------------------------ 
-"""Version = 2014-12-01 12:30"""
+#"""Version = 2014-12-01 12:30"""
 #------------------------------------------------------------------------------ 
+import GameWorldProcess
 import PlayerDBGSEvent
 import GameWorld
 #---------------------------------------------------------------------
@@ -25,10 +26,10 @@
 #  @return None
 #  @remarks 函数详细说明.
 def OnExec(curPlayer, cmdList):
-    
-    day = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_ServerDay) + 1
-    isMixServer = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_IsMixServer)
-    mixServerDay = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_MixServerDay) + 1
-    GameWorld.DebugAnswer(curPlayer, '当前开服天数:%s, 是否合服:%s, 当前合服天数:%s' % (day, isMixServer, mixServerDay))
+    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