From bc9e2ca58aa69066ddf2e44f6d7cc81836a84445 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 十二月 2024 15:33:25 +0800
Subject: [PATCH] 10297 【越南】【英语】【砍树】【tqxbqy】轮回殿-服务端(奖励类型增加类型3 - 消耗物品,目前支持坐骑经验丹、灵宠经验丹)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py |   47 ++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
index ec8d8a6..1dd27a2 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/ChPlayer.py
@@ -79,8 +79,10 @@
 import PlayerFuncTeam
 import PyDataManager
 import GameWorldMineArea
+import PlayerPackData
 import PlayerRecData
 import GameWorship
+import GameXiangong
 #---------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -297,7 +299,7 @@
         CrossYaomoBoss.OnPlayerLogin(curPlayer)
         #玩家记录
         PlayerRecData.OnPlayerLogin(curPlayer)
-        
+        PlayerPackData.OnPlayerLogin(curPlayer)
         #在线状态变更,放最后
         __OnPlayerOnlineStateChange(curPlayer, True)
         
@@ -666,6 +668,7 @@
     if not PlayerControl.GetIsTJG(curPlayer):
         playerID = curPlayer.GetPlayerID()
         PyGameData.g_unTJLogoffTime[playerID] = int(time.time())
+        PyGameData.g_xiangongCanLikeTimeDict.pop(playerID, None)
         
         #在线状态变更,放最后
         __OnPlayerOnlineStateChange(curPlayer, False)
@@ -684,9 +687,8 @@
     #offlineValue = olMgr.GetOfflineValue(playerID, PlayerViewCache.FindViewCache(playerID))
     #SyncRelatedPlayerOnlineState(playerID, offlineValue, relatedPlayerIDList)
     
-    if not PlayerControl.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_CrossRealmPK) \
-        and not PlayerControl.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_CrossBattlefield):
-        GameWorld.DebugLog("跨服相关功能未开启,不同步在线状态到跨服服务器! LV=%s" % curPlayer.GetLV(), curPlayer.GetPlayerID())
+    if curPlayer.GetLV() < 50:
+        #GameWorld.DebugLog("跨服相关功能未开启,不同步在线状态到跨服服务器! LV=%s" % curPlayer.GetLV(), curPlayer.GetPlayerID())
         return
     
     cacheBase = PlayerViewCache.GetSyncCrossCacheBase(curPlayer)
@@ -702,7 +704,26 @@
     cacheBase = msgData["cacheBase"]
     
     isLogout = not isOnline
+    olMgr = GetOnlinePlayerMgr()
+    olMgr.SetOnlineState(playerID, isOnline, cacheBase.get("ServerGroupID", 0))
+    
     PlayerViewCache.UpdCrossCacheBase(playerID, cacheBase, isLogout)
+    serverID = GameWorld.GetAccIDServerID(cacheBase["AccID"])
+    
+    # 上线
+    if isOnline:
+        # 需要管理跨服在线状态时,默认需要同步缓存信息
+        syncStateInfo = {"playerID":playerID, "ViewCacheCross":1}
+        packDataMgr = PyDataManager.GetDBPlayerPackDataManager()
+        if playerID in packDataMgr.playerPackDataDict:
+            syncStateInfo["PackDataCross"] = 1
+        CrossRealmMsg.SendMsgToClientServer(ShareDefine.CrossServerMsg_PlayerPackDataState, syncStateInfo, [serverGroupID])
+        
+        GameXiangong.OnPlayerLogin_CrossLogic(serverGroupID, serverID, playerID)
+        
+    # 下线
+    else:
+        pass
     
     SyncCrossPlayerOnlineStateToRelatedPlayer(playerID)
     return
@@ -824,6 +845,7 @@
     packValue = playerStatePack.GetValue()
     packValueEx = playerStatePack.GetValueEx()
     packType = playerStatePack.GetType()
+    #packValueTotal = packValue + packValueEx * ChConfig.Def_PerPointValue
     
     #---特殊逻辑处理---
     if packType == ShareDefine.CDBPlayerRefresh_ForbidenTalk:
@@ -833,7 +855,11 @@
     if packType == ShareDefine.CDBPlayerRefresh_ExAttr17:
         PlayerControl.SetPlayerAccState(curPlayer, packValue)
         return
-
+    
+    if packType == ShareDefine.CDBPlayerRefresh_ExAttr19:
+        PlayerControl.SetLeaveFamilyTimeEx(curPlayer, packValue)
+        return
+    
     if packType == IPY_GameServer.CDBPlayerRefresh_State:
         # 脱机在线
         PlayerControl.SetIsTJG(curPlayer, packValue)
@@ -869,7 +895,6 @@
         
     elif packType == IPY_GameServer.CDBPlayerRefresh_LV:
         curPlayer.SetLV(packValue)
-        PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
         #玩家等级记录
         playerID = curPlayer.GetID()
         if playerID in PyGameData.g_todayPlayerLVDict:
@@ -919,10 +944,18 @@
     
     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)
+    elif packType == IPY_GameServer.CDBPlayerRefresh_HairColor:
+        #c++头像外框 用头发颜色通知  - 遗漏问题
+        curPlayer.SetFacePic(packValue)
+        PlayerBillboard.UpdateBillboardFacePic(curPlayer)
         
+    #社交信息
+    PlayerSocial.UpdateSocialInfo(curPlayer.GetID(), packType, packValue)
     #组队成员刷新
     PlayerTeam.PlayerTeamMemberRefresh(curPlayer, packType, packValue, tick)
     #家族刷新

--
Gitblit v1.8.0