From cdf7a25b04904eb5a2f6ae4bd6c5cb7226961b4e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期四, 11 八月 2022 14:46:23 +0800
Subject: [PATCH] 9685 【后台】开服时间整合(邮件内容附加MsgInfo信息默认字符串)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index efcbdec..9871848 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -62,12 +62,15 @@
 import GMShell
 import IPY_PlayerDefine
 import GameWorldArena
+import CrossLuckyCloudBuy
 import CrossRealmPK
 import AuctionHouse
 import PlayerAssist
 import PlayerFB
 import PlayerLove
 import PlayerCharm
+import CrossRealmPlayer
+import CrossBattlefield
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -123,6 +126,8 @@
     if GameWorld.IsCrossServer():
         #跨服PK
         CrossRealmPK.OnPlayerLoginCrossServer(curPlayer)
+        #协助
+        PlayerAssist.OnPlayerLoginCrossServer(curPlayer)
         return
     
     #玩家家族刷新
@@ -132,6 +137,7 @@
     PlayerTeam.OnPlayerLoginRefreshTeam(curPlayer, tick)
     PlayerCompensation.NotifyPlayerCompensation(curPlayer)
     __UpdOnedayJobPlayerLoginoffTime(curPlayer)
+    CrossRealmPlayer.OnPlayerLogin(curPlayer)
     
     if not PlayerControl.GetIsTJG(curPlayer):
         # 只有通知逻辑的应该放此处减少IO,如有逻辑处理存储等不可放在此处
@@ -186,19 +192,20 @@
         GameWorldArena.OnPlayerLogin(curPlayer)
         #跨服PK
         CrossRealmPK.OnPlayerLogin(curPlayer)
+        #幸运云购
+        CrossLuckyCloudBuy.OnPlayerLogin(curPlayer)
         #诛仙BOSS
         PlayerZhuXianBoss.OnPlayerLogin(curPlayer)
         #骑宠boss状态通知
         PlayerHorsePetBoss.OnLogin(curPlayer)
         #协助
-        PlayerAssist.OnPlayerLogin(curPlayer, False)
+        PlayerAssist.OnPlayerLogin(curPlayer)
         #天星塔
         GameWorldSkyTower.OnPlayerLogin(curPlayer)
         GMT_CTG.OnPlayerLogin(curPlayer)
         
     else:
-        #协助
-        PlayerAssist.OnPlayerLogin(curPlayer, True)
+        pass
         
     return
 
@@ -210,6 +217,11 @@
     isMixServerFirstLogin = loginMsg[0]
     GameWorld.Log("GameServer->DoPlayerRealLoginOK, isMixServerFirstLogin=%s" % isMixServerFirstLogin, curPlayer.GetPlayerID())
     
+    if GameWorld.IsCrossServer():
+        return
+    
+    PyGameData.g_dbPlayerIDMap[curPlayer.GetPlayerID()] = curPlayer.GetAccID()
+    
     if not PlayerControl.GetIsTJG(curPlayer):
         #家族副本boss状态通知
         PlayerFamilyBoss.OnLogin(curPlayer)
@@ -217,6 +229,8 @@
         PlayerCharm.OnPlayerLogin(curPlayer)
         #情缘
         PlayerLove.OnPlayerLogin(curPlayer)
+        #跨服战场
+        CrossBattlefield.OnPlayerLogin(curPlayer)
         
     if isMixServerFirstLogin:
         PlayerCharm.OnMixServerFirstLogin(curPlayer)
@@ -1213,7 +1227,8 @@
     serverDateTime.Hour = serverTime.hour
     serverDateTime.Minute = serverTime.minute
     serverDateTime.Second = serverTime.second
-    serverDateTime.MicSecond = serverTime.microsecond   
+    serverDateTime.MicSecond = serverTime.microsecond
+    serverDateTime.CrossServerTime = GameWorld.GetCrossServerTimeStr()
     
     # 通知客户端同步时间
     NetPackCommon.SendFakePack(curPlayer, serverDateTime)

--
Gitblit v1.8.0