diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index b6c729a7a2..e4d230ccac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4181,8 +4181,6 @@ function NetManager.TreasureOfHeavenScoreRequest(func) local data = buffer:DataByte() local msg = Expedition_pb.ExpeditionTreasureInfoResponse() msg:ParseFromString(data) - -- LogGreen("msg.treasureRewardState "..#msg.treasureRewardState) - -- TreasureOfHeavenManger.GetTreasureState() TreasureOfHeavenManger.SetScore(msg.score) TreasureOfHeavenManger.SetLimitTime(msg.resetTime) TreasureOfHeavenManger.SetState(msg.treasureRewardState) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 46bab1ca87..08f9adf3f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -86,15 +86,15 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat) -- 充值 - RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge) + --(24暂时关闭)放开这里就行 + -- RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge) RPData:SetParent(RedPointType.VIP_SHOP_DETAIL, RedPointType.Shop_Page_Recharge) - RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge) - RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包 + -- RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge) + -- RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包 -- 主界面商店 RPData:SetParent(RedPointType.Shop_Page_General, RedPointType.Shop) RPData:SetParent(RedPointType.Shop_Page_Coin, RedPointType.Shop) RPData:SetParent(RedPointType.Shop_Page_Play, RedPointType.Shop) - --RPData:SetParent(RedPointType.Shop_Page_Exchange, RedPointType.Shop) RPData:SetParent(RedPointType.Shop_Page_Roam, RedPointType.Shop) -- === 商店小页签 RPData:SetParent(RedPointType.Shop_Tab_General, RedPointType.Shop_Page_General) @@ -104,7 +104,6 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Shop_Tab_Roam, RedPointType.Shop_Page_Roam) -- ====== 商店功能 RPData:SetParent(RedPointType.Shop_General_Check, RedPointType.Shop_Tab_General) - -- RPData:SetParent(RedPointType.Shop_General_Refresh, RedPointType.Shop_Tab_General) RPData:SetParent(RedPointType.Shop_Secret_Check, RedPointType.Shop_Tab_Secret) RPData:SetParent(RedPointType.Shop_Arena_Check, RedPointType.Shop_Tab_Arena) RPData:SetParent(RedPointType.Shop_Guild_Check, RedPointType.Shop_Tab_Guild) @@ -127,12 +126,8 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.CourtesyDress_Online, RedPointType.SecretTer) RPData:SetParent(RedPointType.CourtesyDress_Chapter, RedPointType.SecretTer) RPData:SetParent(RedPointType.SecretTer_FindTreasure, RedPointType.SecretTer) - --RPData:SetParent(RedPointType.DailyTask, RedPointType.SecretTer) RPData:SetParent(RedPointType.DailyTask, RedPointType.DailyTaskMain) - --RPData:SetParent(RedPointType.SecretTer_Uplevel, RedPointType.SecretTer) - --RPData:SetParent(RedPointType.SecretTer_GetAllReward, RedPointType.SecretTer) RPData:SetParent(RedPointType.SecretTer_MaxBoxReward, RedPointType.SecretTer) - --RPData:SetParent(RedPointType.SecretTer_NewHourseOpen, RedPointType.SecretTer) RPData:SetParent(RedPointType.SecretTer_HaveFreeTime, RedPointType.SecretTer) RPData:SetParent(RedPointType.SecretTer_IsCanFight, RedPointType.SecretTer) -- 外敌 @@ -158,13 +153,9 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating) RPData:SetParent(RedPointType.GiftPage, RedPointType.Operating) RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating) - RPData:SetParent(RedPointType.TimeLimited, RedPointType.Operating) - RPData:SetParent(RedPointType.QianKunBox, RedPointType.Operating) - - --开服有礼红点 - --RPData:SetParent(RedPointType.CourtesyDress_Online, RedPointType.CourtesyDress) - --RPData:SetParent(RedPointType.CourtesyDress_SevenDay, RedPointType.CourtesyDress) - --RPData:SetParent(RedPointType.CourtesyDress_Chapter, RedPointType.CourtesyDress) + --(24暂时关闭)放开这里就行 + -- RPData:SetParent(RedPointType.TimeLimited, RedPointType.Operating) + -- RPData:SetParent(RedPointType.QianKunBox, RedPointType.Operating) -- 好友红点 RPData:SetParent(RedPointType.Friend_Reward, RedPointType.Friend) @@ -186,9 +177,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Expert_AccumulativeRecharge, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_Talisman, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_SoulPrint, RedPointType.Expert) - --RPData:SetParent(RedPointType.LuckyTurn, RedPointType.Expert) RPData:SetParent(RedPointType.LuckyCat, RedPointType.Expert) - --RPData:SetParent(RedPointType.CourtesyDress_SevenDay, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_WeekCard, RedPointType.Expert) RPData:SetParent(RedPointType.HERO_STAR_GIFT, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_FindTreasure, RedPointType.Expert) @@ -210,7 +199,6 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Guild_Boss, RedPointType.Guild) RPData:SetParent(RedPointType.Guild_RedPacket, RedPointType.Guild) RPData:SetParent(RedPointType.Guild_Fete, RedPointType.Guild) - --RPData:SetParent(RedPointType.Guild_CarDeleay, RedPointType.Guild) RPData:SetParent(RedPointType.Guild_Aid, RedPointType.Guild) RPData:SetParent(RedPointType.Guild_AidMy, RedPointType.Guild_Aid) RPData:SetParent(RedPointType.Guild_AidGuild, RedPointType.Guild_Aid) @@ -225,11 +213,6 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.FindFairy_FourView, RedPointType.FindFairy) -- 成就 RPData:SetParent(RedPointType.Achievement_Main, RedPointType.DailyTaskMain) - --RPData:SetParent(RedPointType.Achievement_One, RedPointType.Achievement_Main) - --RPData:SetParent(RedPointType.Achievement_Two, RedPointType.Achievement_Main) - --RPData:SetParent(RedPointType.Achievement_Three, RedPointType.Achievement_Main) - --RPData:SetParent(RedPointType.Achievement_Four, RedPointType.Achievement_Main) - --RPData:SetParent(RedPointType.Achievement_Five, RedPointType.Achievement_Main) --大闹天宫 天宫秘宝 RPData:SetParent(RedPointType.Expedition_Treasure, RedPointType.Expedition) end @@ -252,7 +235,6 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.LuckyCat_GetReward,LuckyCatManager.CheckIsShowRedPoint) RPData:AddCheckFunc(RedPointType.DiffMonster, DiffMonsterManager.GetDiffMonsterRedPointStatus, FUNCTION_OPEN_TYPE.DIFFER_DEMONS) - --RPData:AddCheckFunc(RedPointType.Talent, TalentManager.GetTalentRedPointStatus,FUNCTION_OPEN_TYPE.RING_SOUL) RPData:AddCheckFunc(RedPointType.TreasureOfSl, TreasureOfSomebodyManagerV2.GetTreasureRedPointState) @@ -264,22 +246,18 @@ function this.RegisterRedCheckFunc() ---=== 商店相关红点 RPData:AddCheckFunc(RedPointType.Arena_Shop, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_General_Check, ShopManager.ShopRedCheck) - -- RPData:AddCheckFunc(RedPointType.Shop_General_Refresh, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Secret_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Arena_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Shop_Guild_Check, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.Guild_Shop, ShopManager.ShopRedCheck) RPData:AddCheckFunc(RedPointType.VIP_SHOP_DETAIL, VipManager.CheckRedPoint) - RPData:AddCheckFunc(RedPointType.VipPrivilege, VipManager.CheckNewVipRP) RPData:AddCheckFunc(RedPointType.GrowthGift, OperatingManager.GetGrowthRedPointState) RPData:AddCheckFunc(RedPointType.FirstRecharge, FirstRechargeManager.GetFirstRechargeRedPointStatus) RPData:AddCheckFunc(RedPointType.DailyGift, ShopManager.HaveFreeBaby) RPData:AddCheckFunc(RedPointType.GrowthPackage, VipManager.CheckGrowthPackagePointStatus)--成长礼包 - --RPData:AddCheckFunc(RedPointType.SecretBox, SecretBoxManager.GetSecretBoxRedPointStatus) - --工坊 RPData:AddCheckFunc(RedPointType.Refining_Weapon, WorkShopManager.GetWorkShopRedPointState) RPData:AddCheckFunc(RedPointType.Refining_Armor, WorkShopManager.GetWorkShopRedPointState) @@ -287,10 +265,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Friend_Reward, GoodFriendManager.FriendRewardRedPointShow,FUNCTION_OPEN_TYPE.GOODFRIEND) RPData:AddCheckFunc(RedPointType.Friend_Application, GoodFriendManager.FriendApplicationRedPointShow,FUNCTION_OPEN_TYPE.GOODFRIEND) --秘境 - --RPData:AddCheckFunc(RedPointType.SecretTer_Uplevel, AdventureManager.CheckRedPointUpLevel,FUNCTION_OPEN_TYPE.ADVENTURE) - --RPData:AddCheckFunc(RedPointType.SecretTer_GetAllReward, AdventureManager.CheckRedPointGetAllReward) RPData:AddCheckFunc(RedPointType.SecretTer_MaxBoxReward, AdventureManager.BoxMaxReward,FUNCTION_OPEN_TYPE.ADVENTURE) - --RPData:AddCheckFunc(RedPointType.SecretTer_NewHourseOpen, AdventureManager.HaveNewHourseOpen,FUNCTION_OPEN_TYPE.ADVENTURE) RPData:AddCheckFunc(RedPointType.SecretTer_HaveFreeTime, AdventureManager.HaveFreeTime,FUNCTION_OPEN_TYPE.ADVENTURE) RPData:AddCheckFunc(RedPointType.SecretTer_IsCanFight, FightPointPassManager.IsShowFightRP) -- 外敌 @@ -317,7 +292,8 @@ function this.RegisterRedCheckFunc() --累计签到 RPData:AddCheckFunc(RedPointType.CumulativeSignIn,OperatingManager.GetSignInRedPointStatus) --月卡 - RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint) + --(24暂时关闭)放开这里就行 + -- RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint) --连续充值 RPData:AddCheckFunc(RedPointType.ContinuityRecharge,ActivityGiftManager.GetContinuityRechargeRedPoint) -- 头像红点 @@ -358,7 +334,6 @@ function this.RegisterRedCheckFunc() -- 剑影仙踪 RPData:AddCheckFunc(RedPointType.SupremeHero, ActivityGiftManager.CheckSupremeHeroRedPoint) -- 东海寻仙 - --RPData:AddCheckFunc(RedPointType.FindFairy, FindFairyManager.CheckRedPoint) RPData:AddCheckFunc(RedPointType.FindFairy_OneView, FindFairyManager.CheckRedPoint) RPData:AddCheckFunc(RedPointType.FindFairy_ThreeView, FindFairyManager.CheckFindFairyUpStarRedPoint) RPData:AddCheckFunc(RedPointType.FindFairy_FourView, FindFairyManager.CheckFindFairyCeremonyRedPoint) @@ -380,11 +355,6 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Guild_DeathPos,DeathPosManager.CheckDeathPosRedPoint) -- 成就 RPData:AddCheckFunc(RedPointType.Achievement_Main,TaskManager.GetAchievementState) - --RPData:AddCheckFunc(RedPointType.Achievement_One,TaskManager.GetAchievementState) - --RPData:AddCheckFunc(RedPointType.Achievement_Two,TaskManager.GetAchievementState) - --RPData:AddCheckFunc(RedPointType.Achievement_Three,TaskManager.GetAchievementState) - --RPData:AddCheckFunc(RedPointType.Achievement_Four,TaskManager.GetAchievementState) - --RPData:AddCheckFunc(RedPointType.Achievement_Five,TaskManager.GetAchievementState) --天宫秘宝 RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint) --限时招募 diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua index 706a20b222..d614565baf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/MainRechargePanel.lua @@ -9,25 +9,31 @@ local oldAccumRecharge = 0 -- Tab管理器 local TabBox = require("Modules/Common/TabBox") local _PageInfo = { + -- [1] = { -- 充值 + -- default = "r_shop_chongzhi_01", lock = "r_shop_chongzhi_01", select = "r_shop_chongzhi_02", + -- rpType = RedPointType.Shop_Page_Recharge, + -- }, + -- [2] = { -- 充值 + -- default = "l_mrlb_icon2", lock = "l_mrlb_icon2", select = "l_mrlb_icon1", + -- rpType = RedPointType.DailyGift, + -- params = {DirectBuyType.DAILY_GIFT}, -- 每日礼包 + -- }, + -- [3] = { -- 充值 + -- default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1", + -- -- rpType = RedPointType.Shop_Page_Recharge, + -- params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包 + -- }, + -- [4] = { -- 成长礼包 + -- default = "c_czlb_icon2", lock = "c_czlb_icon2", select = "c_czlb_icon1", + -- rpType = RedPointType.GrowthPackage, + -- params = {SHOP_TYPE.VIP_GIFT},-- 成长礼包 + -- }, + + --(24暂时关闭)删除这里就行 [1] = { -- 充值 - default = "r_shop_chongzhi_01", lock = "r_shop_chongzhi_01", select = "r_shop_chongzhi_02", - rpType = RedPointType.Shop_Page_Recharge, - }, - [2] = { -- 充值 - default = "l_mrlb_icon2", lock = "l_mrlb_icon2", select = "l_mrlb_icon1", - rpType = RedPointType.DailyGift, - params = {DirectBuyType.DAILY_GIFT}, -- 每日礼包 - }, - [3] = { -- 充值 - default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1", - -- rpType = RedPointType.Shop_Page_Recharge, - params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包 - }, - [4] = { -- 成长礼包 - default = "c_czlb_icon2", lock = "c_czlb_icon2", select = "c_czlb_icon1", - rpType = RedPointType.GrowthPackage, - params = {SHOP_TYPE.VIP_GIFT},-- 成长礼包 - }, + default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1", + params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包 +}, } local GiftView = require("Modules/Recharge/View/GiftView") local RechargeView = require("Modules/Recharge/View/RechargeView") @@ -48,10 +54,12 @@ function MainShopPanel:InitComponent() local giftView = GiftView.new(self, Util.GetGameObject(self.transform, "content/page_1")) self.PageList = { - [1] = RechargeView.new(self, Util.GetGameObject(self.transform, "content/ShopView")), - [2] = giftView, - [3] = giftView, - [4] = giftView, + --(24暂时关闭)删除这里就行 + -- [1] = RechargeView.new(self, Util.GetGameObject(self.transform, "content/ShopView")), + -- [2] = giftView, + -- [3] = giftView, + -- [4] = giftView, + [1] = giftView, } -- 上部货币显示 this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft}) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua index 7034908447..4be0001793 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenManager.lua @@ -5,8 +5,8 @@ local WorldBossTreasureConfig = ConfigManager.GetConfig(ConfigName.WorldBossTrea local curScore--当前分数 local limitTime--倒计时 local rewardStateData = {}--各个任务状态数据 -local TreasrueState = nil--礼包购买状态 local rewardData = {}--表内活动任务数据 +this.TreasrueState = nil--礼包购买状态 function this.Initialize() rewardData = {} @@ -16,16 +16,13 @@ function this.Initialize() end function this.GetTreasureState() - if TreasrueState == nil then - local TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) - return TreasrueState - end - return TreasrueState + this.TreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) + return this.TreasrueState end function this.SetTreasureState() - TreasrueState = 1 - return TreasrueState + this.TreasrueState = 1 + return this.TreasrueState end function this.SetScore(score) @@ -65,11 +62,11 @@ function this.GetAllRewardData() return rewardData end --红点检测 -function this.RedPointState(singleRewardData,treasrueState) +function this.RedPointState(singleRewardData,TreasrueState) if curScore >= rewardData[singleRewardData.id].Integral then - if singleRewardData.state==0 and treasrueState==1 or - singleRewardData.state==1 and treasrueState==1 or - singleRewardData.state==0 and treasrueState==0 then + if singleRewardData.state==0 and this.TreasrueState==1 or + singleRewardData.state==1 and this.TreasrueState==1 or + singleRewardData.state==0 and this.TreasrueState==0 then return true end return false @@ -79,12 +76,11 @@ end function this.RedPoint() for i =1, #rewardStateData do - local curtreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) + local curTreasrueState = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.TreasureOfHeaven,106) if curScore >= rewardData[rewardStateData[i].id].Integral then - if rewardStateData[i].state==0 and curtreasrueState==1 or - rewardStateData[i].state==1 and curtreasrueState==1 or - rewardStateData[i].state==0 and curtreasrueState==0 then - -- LogBlue("掉了么?") + if rewardStateData[i].state==0 and curTreasrueState==1 or + rewardStateData[i].state==1 and curTreasrueState==1 or + rewardStateData[i].state==0 and curTreasrueState==0 then return true end end @@ -93,9 +89,3 @@ function this.RedPoint() end return this ---(singleRewardData.state == 0 and TreasrueState == 1) or ( - --) or (singleRewardData.state == 0 and TreasrueState == 0) - - -- LoadingPanel.AddStep(function() - -- NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) - -- end) \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua index d35423136a..1721c9d923 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua @@ -3,7 +3,7 @@ local TreasureOfHeavenPanel = Inherit(BasePanel) local this = TreasureOfHeavenPanel local curScore = 0--当前分数 local rewardStateData = {} -local treasureState--礼包状态 +local treasureState = nil local rewardData--表内活动数据 --初始化组件(用于子类重写) @@ -94,15 +94,16 @@ end --topBar按钮状态 function TreasureOfHeavenPanel:topBar() --设置礼包购买按钮状态 - if treasureState == 1 then--已购买 - this.buyBtn:GetComponent("Button").interactable = false - this.Text1.gameObject:SetActive(false) - this.Text2.gameObject:SetActive(true) - else--未购买弹窗 + this.buyBtn:GetComponent("Button").interactable = treasureState == 0 + this.Text1.gameObject:SetActive(treasureState == 0) + this.Text2.gameObject:SetActive(treasureState == 1) + + if treasureState == 0 then Util.AddOnceClick(this.buyBtn,function() UIManager.OpenPanel(UIName.HeavenUnlockExtraRewardPanel) end) end + this.scoreText.text = curScore end @@ -249,6 +250,8 @@ function TreasureOfHeavenPanel:ShowTime() if t-GetTimeStamp() <= 0 then time = 0 t = TreasureOfHeavenManger.GetLimitTime() + treasureState = nil + TreasureOfHeavenPanel:refresh() end this.time.text=TimeToDHMS(time) end,1,-1,true) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 7012af173a..e0012439a9 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -289,7 +289,7 @@ function UpView:OnClick(index) Log("reChargeType:"..reChargeType) --(24暂时关闭)删除这里就行 - if (reChargeType==16 or reChargeType==20 or reChargeType==19) then + if (reChargeType==16 or reChargeType==20 or reChargeType==19 or reChargeType==61) then return end if(reChargeType==20) then