From 3ddd283d8d8fc305e340c496a5993c3aa0356c17 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 九月 2018 01:05:36 +0800
Subject: [PATCH] 3798 还原(修复活动日期相连时如果都配置了提前显示时间不会取最近的活动时间bug)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 58f3f7b..eda9b03 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -108,6 +108,7 @@
 import PlayerSpringSale
 import PlayerFairyCeremony
 import ChNetSendPack
+import FamilyRobBoss
 import PyGameData
 import PlayerCoin
 import PlayerGeTui
@@ -237,6 +238,7 @@
     curPlayer.SetDict(ChConfig.Def_PlayerKey_LoadMapIsLogin, 1)
     #通知时间
     Sync_PyServerDataTimeToClient(curPlayer)
+    Sync_OpenServerDay(curPlayer)
     #通知玩家基本信息
     curPlayer.Sync_ClientPlayerLogin()
     
@@ -537,11 +539,13 @@
     SyncPackDownloadAward(curPlayer)
     # 登录触发功能开启(老号处理)
     GameFuncComm.DoFuncOpenLogic(curPlayer)
-	# 神兽
+    # 神兽
     PlayerDogz.OnPlayerLogin(curPlayer)
-	# 神兽副本
+    # 神兽副本
     GameLogic_Dogz.SyncNPCRefreshTime(curPlayer.GetID())
-
+    # 骑宠
+    FamilyRobBoss.OnPlayerLogin(curPlayer)
+    
     # 上线查询一次充值订单
     curPlayer.SendDBQueryRecharge()
     
@@ -550,7 +554,10 @@
     tjgTime = PlayerTJG.GetTJGTime(curPlayer)
     if tjgTime:
         curPlayer.SendGameServerRefreshState(IPY_GameWorld.CDBPlayerRefresh_HappyPoint, tjgTime)
-    
+        
+    # 如果被禁言的,上线同步前端
+    if curPlayer.GetGMForbidenTalk():
+        curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, curPlayer.GetGMForbidenTalk(), False)
     return
 
 
@@ -5323,6 +5330,29 @@
     NetPackCommon.SendFakePack(curPlayer, serverDateTime)
     return
 
+## 通知开服天数
+#  @param curPlayer: 玩家实例
+#  @return: None
+def Sync_OpenServerDay(curPlayer):
+    serverTime = GameWorld.GetCurrentTime()
+    if not serverTime:
+        return
+    gw = GameWorld.GetGameWorld()
+    packData = ChPyNetSendPack.tagOpenServerDay()
+    packData.Clear()
+    packData.Day = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay)
+    packData.IsMixServer = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_IsMixServer)
+    packData.MixDay = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_MixServerDay)
+    packData.OpenWeekday = gw.GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_OpenServerWeekday)
+    packData.NowYear = serverTime.year
+    packData.NowMonth = serverTime.month
+    packData.NowDay = serverTime.day
+    packData.NowHour = serverTime.hour
+    packData.NowMinute = serverTime.minute
+    packData.NowSecond = serverTime.second
+    packData.NowMicSecond = serverTime.microsecond
+    NetPackCommon.SendFakePack(curPlayer, packData)
+    return
 
 #===============================================================================
 # //B4 09 玩家移动 # tagCMPyMove

--
Gitblit v1.8.0