From 9d5ec7599f3abe0cebb76ce1df3c3b8c4e0aa51e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 10 二月 2026 11:40:15 +0800
Subject: [PATCH] 66 【公会】基础主体-服务端(跨服聊天;)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 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 2110b27..6ad9ddc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -164,10 +164,6 @@
     if FBLogic.PlayerLoginInFBCheck(curPlayer, tick):
         #玩家是第一次登录, 并且玩家需要踢回原来地图
         return
-    
-    #刷新人物日期状态
-    #GameWorld.Log('PlayerEventCounter.UpdatePlayerLoginTime')
-    PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
     return
 
 #// A1 20 货币兑换 #tagCMMoneyExchange
@@ -406,6 +402,9 @@
     # !!!必要发送的数据要注意位置
     if GameWorld.IsCrossServer():
         curPlayer.SetForbiddenSyncClientState(True)
+        
+    # !!!先处理检查OnDay,再处理玩家登录的功能数据,防止某些功能login处理数据后又被onday重置
+    PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
     
     __DoPlayerLoginServer(curPlayer, tick)
     
@@ -482,7 +481,7 @@
     EventReport.WriteEvent_login(curPlayer)
     
     # 合服首登处理
-    __DoMixServerFirstLogin(curPlayer)
+    #__DoMixServerFirstLogin(curPlayer)
     PlayerBillboard.BillboardOnLogin(curPlayer)
     
     #玩家扩展信息
@@ -539,8 +538,6 @@
     #同步自动战斗配置记录
 #    Sync_AutoFightSetting(curPlayer)
     
-    PlayerFamily.OnPlayerLogin(curPlayer, tick)
-    
     # 竞技场
     PlayerArena.OnLogin(curPlayer)
     
@@ -580,8 +577,6 @@
     PlayerActTask.OnPlayerLogin(curPlayer)
     # 运势活动
     PlayerActYunshi.OnPlayerLogin(curPlayer)
-    # 轮回殿活动
-    PlayerActLunhuidian.OnPlayerLogin(curPlayer)
     # 登录活动
     PlayerActLoginNew.OnPlayerLogin(curPlayer)
     # 节日登录活动
@@ -666,6 +661,7 @@
     else:
         PyMongoMain.GetUserCtrlDB().OnPlayerLogin(curPlayer)
         GMT_BroadCast.OnPlayerLogin(curPlayer)
+        PlayerFamily.OnPlayerLogin(curPlayer, tick)
         PlayerHero.OnPlayerLogin(curPlayer)
         PlayerMail.OnPlayerLogin(curPlayer)
         PlayerHJG.OnPlayerLogin(curPlayer)
@@ -687,6 +683,7 @@
         OpenServerActivity.OnPlayerLogin(curPlayer)
         PlayerPreset.OnPlayerLogin(curPlayer)
         CrossPlayer.OnPlayerLogin(curPlayer)
+        PlayerActLunhuidian.OnPlayerLogin(curPlayer)
         
         __OnFixVersion(curPlayer) # 修正线上玩家数据用,暂时放最后
         # 上线查询一次充值订单
@@ -782,11 +779,16 @@
     
     # --------------------------------------------------------------
     
+    syncCD = 2000
+    if refreshType == IPY_PlayerDefine.CDBPlayerRefresh_FightPower:
+        syncCD = 60 * 1000
+        
     # 同步给相关跨服
     tick = GameWorld.GetGameWorld().GetTick()
     lastSyncTick = curPlayer.GetDictByKey("S2C_PlayerBaseInfo")
-    if lastSyncTick and (tick - lastSyncTick) <= 2000:
+    if lastSyncTick and (tick - lastSyncTick) <= syncCD:
         # 短时间内只同步一次
+        #GameWorld.DebugLog("同步基础属性CD中! refreshType=%s,syncCD=%s,pass=%s" % (refreshType, syncCD, tick - lastSyncTick))
         return
     curPlayer.SetDict("S2C_PlayerBaseInfo", tick)
     
@@ -1253,7 +1255,8 @@
         #到此处已经可以保存数据,即使客户端不回包断线
         #原 //01 07 地图读取OK#tagCInitMapOK 逻辑 直接调用
         __Func_LoadMapOK(index, tick)
-        GameServerRefresh.GameSever_PlayerInitOK(index, tick)
+        DoPlayerRealLoginOK(curPlayer, tick)
+        #GameServerRefresh.GameSever_PlayerInitOK(index, tick) GameServer已废弃,不再执行该逻辑
     except:
         curPlayer.Kick(IPY_GameWorld.disWaitForPlayerLoinError)
         import traceback
@@ -1567,9 +1570,6 @@
 
     #申请得到奖励物品
     #curPlayer.DataServer_CheckPrizeItem()
-    
-    #防止玩家读取地图时未触发OnDay,读取地图后再次验证(2009.9.11)
-    PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
     
     #设置阵营
     if curPlayer.GetFaction() != ChConfig.CampType_Neutral \
@@ -3399,6 +3399,9 @@
     # 开服庆典积分阶段奖励 
     elif rewardType == ChConfig.Def_RewardType_OSACelebrationPointAward:
         OpenServerActivity.GetOSACelebrationPointAward(curPlayer, dataEx)
+    # 轮回殿奖励
+    elif rewardType == ChConfig.Def_RewardType_LunhuidianAward:
+        PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr)
         
         
     # 每日免费直购礼包
@@ -3455,9 +3458,6 @@
     # 寻宝累计次数奖励
     elif rewardType == ChConfig.Def_RewardType_TreasureCntAward:
         PlayerTreasure.GetTreasureCntAward(curPlayer, dataEx, dataExStr)
-    # 轮回殿奖励
-    elif rewardType == ChConfig.Def_RewardType_LunhuidianAward:
-        PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr)
     #历史累计充值领取
     elif rewardType == ChConfig.Def_RewardType_HistoryChargeAward:
         PlayerGoldGift.OnGetHistoryRechargeAward(curPlayer, dataEx)

--
Gitblit v1.8.0