From 33afb14fa1def4e211793532bbeb463f9a0deaf8 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 11 二月 2026 20:05:46 +0800
Subject: [PATCH] 16 卡牌服务端（删除旧的七天登录、活动登录、节日登录、节日祝福、等级奖励；）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 60 +++++++++++++++++-------------------------------------------
1 files changed, 17 insertions(+), 43 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..3731bd0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -35,12 +35,10 @@
import ChPyNetSendPack
import DataRecordPack
import PlayerBillboard
-import PlayerLVAward
import PlayerGoldGift
import PlayerSignDay
import PlayerPrestigeSys
import PlayerFamily
-import PlayerLoginDayAward
import PlayerGoldInvest
import PlayerActivity
import FBCommon
@@ -49,9 +47,6 @@
import PlayerFreeGoods
import GameFuncComm
import PlayerFamilyTaofa
-import PlayerFeastLogin
-import PlayerFeastWish
-import PlayerActLogin
import PlayerTreasure
import IpyGameDataPY
import EventReport
@@ -164,10 +159,6 @@
if FBLogic.PlayerLoginInFBCheck(curPlayer, tick):
#玩家是第一次登录, 并且玩家需要踢回原来地图
return
-
- #刷新人物日期状态
- #GameWorld.Log('PlayerEventCounter.UpdatePlayerLoginTime')
- PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
return
#// A1 20 货币兑换 #tagCMMoneyExchange
@@ -406,6 +397,9 @@
# ！！！必要发送的数据要注意位置
if GameWorld.IsCrossServer():
curPlayer.SetForbiddenSyncClientState(True)
+
+ # ！！！先处理检查OnDay，再处理玩家登录的功能数据，防止某些功能login处理数据后又被onday重置
+ PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
__DoPlayerLoginServer(curPlayer, tick)
@@ -482,7 +476,7 @@
EventReport.WriteEvent_login(curPlayer)
# 合服首登处理
- __DoMixServerFirstLogin(curPlayer)
+ #__DoMixServerFirstLogin(curPlayer)
PlayerBillboard.BillboardOnLogin(curPlayer)
#玩家扩展信息
@@ -490,9 +484,6 @@
#PK模式
#SyncPKModel(curPlayer)
-
- # 通知等级奖励领取记录
- PlayerLVAward.Sync_LVAwardGetRecordInfo(curPlayer)
PlayerCoin.OnLogin(curPlayer)
# 首充/天天首充/充值豪礼
@@ -518,9 +509,6 @@
PlayerTreasure.OnTreasureLogin(curPlayer)
- # 通知累计登陆礼
- PlayerLoginDayAward.OnLoginNotifyLoginDayAward(curPlayer)
-
# 副本进入时间
FBCommon.FBOnLogin(curPlayer)
@@ -538,8 +526,6 @@
#同步自动战斗配置记录
# Sync_AutoFightSetting(curPlayer)
-
- PlayerFamily.OnPlayerLogin(curPlayer, tick)
# 竞技场
PlayerArena.OnLogin(curPlayer)
@@ -580,16 +566,8 @@
PlayerActTask.OnPlayerLogin(curPlayer)
# 运势活动
PlayerActYunshi.OnPlayerLogin(curPlayer)
- # 轮回殿活动
- PlayerActLunhuidian.OnPlayerLogin(curPlayer)
# 登录活动
PlayerActLoginNew.OnPlayerLogin(curPlayer)
- # 节日登录活动
- PlayerFeastLogin.OnPlayerLogin(curPlayer)
- # 节日祝福活动
- PlayerFeastWish.OnPlayerLogin(curPlayer)
- # 登录奖励活动
- PlayerActLogin.OnLogin(curPlayer)
# 炼器活动
PlayerActLianqi.OnPlayerLogin(curPlayer)
# 天帝礼包活动
@@ -666,6 +644,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 +666,7 @@
OpenServerActivity.OnPlayerLogin(curPlayer)
PlayerPreset.OnPlayerLogin(curPlayer)
CrossPlayer.OnPlayerLogin(curPlayer)
+ PlayerActLunhuidian.OnPlayerLogin(curPlayer)
__OnFixVersion(curPlayer) # 修正线上玩家数据用，暂时放最后
# 上线查询一次充值订单
@@ -782,11 +762,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 +1238,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 +1553,6 @@
#申请得到奖励物品
#curPlayer.DataServer_CheckPrizeItem()
-
- #防止玩家读取地图时未触发OnDay，读取地图后再次验证(2009.9.11)
- PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
#设置阵营
if curPlayer.GetFaction() != ChConfig.CampType_Neutral \
@@ -3399,14 +3382,14 @@
# 开服庆典积分阶段奖励
elif rewardType == ChConfig.Def_RewardType_OSACelebrationPointAward:
OpenServerActivity.GetOSACelebrationPointAward(curPlayer, dataEx)
+ # 轮回殿奖励
+ elif rewardType == ChConfig.Def_RewardType_LunhuidianAward:
+ PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr)
# 每日免费直购礼包
elif rewardType == ChConfig.Def_RewardType_DayFreeGoldGift:
PlayerDailyGiftbag.OnGetDailyFreeGiftbag(curPlayer)
- # 玩家等级奖励
- elif rewardType == ChConfig.Def_RewardType_LVAward:
- PlayerLVAward.GetPlayerLVAward(curPlayer, dataEx)
# 首充礼包奖励
elif rewardType == ChConfig.Def_RewardType_FirstCharge:
PlayerGoldGift.GetPlayerFirstCharge(curPlayer, dataEx, dataExStr)
@@ -3425,12 +3408,6 @@
# 领取许愿池奖励
elif rewardType == ChConfig.Def_RewardType_WishingWell:
PlayerWishingWell.DoGetWishingAward(curPlayer)
- # 领取登录奖励活动奖励
- elif rewardType == ChConfig.Def_RewardType_ActLoginAwardAct:
- PlayerActLogin.GetLoginAwardActionAward(curPlayer, dataEx, dataExStr)
- # 领取节日登录奖励
- elif rewardType == ChConfig.Def_RewardType_FeastLogin:
- PlayerFeastLogin.GetFeastLoginAward(curPlayer, dataEx)
# 领取登录活动奖励
elif rewardType == ChConfig.Def_RewardType_ActLoginAwardNew:
PlayerActLoginNew.OnGetActLoginAward(curPlayer, dataEx, dataExStr)
@@ -3455,9 +3432,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