From 8eec7c10e8d56fad0159556eb1ef7f3d6d68a479 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期二, 26 一月 2021 11:40:17 +0800 Subject: [PATCH] 8710 【开发】【主干】【BT2】根据世界等级配置奖励(集字活动支持按世界等级配置不同奖励); --- ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py | 61 ++++++++++++++++-------------- 1 files changed, 32 insertions(+), 29 deletions(-) diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py index 58e0646..087a71b 100644 --- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py +++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.py @@ -588,42 +588,45 @@ sendMapServerMsgDict = mapServerInfoDict.get(actName, {}) dbOperationActIDKey = PlayerDBGSEvent.Def_OperationActID % actName - curActID = sendMapServerMsgDict.get(ShareDefine.ActKey_ID) + dbActID = PlayerDBGSEvent.GetDBGSTrig_ByKey(dbOperationActIDKey) + curActID = sendMapServerMsgDict.get(ShareDefine.ActKey_ID, 0) dayIndex = sendMapServerMsgDict.get(ShareDefine.ActKey_DayIndex, 0) - if curActID and PlayerDBGSEvent.GetDBGSTrig_ByKey(dbOperationActIDKey) != curActID: - GameWorld.Log(" dbActID变更,dbActID=%s,curActID=%s" % (PlayerDBGSEvent.GetDBGSTrig_ByKey(dbOperationActIDKey), curActID)) + if dbActID != curActID: + GameWorld.Log(" dbActID变更: dbActID=%s,curActID=%s" % (dbActID, curActID)) PlayerDBGSEvent.SetDBGSTrig_ByKey(dbOperationActIDKey, curActID) - if actName in ShareDefine.NeedWorldLVOperationActNameList: - #记录开启时世界等级 - worldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv) - PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % actName, worldLV) - GameWorld.Log(" 记录活动开启时世界等级: worldLV=%s" % (worldLV)) - - #此处为活动开启时 - if actName == ShareDefine.OperationActionName_BossReborn: - #重置BOSS复活点 - GameWorldBoss.ResetBossRebornPoint() - elif actName == ShareDefine.OperationActionName_FairyCeremony: - #重置仙界盛典 - PlayerFairyCeremony.ResetFairyCeremony() - elif actName == ShareDefine.OperationActionName_NewFairyCeremony: - #重置仙界盛典 - PlayerNewFairyCeremony.ResetNewFairyCeremony() - elif actName == ShareDefine.OperationActionName_FeastRedPacket: - #重置节日红包 - if ipyData: - PlayerFamilyRedPacket.OnResetFeastRedPacket(ipyData, dayIndex) - elif actName == ShareDefine.OperationActionName_FlashSale: - #限时抢购重置购买次数 本次活动每场不能重复 - #dayIndex = sendMapServerMsgDict.get(ShareDefine.ActKey_DayIndex, 0) - PlayerStore.ResetFlashSaleBuyCnt(ipyData) + + if curActID: + if actName in ShareDefine.NeedWorldLVOperationActNameList: + #记录开启时世界等级 + worldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(ShareDefine.Def_Notify_WorldKey_WorldAverageLv) + PlayerDBGSEvent.SetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % actName, worldLV) + GameWorld.Log(" 记录活动开启时世界等级: worldLV=%s" % (worldLV)) + + #此处为活动开启时 + if actName == ShareDefine.OperationActionName_BossReborn: + #重置BOSS复活点 + GameWorldBoss.ResetBossRebornPoint() + elif actName == ShareDefine.OperationActionName_FairyCeremony: + #重置仙界盛典 + PlayerFairyCeremony.ResetFairyCeremony() + elif actName == ShareDefine.OperationActionName_NewFairyCeremony: + #重置仙界盛典 + PlayerNewFairyCeremony.ResetNewFairyCeremony() + elif actName == ShareDefine.OperationActionName_FeastRedPacket: + #重置节日红包 + if ipyData: + PlayerFamilyRedPacket.OnResetFeastRedPacket(ipyData, dayIndex) + elif actName == ShareDefine.OperationActionName_FlashSale: + #限时抢购重置购买次数 本次活动每场不能重复 + #dayIndex = sendMapServerMsgDict.get(ShareDefine.ActKey_DayIndex, 0) + PlayerStore.ResetFlashSaleBuyCnt(ipyData) else: - GameWorld.Log(" dbActID不变或无活动: dbActID=%s,curActID=%s" % (PlayerDBGSEvent.GetDBGSTrig_ByKey(dbOperationActIDKey), curActID)) + GameWorld.Log(" dbActID不变: dbActID=%s,curActID=%s" % (dbActID, curActID)) if actName in ShareDefine.NeedWorldLVOperationActNameList: actWorldLV = PlayerDBGSEvent.GetDBGSTrig_ByKey(PlayerDBGSEvent.Def_OActWorldLV % actName) sendMapServerMsgDict[ShareDefine.ActKey_WorldLV] = actWorldLV - GameWorld.Log(" 活动开始时世界等级: actWorldLV=%s" % (actWorldLV)) + GameWorld.Log(" 活动世界等级: actWorldLV=%s" % (actWorldLV)) if actName == ShareDefine.OperationActionName_ExpRate: if isReload and ipyData: -- Gitblit v1.8.0