From 09f7856ed26cb659933e761f4641f0511b7cab0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 06 五月 2024 16:21:11 +0800
Subject: [PATCH] 10033 【后端】砍树（回合战斗副本支持任务类型4副本过关、类型12挑战副本；回合副本可重复挑战奖励及首通奖励支持；修复回合战斗NPC不存在时报错bug；）

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index 17c406e..73648ca 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -51,7 +51,6 @@
 import PlayerFamilySWRH
 import IpyGameDataPY
 import PlayerTalk
-import PlayerGeTui
 import PlayerStore
 import GameWorldActionControl
 import GameWorldFamilyWar
@@ -64,11 +63,17 @@
 import GameWorldArena
 import CrossLuckyCloudBuy
 import CrossRealmPK
+import CrossChampionship
 import AuctionHouse
 import PlayerAssist
 import PlayerFB
 import PlayerLove
 import PlayerCharm
+import CrossRealmPlayer
+import CrossBattlefield
+import CrossActAllRecharge
+import CrossYaomoBoss
+import GameWorldMineArea
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -124,6 +129,8 @@
     if GameWorld.IsCrossServer():
         #跨服PK
         CrossRealmPK.OnPlayerLoginCrossServer(curPlayer)
+        #协助
+        PlayerAssist.OnPlayerLoginCrossServer(curPlayer)
         return
     
     #玩家家族刷新
@@ -131,8 +138,9 @@
     PlayerFamily.PlayerLoginRefreshFamily(curPlayer, tick)
     #玩家队伍初始化
     PlayerTeam.OnPlayerLoginRefreshTeam(curPlayer, tick)
-    PlayerCompensation.NotifyPlayerCompensation(curPlayer)
+    #PlayerCompensation.NotifyPlayerCompensation(curPlayer)
     __UpdOnedayJobPlayerLoginoffTime(curPlayer)
+    CrossRealmPlayer.OnPlayerLogin(curPlayer)
     
     if not PlayerControl.GetIsTJG(curPlayer):
         # 只有通知逻辑的应该放此处减少IO，如有逻辑处理存储等不可放在此处
@@ -178,7 +186,6 @@
         PlayerFamilySWRH.OnLogin(curPlayer)
         PlayerTalk.LoginChatMi(curPlayer)
         PlayerTalk.NotifyTalkCache(curPlayer)
-        #PlayerGeTui.CleanNewGuyCallBackGeTui(curPlayer.GetID())
         #活动
         GameWorldActionControl.OnPlayerLogin(curPlayer)
         #玩家等级记录
@@ -194,14 +201,15 @@
         #骑宠boss状态通知
         PlayerHorsePetBoss.OnLogin(curPlayer)
         #协助
-        PlayerAssist.OnPlayerLogin(curPlayer, False)
+        PlayerAssist.OnPlayerLogin(curPlayer)
         #天星塔
         GameWorldSkyTower.OnPlayerLogin(curPlayer)
+        #福地
+        GameWorldMineArea.OnPlayerLogin(curPlayer)
         GMT_CTG.OnPlayerLogin(curPlayer)
         
     else:
-        #协助
-        PlayerAssist.OnPlayerLogin(curPlayer, True)
+        pass
         
     return
 
@@ -216,6 +224,8 @@
     if GameWorld.IsCrossServer():
         return
     
+    PyGameData.g_dbPlayerIDMap[curPlayer.GetPlayerID()] = curPlayer.GetAccID()
+    
     if not PlayerControl.GetIsTJG(curPlayer):
         #家族副本boss状态通知
         PlayerFamilyBoss.OnLogin(curPlayer)
@@ -223,10 +233,19 @@
         PlayerCharm.OnPlayerLogin(curPlayer)
         #情缘
         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):
@@ -572,7 +591,6 @@
     PlayerFriend.OnPlayerDisconnect(curPlayer, tick)
     
     __UpdOnedayJobPlayerLoginoffTime(curPlayer)
-    #PlayerGeTui.NewGuyCallBackGeTui(curPlayer, tick)
     # 设置家族成员离线时间
     SetPlayerOfflineTime(curPlayer)
     #拍卖行
@@ -697,13 +715,14 @@
         
     elif packType == IPY_GameServer.CDBPlayerRefresh_LV:
         curPlayer.SetLV(packValue)
-        PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
         #玩家等级记录
         playerID = curPlayer.GetID()
         if playerID in PyGameData.g_todayPlayerLVDict:
             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:
@@ -731,7 +750,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)
@@ -744,10 +764,14 @@
     
     elif packType == IPY_GameServer.CDBPlayerRefresh_OfficialRank:
         curPlayer.SetOfficialRank(packValue)
-        PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
         #更新排行榜的境界
         PlayerBillboard.UpdateBillboardRealm(curPlayer)
+    elif packType == IPY_GameServer.CDBPlayerRefresh_Face:
+        curPlayer.SetFace(packValue)
+        PlayerBillboard.UpdateBillboardFace(curPlayer)
         
+    #社交信息
+    PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
     #组队成员刷新
     PlayerTeam.PlayerTeamMemberRefresh(curPlayer, packType, packValue, tick)
     #家族刷新

--
Gitblit v1.8.0