From d2e8880933fca8e8d8a8f0205bdd9ea95f4ec665 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 十二月 2023 15:58:14 +0800
Subject: [PATCH] 10024 【主干】【港台】【砍树】新增三种战令(增加战令类型4:古宝总星级)

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

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index c3a21bd..d6d1a38 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -64,6 +64,7 @@
 import GameWorldArena
 import CrossLuckyCloudBuy
 import CrossRealmPK
+import CrossChampionship
 import AuctionHouse
 import PlayerAssist
 import PlayerFB
@@ -71,6 +72,8 @@
 import PlayerCharm
 import CrossRealmPlayer
 import CrossBattlefield
+import CrossActAllRecharge
+import CrossYaomoBoss
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -126,6 +129,8 @@
     if GameWorld.IsCrossServer():
         #跨服PK
         CrossRealmPK.OnPlayerLoginCrossServer(curPlayer)
+        #协助
+        PlayerAssist.OnPlayerLoginCrossServer(curPlayer)
         return
     
     #玩家家族刷新
@@ -133,7 +138,7 @@
     PlayerFamily.PlayerLoginRefreshFamily(curPlayer, tick)
     #玩家队伍初始化
     PlayerTeam.OnPlayerLoginRefreshTeam(curPlayer, tick)
-    PlayerCompensation.NotifyPlayerCompensation(curPlayer)
+    #PlayerCompensation.NotifyPlayerCompensation(curPlayer)
     __UpdOnedayJobPlayerLoginoffTime(curPlayer)
     CrossRealmPlayer.OnPlayerLogin(curPlayer)
     
@@ -197,14 +202,13 @@
         #骑宠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
 
@@ -230,10 +234,17 @@
         PlayerLove.OnPlayerLogin(curPlayer)
         #跨服战场
         CrossBattlefield.OnPlayerLogin(curPlayer)
+        #跨服排位
+        CrossChampionship.OnPlayerLogin(curPlayer, tick)
+        #跨服全民充值
+        CrossActAllRecharge.OnPlayerLogin(curPlayer)
+        #跨服妖魔boss
+        CrossYaomoBoss.OnPlayerLogin(curPlayer)
         
     if isMixServerFirstLogin:
         PlayerCharm.OnMixServerFirstLogin(curPlayer)
         
+    PyGameData.g_noPlayerLoginWarningMailState = 2
     return
 
 def __UpdOnedayJobPlayerLoginoffTime(curPlayer):
@@ -711,6 +722,8 @@
             PyGameData.g_todayPlayerLVDict[playerID] = packValue
 
     elif packType == IPY_GameServer.CDBPlayerRefresh_Job:
+        if packValue != curPlayer.GetJob():
+            PlayerBillboard.DelJobFightPowerBillboard(curPlayer, curPlayer.GetJob())
         curPlayer.SetJob(packValue)
         
 #    elif packType == IPY_GameServer.CDBPlayerRefresh_CurrentPlayerType:
@@ -738,7 +751,8 @@
         PlayerControl.SetCrossMapID(curPlayer, packValue, False)
         
     elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr9:
-        PlayerControl.SetVIPExpireTime(curPlayer, packValue)
+        curPlayer.SetExAttr9(packValue)
+        #PlayerControl.SetVIPExpireTime(curPlayer, packValue)
         
     elif packType == IPY_GameServer.CDBPlayerRefresh_ExAttr10:
         PlayerControl.SetChatBubbleBox(curPlayer, packValue)

--
Gitblit v1.8.0