From a8f666e9014709de4858dbaef6043dc5bc98f74c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 25 Nov 2021 17:27:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=A0=E9=99=A4=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B43=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../View/GeneralBigPopup_RecrutDetail.lua | 23 ++------------ .../Modules/Operating/OperatingManager.lua | 30 +++++++++---------- .../~Lua/Modules/Player/RedpotManager.lua | 2 +- .../View/GeneralPopup_RecruitConfirm.lua | 10 +------ .../~Lua/Modules/Recruit/HeroPreviewPanel.lua | 2 +- .../~Lua/Modules/Recruit/RecruitManager.lua | 13 +++----- 7 files changed, 26 insertions(+), 56 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 318ca5a223..eaf1b8c14b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1330,7 +1330,7 @@ ActivityTypeDef = { XunBaoMiZong = 82, --寻宝迷踪 --主题活动 - FindFairy=43,--限时招募 + -- FindFairy=43,--限时招募 QianKunBox = 44,--乾坤宝囊 DynamicAct_recharge = 58,--主题活动累充 DynamicAct = 20000,--主题活动任务 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 405d885ea2..c000ff6b5c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -1,4 +1,4 @@ ------ 易经宝库奖励预览弹窗 ----- +----- 固定活动抽卡详情 ----- local this = {} --传入父脚本模块 local parent @@ -15,6 +15,7 @@ function this:InitComponent(gameObject) this.tip = Util.GetGameObject(gameObject,"tip"):GetComponent("Text") this.itemGrid=Util.GetGameObject(gameObject,"panel/itemGrid") this.LookDetailBtn=Util.GetGameObject(gameObject,"panel/Image3/updetail") + this.LookDetailBtn:SetActive(false) this.content=Util.GetGameObject(gameObject,"panel/content/grid/Text"):GetComponent("Text") this.time=Util.GetGameObject(gameObject,"tip"):GetComponent("Text") this.grid = Util.GetGameObject(gameObject,"panel/rate/grid") @@ -31,16 +32,6 @@ function this:InitComponent(gameObject) end function this:BindEvent() - Util.AddClick(this.LookDetailBtn,function() - this:LookDetailBtnAction() - end) -end -function this:LookDetailBtnAction() - if activityType == ActivityTypeDef.FindFairy then - UIManager.OpenPanel(UIName.HeroPreviewPanel,true,false) - else - LogPurple("打开魂印奖励预览") - end end function this:AddListener() @@ -63,11 +54,6 @@ function this:OnShow(_parent,_Data) activityType = args[2] local str2 = ActivityGiftManager.GetTimeStartToEnd(activityType) - if activityType == ActivityTypeDef.FindFairy then - this.LookDetailBtn.gameObject:SetActive(true) - else - this.LookDetailBtn.gameObject:SetActive(false) - end this.time.text="概率有效期:"..str2 local poolUpType = args[3] or 0 @@ -167,10 +153,7 @@ local hero function this:BuildRateData(actType,UpItem,upItemList) local rateList = {} local _upRateList = {} - if actType == ActivityTypeDef.FindFairy then - _upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"5星UP!",ConfigName.HeroConfig) - rateList = this:RefreshHeroRate(UpItem,_upRateList) - elseif actType == ActivityTypeDef.QianKunBox then + if actType == ActivityTypeDef.QianKunBox then _upRateList = this:ReculateUpHeroRate(UpItem,upItemList,"魂印UP!",ConfigName.EquipConfig) rateList = this:RefreshSoulRate(UpItem,_upRateList) elseif actType == ActivityTypeDef.LingShouBaoGe then diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 96eb4ec8c1..e8dc4865e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -612,21 +612,21 @@ function this.IsGiftBuyActive() end -function this.GetTimeLimitRedPointStatus() - local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) - local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) - if not activityId then - return false - end - local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1) - local freeTimesId=lotterySetting[array.Id].FreeTimes - local freeTime= 0 - if freeTimesId>0 then - freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) - RecruitManager.freeUseTimeList[freeTimesId]=freeTime - return freeTime and freeTime >= 1 - end -end +-- function this.GetTimeLimitRedPointStatus() +-- local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting) +-- local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) +-- if not activityId then +-- return false +-- end +-- local array = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"ActivityId",activityId,"PerCount",1) +-- local freeTimesId=lotterySetting[array.Id].FreeTimes +-- local freeTime= 0 +-- if freeTimesId>0 then +-- freeTime= PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) +-- RecruitManager.freeUseTimeList[freeTimesId]=freeTime +-- return freeTime and freeTime >= 1 +-- end +-- end --检测心愿抽卡活动红点 function this.GetWishDrawRedPointStatus() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 97faf2ce34..44e0d51aac 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -494,7 +494,7 @@ function this.RegisterRedCheckFunc() --天宫秘宝 RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint) --主题活动 - RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) + -- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) RPData:AddCheckFunc(RedPointType.TimeLimitWish,OperatingManager.GetWishDrawRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) RPData:AddCheckFunc(RedPointType.DynamicActTask, OperatingManager.CheckDynamicActTaskRed) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua index 5efa2759df..1810c9bdb8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_RecruitConfirm.lua @@ -81,15 +81,7 @@ function this:OnShow(_parent,...) local data = ConfigManager.GetConfigData(ConfigName.LotterySetting,_args[1]) local activityData = ConfigManager.GetConfigData(ConfigName.GlobalActivity,data.ActivityId) if data.LotteryType == 3 then--限时招募 - if activityData.Type == ActivityTypeDef.FindFairy then - var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen - local d = RecruitManager.GetExpendData(data.Id) - if data.PerCount == 1 then - this.rootText.text = string.format(Language[11596],d[2]) - else - this.rootText.text = string.format(Language[11597],d[2]) - end - elseif activityData.Type == ActivityTypeDef.QianKunBox then--乾坤宝盒 + if activityData.Type == ActivityTypeDef.QianKunBox then--乾坤宝盒 var = PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen local d=RecruitManager.GetExpendData(data.Id) if data.PerCount == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua index 4a76b96a7e..4a22151782 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua @@ -19,7 +19,7 @@ local dataType={ [1]=PRE_REWARD_POOL_TYPE.RECRUIT, [2]=PRE_REWARD_POOL_TYPE.FRIEND, [3]=PRE_REWARD_POOL_TYPE.NORMAL, - [4]=PRE_REWARD_POOL_TYPE.TIME_LIMITED, + [4]=PRE_REWARD_POOL_TYPE.TIME_LIMITED_NEW_UP, } local itemList={} function HeroPreviewPanel:InitComponent() diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index ffbdc8d567..011008aab4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -244,9 +244,7 @@ function this.GetRewardPreviewData(type) return this.previewNormalData elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU then--常驻 return this.previewLingShou - elseif type==PRE_REWARD_POOL_TYPE.TIME_LIMITED--限时招募--开启时间有限制的 - or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP--限时招募UP - or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒 + elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL--乾坤宝盒 or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP--乾坤宝盒UP or type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP--灵兽宝阁UP or type==PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--降妖夺宝UP @@ -284,10 +282,7 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览 local previewData = {} -- 根据当前期获取卡池信息 local curActivityId = nil - if type==PRE_REWARD_POOL_TYPE.TIME_LIMITED - or type==PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP then - curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) - elseif type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL + if type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL or type==PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then curActivityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) elseif type==PRE_REWARD_POOL_TYPE.LING_SHOU_UP then @@ -304,9 +299,9 @@ function this.GetActivityPreviewData(type)--非常驻抽卡奖池预览 end local poolId = nil if data ~= nil then - if type == PRE_REWARD_POOL_TYPE.TIME_LIMITED or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒 + if type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL then--限时招募,乾坤宝盒 poolId = data.DiamondBoxContain[1][1] - elseif type == PRE_REWARD_POOL_TYPE.TIME_LIMITED_UP or type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP,乾坤宝盒UP + elseif type == PRE_REWARD_POOL_TYPE.LOTTERY_SOUL_UP then--限时招募UP,乾坤宝盒UP data = ConfigManager.GetConfigDataByKey(ConfigName.LotterySpecialConfig,"Type",data.MergePool) poolId = data.pool_id elseif type == PRE_REWARD_POOL_TYPE.LING_SHOU_UP or type == PRE_REWARD_POOL_TYPE.XIANG_YAO_UP then--灵兽宝阁,降妖夺宝