From 9ad0593572f8794edf2f98d388ac272d9d9d724e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 25 Aug 2020 11:21:42 +0800 Subject: [PATCH] qinglong redpoint commit --- .../~Lua/Modules/Main/MainPanel.lua | 1 - ...ssionDailyPanel_QingLongSecretTreasure.lua | 33 +++++++++++++------ .../~Lua/Modules/Player/RedpotManager.lua | 4 ++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 640a9f2fef..7e37ab6fc8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -572,7 +572,6 @@ function this:BindEvent() end) --戒灵秘宝 Util.AddClick(this.treasureOfSl, function() - local page, extra = TreasureOfSomebodyManagerV2.GetTreasureRedPointShow() UIManager.OpenPanel(UIName.MissionDailyPanel,2) end) -- --天宫秘宝 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua index 33c35eef3c..885f519237 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_QingLongSecretTreasure.lua @@ -164,7 +164,10 @@ function this:topBar() NetManager.GetActivityRewardRequest(-2,QinglongSerectTreasureManager.activityId,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1) PopupTipPanel.ShowTip("成功领取额外积分包") - this.refresh() + Timer.New(function() + LogBlue("level:"..QinglongSerectTreasureManager.GetLevel()) + this.refresh() + end,1):Start() end) end,1.5):Start() end) @@ -201,20 +204,30 @@ end --单个任务 function this:SingleTask(rewardItem, rewardSingleData) local scoreLevel = Util.GetGameObject(rewardItem, "scoreLevel"):GetComponent("Text") - local pos1 = Util.GetGameObject(rewardItem, "itemPos_1") - local pos3 = Util.GetGameObject(rewardItem, "itemPos_3") - local pos4 = Util.GetGameObject(rewardItem, "itemPos_4") + local box1 = Util.GetGameObject(rewardItem, "box1") + local box2 = Util.GetGameObject(rewardItem, "box2") if not itemsList[rewardItem] then - local item1 = SubUIManager.Open(SubUIConfig.ItemView, pos1.transform) - local item3 = SubUIManager.Open(SubUIConfig.ItemView, pos3.transform) - local item4 = SubUIManager.Open(SubUIConfig.ItemView, pos4.transform) - itemsList[rewardItem] ={item1,item3,item4} + itemsList[rewardItem] = {} + end + for i = 1, #itemsList[rewardItem] do + itemsList[rewardItem][i].gameObject:SetActive(false) end scoreLevel.text = rewardSingleData.level - for i = 1, #itemsList[rewardItem] do - if i <= #rewardSingleData.Reward and rewardSingleData.Reward[i] then + + for i = 1, #rewardSingleData.Reward do + if not itemsList[rewardItem][i] then + itemsList[rewardItem][i] = SubUIManager.Open(SubUIConfig.ItemView,box1.transform) + itemsList[rewardItem][i].gameObject:SetActive(false) + end + if rewardSingleData.Reward[i] then + if rewardSingleData.Reward[i].type == 1 then + itemsList[rewardItem][i].gameObject.transform:SetParent(box1.transform) + else + itemsList[rewardItem][i].gameObject.transform:SetParent(box2.transform) + end + itemsList[rewardItem][i].gameObject:GetComponent("RectTransform").localPosition = Vector3.zero itemsList[rewardItem][i].gameObject:SetActive(true) itemsList[rewardItem][i]:OnOpen(false, rewardSingleData.Reward[i].item, 0.8, false) else diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 0f1202376d..5f9bfcbde2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -152,6 +152,8 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.DailyTask, RedPointType.DailyTaskMain) RPData:SetParent(RedPointType.QinglongSerectTreasure, RedPointType.DailyTaskMain) RPData:SetParent(RedPointType.QinglongSerectTreasureTrail, RedPointType.DailyTaskMain) + RPData:SetParent(RedPointType.QinglongSerectTreasure, RedPointType.TreasureOfSl) + RPData:SetParent(RedPointType.QinglongSerectTreasureTrail, RedPointType.TreasureOfSl) RPData:SetParent(RedPointType.SecretTer_MaxBoxReward, RedPointType.SecretTer) RPData:SetParent(RedPointType.SecretTer_HaveFreeTime, RedPointType.SecretTer) RPData:SetParent(RedPointType.SecretTer_IsCanFight, RedPointType.SecretTer) @@ -263,7 +265,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.DiffMonster, DiffMonsterManager.GetDiffMonsterRedPointStatus, FUNCTION_OPEN_TYPE.DIFFER_DEMONS) - RPData:AddCheckFunc(RedPointType.TreasureOfSl, TreasureOfSomebodyManagerV2.GetTreasureRedPointState) + --RPData:AddCheckFunc(RedPointType.TreasureOfSl, TreasureOfSomebodyManagerV2.GetTreasureRedPointState) RPData:AddCheckFunc(RedPointType.Mail_Local, MailManager.GetMailRedPointState)