diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index fcd0c80f..d045a368 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -392,6 +392,13 @@ BIReport.PAY_DOUBLE = { DOUBLED = "Doubled", } +-- 冲刺活动 +BIReport.ACT_SPRINT_TYPE = { + SUMMON = "Summon", + SOUL_BOX = "SoulBox", + TREE = "Tree", +} + -- b6 local EVENT_NAME_EXIT = "client_exit" local EVENT_NAME_FIGHT = "client_fight" diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 458b8c2e..5c665561 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -122,7 +122,6 @@ function DataManager:initWithServerData(data) if EDITOR_MODE then Logger.logHighlight("initWithServerData") - Logger.printTable(data) Logger.logHighlight("注册时间 : " .. Time:formatTimeYMDHMS(GFunc.formatTimeStep(data.stat.register_ts))) end self.registerTs = data.stat and data.stat.register_ts or Time:getServerTime() @@ -131,18 +130,13 @@ function DataManager:initWithServerData(data) self.PlayerData:init(data) self.ChapterData:init(data.chapter) self.DailyChallengeData:init(data.chapter_daily_challenge) - -- self.DungeonData:initDungeonGold(data.chapter_gold_challenge) - -- self.DungeonData:initDungeonShards(data.chapter_shards_challenge) self.FormationData:init(data.formations) self.EquipData:init(data.equip) - self.SkinData:init(data.bag.skins) + -- self.SkinData:init(data.bag.skins) self.TalentData:init(data.talent) -- HeroData要在EquipData、SkinData、TalentData之后初始化，依赖它们的属性数据 self.HeroData:init(data.bag.heroes) self.BagData:init(data.bag) - -- self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge) - -- self.DungeonData:initDungeonArmor(data.chapter_armor_challenge) - self.CollectionData:init(data.collection) self.TutorialData:init(data.guide) self.MailData:init(data.mail_info) -- self.BountyData:init(data.bounty) @@ -152,8 +146,6 @@ function DataManager:initWithServerData(data) self.DailyTaskData:init(data.task_daily, data.task_achievement) self.IdleData:init(data.idle) self.ShopData:init() - -- self.ShopData:refreshChapterShop(data.mall_chapter) - -- self.ShopData:refreshCoreSoulShop(data.soul) self.ShopData:refreshDailyShop(data.mall_daily_store) -- self.ShopData:refreshGoldShop(data.mall_gold) -- self.ShopData:refreshEmblemShop(data.mall_mythic_store) @@ -183,7 +175,7 @@ function DataManager:initWithServerData(data) -- 商店礼包都初始化完了后检查一下每日红点 -- self.ShopData:checkShopDiscountRedPoint() -- self.ShopData:checkLoginPopInfo() -- 需要写在shopdata所有初始化之后 - self.SummonData:init(data.summon_data.summons) + self.SummonData:init(data.summon_data) self.AIHelperData:init(nil, true) -- 任务数据最后初始化,依赖其他模块的数据 @@ -365,9 +357,9 @@ function DataManager:doCrossDay() end function DataManager:onCrossDay(info) - if info.activities then - self.ActTimeData:init(info.activities) -- 全活动时间, after PlayerData - end + -- if info.activities then + -- self.ActTimeData:init(info.activities) -- 全活动时间, after PlayerData + -- end if info.door then self.DoorData:init(info.door) end diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index a278e5e5..13efb5a9 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -856,6 +856,9 @@ local LocalizationGlobalConst = GIFT_ROUTINE_DESC_18 = "GIFT_ROUTINE_DESC_18", GIFT_ROUTINE_DESC_19 = "GIFT_ROUTINE_DESC_19", FREE_DESC = "FREE_DESC", + ACT_HERO_SUIT_DESC_4 = "ACT_HERO_SUIT_DESC_4", + ACT_HERO_SUIT_DESC_5 = "ACT_HERO_SUIT_DESC_5", + ACT_HERO_SUIT_DESC_6 = "ACT_HERO_SUIT_DESC_6", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 83309d78..b8f7c24f 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -856,6 +856,9 @@ local localization_global = ["GIFT_ROUTINE_DESC_18"] = "精彩活动", ["GIFT_ROUTINE_DESC_19"] = "必买", ["FREE_DESC"] = "免费", + ["ACT_HERO_SUIT_DESC_4"] = "登陆", + ["ACT_HERO_SUIT_DESC_5"] = "免费奖励", + ["ACT_HERO_SUIT_DESC_6"] = "高级奖励", } return localization_global \ No newline at end of file diff --git a/lua/app/global/global_func.lua b/lua/app/global/global_func.lua index b17988a0..2c0ebd89 100644 --- a/lua/app/global/global_func.lua +++ b/lua/app/global/global_func.lua @@ -491,6 +491,11 @@ end function GFunc.getConstIntValue(key) local ConstCfg = ConfigManager:getConfig("const") + if EDITOR_MODE then + if not ConstCfg[key] then + Logger.logHighlight("================ key = %s", key) + end + end return math.floor(ConstCfg[key].value) end diff --git a/lua/app/module/activity/activity_const.lua b/lua/app/module/activity/activity_const.lua index 6b12d6f8..40d664d2 100644 --- a/lua/app/module/activity/activity_const.lua +++ b/lua/app/module/activity/activity_const.lua @@ -1,36 +1,27 @@ local ActivityConst = {} --- 活动类型 -ActivityConst.ACT_TYPE = { +ActivityConst.ACTIVITY_TYPE_DATA = { + [2] = "SummonActData", + -- [7] = "ActSevenDayLoopData3", + -- [8] = "ActSevenDayLoopData", + -- [9] = "ActSevenDayLoopData2", } --- 活动id -ActivityConst.ACT = { - SUMMER = 106, +-- 禁止客户端自己跨天判断开启并初始化 +-- ActivityConst.DISABLE_CLIENT_CROSS_DAY_REFRESH = { +-- [7] = true, +-- [8] = true, +-- [9] = true, +-- } + +ActivityConst.REWARD_GEAR = { + COMMON = 0, + PRO = 1 } --- 战令档位 -ActivityConst.BOUNTY_GRADE_TYPE = { - FREE = 0, - PAY1 = 1, - PAY2 = 2, +ActivityConst.TURNTABLE_TIMES = { + ONE = 1, + TEN = 10, } --- 界面 -ActivityConst.PANEL_TYPE = { - TASK = 1, - BOUNTY = 2, - SKIN = 3, - HERO = 4 -} - --- 战令礼包id -ActivityConst.BOUNTY_GIFT_ID_1 = 130002 -ActivityConst.BOUNTY_GIFT_ID_2 = 130102 --- 皮肤礼包id -ActivityConst.SKIN_GIFT_ID_1 = 130302 -ActivityConst.SKIN_GIFT_ID_2 = 130202 --- 英雄礼包id -ActivityConst.HERO_GIFT_ID_1 = 130402 - -return ActivityConst \ No newline at end of file +return ActivityConst \ No newline at end of file diff --git a/lua/app/module/activity/activity_manager.lua b/lua/app/module/activity/activity_manager.lua index 61e9c4a5..3dc89b86 100644 --- a/lua/app/module/activity/activity_manager.lua +++ b/lua/app/module/activity/activity_manager.lua @@ -112,4 +112,14 @@ end -- 夏日活动分界线----------------------------------------------------------------------------------------------------- +function ActivityManager:getActivityInCfg(actId) + return ConfigManager:getConfig("activity")[actId] ~= nil +end + +--@region 礼包购买通信 +function ActivityManager:onGiftBuy(giftId) + PayManager:purchasePackage(giftId, PayManager.PURCHARSE_TYPE.ACT_GIFT, true) +end +--@endregion + return ActivityManager \ No newline at end of file diff --git a/lua/app/module/shop/shop_const.lua b/lua/app/module/shop/shop_const.lua index 6a958360..3cb772d8 100644 --- a/lua/app/module/shop/shop_const.lua +++ b/lua/app/module/shop/shop_const.lua @@ -16,16 +16,16 @@ ShopConst.PRIVILEGE_CARD_ID_MAP = { --首充档位 ShopConst.FIRST_RECHARGE_GEARS = { - GEAR_1 = 1, - GEAR_2 = 2, - GEAR_3 = 3 + GEAR_1 = 1, + GEAR_2 = 2, + GEAR_3 = 3 } -- 首充id ShopConst.FIRST_RECHARGE_ID = { - [ShopConst.FIRST_RECHARGE_GEARS.GEAR_1] = {10102, 10202, 10302},-- 第一档首充 - [ShopConst.FIRST_RECHARGE_GEARS.GEAR_2] = {10402, 10502, 10602},-- 第二档首充 - [ShopConst.FIRST_RECHARGE_GEARS.GEAR_3] = {10702, 10802, 10902},-- 第三档首充 + [ShopConst.FIRST_RECHARGE_GEARS.GEAR_1] = {1003000001, 1003000101, 1003000201},-- 第一档首充 + [ShopConst.FIRST_RECHARGE_GEARS.GEAR_2] = {1003000301, 1003000401, 1003000501},-- 第二档首充 + [ShopConst.FIRST_RECHARGE_GEARS.GEAR_3] = {1003000601, 1003000701, 1003000801},-- 第三档首充 } -- 新首充id @@ -66,7 +66,7 @@ ShopConst.PRIVILEGE_PAGE_BTN_DESC = { -- fund 活动 ShopConst.FUND_SHOW_PAGE = { - FUND = 1, + FUND = 1, CHAPTER_FUND = 2, BOUNTY = 3, BOUNTY_COLLECTION = 4, diff --git a/lua/app/net/net_manager.lua b/lua/app/net/net_manager.lua index ed7016c2..229bca7e 100644 --- a/lua/app/net/net_manager.lua +++ b/lua/app/net/net_manager.lua @@ -742,7 +742,8 @@ function NetManager:onReceive(msgId, data) pbData.status = ProtoMsgDispatch:getErrCodeEnum(pbData.err_code) end if EDITOR_MODE then - Logger.logHighlight("[NetManager]===onReceive===name:%s, msgId:%s, data:%s", msgName, msgId, json.encode(pbData)) + -- Logger.logHighlight("[NetManager]===onReceive===name:%s, msgId:%s, data:%s", msgName, msgId, json.encode(pbData)) + self:printReceive(msgName, msgId, pbData) end self:dispatch(msgName, pbData) else @@ -1192,4 +1193,34 @@ function NetManager:clearTagAuthFailToLogin() self.authFailToLogin = false end +--region 解析activities +-- 解析activities中的bytes +function NetManager:decodeActivityData(msgName, data) + local ok, pbData = pcall(function() + local fullMsgName = ProtoMsgDispatch:getMsgFullNameByMsgName(msgName) + return pb.decode(fullMsgName, data) + end) + if ok and pbData then + return pbData + end +end + +-- activities 中会有bytes +function NetManager:printReceive(msgName, msgId, pbData) + if msgName ~= ProtoMsgType.FromMsgEnum.LoginRsp and msgName ~= ProtoMsgType.FromMsgEnum.PassDayRsp then + Logger.logHighlight("[NetManager]===onReceive===name:%s, msgId:%s, data:%s", msgName, msgId, json.encode(pbData)) + return + end + local tmp = table.refCopy(pbData) + tmp.activities = table.refCopy(pbData.activities) + for i, v in ipairs(tmp.activities) do + if v.data ~= GConst.EMPTY_STRING then + tmp.activities[i] = table.refCopy(v) + tmp.activities[i].data = "" + end + end + Logger.logHighlight("[NetManager]===onReceive===name:%s, msgId:%s, data:%s", msgName, msgId, json.encode(tmp)) +end +--endregion + return NetManager \ No newline at end of file diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 4efa668c..91072573 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -1,8 +1,5 @@ local ProtoMsgType = { FromMsgId = { - [109633552] = "PigLevelDownNtf", - [109700242] = "PigLevelDownReq", - [109702075] = "PigLevelDownRsp", [129077983] = "PassDayReq", [129079816] = "PassDayRsp", [132242856] = "ChapterSettlementReq", @@ -15,8 +12,6 @@ local ProtoMsgType = { [295350214] = "ChangeAvatarRsp", [317272657] = "IdleQuickReq", [317274490] = "IdleQuickRsp", - [326310937] = "ActivityPVPDataReq", - [326312770] = "ActivityPVPDataRsp", [349009610] = "TriggerGrowUpGiftNtf", [433807827] = "LevelUpReq", [433809660] = "LevelUpRsp", @@ -24,9 +19,6 @@ local ProtoMsgType = { [516283389] = "GuideFundMarkRsp", [522621311] = "DungeonSettlementReq", [522623144] = "DungeonSettlementRsp", - [524551468] = "FourteenBountyAwardReq", - [524553301] = "FourteenBountyAwardRsp", - [531558517] = "PigPlayUpdateNtf", [554454681] = "EnergyByDiamondReq", [554456514] = "EnergyByDiamondRsp", [606208752] = "DailyChallengeTaskAwardReq", @@ -35,18 +27,12 @@ local ProtoMsgType = { [608555515] = "GiftTriggerGiftRsp", [613793796] = "WatchADReq", [613795629] = "WatchADRsp", - [629736377] = "TournArenaBountyClaimByDiamondReq", - [629738210] = "TournArenaBountyClaimByDiamondRsp", - [697000709] = "FourteenBountyTaskAwardReq", - [697002542] = "FourteenBountyTaskAwardRsp", [758116008] = "SummonWishSetReq", [758117841] = "SummonWishSetRsp", [817577269] = "SwitchFrontReq", [817579102] = "SwitchFrontRsp", [822916593] = "MatchReq", [822918426] = "MatchRsp", - [850670891] = "SummerBountyClaimByDiamondReq", - [850672724] = "SummerBountyClaimByDiamondRsp", [904222760] = "ArenaBountyLevelUnlockReq", [904224593] = "ArenaBountyLevelUnlockRsp", [963448435] = "FuncOpenRewardClaimReq", @@ -61,28 +47,20 @@ local ProtoMsgType = { [1070843294] = "LoginRsp", [1114435750] = "ItemUseReq", [1114437583] = "ItemUseRsp", - [1150265172] = "ActivityPVPDailyRewardsReq", - [1150267005] = "ActivityPVPDailyRewardsRsp", [1224176921] = "EquipRefineReq", [1224178754] = "EquipRefineRsp", - [1283733956] = "ActivityPVPMatchReq", - [1283735789] = "ActivityPVPMatchRsp", - [1312685858] = "BossRushTopReq", - [1312687691] = "BossRushTopRsp", - [1326064687] = "FourteenBountyExchangeAwardReq", - [1326066520] = "FourteenBountyExchangeAwardRsp", [1405582465] = "EquipDecomposeReq", [1405584298] = "EquipDecomposeRsp", [1433352538] = "ChapterDailyChallengeResetReq", [1433354371] = "ChapterDailyChallengeResetRsp", [1471116409] = "BindReq", [1471118242] = "BindRsp", - [1478006910] = "BossRushBountyClaimReq", - [1478008743] = "BossRushBountyClaimRsp", [1515380214] = "CardDailyRewardReq", [1515382047] = "CardDailyRewardRsp", [1552772605] = "MallDailyBuyReq", [1552774438] = "MallDailyBuyRsp", + [1557372246] = "ActivityRushSignReq", + [1557374079] = "ActivityRushSignRsp", [1584689751] = "ActPaidResultReq", [1584691584] = "ActPaidResultRsp", [1635643251] = "RecoveryNtf", @@ -94,8 +72,6 @@ local ProtoMsgType = { [1690297937] = "SummonReq", [1690299770] = "SummonRsp", [1698771529] = "MallDailyStoreRefreshNtf", - [1729069725] = "TournArenaRankReq", - [1729071558] = "TournArenaRankRsp", [1746317288] = "IdleInfoReq", [1746319121] = "IdleInfoRsp", [1751460231] = "PVPHeroesArrayReq", @@ -103,14 +79,10 @@ local ProtoMsgType = { [1877100820] = "MallGoldBuyReq", [1877102653] = "MallGoldBuyRsp", [1901321540] = "PipedReq", + [1904766903] = "SignAutoRewardsClaimedReq", + [1904768736] = "SignAutoRewardsClaimedRsp", [1959836545] = "GiftPaidResultReq", [1959838378] = "GiftPaidResultRsp", - [1975350605] = "ActivityPVPRankRewardsReq", - [1975352438] = "ActivityPVPRankRewardsRsp", - [2017336372] = "BossRushSettlementReq", - [2017338205] = "BossRushSettlementRsp", - [2018011867] = "TournWaveRankReq", - [2018013700] = "TournWaveRankRsp", [2055679641] = "ChapterDailyChallengeLevelReq", [2055681474] = "ChapterDailyChallengeLevelRsp", [2060508030] = "ChangeAvatarFrameReq", @@ -121,28 +93,21 @@ local ProtoMsgType = { [2105156478] = "CDKeyUseRsp", [2118851896] = "HeroUpgradeReq", [2118853729] = "HeroUpgradeRsp", - [2140118069] = "ActivityPVPDecideHeroReq", - [2140119902] = "ActivityPVPDecideHeroRsp", - [2164009445] = "BossRushStartReq", - [2164011278] = "BossRushStartRsp", - [2198847028] = "BossRushBoughtNtf", [2199526631] = "TeamSyncMatchNtf", [2199593321] = "TeamSyncMatchReq", [2199595154] = "TeamSyncMatchRsp", - [2247710148] = "ActivityPVPBountyClaimReq", - [2247711981] = "ActivityPVPBountyClaimRsp", [2258626758] = "SummonWishClaimReq", [2258628591] = "SummonWishClaimRsp", [2285872137] = "ChapterBoxRewardReq", [2285873970] = "ChapterBoxRewardRsp", - [2369545247] = "ActivityPVPRankReq", - [2369547080] = "ActivityPVPRankRsp", - [2420360424] = "FourteenDayInfoReq", - [2420362257] = "FourteenDayInfoRsp", [2429586383] = "MailCycleReq", [2429588216] = "MailCycleRsp", + [2431353944] = "SignClaimedReq", + [2431355777] = "SignClaimedRsp", [2494225153] = "PVPSettlementADRewardReq", [2494226986] = "PVPSettlementADRewardRsp", + [2494336960] = "ActivityRushExchangeReq", + [2494338793] = "ActivityRushExchangeRsp", [2494731810] = "TriggerGoldGiftReq", [2494733643] = "TriggerGoldGiftRsp", [2514397758] = "PVPInfoReq", @@ -153,26 +118,22 @@ local ProtoMsgType = { [2553353804] = "ChapterDailyChallengeStartRsp", [2581180989] = "MailListReq", [2581182822] = "MailListRsp", - [2620369240] = "SevenDayRewardReq", - [2620371073] = "SevenDayRewardRsp", - [2665299111] = "BossRushInfoReq", - [2665300944] = "BossRushInfoRsp", + [2660643921] = "SignReCheckinReq", + [2660645754] = "SignReCheckinRsp", [2706989220] = "TriggerGrowUpGift2Ntf", [2708281176] = "PVPChallengeSettlementReq", [2708283009] = "PVPChallengeSettlementRsp", - [2723654496] = "ActivityPVPBeginReq", - [2723656329] = "ActivityPVPBeginRsp", [2731281392] = "MailExtractReq", [2731283225] = "MailExtractRsp", [2772586812] = "DebugPowerReq", [2772588645] = "DebugPowerRsp", + [2806041093] = "ChapterDoubleRewardReq", + [2806042926] = "ChapterDoubleRewardRsp", [2849800229] = "MailReadReq", [2849802062] = "MailReadRsp", [2909026364] = "AIHelpUnreadNtf", [2909093054] = "AIHelpUnreadReq", [2909094887] = "AIHelpUnreadRsp", - [2964758488] = "TournWaveBountyClaimReq", - [2964760321] = "TournWaveBountyClaimRsp", [2979798841] = "TaskDailyStageRewardReq", [2979800674] = "TaskDailyStageRewardRsp", [2989494846] = "HeroStarReq", @@ -182,29 +143,15 @@ local ProtoMsgType = { [3013275569] = "PVPRankHeroesRsp", [3024278414] = "PVPSeasonRewardReq", [3024280247] = "PVPSeasonRewardRsp", - [3039097236] = "SummerBountyClaimReq", - [3039099069] = "SummerBountyClaimRsp", [3058879524] = "PVPRankReq", [3058881357] = "PVPRankRsp", - [3062745642] = "FundAwardReq", - [3062747475] = "FundAwardRsp", [3087688987] = "IdleRewardReq", [3087690820] = "IdleRewardRsp", - [3123310542] = "BossRushRankRewardReq", - [3123312375] = "BossRushRankRewardRsp", [3137310682] = "ActPayNtf", [3137377372] = "ActPayReq", [3137379205] = "ActPayRsp", [3190730044] = "KickOutNtf", [3197501935] = "ArenaBountyBoughtNtf", - [3209780877] = "BossRushRankReq", - [3209782710] = "BossRushRankRsp", - [3222113774] = "ActivityPVPOverCDReq", - [3222115607] = "ActivityPVPOverCDRsp", - [3224230499] = "SevenDayTaskRewardReq", - [3224232332] = "SevenDayTaskRewardRsp", - [3274332802] = "BossRushBountyUnlockReq", - [3274334635] = "BossRushBountyUnlockRsp", [3309820798] = "HeroPutOnReq", [3309822631] = "HeroPutOnRsp", [3341173994] = "BountyBoughtNtf", @@ -217,21 +164,12 @@ local ProtoMsgType = { [3429528472] = "GiftPayNtf", [3429595162] = "GiftPayReq", [3429596995] = "GiftPayRsp", - [3440328467] = "PigLevelUpNtf", [3448193560] = "MallDailyRefreshReq", [3448195393] = "MallDailyRefreshRsp", - [3512214338] = "BossRushPlayerInfoReq", - [3512216171] = "BossRushPlayerInfoRsp", [3525363388] = "TaskAchievementReq", [3525365221] = "TaskAchievementRsp", [3530560174] = "DungeonStartReq", [3530562007] = "DungeonStartRsp", - [3531336428] = "TournArenaRankClaimRewardReq", - [3531338261] = "TournArenaRankClaimRewardRsp", - [3533710638] = "TournArenaBountyClaimReq", - [3533712471] = "TournArenaBountyClaimRsp", - [3548077431] = "TournWaveBountyClaimByDiamondReq", - [3548079264] = "TournWaveBountyClaimByDiamondRsp", [3555824176] = "TaskDailyInfoReq", [3555826009] = "TaskDailyInfoRsp", [3597633120] = "BattleSkillRefreshReq", @@ -240,25 +178,21 @@ local ProtoMsgType = { [3607881087] = "AuthRsp", [3613497485] = "ArenaBountyRewardReq", [3613499318] = "ArenaBountyRewardRsp", - [3623429051] = "ActivityPVPBountyClaimByDiamondReq", - [3623430884] = "ActivityPVPBountyClaimByDiamondRsp", [3624439233] = "NewMailNtf", - [3629726454] = "ActivityPVPSettlementReq", - [3629728287] = "ActivityPVPSettlementRsp", [3629950931] = "PVPStageRewardReq", [3629952764] = "PVPStageRewardRsp", - [3739566473] = "SummerDataReq", - [3739568306] = "SummerDataRsp", [3750411183] = "EquipWearReq", [3750413016] = "EquipWearRsp", [3757169544] = "BountyRewardReq", [3757171377] = "BountyRewardRsp", - [3762291611] = "ActivityPVPStartReq", - [3762293444] = "ActivityPVPStartRsp", [3763117270] = "HeartbeatReq", [3763119103] = "HeartbeatRsp", + [3796802337] = "ChapterFundClaimedReq", + [3796804170] = "ChapterFundClaimedRsp", [3805364358] = "EquipUpgradeReq", [3805366191] = "EquipUpgradeRsp", + [3851279152] = "FundClaimedReq", + [3851280985] = "FundClaimedRsp", [3851969243] = "HeroChangeSkinReq", [3851971076] = "HeroChangeSkinRsp", [3904148760] = "GMReq", @@ -267,26 +201,14 @@ local ProtoMsgType = { [3931688291] = "TalentUpgradeRsp", [3933875617] = "ChapterStartReq", [3933877450] = "ChapterStartRsp", - [3966736054] = "TournWaveRankClaimRewardReq", - [3966737887] = "TournWaveRankClaimRewardRsp", [3975844247] = "CardRewardReq", [3975846080] = "CardRewardRsp", - [3980802711] = "TournArenaDataReq", - [3980804544] = "TournArenaDataRsp", - [4027379273] = "ActivityPVPFlushHeroesReq", - [4027381106] = "ActivityPVPFlushHeroesRsp", [4063447601] = "FormationSetReq", [4063449434] = "FormationSetRsp", - [4099982754] = "BossRushExchangeReq", - [4099984587] = "BossRushExchangeRsp", [4106156009] = "BountyLevelUnlockReq", [4106157842] = "BountyLevelUnlockRsp", [4152754481] = "PVPChallengeStartReq", [4152756314] = "PVPChallengeStartRsp", - [4155165814] = "SummerTaskClaimReq", - [4155167647] = "SummerTaskClaimRsp", - [4188104820] = "HeroFundAwardReq", - [4188106653] = "HeroFundAwardRsp", [4192050044] = "DungeonSweepReq", [4192051877] = "DungeonSweepRsp", [4195650791] = "TriggerWeaponArmorGiftReq", @@ -295,13 +217,8 @@ local ProtoMsgType = { [4250419300] = "PlayerInfoRsp", [4256333947] = "ExistReq", [4256335780] = "ExistRsp", - [4269744853] = "TournWaveDataReq", - [4269746686] = "TournWaveDataRsp", }, FromMsgToId = { - PigLevelDownNtf = 109633552, - PigLevelDownReq = 109700242, - PigLevelDownRsp = 109702075, PassDayReq = 129077983, PassDayRsp = 129079816, ChapterSettlementReq = 132242856, @@ -314,8 +231,6 @@ local ProtoMsgType = { ChangeAvatarRsp = 295350214, IdleQuickReq = 317272657, IdleQuickRsp = 317274490, - ActivityPVPDataReq = 326310937, - ActivityPVPDataRsp = 326312770, TriggerGrowUpGiftNtf = 349009610, LevelUpReq = 433807827, LevelUpRsp = 433809660, @@ -323,9 +238,6 @@ local ProtoMsgType = { GuideFundMarkRsp = 516283389, DungeonSettlementReq = 522621311, DungeonSettlementRsp = 522623144, - FourteenBountyAwardReq = 524551468, - FourteenBountyAwardRsp = 524553301, - PigPlayUpdateNtf = 531558517, EnergyByDiamondReq = 554454681, EnergyByDiamondRsp = 554456514, DailyChallengeTaskAwardReq = 606208752, @@ -334,18 +246,12 @@ local ProtoMsgType = { GiftTriggerGiftRsp = 608555515, WatchADReq = 613793796, WatchADRsp = 613795629, - TournArenaBountyClaimByDiamondReq = 629736377, - TournArenaBountyClaimByDiamondRsp = 629738210, - FourteenBountyTaskAwardReq = 697000709, - FourteenBountyTaskAwardRsp = 697002542, SummonWishSetReq = 758116008, SummonWishSetRsp = 758117841, SwitchFrontReq = 817577269, SwitchFrontRsp = 817579102, MatchReq = 822916593, MatchRsp = 822918426, - SummerBountyClaimByDiamondReq = 850670891, - SummerBountyClaimByDiamondRsp = 850672724, ArenaBountyLevelUnlockReq = 904222760, ArenaBountyLevelUnlockRsp = 904224593, FuncOpenRewardClaimReq = 963448435, @@ -360,28 +266,20 @@ local ProtoMsgType = { LoginRsp = 1070843294, ItemUseReq = 1114435750, ItemUseRsp = 1114437583, - ActivityPVPDailyRewardsReq = 1150265172, - ActivityPVPDailyRewardsRsp = 1150267005, EquipRefineReq = 1224176921, EquipRefineRsp = 1224178754, - ActivityPVPMatchReq = 1283733956, - ActivityPVPMatchRsp = 1283735789, - BossRushTopReq = 1312685858, - BossRushTopRsp = 1312687691, - FourteenBountyExchangeAwardReq = 1326064687, - FourteenBountyExchangeAwardRsp = 1326066520, EquipDecomposeReq = 1405582465, EquipDecomposeRsp = 1405584298, ChapterDailyChallengeResetReq = 1433352538, ChapterDailyChallengeResetRsp = 1433354371, BindReq = 1471116409, BindRsp = 1471118242, - BossRushBountyClaimReq = 1478006910, - BossRushBountyClaimRsp = 1478008743, CardDailyRewardReq = 1515380214, CardDailyRewardRsp = 1515382047, MallDailyBuyReq = 1552772605, MallDailyBuyRsp = 1552774438, + ActivityRushSignReq = 1557372246, + ActivityRushSignRsp = 1557374079, ActPaidResultReq = 1584689751, ActPaidResultRsp = 1584691584, RecoveryNtf = 1635643251, @@ -393,8 +291,6 @@ local ProtoMsgType = { SummonReq = 1690297937, SummonRsp = 1690299770, MallDailyStoreRefreshNtf = 1698771529, - TournArenaRankReq = 1729069725, - TournArenaRankRsp = 1729071558, IdleInfoReq = 1746317288, IdleInfoRsp = 1746319121, PVPHeroesArrayReq = 1751460231, @@ -402,14 +298,10 @@ local ProtoMsgType = { MallGoldBuyReq = 1877100820, MallGoldBuyRsp = 1877102653, PipedReq = 1901321540, + SignAutoRewardsClaimedReq = 1904766903, + SignAutoRewardsClaimedRsp = 1904768736, GiftPaidResultReq = 1959836545, GiftPaidResultRsp = 1959838378, - ActivityPVPRankRewardsReq = 1975350605, - ActivityPVPRankRewardsRsp = 1975352438, - BossRushSettlementReq = 2017336372, - BossRushSettlementRsp = 2017338205, - TournWaveRankReq = 2018011867, - TournWaveRankRsp = 2018013700, ChapterDailyChallengeLevelReq = 2055679641, ChapterDailyChallengeLevelRsp = 2055681474, ChangeAvatarFrameReq = 2060508030, @@ -420,28 +312,21 @@ local ProtoMsgType = { CDKeyUseRsp = 2105156478, HeroUpgradeReq = 2118851896, HeroUpgradeRsp = 2118853729, - ActivityPVPDecideHeroReq = 2140118069, - ActivityPVPDecideHeroRsp = 2140119902, - BossRushStartReq = 2164009445, - BossRushStartRsp = 2164011278, - BossRushBoughtNtf = 2198847028, TeamSyncMatchNtf = 2199526631, TeamSyncMatchReq = 2199593321, TeamSyncMatchRsp = 2199595154, - ActivityPVPBountyClaimReq = 2247710148, - ActivityPVPBountyClaimRsp = 2247711981, SummonWishClaimReq = 2258626758, SummonWishClaimRsp = 2258628591, ChapterBoxRewardReq = 2285872137, ChapterBoxRewardRsp = 2285873970, - ActivityPVPRankReq = 2369545247, - ActivityPVPRankRsp = 2369547080, - FourteenDayInfoReq = 2420360424, - FourteenDayInfoRsp = 2420362257, MailCycleReq = 2429586383, MailCycleRsp = 2429588216, + SignClaimedReq = 2431353944, + SignClaimedRsp = 2431355777, PVPSettlementADRewardReq = 2494225153, PVPSettlementADRewardRsp = 2494226986, + ActivityRushExchangeReq = 2494336960, + ActivityRushExchangeRsp = 2494338793, TriggerGoldGiftReq = 2494731810, TriggerGoldGiftRsp = 2494733643, PVPInfoReq = 2514397758, @@ -452,26 +337,22 @@ local ProtoMsgType = { ChapterDailyChallengeStartRsp = 2553353804, MailListReq = 2581180989, MailListRsp = 2581182822, - SevenDayRewardReq = 2620369240, - SevenDayRewardRsp = 2620371073, - BossRushInfoReq = 2665299111, - BossRushInfoRsp = 2665300944, + SignReCheckinReq = 2660643921, + SignReCheckinRsp = 2660645754, TriggerGrowUpGift2Ntf = 2706989220, PVPChallengeSettlementReq = 2708281176, PVPChallengeSettlementRsp = 2708283009, - ActivityPVPBeginReq = 2723654496, - ActivityPVPBeginRsp = 2723656329, MailExtractReq = 2731281392, MailExtractRsp = 2731283225, DebugPowerReq = 2772586812, DebugPowerRsp = 2772588645, + ChapterDoubleRewardReq = 2806041093, + ChapterDoubleRewardRsp = 2806042926, MailReadReq = 2849800229, MailReadRsp = 2849802062, AIHelpUnreadNtf = 2909026364, AIHelpUnreadReq = 2909093054, AIHelpUnreadRsp = 2909094887, - TournWaveBountyClaimReq = 2964758488, - TournWaveBountyClaimRsp = 2964760321, TaskDailyStageRewardReq = 2979798841, TaskDailyStageRewardRsp = 2979800674, HeroStarReq = 2989494846, @@ -481,29 +362,15 @@ local ProtoMsgType = { PVPRankHeroesRsp = 3013275569, PVPSeasonRewardReq = 3024278414, PVPSeasonRewardRsp = 3024280247, - SummerBountyClaimReq = 3039097236, - SummerBountyClaimRsp = 3039099069, PVPRankReq = 3058879524, PVPRankRsp = 3058881357, - FundAwardReq = 3062745642, - FundAwardRsp = 3062747475, IdleRewardReq = 3087688987, IdleRewardRsp = 3087690820, - BossRushRankRewardReq = 3123310542, - BossRushRankRewardRsp = 3123312375, ActPayNtf = 3137310682, ActPayReq = 3137377372, ActPayRsp = 3137379205, KickOutNtf = 3190730044, ArenaBountyBoughtNtf = 3197501935, - BossRushRankReq = 3209780877, - BossRushRankRsp = 3209782710, - ActivityPVPOverCDReq = 3222113774, - ActivityPVPOverCDRsp = 3222115607, - SevenDayTaskRewardReq = 3224230499, - SevenDayTaskRewardRsp = 3224232332, - BossRushBountyUnlockReq = 3274332802, - BossRushBountyUnlockRsp = 3274334635, HeroPutOnReq = 3309820798, HeroPutOnRsp = 3309822631, BountyBoughtNtf = 3341173994, @@ -516,21 +383,12 @@ local ProtoMsgType = { GiftPayNtf = 3429528472, GiftPayReq = 3429595162, GiftPayRsp = 3429596995, - PigLevelUpNtf = 3440328467, MallDailyRefreshReq = 3448193560, MallDailyRefreshRsp = 3448195393, - BossRushPlayerInfoReq = 3512214338, - BossRushPlayerInfoRsp = 3512216171, TaskAchievementReq = 3525363388, TaskAchievementRsp = 3525365221, DungeonStartReq = 3530560174, DungeonStartRsp = 3530562007, - TournArenaRankClaimRewardReq = 3531336428, - TournArenaRankClaimRewardRsp = 3531338261, - TournArenaBountyClaimReq = 3533710638, - TournArenaBountyClaimRsp = 3533712471, - TournWaveBountyClaimByDiamondReq = 3548077431, - TournWaveBountyClaimByDiamondRsp = 3548079264, TaskDailyInfoReq = 3555824176, TaskDailyInfoRsp = 3555826009, BattleSkillRefreshReq = 3597633120, @@ -539,25 +397,21 @@ local ProtoMsgType = { AuthRsp = 3607881087, ArenaBountyRewardReq = 3613497485, ArenaBountyRewardRsp = 3613499318, - ActivityPVPBountyClaimByDiamondReq = 3623429051, - ActivityPVPBountyClaimByDiamondRsp = 3623430884, NewMailNtf = 3624439233, - ActivityPVPSettlementReq = 3629726454, - ActivityPVPSettlementRsp = 3629728287, PVPStageRewardReq = 3629950931, PVPStageRewardRsp = 3629952764, - SummerDataReq = 3739566473, - SummerDataRsp = 3739568306, EquipWearReq = 3750411183, EquipWearRsp = 3750413016, BountyRewardReq = 3757169544, BountyRewardRsp = 3757171377, - ActivityPVPStartReq = 3762291611, - ActivityPVPStartRsp = 3762293444, HeartbeatReq = 3763117270, HeartbeatRsp = 3763119103, + ChapterFundClaimedReq = 3796802337, + ChapterFundClaimedRsp = 3796804170, EquipUpgradeReq = 3805364358, EquipUpgradeRsp = 3805366191, + FundClaimedReq = 3851279152, + FundClaimedRsp = 3851280985, HeroChangeSkinReq = 3851969243, HeroChangeSkinRsp = 3851971076, GMReq = 3904148760, @@ -566,26 +420,14 @@ local ProtoMsgType = { TalentUpgradeRsp = 3931688291, ChapterStartReq = 3933875617, ChapterStartRsp = 3933877450, - TournWaveRankClaimRewardReq = 3966736054, - TournWaveRankClaimRewardRsp = 3966737887, CardRewardReq = 3975844247, CardRewardRsp = 3975846080, - TournArenaDataReq = 3980802711, - TournArenaDataRsp = 3980804544, - ActivityPVPFlushHeroesReq = 4027379273, - ActivityPVPFlushHeroesRsp = 4027381106, FormationSetReq = 4063447601, FormationSetRsp = 4063449434, - BossRushExchangeReq = 4099982754, - BossRushExchangeRsp = 4099984587, BountyLevelUnlockReq = 4106156009, BountyLevelUnlockRsp = 4106157842, PVPChallengeStartReq = 4152754481, PVPChallengeStartRsp = 4152756314, - SummerTaskClaimReq = 4155165814, - SummerTaskClaimRsp = 4155167647, - HeroFundAwardReq = 4188104820, - HeroFundAwardRsp = 4188106653, DungeonSweepReq = 4192050044, DungeonSweepRsp = 4192051877, TriggerWeaponArmorGiftReq = 4195650791, @@ -594,13 +436,8 @@ local ProtoMsgType = { PlayerInfoRsp = 4250419300, ExistReq = 4256333947, ExistRsp = 4256335780, - TournWaveDataReq = 4269744853, - TournWaveDataRsp = 4269746686, }, FromMsgEnum = { - PigLevelDownNtf = "PigLevelDownNtf", - PigLevelDownReq = "PigLevelDownReq", - PigLevelDownRsp = "PigLevelDownRsp", PassDayReq = "PassDayReq", PassDayRsp = "PassDayRsp", ChapterSettlementReq = "ChapterSettlementReq", @@ -613,8 +450,6 @@ local ProtoMsgType = { ChangeAvatarRsp = "ChangeAvatarRsp", IdleQuickReq = "IdleQuickReq", IdleQuickRsp = "IdleQuickRsp", - ActivityPVPDataReq = "ActivityPVPDataReq", - ActivityPVPDataRsp = "ActivityPVPDataRsp", TriggerGrowUpGiftNtf = "TriggerGrowUpGiftNtf", LevelUpReq = "LevelUpReq", LevelUpRsp = "LevelUpRsp", @@ -622,9 +457,6 @@ local ProtoMsgType = { GuideFundMarkRsp = "GuideFundMarkRsp", DungeonSettlementReq = "DungeonSettlementReq", DungeonSettlementRsp = "DungeonSettlementRsp", - FourteenBountyAwardReq = "FourteenBountyAwardReq", - FourteenBountyAwardRsp = "FourteenBountyAwardRsp", - PigPlayUpdateNtf = "PigPlayUpdateNtf", EnergyByDiamondReq = "EnergyByDiamondReq", EnergyByDiamondRsp = "EnergyByDiamondRsp", DailyChallengeTaskAwardReq = "DailyChallengeTaskAwardReq", @@ -633,18 +465,12 @@ local ProtoMsgType = { GiftTriggerGiftRsp = "GiftTriggerGiftRsp", WatchADReq = "WatchADReq", WatchADRsp = "WatchADRsp", - TournArenaBountyClaimByDiamondReq = "TournArenaBountyClaimByDiamondReq", - TournArenaBountyClaimByDiamondRsp = "TournArenaBountyClaimByDiamondRsp", - FourteenBountyTaskAwardReq = "FourteenBountyTaskAwardReq", - FourteenBountyTaskAwardRsp = "FourteenBountyTaskAwardRsp", SummonWishSetReq = "SummonWishSetReq", SummonWishSetRsp = "SummonWishSetRsp", SwitchFrontReq = "SwitchFrontReq", SwitchFrontRsp = "SwitchFrontRsp", MatchReq = "MatchReq", MatchRsp = "MatchRsp", - SummerBountyClaimByDiamondReq = "SummerBountyClaimByDiamondReq", - SummerBountyClaimByDiamondRsp = "SummerBountyClaimByDiamondRsp", ArenaBountyLevelUnlockReq = "ArenaBountyLevelUnlockReq", ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp", FuncOpenRewardClaimReq = "FuncOpenRewardClaimReq", @@ -659,28 +485,20 @@ local ProtoMsgType = { LoginRsp = "LoginRsp", ItemUseReq = "ItemUseReq", ItemUseRsp = "ItemUseRsp", - ActivityPVPDailyRewardsReq = "ActivityPVPDailyRewardsReq", - ActivityPVPDailyRewardsRsp = "ActivityPVPDailyRewardsRsp", EquipRefineReq = "EquipRefineReq", EquipRefineRsp = "EquipRefineRsp", - ActivityPVPMatchReq = "ActivityPVPMatchReq", - ActivityPVPMatchRsp = "ActivityPVPMatchRsp", - BossRushTopReq = "BossRushTopReq", - BossRushTopRsp = "BossRushTopRsp", - FourteenBountyExchangeAwardReq = "FourteenBountyExchangeAwardReq", - FourteenBountyExchangeAwardRsp = "FourteenBountyExchangeAwardRsp", EquipDecomposeReq = "EquipDecomposeReq", EquipDecomposeRsp = "EquipDecomposeRsp", ChapterDailyChallengeResetReq = "ChapterDailyChallengeResetReq", ChapterDailyChallengeResetRsp = "ChapterDailyChallengeResetRsp", BindReq = "BindReq", BindRsp = "BindRsp", - BossRushBountyClaimReq = "BossRushBountyClaimReq", - BossRushBountyClaimRsp = "BossRushBountyClaimRsp", CardDailyRewardReq = "CardDailyRewardReq", CardDailyRewardRsp = "CardDailyRewardRsp", MallDailyBuyReq = "MallDailyBuyReq", MallDailyBuyRsp = "MallDailyBuyRsp", + ActivityRushSignReq = "ActivityRushSignReq", + ActivityRushSignRsp = "ActivityRushSignRsp", ActPaidResultReq = "ActPaidResultReq", ActPaidResultRsp = "ActPaidResultRsp", RecoveryNtf = "RecoveryNtf", @@ -692,8 +510,6 @@ local ProtoMsgType = { SummonReq = "SummonReq", SummonRsp = "SummonRsp", MallDailyStoreRefreshNtf = "MallDailyStoreRefreshNtf", - TournArenaRankReq = "TournArenaRankReq", - TournArenaRankRsp = "TournArenaRankRsp", IdleInfoReq = "IdleInfoReq", IdleInfoRsp = "IdleInfoRsp", PVPHeroesArrayReq = "PVPHeroesArrayReq", @@ -701,14 +517,10 @@ local ProtoMsgType = { MallGoldBuyReq = "MallGoldBuyReq", MallGoldBuyRsp = "MallGoldBuyRsp", PipedReq = "PipedReq", + SignAutoRewardsClaimedReq = "SignAutoRewardsClaimedReq", + SignAutoRewardsClaimedRsp = "SignAutoRewardsClaimedRsp", GiftPaidResultReq = "GiftPaidResultReq", GiftPaidResultRsp = "GiftPaidResultRsp", - ActivityPVPRankRewardsReq = "ActivityPVPRankRewardsReq", - ActivityPVPRankRewardsRsp = "ActivityPVPRankRewardsRsp", - BossRushSettlementReq = "BossRushSettlementReq", - BossRushSettlementRsp = "BossRushSettlementRsp", - TournWaveRankReq = "TournWaveRankReq", - TournWaveRankRsp = "TournWaveRankRsp", ChapterDailyChallengeLevelReq = "ChapterDailyChallengeLevelReq", ChapterDailyChallengeLevelRsp = "ChapterDailyChallengeLevelRsp", ChangeAvatarFrameReq = "ChangeAvatarFrameReq", @@ -719,28 +531,21 @@ local ProtoMsgType = { CDKeyUseRsp = "CDKeyUseRsp", HeroUpgradeReq = "HeroUpgradeReq", HeroUpgradeRsp = "HeroUpgradeRsp", - ActivityPVPDecideHeroReq = "ActivityPVPDecideHeroReq", - ActivityPVPDecideHeroRsp = "ActivityPVPDecideHeroRsp", - BossRushStartReq = "BossRushStartReq", - BossRushStartRsp = "BossRushStartRsp", - BossRushBoughtNtf = "BossRushBoughtNtf", TeamSyncMatchNtf = "TeamSyncMatchNtf", TeamSyncMatchReq = "TeamSyncMatchReq", TeamSyncMatchRsp = "TeamSyncMatchRsp", - ActivityPVPBountyClaimReq = "ActivityPVPBountyClaimReq", - ActivityPVPBountyClaimRsp = "ActivityPVPBountyClaimRsp", SummonWishClaimReq = "SummonWishClaimReq", SummonWishClaimRsp = "SummonWishClaimRsp", ChapterBoxRewardReq = "ChapterBoxRewardReq", ChapterBoxRewardRsp = "ChapterBoxRewardRsp", - ActivityPVPRankReq = "ActivityPVPRankReq", - ActivityPVPRankRsp = "ActivityPVPRankRsp", - FourteenDayInfoReq = "FourteenDayInfoReq", - FourteenDayInfoRsp = "FourteenDayInfoRsp", MailCycleReq = "MailCycleReq", MailCycleRsp = "MailCycleRsp", + SignClaimedReq = "SignClaimedReq", + SignClaimedRsp = "SignClaimedRsp", PVPSettlementADRewardReq = "PVPSettlementADRewardReq", PVPSettlementADRewardRsp = "PVPSettlementADRewardRsp", + ActivityRushExchangeReq = "ActivityRushExchangeReq", + ActivityRushExchangeRsp = "ActivityRushExchangeRsp", TriggerGoldGiftReq = "TriggerGoldGiftReq", TriggerGoldGiftRsp = "TriggerGoldGiftRsp", PVPInfoReq = "PVPInfoReq", @@ -751,26 +556,22 @@ local ProtoMsgType = { ChapterDailyChallengeStartRsp = "ChapterDailyChallengeStartRsp", MailListReq = "MailListReq", MailListRsp = "MailListRsp", - SevenDayRewardReq = "SevenDayRewardReq", - SevenDayRewardRsp = "SevenDayRewardRsp", - BossRushInfoReq = "BossRushInfoReq", - BossRushInfoRsp = "BossRushInfoRsp", + SignReCheckinReq = "SignReCheckinReq", + SignReCheckinRsp = "SignReCheckinRsp", TriggerGrowUpGift2Ntf = "TriggerGrowUpGift2Ntf", PVPChallengeSettlementReq = "PVPChallengeSettlementReq", PVPChallengeSettlementRsp = "PVPChallengeSettlementRsp", - ActivityPVPBeginReq = "ActivityPVPBeginReq", - ActivityPVPBeginRsp = "ActivityPVPBeginRsp", MailExtractReq = "MailExtractReq", MailExtractRsp = "MailExtractRsp", DebugPowerReq = "DebugPowerReq", DebugPowerRsp = "DebugPowerRsp", + ChapterDoubleRewardReq = "ChapterDoubleRewardReq", + ChapterDoubleRewardRsp = "ChapterDoubleRewardRsp", MailReadReq = "MailReadReq", MailReadRsp = "MailReadRsp", AIHelpUnreadNtf = "AIHelpUnreadNtf", AIHelpUnreadReq = "AIHelpUnreadReq", AIHelpUnreadRsp = "AIHelpUnreadRsp", - TournWaveBountyClaimReq = "TournWaveBountyClaimReq", - TournWaveBountyClaimRsp = "TournWaveBountyClaimRsp", TaskDailyStageRewardReq = "TaskDailyStageRewardReq", TaskDailyStageRewardRsp = "TaskDailyStageRewardRsp", HeroStarReq = "HeroStarReq", @@ -780,29 +581,15 @@ local ProtoMsgType = { PVPRankHeroesRsp = "PVPRankHeroesRsp", PVPSeasonRewardReq = "PVPSeasonRewardReq", PVPSeasonRewardRsp = "PVPSeasonRewardRsp", - SummerBountyClaimReq = "SummerBountyClaimReq", - SummerBountyClaimRsp = "SummerBountyClaimRsp", PVPRankReq = "PVPRankReq", PVPRankRsp = "PVPRankRsp", - FundAwardReq = "FundAwardReq", - FundAwardRsp = "FundAwardRsp", IdleRewardReq = "IdleRewardReq", IdleRewardRsp = "IdleRewardRsp", - BossRushRankRewardReq = "BossRushRankRewardReq", - BossRushRankRewardRsp = "BossRushRankRewardRsp", ActPayNtf = "ActPayNtf", ActPayReq = "ActPayReq", ActPayRsp = "ActPayRsp", KickOutNtf = "KickOutNtf", ArenaBountyBoughtNtf = "ArenaBountyBoughtNtf", - BossRushRankReq = "BossRushRankReq", - BossRushRankRsp = "BossRushRankRsp", - ActivityPVPOverCDReq = "ActivityPVPOverCDReq", - ActivityPVPOverCDRsp = "ActivityPVPOverCDRsp", - SevenDayTaskRewardReq = "SevenDayTaskRewardReq", - SevenDayTaskRewardRsp = "SevenDayTaskRewardRsp", - BossRushBountyUnlockReq = "BossRushBountyUnlockReq", - BossRushBountyUnlockRsp = "BossRushBountyUnlockRsp", HeroPutOnReq = "HeroPutOnReq", HeroPutOnRsp = "HeroPutOnRsp", BountyBoughtNtf = "BountyBoughtNtf", @@ -815,21 +602,12 @@ local ProtoMsgType = { GiftPayNtf = "GiftPayNtf", GiftPayReq = "GiftPayReq", GiftPayRsp = "GiftPayRsp", - PigLevelUpNtf = "PigLevelUpNtf", MallDailyRefreshReq = "MallDailyRefreshReq", MallDailyRefreshRsp = "MallDailyRefreshRsp", - BossRushPlayerInfoReq = "BossRushPlayerInfoReq", - BossRushPlayerInfoRsp = "BossRushPlayerInfoRsp", TaskAchievementReq = "TaskAchievementReq", TaskAchievementRsp = "TaskAchievementRsp", DungeonStartReq = "DungeonStartReq", DungeonStartRsp = "DungeonStartRsp", - TournArenaRankClaimRewardReq = "TournArenaRankClaimRewardReq", - TournArenaRankClaimRewardRsp = "TournArenaRankClaimRewardRsp", - TournArenaBountyClaimReq = "TournArenaBountyClaimReq", - TournArenaBountyClaimRsp = "TournArenaBountyClaimRsp", - TournWaveBountyClaimByDiamondReq = "TournWaveBountyClaimByDiamondReq", - TournWaveBountyClaimByDiamondRsp = "TournWaveBountyClaimByDiamondRsp", TaskDailyInfoReq = "TaskDailyInfoReq", TaskDailyInfoRsp = "TaskDailyInfoRsp", BattleSkillRefreshReq = "BattleSkillRefreshReq", @@ -838,25 +616,21 @@ local ProtoMsgType = { AuthRsp = "AuthRsp", ArenaBountyRewardReq = "ArenaBountyRewardReq", ArenaBountyRewardRsp = "ArenaBountyRewardRsp", - ActivityPVPBountyClaimByDiamondReq = "ActivityPVPBountyClaimByDiamondReq", - ActivityPVPBountyClaimByDiamondRsp = "ActivityPVPBountyClaimByDiamondRsp", NewMailNtf = "NewMailNtf", - ActivityPVPSettlementReq = "ActivityPVPSettlementReq", - ActivityPVPSettlementRsp = "ActivityPVPSettlementRsp", PVPStageRewardReq = "PVPStageRewardReq", PVPStageRewardRsp = "PVPStageRewardRsp", - SummerDataReq = "SummerDataReq", - SummerDataRsp = "SummerDataRsp", EquipWearReq = "EquipWearReq", EquipWearRsp = "EquipWearRsp", BountyRewardReq = "BountyRewardReq", BountyRewardRsp = "BountyRewardRsp", - ActivityPVPStartReq = "ActivityPVPStartReq", - ActivityPVPStartRsp = "ActivityPVPStartRsp", HeartbeatReq = "HeartbeatReq", HeartbeatRsp = "HeartbeatRsp", + ChapterFundClaimedReq = "ChapterFundClaimedReq", + ChapterFundClaimedRsp = "ChapterFundClaimedRsp", EquipUpgradeReq = "EquipUpgradeReq", EquipUpgradeRsp = "EquipUpgradeRsp", + FundClaimedReq = "FundClaimedReq", + FundClaimedRsp = "FundClaimedRsp", HeroChangeSkinReq = "HeroChangeSkinReq", HeroChangeSkinRsp = "HeroChangeSkinRsp", GMReq = "GMReq", @@ -865,26 +639,14 @@ local ProtoMsgType = { TalentUpgradeRsp = "TalentUpgradeRsp", ChapterStartReq = "ChapterStartReq", ChapterStartRsp = "ChapterStartRsp", - TournWaveRankClaimRewardReq = "TournWaveRankClaimRewardReq", - TournWaveRankClaimRewardRsp = "TournWaveRankClaimRewardRsp", CardRewardReq = "CardRewardReq", CardRewardRsp = "CardRewardRsp", - TournArenaDataReq = "TournArenaDataReq", - TournArenaDataRsp = "TournArenaDataRsp", - ActivityPVPFlushHeroesReq = "ActivityPVPFlushHeroesReq", - ActivityPVPFlushHeroesRsp = "ActivityPVPFlushHeroesRsp", FormationSetReq = "FormationSetReq", FormationSetRsp = "FormationSetRsp", - BossRushExchangeReq = "BossRushExchangeReq", - BossRushExchangeRsp = "BossRushExchangeRsp", BountyLevelUnlockReq = "BountyLevelUnlockReq", BountyLevelUnlockRsp = "BountyLevelUnlockRsp", PVPChallengeStartReq = "PVPChallengeStartReq", PVPChallengeStartRsp = "PVPChallengeStartRsp", - SummerTaskClaimReq = "SummerTaskClaimReq", - SummerTaskClaimRsp = "SummerTaskClaimRsp", - HeroFundAwardReq = "HeroFundAwardReq", - HeroFundAwardRsp = "HeroFundAwardRsp", DungeonSweepReq = "DungeonSweepReq", DungeonSweepRsp = "DungeonSweepRsp", TriggerWeaponArmorGiftReq = "TriggerWeaponArmorGiftReq", @@ -893,8 +655,6 @@ local ProtoMsgType = { PlayerInfoRsp = "PlayerInfoRsp", ExistReq = "ExistReq", ExistRsp = "ExistRsp", - TournWaveDataReq = "TournWaveDataReq", - TournWaveDataRsp = "TournWaveDataRsp", }, } diff --git a/lua/app/ui/activity/act_sprint_summon_all/comp/login_comp.lua b/lua/app/ui/activity/act_sprint_summon_all/comp/login_comp.lua index 64777b55..0f2d9da0 100644 --- a/lua/app/ui/activity/act_sprint_summon_all/comp/login_comp.lua +++ b/lua/app/ui/activity/act_sprint_summon_all/comp/login_comp.lua @@ -21,7 +21,7 @@ function SummonActLogin:init() ModuleManager.ActSprintManager:reqSprintBountySign(actType, actId, grade) end) self.getBtnTx = uiMap["login_comp.get_btn.text"] - self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_TEXT_CLAIMALL)) + self.getBtnTx:setText(I18N:getGlobalText(I18N.GlobalConst.ONE_KEY_GET_DESC)) self.payBtn = uiMap["login_comp.pay_btn"] self.payBtn:addClickListener(function() if DataManager.ActSprintSummonDataAll:isUnlockBountyPro() then diff --git a/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua b/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua index d8168d12..677979fe 100755 --- a/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua +++ b/lua/app/ui/main_city/cell/side_bar_act_sprint_cell.lua @@ -26,6 +26,7 @@ end function SideBarActSprintCell:getCellName() return I18N:getGlobalText(I18N.GlobalConst.ACT_GOGOGO_DESC_1) end + function SideBarActSprintCell:updateTime() if self:getIsOpen() then self:_refreshTime() diff --git a/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua b/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua index 5357b1dd..5b1f17dd 100644 --- a/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua +++ b/lua/app/userdata/activity/act_sprint/act_sprint_summon_data_all.lua @@ -58,7 +58,7 @@ function ActSprintSummonData:initTaskData(standardData, normalData) local round = info.round local roundClaimed = info.round_claimed local claimedTaskList = info.claimed - + self.standardScore = score self.standardTotalScore = totalScore self.standardTurn = round @@ -69,7 +69,7 @@ function ActSprintSummonData:initTaskData(standardData, normalData) end end end - + -- 常规任务 for _, info in ipairs(normalData) do if info.activity_id == self.actId then @@ -83,7 +83,7 @@ function ActSprintSummonData:initTaskData(standardData, normalData) end end -function ActSprintSummonData:setActivityInfo(data, isCrossDayClientRefresh) +function ActSprintSummonData:setActivityInfo(data) if self.actId ~= data.actId then self:clear() end @@ -94,7 +94,7 @@ function ActSprintSummonData:setActivityInfo(data, isCrossDayClientRefresh) if data.data ~= GConst.EMPTY_STRING then local info = NetManager:decodeActivityData("ActivityRushSign", data.data) - if info and not isCrossDayClientRefresh then + if info then self:initActivityData(info) end end @@ -104,6 +104,9 @@ function ActSprintSummonData:setActivityInfo(data, isCrossDayClientRefresh) self.isInit = true -- 跨天 DataManager:registerCrossDayFunc("ActSprintSummonDataAll", function() + if not self:getIsOpen() then + return + end -- 当天开启 重置任务 if self:getStartTime() == Time:getBeginningOfServerToday() then -- 达标任务数据 @@ -137,6 +140,9 @@ function ActSprintSummonData:setActivityInfo(data, isCrossDayClientRefresh) for id, info in pairs(self:getActTaskConfig()) do if info.activity == self.actId and info.display ~= nil then ModuleManager.TaskManager:registerTask("ActSprintSummonDataAll", info.type, function(count) + if not self:getIsOpen() then + return + end self:addTaskProgress(info.type, count) end) end @@ -451,7 +457,6 @@ function ActSprintSummonData:hasTaskRp(actId) actId = actId or self:getActId() return self:getCanAnyNormalTaskCanGetReward(actId) end - --@endregion -- 活动数据相关 ********************************************************************** @@ -481,7 +486,6 @@ function ActSprintSummonData:getActFuncOpen(id) end -- 活动任务相关 ********************************************************************** - function ActSprintSummonData:addTaskProgress(taskType, progress) local standardList = self:getActStandardTaskIdList(self.actId) local normalList = self:getActNormalTaskIdList(self.actId) @@ -785,7 +789,6 @@ function ActSprintSummonData:getStandardTurnScoreLimit() end -- 活动礼包相关 ********************************************************************** - function ActSprintSummonData:getActGiftBuyCount(actGiftId) return DataManager.PaymentData:getGiftBoughtNum(PayManager.PURCHARSE_TYPE.ACT_GIFT, actGiftId) end @@ -868,6 +871,7 @@ end function ActSprintSummonData:getBIType() return BIReport.ACT_SPRINT_TYPE.SUMMON end + function ActSprintSummonData:getBISprintTaskNumInfo() local num, totalNum = 0, 0 local taskList = self:getActStandardTaskIdList() @@ -879,6 +883,7 @@ function ActSprintSummonData:getBISprintTaskNumInfo() end return num, totalNum end + function ActSprintSummonData:getBINormalTaskNumInfo() local num, totalNum = 0, 0 local taskList = self:getActNormalTaskIdList() @@ -890,6 +895,7 @@ function ActSprintSummonData:getBINormalTaskNumInfo() end return num, totalNum end + function ActSprintSummonData:getCanGetRewardStandardTaskList() local taskIdList = {} local taskList = self:getActStandardTaskIdList() diff --git a/lua/app/userdata/activity/act_time_data.lua b/lua/app/userdata/activity/act_time_data.lua index 107ab8a1..87db32d3 100644 --- a/lua/app/userdata/activity/act_time_data.lua +++ b/lua/app/userdata/activity/act_time_data.lua @@ -25,7 +25,7 @@ function ActTimeData:init(data) self.isInited = true end -function ActTimeData:refreshActTime(isCrossDayClientRefresh) +function ActTimeData:refreshActTime() local curTime = Time:getServerTime() self.actTypeTimeList = {} for _, info in ipairs(self.actTimeList) do @@ -52,26 +52,26 @@ function ActTimeData:refreshActTime(isCrossDayClientRefresh) local actGifts = info.gifts or {} local data = info.data Logger.logHighlight("活动暂未开启：" .. (curTime - extraTime)) - if startTime <= curTime and curTime < extraTime then -- 在有效期内 + -- if startTime <= curTime and curTime < extraTime then -- 在有效期内 if self.actTypeTimeList[actType] == nil or self.actTypeTimeList[actType].endTime > endTime then self.actTypeTimeList[actType] = {actId = actId, actType = actType, startTime = startTime, endTime = endTime, extraTime = extraTime, actGifts = actGifts, data = data, version = version} - self:initActivityData(actType, self.actTypeTimeList[actType], isCrossDayClientRefresh) + self:initActivityData(actType, self.actTypeTimeList[actType]) else -- 如果start_time更小 替换 if self.actTypeTimeList[actType].startTime > startTime then self.actTypeTimeList[actType] = {actId = actId, actType = actType, startTime = startTime, endTime = endTime, extraTime = extraTime, actGifts = actGifts, data = data, version = version} - self:initActivityData(actType, self.actTypeTimeList[actType], isCrossDayClientRefresh) + self:initActivityData(actType, self.actTypeTimeList[actType]) -- 如果version更小 替换 elseif self.actTypeTimeList[actType].version > version then self.actTypeTimeList[actType] = {actId = actId, actType = actType, startTime = startTime, endTime = endTime, extraTime = extraTime, actGifts = actGifts, data = data, version = version} - self:initActivityData(actType, self.actTypeTimeList[actType], isCrossDayClientRefresh) + self:initActivityData(actType, self.actTypeTimeList[actType]) end end - else - if EDITOR_MODE then - Logger.logHighlight("活动暂未开启：" .. info.id) - end - end + -- else + -- if EDITOR_MODE then + -- Logger.logHighlight("活动暂未开启：" .. info.id) + -- end + -- end end end self:setDirty() @@ -135,10 +135,10 @@ function ActTimeData:getActTypeTimeList() return self.actTypeTimeList or {} end -function ActTimeData:initActivityData(actType, info, isCrossDayClientRefresh) - if isCrossDayClientRefresh and GConst.ActivityConst.DISABLE_CLIENT_CROSS_DAY_REFRESH[actType] then - return - end +function ActTimeData:initActivityData(actType, info) + -- if isCrossDayClientRefresh and GConst.ActivityConst.DISABLE_CLIENT_CROSS_DAY_REFRESH[actType] then + -- return + -- end local data = DataManager[GConst.ActivityConst.ACTIVITY_TYPE_DATA[actType]] if data then if self.isInited and not data:getIsOpen() then @@ -172,7 +172,7 @@ function ActTimeData:initActivityData(actType, info, isCrossDayClientRefresh) if data.initActInfo then data:initActInfo(info)-- 初始化基类方法 end - data:setActivityInfo(info, isCrossDayClientRefresh)-- 初始化子类方法 + data:setActivityInfo(info)-- 初始化子类方法 end end end diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index f6327910..ef658925 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -177,9 +177,9 @@ function HeroData:getRp() end end - if DataManager.CollectionData:hasRedPoint() then - return true - end + -- if DataManager.CollectionData:hasRedPoint() then + -- return true + -- end return false end diff --git a/lua/app/userdata/summon/summon_data.lua b/lua/app/userdata/summon/summon_data.lua index a0c7b422..5163764e 100644 --- a/lua/app/userdata/summon/summon_data.lua +++ b/lua/app/userdata/summon/summon_data.lua @@ -23,7 +23,7 @@ function SummonData:init(data) Logger.logHighlight("抽奖数据") Logger.printTable(data) end - self:initData(data) + self:initData(data.summons) self:setDirty() if not self.isInit then self.isInit = true