From 35d98e9c630fd4408561c8c54b4c09193bb9ce9e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 20 三月 2026 14:57:32 +0800
Subject: [PATCH] 0312 修改服务端补主线进度通知
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 505 +++++++++++++++++--------------------------------------
1 files changed, 156 insertions(+), 349 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 2deb268..06d7dc5 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -35,77 +35,52 @@
import ChPyNetSendPack
import DataRecordPack
import PlayerBillboard
-import PlayerLVAward
import PlayerGoldGift
import PlayerSignDay
import PlayerPrestigeSys
import PlayerFamily
-import PlayerLoginDayAward
import PlayerGoldInvest
import PlayerActivity
import FBCommon
-import PlayerWishingWell
import PlayerSuccess
-import PlayerFreeGoods
import GameFuncComm
import PlayerFamilyTaofa
-import PlayerFeastLogin
-import PlayerFeastWish
-import PlayerActLogin
import PlayerTreasure
import IpyGameDataPY
import EventReport
-import PassiveBuffEffMng
-import PlayerFlashSale
-import PlayerFlashGiftbag
-import PlayerDailyGiftbag
import PlayerActBuyOne
-import PlayerActGrowupBuy
import PlayerActCollectWords
import PlayerActTotalRecharge
import PlayerActLianqi
-import PlayerActGodGift
import PlayerActFamilyCTGAssist
import PlayerActManyDayRecharge
import PlayerActSingleRecharge
-import PlayerSpringSale
-import PlayerLuckyTreasure
-import PlayerFuncSysPrivilege
-import PlayerActTurntable
import OpenServerActivity
+import GameLogic_Qunying
import ChNetSendPack
import PlayerArena
import PyGameData
import PlayerCoin
-import PlayerCharm
-import PlayerDogz
import PlayerFB
-import PlayerFaQi
-import SkillShell
import PlayerGubao
import PlayerCustomAward
import PlayerZhanling
import PlayerTree
import PlayerLLMJ
-import PlayerLianTi
import PlayerTask
-import PlayerYinji
-import PlayerLove
import GameObj
-import PlayerChangeJob
-import PlayerXiangong
import PlayerGoldRush
-import PlayerActLoginNew
+import PlayerActSign
import PlayerActBuyCountGift
import PlayerActLunhuidian
+import PlayerActHeroAppear
import PlayerActFamilyGCZ
-import PlayerActYunshi
import PlayerActTask
import PlayerMail
import DBDataMgr
import PlayerViewCache
import UpdatePlayerName
-import GameServerRefresh
+#import GameServerRefresh
import IPY_ServerDefine
import IPY_PlayerDefine
import CommFunc
@@ -164,198 +139,6 @@
if FBLogic.PlayerLoginInFBCheck(curPlayer, tick):
#玩家是第一次登录, 并且玩家需要踢回原来地图
return
-
- #刷新人物日期状态
- #GameWorld.Log('PlayerEventCounter.UpdatePlayerLoginTime')
- PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
- return
-
-#// A1 20 货币兑换 #tagCMMoneyExchange
-#
-#struct tagCMMoneyExchange
-#{
-# tagHead Head;
-# BYTE SrcMoneyType; // 源货币类型
-# BYTE TagMoneyType; // 目标货币类型
-# DWORD ExchangeValue; // 兑换数量（消耗源货币的数量）
-#};
-def OnMoneyExchange(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- srcMoneyType = clientData.SrcMoneyType
- tagMoneyType = clientData.TagMoneyType
- exchangeValue = clientData.ExchangeValue
-
- exchangeMoneyInfo = IpyGameDataPY.GetFuncEvalCfg("EqualValueMoney", 1, {})
- if str(srcMoneyType) not in exchangeMoneyInfo:
- return
- exchangeInfo = exchangeMoneyInfo[str(srcMoneyType)]
- if tagMoneyType != exchangeInfo[0]:
- return
- multiple = exchangeInfo[1]
- if exchangeValue <= 0:
- return
-
- if not PlayerControl.PayMoney(curPlayer, srcMoneyType, exchangeValue, "MoneyExchange"):
- return
-
- tagMoneyAdd = exchangeValue * multiple
- PlayerControl.GiveMoney(curPlayer, tagMoneyType, tagMoneyAdd, "MoneyExchange")
- GameWorld.Log("货币兑换: srcMoneyType=%s,exchangeValue=%s,tagMoneyType=%s,tagMoneyAdd=%s"
- % (srcMoneyType, exchangeValue, tagMoneyType, tagMoneyAdd), curPlayer.GetPlayerID())
- return
-
-#// A1 21 转职业 #tagCMChangeJob
-#
-#struct tagCMChangeJob
-#{
-# tagHead Head;
-# BYTE TagJob;
-#};
-def OnChangeJob(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- PlayerChangeJob.DoChangeJob(curPlayer, curPlayer.GetJob(), clientData.TagJob)
- return
-
-#// A1 08 刷新主服角色信息 #tagCMRefreshMainServerRole
-#
-#struct tagCMRefreshMainServerRole
-#{
-# tagHead Head;
-#};
-def OnRefreshMainServerRole(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
-
- Sync_DBPlayer(curPlayer)
-
- # 死亡复活
- if GameObj.GetHP(curPlayer) <=0 or curPlayer.GetPlayerAction() == IPY_GameWorld.paDie:
- PlayerRebornByType(curPlayer, ChConfig.rebornType_System, tick)
-
- # 强刷一次属性，刷之前重置还没同步过所有属性
- curPlayer.SetDict(ChConfig.Def_PlayerKey_NotifyAllAttrState, 0)
- playerControl = PlayerControl.PlayerControl(curPlayer)
- playerControl.ReCalcAllState()
-
- # 同步所有buff
- __Sync_ClientBuff(curPlayer)
-
- PlayerState.Sync_PKBossState(curPlayer)
-
- # 恢复视野，刷新自己的视野
- curPlayer.SetVisible(True)
- PlayerControl.SetSight(curPlayer, 0)
- curPlayer.RefreshView()
- PlayerControl.SetSight(curPlayer, ChConfig.Def_PlayerSight_Default)
- curPlayer.RefreshView()
-
- msgInfo = ""
- GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(curPlayer.GetPlayerID(), 0, 0, "RefreshMainServerRole", msgInfo, len(msgInfo))
- return
-
-def Sync_DBPlayer(curPlayer):
- ## 同步DBPlayer信息，同0102封包
- dbPlayer = ChPyNetSendPack.tagMCDBPlayer()
- dbPlayer.AccID = curPlayer.GetAccID()
- dbPlayer.PlayerID = curPlayer.GetPlayerID()
- dbPlayer.PlayerName = curPlayer.GetPlayerName()
- dbPlayer.AccState = curPlayer.GetAccState()
- dbPlayer.GMLevel = curPlayer.GetGMLevel()
- dbPlayer.Sex = curPlayer.GetSex()
- dbPlayer.Job = curPlayer.GetJob()
- dbPlayer.ReincarnationLv = curPlayer.GetReincarnationLv()
- dbPlayer.LV = curPlayer.GetLV()
- dbPlayer.LVEx = curPlayer.GetLVEx()
- dbPlayer.LV2 = curPlayer.GetLV2()
- dbPlayer.ExpPoint = curPlayer.GetExpPoint()
- dbPlayer.TotalExp = curPlayer.GetTotalExp()
- dbPlayer.Family = curPlayer.GetFamilyID()
- dbPlayer.FamilyName = curPlayer.GetFamilyName()
- dbPlayer.TeamHornor = curPlayer.GetTeamHornor()
- dbPlayer.FamilyHornor = curPlayer.GetFamilyHornor()
- dbPlayer.FamilyActiveValue = curPlayer.GetFamilyActiveValue()
- dbPlayer.LastWeekFamilyActiveValue = curPlayer.GetLastWeekFamilyActiveValue()
- dbPlayer.CountryHornor = curPlayer.GetCountryHornor()
- dbPlayer.CountryLastWeekHornor = curPlayer.GetCountryLastWeekHornor()
- dbPlayer.Mate = curPlayer.GetMate()
- dbPlayer.Gold = curPlayer.GetGold()
- dbPlayer.GoldPaper = curPlayer.GetGoldPaper()
- dbPlayer.Silver = curPlayer.GetSilver()
- dbPlayer.SilverPaper = curPlayer.GetSilverPaper()
- dbPlayer.FightPoint = curPlayer.GetFightPoint()
- dbPlayer.HappyPoint = curPlayer.GetHappyPoint()
- dbPlayer.LineID = curPlayer.GetLineID()
- dbPlayer.MapID = curPlayer.GetMapID() # 玩家身上的 GetMapID 返回的就是 GetDataMapID
- dbPlayer.PosX = curPlayer.GetPosX()
- dbPlayer.PosY = curPlayer.GetPosY()
- dbPlayer.RebornMapID = curPlayer.GetRebornMapID()
- dbPlayer.RebornPosX = curPlayer.GetRebornPosX()
- dbPlayer.RebornPosY = curPlayer.GetRebornPosY()
- dbPlayer.State = curPlayer.GetState()
- dbPlayer.HP = curPlayer.GetHP()
- dbPlayer.HPEx = curPlayer.GetHPEx()
- dbPlayer.XP = curPlayer.GetXP()
- dbPlayer.HPRestoreSetting = curPlayer.GetHPRestoreSetting()
- dbPlayer.MPRestoreSetting = curPlayer.GetMPRestoreSetting()
- dbPlayer.FreePoint = curPlayer.GetFreePoint()
- dbPlayer.FreeSkillPoint = curPlayer.GetFreeSkillPoint()
- dbPlayer.BaseSTR = curPlayer.GetBaseSTR()
- dbPlayer.BasePNE = curPlayer.GetBasePNE()
- dbPlayer.BasePHY = curPlayer.GetBasePHY()
- dbPlayer.BaseCON = curPlayer.GetBaseCON()
- dbPlayer.STR = curPlayer.GetSTR()
- dbPlayer.PNE = curPlayer.GetPNE()
- dbPlayer.PHY = curPlayer.GetPHY()
- dbPlayer.CON = curPlayer.GetCON()
- #dbPlayer.Setting = curPlayer.GetSetting() # 没有
- dbPlayer.PKValue = curPlayer.GetPKValue()
- #dbPlayer.ActiveValue = curPlayer.GetActiveValue() # 没有
- dbPlayer.BackpackLV = curPlayer.GetBackpackLV()
- dbPlayer.WarehouseLV = curPlayer.GetWarehouseLV()
- dbPlayer.TeamID = curPlayer.GetTeamID()
- dbPlayer.UseGoldType = curPlayer.GetUseGoldType()
- dbPlayer.UseSilverType = curPlayer.GetUseSilverType()
- dbPlayer.AttackMode = curPlayer.GetAttackMode()
- dbPlayer.LastWeekOnlineTime = curPlayer.GetLastWeekOnlineTime()
- dbPlayer.FBID = curPlayer.GetClientLineID()
- dbPlayer.FamilyLV = curPlayer.GetFamilyLV()
- dbPlayer.FriendFavor = curPlayer.GetFriendFavor()
- dbPlayer.Energy = curPlayer.GetEnergy()
- dbPlayer.EquipShowSwitch = curPlayer.GetEquipShowSwitch()
- dbPlayer.LuckValue = curPlayer.GetLuckValue()
- dbPlayer.ExAttr1 = curPlayer.GetExAttr1()
- dbPlayer.ExAttr2 = curPlayer.GetExAttr2()
- dbPlayer.ExAttr3 = curPlayer.GetExAttr3()
- dbPlayer.ExAttr4 = curPlayer.GetExAttr4()
- dbPlayer.ExAttr5 = curPlayer.GetExAttr5()
- dbPlayer.Faction = curPlayer.GetFaction()
- dbPlayer.InfamyValue = curPlayer.GetInfamyValue()
- dbPlayer.OfficialRank = curPlayer.GetOfficialRank()
- dbPlayer.ChangeCoinPointTotal = curPlayer.GetChangeCoinPointTotal()
- dbPlayer.VIPLv = curPlayer.GetVIPLv()
- dbPlayer.VIPLvForPhone = curPlayer.GetVIPLvForPhone()
- dbPlayer.ExAttr6 = curPlayer.GetExAttr6()
- dbPlayer.ExAttr7 = curPlayer.GetExAttr7()
- dbPlayer.ExAttr8 = curPlayer.GetExAttr8()
- dbPlayer.ExAttr9 = curPlayer.GetExAttr9()
- dbPlayer.ExAttr10 = curPlayer.GetExAttr10()
- dbPlayer.ModelMark = curPlayer.GetModelMark()
- dbPlayer.ExAttr11 = curPlayer.GetExAttr11()
- dbPlayer.ExAttr12 = curPlayer.GetExAttr12()
- dbPlayer.ExAttr13 = curPlayer.GetExAttr13()
- dbPlayer.ExAttr14 = curPlayer.GetExAttr14()
- dbPlayer.OperateInfo = curPlayer.GetOperateInfo()
- dbPlayer.Operate = curPlayer.GetOperate()
- dbPlayer.ServerID = curPlayer.GetServerID()
- dbPlayer.ExAttr15 = curPlayer.GetExAttr15()
- dbPlayer.ExAttr16 = curPlayer.GetExAttr16()
- dbPlayer.ExAttr17 = curPlayer.GetExAttr17()
- dbPlayer.ExAttr18 = curPlayer.GetExAttr18()
- dbPlayer.ExAttr19 = curPlayer.GetExAttr19()
- dbPlayer.ExAttr20 = curPlayer.GetExAttr20()
- dbPlayer.Face = curPlayer.GetFace()
- dbPlayer.FacePic = curPlayer.GetFacePic()
- dbPlayer.RoleType = curPlayer.GetRoleType()
- NetPackCommon.SendFakePack(curPlayer, dbPlayer)
return
#---------------------------------------------------------------------
@@ -400,11 +183,15 @@
Sync_OpenServerDay(curPlayer)
#通知玩家基本信息
curPlayer.Sync_ClientPlayerLogin() #01 02 玩家初始化#tagCDBPlayer
+ SyncSettingData(curPlayer)
# 屏蔽跨服下关闭和子服重复的数据的发送 pushsend接口， notifyall正常发送
# ！！！必要发送的数据要注意位置
if GameWorld.IsCrossServer():
curPlayer.SetForbiddenSyncClientState(True)
+
+ # ！！！先处理检查OnDay，再处理玩家登录的功能数据，防止某些功能login处理数据后又被onday重置
+ PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
__DoPlayerLoginServer(curPlayer, tick)
@@ -481,7 +268,7 @@
EventReport.WriteEvent_login(curPlayer)
# 合服首登处理
- __DoMixServerFirstLogin(curPlayer)
+ #__DoMixServerFirstLogin(curPlayer)
PlayerBillboard.BillboardOnLogin(curPlayer)
#玩家扩展信息
@@ -489,9 +276,6 @@
#PK模式
#SyncPKModel(curPlayer)
-
- # 通知等级奖励领取记录
- PlayerLVAward.Sync_LVAwardGetRecordInfo(curPlayer)
PlayerCoin.OnLogin(curPlayer)
# 首充/天天首充/充值豪礼
@@ -509,16 +293,7 @@
# 坐骑相关通知
PlayerHorse.PlayerHorseLogin(curPlayer)
- # 法器
- PlayerFaQi.PlayerFaQiLogin(curPlayer)
-
- # 炼体
- PlayerLianTi.OnPlayerLogin(curPlayer)
-
PlayerTreasure.OnTreasureLogin(curPlayer)
-
- # 通知累计登陆礼
- PlayerLoginDayAward.OnLoginNotifyLoginDayAward(curPlayer)
# 副本进入时间
FBCommon.FBOnLogin(curPlayer)
@@ -529,16 +304,8 @@
#成就
PlayerSuccess.SuccOnLogin(curPlayer)
- #魅力
- PlayerCharm.OnPlayerLogin(curPlayer)
-
- #情缘
- PlayerLove.DoPlayerLogin(curPlayer)
-
#同步自动战斗配置记录
# Sync_AutoFightSetting(curPlayer)
-
- PlayerFamily.OnPlayerLogin(curPlayer, tick)
# 竞技场
PlayerArena.OnLogin(curPlayer)
@@ -550,16 +317,6 @@
#NotifyPlayerBasePoint(curPlayer)
#累计充值
PlayerActTotalRecharge.OnPlayerLogin(curPlayer)
- #成长必买
- PlayerActGrowupBuy.OnPlayerLogin(curPlayer)
- #限时特惠
- PlayerSpringSale.OnPlayerLogin(curPlayer)
- #限时礼包
- PlayerFlashGiftbag.OnPlayerLogin(curPlayer)
- #每日礼包
- PlayerDailyGiftbag.OnPlayerLogin(curPlayer)
- #限时抢购
- PlayerFlashSale.OnPlayerLogin(curPlayer)
#买一送多活动
PlayerActBuyOne.OnPlayerLogin(curPlayer)
#仙盟充值互助
@@ -571,44 +328,20 @@
FunctionNPCCommon.ShopItemOnLogin(curPlayer)
# 通知设置的被动功法
#PassiveBuffEffMng.OnLoginGFPassive(curPlayer)
- # 极品白拿
- PlayerFreeGoods.OnLogin(curPlayer)
# 购买次数礼包活动
PlayerActBuyCountGift.OnPlayerLogin(curPlayer)
# 任务活动
PlayerActTask.OnPlayerLogin(curPlayer)
- # 运势活动
- PlayerActYunshi.OnPlayerLogin(curPlayer)
- # 轮回殿活动
- PlayerActLunhuidian.OnPlayerLogin(curPlayer)
- # 登录活动
- PlayerActLoginNew.OnPlayerLogin(curPlayer)
- # 节日登录活动
- PlayerFeastLogin.OnPlayerLogin(curPlayer)
- # 节日祝福活动
- PlayerFeastWish.OnPlayerLogin(curPlayer)
- # 登录奖励活动
- PlayerActLogin.OnLogin(curPlayer)
# 炼器活动
PlayerActLianqi.OnPlayerLogin(curPlayer)
- # 天帝礼包活动
- PlayerActGodGift.OnPlayerLogin(curPlayer)
# 多日连充活动
PlayerActManyDayRecharge.OnPlayerLogin(curPlayer)
# 单笔累充活动
PlayerActSingleRecharge.OnPlayerLogin(curPlayer)
- # 转盘活动
- PlayerActTurntable.OnPlayerLogin(curPlayer)
# 分支下载奖励记录通知
SyncPackDownloadAward(curPlayer)
# 登录触发功能开启（老号处理）
GameFuncComm.DoFuncOpenLogic(curPlayer)
- # 神兽
- PlayerDogz.OnPlayerLogin(curPlayer)
- # 许愿池
- PlayerWishingWell.OnLogin(curPlayer)
- #幸运鉴宝
- PlayerLuckyTreasure.OnLogin(curPlayer)
# 小助手
SyncLittleHelper(curPlayer)
PlayerFB.OnLogin(curPlayer)
@@ -618,8 +351,6 @@
Sync_CreateRoleAwardInfo(curPlayer)
#自定义奖励
PlayerCustomAward.OnPlayerLogin(curPlayer)
- #功能系统特权
- PlayerFuncSysPrivilege.OnPlayerLogin(curPlayer)
#玩法前瞻奖励
gameNoticeAwardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_GameNoticeAwardState)
if gameNoticeAwardState:
@@ -665,10 +396,10 @@
else:
PyMongoMain.GetUserCtrlDB().OnPlayerLogin(curPlayer)
GMT_BroadCast.OnPlayerLogin(curPlayer)
+ PlayerFamily.OnPlayerLogin(curPlayer, tick)
PlayerHero.OnPlayerLogin(curPlayer)
PlayerMail.OnPlayerLogin(curPlayer)
PlayerHJG.OnPlayerLogin(curPlayer)
- PlayerXiangong.OnPlayerLogin(curPlayer)
PlayerGubao.OnPlayerLogin(curPlayer)
PlayerZhanling.OnPlayerLogin(curPlayer)
PlayerTask.OnPlayerLogin(curPlayer)
@@ -686,6 +417,8 @@
OpenServerActivity.OnPlayerLogin(curPlayer)
PlayerPreset.OnPlayerLogin(curPlayer)
CrossPlayer.OnPlayerLogin(curPlayer)
+ PlayerActLunhuidian.OnPlayerLogin(curPlayer)
+ PlayerActHeroAppear.OnPlayerLogin(curPlayer)
__OnFixVersion(curPlayer) # 修正线上玩家数据用，暂时放最后
# 上线查询一次充值订单
@@ -714,7 +447,7 @@
'''
playerID = curPlayer.GetPlayerID()
- sysFixVersion = 2025123012 # 系统定义的最后一次修正版本号，一般以 yyyyMMddhh 定义为版本号
+ sysFixVersion = 2026021300 # 系统定义的最后一次修正版本号，一般以 yyyyMMddhh 定义为版本号
playerVersion = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FixVersion)
if not playerVersion:
createRoleTime = curPlayer.GetCreateRoleTime() # 按创角
@@ -734,6 +467,13 @@
# 每个版本修正完需要立即更新到对应的版本号值，防止中间某个版本修正失败，导致重登后重复修正已经处理的版本
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FixVersion, fixVersion)
+ # 修正公会跨服首次没有过天
+ fixVersion = 2026021300
+ if playerVersion < fixVersion:
+ if DBFamily.IsFamilyCross():
+ GameWorld.Log("跨服公会玩家登录补过天")
+ PlayerFamily.__doPlayerOnDay(curPlayer)
+
# 其他
# 需要按修正版本时间顺序依次处理！！！需要按修正版本时间顺序依次处理！！！需要按修正版本时间顺序依次处理！！！
@@ -781,11 +521,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)
@@ -870,29 +615,34 @@
return
def S2C_OnlineState(dataMsg, fromServerID, playerID):
- ## 收到游戏服玩家在线状态同步
+ '''收到游戏服玩家在线状态同步
+ 跨服收到在线状态同步时都视为在跨服上线，需要处理跨服在线/上线的逻辑
+ 不然在跨服维护游戏服不维护的情况下，等跨服重开后，游戏服重新同步在线玩家，此时如果跨服不处理登录逻辑，会少同步封包
+ 如公会，跨服维护之后登录的玩家会取不到公会数据，等跨服重开后，需视为登录重新同步
+ 与跨服重连一样的道理，都是重新同步所有信息
+ '''
isOnline = dataMsg["isOnline"]
- isLoginout = dataMsg["isLoginout"]
+ #isLoginout = dataMsg["isLoginout"] # 如果个别跨服功能有需要对真实上下线做特殊处理的可使用该参数判断
baseInfo = dataMsg["baseInfo"]
crossPlayer = UpdCrossPlayerFromMainServer(fromServerID, playerID, baseInfo, isOnline)
# 其他跨服功能处理，暂时仅上下线时处理
curServerID = GameWorld.GetGameWorld().GetServerID()
- if isLoginout:
- # 公会
- if "crossFamilyServerID" in dataMsg:
- crossFamilyServerID = dataMsg["crossFamilyServerID"]
- if curServerID == crossFamilyServerID:
- if isOnline:
- PlayerFamily.OnCrossPlayerLogin(crossPlayer)
- else:
- PlayerFamily.OnCrossPlayerLogout(crossPlayer)
-
- # 最后处理缓存，先放在更新中处理删除，有问题再放后面
- #if not isOnline:
- # PlayerViewCache.OnCrossPlayerLogout(crossPlayer)
- # CrossPlayer.GetCrossPlayerMgr().DeletePlayer(playerID)
+ #if isLoginout:
+ # 公会
+ if "crossFamilyServerID" in dataMsg:
+ crossFamilyServerID = dataMsg["crossFamilyServerID"]
+ if curServerID == crossFamilyServerID:
+ if isOnline:
+ PlayerFamily.OnCrossPlayerLogin(crossPlayer)
+ else:
+ PlayerFamily.OnCrossPlayerLogout(crossPlayer)
+
+ # 最后处理缓存，先放在更新中处理删除，有问题再放后面
+ #if not isOnline:
+ # PlayerViewCache.OnCrossPlayerLogout(crossPlayer)
+ # CrossPlayer.GetCrossPlayerMgr().DeletePlayer(playerID)
# 最后同步处理跨服登录成功
#if isLoginout and isOnline:
@@ -948,7 +698,12 @@
#首登邮件
mailList = IpyGameDataPY.GetFuncEvalCfg("MailLVAward", 2)
for mailTypeKey, mailItemList in mailList:
- PlayerControl.SendMailByKey(mailTypeKey, [curPlayer.GetPlayerID()], mailItemList)
+ PlayerMail.SendMailByKey(mailTypeKey, playerID, mailItemList)
+ appID = GameWorld.GetAppIDByAccID(curPlayer.GetAccID())
+ appIDMailDict = IpyGameDataPY.GetFuncEvalCfg("MailLVAward", 3, {})
+ mailDict = appIDMailDict.get(appID, {})
+ for mailTypeKey, mailItemList in mailDict.items():
+ PlayerMail.SendMailByKey(mailTypeKey, playerID, mailItemList)
PlayerHero.OnPlayerFirstLogin(curPlayer)
@@ -1016,7 +771,7 @@
PlayerControl.SendMailByKey("MixServer1", [playerID], addItemList, gold=gold, silver=silver, detail=detailDict)
# 同步排行榜
- PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer, isAll=True)
+ #PlayerBillboard.UpdatePlayerBillboardOnLeaveServer(curPlayer, isAll=True)
return
#---------------------------------------------------------------------
@@ -1247,7 +1002,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
@@ -1365,13 +1121,6 @@
#初始化寻宝背包
PlayerControl.Init_PackCount(curPlayer, ShareDefine.rptTreasure)
- #初始化神兽物品背包
- #curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzItem)
- #curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptDogzItem))
- #curPack.Sync_PackCanUseCount()
- #初始化神兽装备背包
- #curPack = curPlayer.GetItemManager().GetPack(ShareDefine.rptDogzEquip)
- #curPack.SetCount(ItemCommon.GetPackInitCount(ShareDefine.rptDogzEquip))
#curPack.Sync_PackCanUseCount()
#初始化垃圾分类背包
#curPack = itemManager.GetPack(ShareDefine.rptGarbage)
@@ -1562,9 +1311,6 @@
#申请得到奖励物品
#curPlayer.DataServer_CheckPrizeItem()
- #防止玩家读取地图时未触发OnDay，读取地图后再次验证(2009.9.11)
- PlayerEventCounter.UpdatePlayerLoginTime(curPlayer)
-
#设置阵营
if curPlayer.GetFaction() != ChConfig.CampType_Neutral \
and FBCommon.GetRecordMapID(GameWorld.GetMap().GetMapID()) not in ChConfig.Def_MapID_NeedCamp:
@@ -1580,8 +1326,7 @@
SyncPKModel(curPlayer)
GameWorld.DebugLog("进入地图强制切换PK模式: %s" % initAttackModel)
- PassiveBuffEffMng.OnLoadMapGFPassive(curPlayer)
- PlayerYinji.OnLoadMap(curPlayer)
+ #PassiveBuffEffMng.OnLoadMapGFPassive(curPlayer)
#EndLoadMap需放在最后, 0403 tagPlayerLoginLoadOK
curPlayer.EndLoadMap()
@@ -1632,6 +1377,7 @@
if (curPlayer.GetAccState() & pow(2, ChConfig.Def_PysForbidByPy)) <= 0:
return True
+ GameWorld.Log("玩家被封号禁止登录" , curPlayer.GetPlayerID())
curPlayer.Kick(IPY_GameWorld.disGMKick)
return
@@ -2163,7 +1909,8 @@
#@return 返回值无意义
#@remarks C++封包触发, 玩家下线
def PlayerDisconnect(index, tick):
- GameWorld.GetPsycoFunc(__Func_PlayerDisconnect)(index, tick)
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ PlayerDisconnectEx(curPlayer, tick)
return
##C++封包触发, 玩家下线
@@ -2171,8 +1918,7 @@
#@param tick 时间戳
#@return 返回值无意义
#@remarks C++封包触发, 玩家下线
-def __Func_PlayerDisconnect(index, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+def PlayerDisconnectEx(curPlayer, tick):
try:
# 避免因逻辑错误导致下线失败，可能导致回档的情况
DoPlayerDisconnect(curPlayer, tick)
@@ -2260,6 +2006,76 @@
return
curPlayer.SetSetting(setting)
+ return
+
+#// A1 31 前端自定义保存设置内容 #tagCSSettingData
+#
+#struct tagCSSettingData
+#{
+# tagHead Head;
+# BYTE KeyNum; // 自定义key编号，后端使用数字key存储，前端自行进行转换定义，限制100个
+# BYTE DataLen;
+# char SetData[DataLen]; //自定义保存的内容
+#};
+def OnSettingData(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ playerID = curPlayer.GetPlayerID()
+
+ keyNum = clientData.KeyNum
+ setData = clientData.SetData
+ setData = setData.replace(" ", "") # 去空格
+ keyStr = str(keyNum)
+
+ gameRecMgr = DBDataMgr.GetGameRecMgr()
+ preSetRecMgr = gameRecMgr.GetRecTypeIDMgr(ShareDefine.Def_GameRecType_Setting, playerID)
+ recData = preSetRecMgr.GetOneRecData(True)
+ if not recData:
+ return
+ dataDict = recData.GetUserDict()
+
+ if not setData:
+ dataDict.pop(keyStr, None)
+ else:
+ keyMax = 100
+ if keyStr not in dataDict:
+ if len(dataDict) >= keyMax:
+ GameWorld.ErrLog("存储个数达到上限! keyMax=%s" % keyMax)
+ return
+ dataDict[keyStr] = setData
+
+ SyncSettingData(curPlayer, keyStr)
+ return
+
+def SyncSettingData(curPlayer, keyStr=""):
+ playerID = curPlayer.GetPlayerID()
+ gameRecMgr = DBDataMgr.GetGameRecMgr()
+ preSetRecMgr = gameRecMgr.GetRecTypeIDMgr(ShareDefine.Def_GameRecType_Setting, playerID)
+ recData = preSetRecMgr.GetOneRecData()
+ if not recData:
+ return
+ dataDict = recData.GetUserDict()
+
+ settingDataList = []
+ syncKeyList = [keyStr] if keyStr else dataDict.keys()
+ for keyStr in syncKeyList:
+ if keyStr in dataDict:
+ setData = dataDict[keyStr]
+ else:
+ setData = ""
+ keyNum = GameWorld.ToIntDef(keyStr, None)
+ if keyNum == None:
+ continue
+ sData = ChPyNetSendPack.tagSCSettingData()
+ sData.KeyNum = keyNum
+ sData.SetData = setData
+ sData.DataLen = len(sData.SetData)
+ settingDataList.append(sData)
+ if not settingDataList:
+ return
+ clientPack = ChPyNetSendPack.tagSCSettingDataInfo()
+ clientPack.SettingDataList = settingDataList
+ clientPack.DataCnt = len(clientPack.SettingDataList)
+ NetPackCommon.SendFakePack(curPlayer, clientPack)
return
#// A2 29 设置小助手 #tagCMSetLittleHelper
@@ -2855,7 +2671,7 @@
GameObj.SetHP(curPlayer, GameObj.GetMaxHP(curPlayer) * resetHpPercent / ChConfig.Def_MaxRateValue)
#curPlayer.SetMP(curPlayer.GetMaxMP() * resetMpPercent / ChConfig.Def_MaxRateValue)
#护盾
- PlayerControl.SetProDef(curPlayer, PlayerControl.GetMaxProDef(curPlayer))
+ #PlayerControl.SetProDef(curPlayer, PlayerControl.GetMaxProDef(curPlayer))
#玩家复活后副本处理
FBLogic.OnPlayerRebornOver(curPlayer, rebornType)
@@ -3323,20 +3139,23 @@
# 开服庆典积分阶段奖励
elif rewardType == ChConfig.Def_RewardType_OSACelebrationPointAward:
OpenServerActivity.GetOSACelebrationPointAward(curPlayer, dataEx)
+ # 轮回殿奖励
+ elif rewardType == ChConfig.Def_RewardType_LunhuidianAward:
+ PlayerActLunhuidian.GetLunhuidianAward(curPlayer, dataEx, dataExStr)
+ # 武将登场升星计划免费奖励 10
+ elif rewardType == ChConfig.Def_RewardType_ActHeroAppearStarFreeAward:
+ PlayerActHeroAppear.GetHeroAppearStarFreeAward(curPlayer, dataEx)
+ # 领取活动签到奖励 70
+ elif rewardType == ChConfig.Def_RewardType_ActSignAward:
+ PlayerActSign.OnGetActSignAward(curPlayer, dataEx, dataExStr)
+ # 群英榜历史最高名次奖励 7
+ elif rewardType == ChConfig.Def_RewardType_QunyingRankHighest:
+ GameLogic_Qunying.GetQunyingRankHighestAward(curPlayer)
- # 每日免费直购礼包
- 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)
- # 领取极品白拿
- elif rewardType == ChConfig.Def_RewardType_FreeGoods:
- PlayerFreeGoods.OnGetFreeGoods(curPlayer, dataEx)
# 领取累计充值奖励
elif rewardType == ChConfig.Def_RewardType_TotalRecharge:
PlayerActTotalRecharge.OnGetTotalRechargeAward(curPlayer, dataEx, dataExStr)
@@ -3346,18 +3165,6 @@
# 领取单笔累充领取
elif rewardType == ChConfig.Def_RewardType_SingleRecharge:
PlayerActSingleRecharge.OnGetSingleRechargeAward(curPlayer, dataEx, dataExStr)
- # 领取许愿池奖励
- 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)
# 领取购买次数礼包活动
elif rewardType == ChConfig.Def_RewardType_ActBuyCountGift:
PlayerActBuyCountGift.OnGetBuyCountGiftAward(curPlayer, dataEx, dataExStr)
@@ -3373,15 +3180,9 @@
# 仙盟攻城战活动奖励
elif rewardType == ChConfig.Def_RewardType_FamilyGCZ:
PlayerActFamilyGCZ.GetFamilyGCZAward(curPlayer, dataEx, tick)
- # 天道树奖励
- elif rewardType == ChConfig.Def_RewardType_TiandaoTree:
- PlayerXiangong.GetTiandaoTreeAward(curPlayer, dataEx)
# 寻宝累计次数奖励
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)
@@ -3405,16 +3206,16 @@
PlayerZhanling.GetZhanlingReward(curPlayer, dataEx, dataExStr)
#玩法前瞻奖励
elif rewardType == ChConfig.Def_RewardType_GameNotice:
- OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_GameNoticeAwardState, IpyGameDataPY.GetFuncEvalCfg("GameNoticeReward", 1))
+ OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_GameNoticeAwardState, IpyGameDataPY.GetFuncEvalCfg("GameNoticeReward", 1), "GameNotice")
#每日分享奖励34
elif rewardType == ChConfig.Def_RewardType_ShareGame:
- OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_ShareGameAwardState, IpyGameDataPY.GetFuncEvalCfg("ShareGameReward", 1))
+ OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_ShareGameAwardState, IpyGameDataPY.GetFuncEvalCfg("ShareGameReward", 1), "ShareGame")
#游戏好评奖励35
elif rewardType == ChConfig.Def_RewardType_GoodGame:
- OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_GoodGameAwardState, IpyGameDataPY.GetFuncEvalCfg("GoodGameReward", 1))
+ OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_GoodGameAwardState, IpyGameDataPY.GetFuncEvalCfg("GoodGameReward", 1), "GoodGame")
#游戏点赞奖励67
elif rewardType == ChConfig.Def_RewardType_LikeGame:
- OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_LikeGameAwardState, IpyGameDataPY.GetFuncEvalCfg("GoodGameReward", 4))
+ OnGiveAwardByClient(curPlayer, rewardType, ChConfig.Def_PDict_LikeGameAwardState, IpyGameDataPY.GetFuncEvalCfg("GoodGameReward", 4), "LikeGame")
#领取开服每日奖励
elif rewardType == ChConfig.Def_RewardType_OpenServerDailyAward:
openServerDay = GameWorld.GetGameWorld().GetGameWorldDictByKey(ShareDefine.Def_Notify_WorldKey_ServerDay) + 1
@@ -3460,6 +3261,8 @@
# 游历体力
elif adAwardType == 4:
PlayerTravel.AddTravelEnergy(curPlayer, adAwardValue)
+
+ DataRecordPack.DR_ADAward(curPlayer, adID)
return
def ADCntOnDay(curPlayer):
@@ -3847,6 +3650,7 @@
clientPack.NowSecond = serverTime.second
clientPack.NowMicSecond = serverTime.microsecond
clientPack.WeekOfYear = GameWorld.GetWeekOfYear()
+ clientPack.OpenServerTime = DBDataMgr.GetEventTrigMgr().GetValue(ShareDefine.Def_InitOpenServerTime)
NetPackCommon.SendFakePack(curPlayer, clientPack)
return
@@ -4082,14 +3886,17 @@
if recType in ShareDefine.Def_ViewGameRecSelfList:
recID = curPlayer.GetPlayerID()
recTypeIDMgr = DBDataMgr.GetGameRecMgr().GetRecTypeIDMgr(recType, recID)
- SyncGameRecInfo(curPlayer, recType, recID, recTypeIDMgr.GetDataList())
+ SyncGameRecInfo(curPlayer, recTypeIDMgr.GetDataList(), recType, recID)
return
-def SyncGameRecInfo(curPlayer, recType, recID, recDataList):
+def SyncGameRecInfo(curPlayer, recDataList, recType=0, recID=0):
recList = []
for recData in recDataList:
if not recData:
continue
+ if not recType:
+ recType = recData.GetRecType()
+ recID = recData.GetRecID()
rec = ChPyNetSendPack.tagSCGameRec()
rec.Time = recData.GetTime()
rec.Value1 = recData.GetValue1()
--
Gitblit v1.8.0