From 2638c8b67d1dcac1c774f942ac144579c6f82ec1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 九月 2018 21:41:11 +0800
Subject: [PATCH] 3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑(自动加入匹配中的队伍);

---
 ServerPython/CoreServerGroup/GameServer/Script/GM/Commands/GetOpenServerDay.py |   14 ++++++++------
 1 files changed, 8 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..0f6d517 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,11 @@
 #  @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, 合服天数:%s'%\
+                          (GameWorld.ChangeTimeNumToStr(PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_InitOpenServerTime)),
+                           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