From 9ca403ebff961dde6b6c0544787c9c5941899317 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 9 Nov 2020 11:09:42 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D=E5=BA=93?= =?UTF-8?q?=E3=80=91=E7=AC=AC=E4=B8=89=E5=B1=82=E6=8A=BD=E5=8F=96=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8Ebug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/GeneralPopup.prefab | 2 +- .../DynamicActivityManager.lua | 6 ++++-- .../Modules/DynamicActivity/YiJingBaoKu.lua | 2 +- .../View/GeneralBigPopup_YiJingBaoKu.lua | 9 ++++++--- ...neralBigPopup_YiJingBaoKuRewardPreview.lua | 20 +++++++++++++------ .../View/GeneralPopup_YiJingBaoKuConfirm.lua | 2 +- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index 43cd8e17ec..4aaca3f794 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -16898,7 +16898,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u4F7F \u7528" + m_Text: "\u786E \u5B9A\r" LanguageIndex: 11274 --- !u!1 &4502575453775152244 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 03a44daaea..e756af33db 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -154,9 +154,11 @@ function this.GetLeftRewardData() data[RewardConfig[i].Id].limit = RewardConfig[i].InitializeNum end + -- LogYellow("#finalCardDatas:"..#finalCardDatas.." actData.selectId:"..actData.selectId) for i = 1, #finalCardDatas do - if finalCardDatas[i].rewardId ~= 0 then - data[finalCardDatas[i].rewardId].progress = data[finalCardDatas[i].rewardId].progress -1 + if finalCardDatas[i].rewardId and finalCardDatas[i].rewardId ~= 0 and finalCardDatas[i].rewardId ~= actData.selectId then + -- LogYellow("i:"..i.." rewardId:"..tostring(finalCardDatas[i].rewardId) .." progress"..tonumber(data[finalCardDatas[i].rewardId].progress)) + data[finalCardDatas[i].rewardId].progress = data[finalCardDatas[i].rewardId].progress - 1 end end return data diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index ad7265667c..a65449ee25 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -109,7 +109,7 @@ function YiJingBaoKu:Refresh() if ActData.selectId == 0 then--如果没有选择了最终奖励 YiJingBaoKu:ResetCardToFront()--把卡片全部翻到正面 YiJingBaoKu:InitSetAllCard()--显示所有奖励 - this.tip.text = "选择本层珍稀有秘宝" + this.tip.text = "选择本层珍稀秘宝" else--选择了最终奖励 YiJingBaoKu:ResetCardToBack()--把卡片全部翻到背面 YiJingBaoKu:SetFinalReward()--设置最终奖励 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index dd5554b2b3..876979b71b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -116,7 +116,6 @@ function this:SetSingleData(index,item,data) num.gameObject:SetActive(true) limit1.gameObject:SetActive(false) select:SetActive(true) - num.text = ActData.allData[index].progress.."/"..data.InitializeNum else limit1.gameObject:SetActive(true) limit1.text = data.LevelLimit.."级可选" @@ -126,7 +125,6 @@ function this:SetSingleData(index,item,data) num.gameObject:SetActive(true) limit2.gameObject:SetActive(false) select:SetActive(true) - num.text = ActData.allData[index].progress.."/"..data.InitializeNum else limit2.gameObject:SetActive(true) limit2.text = "第"..data.FloorLimit.."层可选" @@ -135,10 +133,15 @@ function this:SetSingleData(index,item,data) -- LogRed(ActData.allData[index].rewardId..":"..tostring(ActData.allData[index].progress)) if ActData.allData[index].progress > data.InitializeNum then t3 = false + elseif ActData.allData[index].progress == data.InitializeNum and ActData.curLevel > data.InitializeNum then + t3 = false + num.text = ""..(data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum.."" else t3 = true + num.text = (data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum end - num.gameObject:SetActive(t1 and t2 and t3) + + num.gameObject:SetActive(t1 and t2) select:SetActive(t1 and t2 and t3) end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua index c77eeaa665..17930e8c9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua @@ -59,14 +59,22 @@ function this:OnShow(_parent,...) finalReward = SubUIManager.Open(SubUIConfig.ItemView,this.bigIcon.transform) end finalReward:OnOpen(false, BlessingConfig[ActData.selectId].Reward, 1.1, false, false, false, sortingOrder) - this.bigNum.text = "1/1" - -- for i = 1, #ActData.allData do - -- if ActData.selectId == ActData.allData[i].configId then - -- this.bigNum.text = ActData.allData[i].progress.."/"..BlessingConfig[ActData.selectId].InitializeNum - -- end - -- end + + -- + local t1 = false + for i = 1, #ActData.finalCardDatas do + if ActData.selectId == ActData.finalCardDatas[i].rewardId then + t1 = true + end + end + if t1 then + this.bigNum.text = "0/1" + else + this.bigNum.text = "1/1" + end local leftRewardData = DynamicActivityManager.GetLeftRewardData() + -- LogYellow("#leftRewardData"..#leftRewardData) local tempData={} for key, value in pairs(leftRewardData) do table.insert(tempData,value) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua index b5bb4190b0..bb5aed3e94 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua @@ -44,7 +44,7 @@ function this:OnShow(_parent,...) curId = _args[1] this.titleText.text=Language[11351] - this.tip.text = "切换本层珍惜秘宝为" + this.tip.text = "切换本层珍稀秘宝为" if not finalReward then finalReward = SubUIManager.Open(SubUIConfig.ItemView,this.root.transform)