From a80d16fbda53b72ba8f5487391e75e816f3d2008 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 14:19:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D?= =?UTF-8?q?=E5=BA=93=E3=80=91=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E5=A5=96?= =?UTF-8?q?=E5=8A=B1=E7=95=8C=E9=9D=A2=E7=9A=84=E6=8E=92=E5=BA=8F=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index 4b6d8ba18c..68bf003680 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -63,6 +63,12 @@ function this:OnShow(_parent,...) this.titleText.text = Language[10760] curId = ActData.selectId or nil local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",ActData.curFinalPool) + table.sort(RewardConfig, function(a, b) + if a.FloorLimit == b.FloorLimit then + return a.Id < b.Id + end + return a.FloorLimit < b.FloorLimit + end) this.ScrollView:SetData(RewardConfig, function(index, go) this:SetSingleData(index,go, RewardConfig[index]) end) From 7e954b997af38ebd397ee1b913cab9e41f95074d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 15:15:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D?= =?UTF-8?q?=E5=BA=93=E3=80=91=E4=BF=AE=E5=A4=8D=E6=9F=A5=E7=9C=8B=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E5=A5=96=E5=8A=B1=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 3 ++- .../View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index cfcd34bf51..b2f6731cce 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -221,6 +221,7 @@ function this.GetBaoKuData() if v.missionId == 100 then actData.curLevel = v.progress curBasicPool = tonumber(BasicPoolId[v.progress]) + actData.poolId = curBasicPool curFinalPool = BlessingConfigNew.FinalPoolId elseif v.missionId > 1000 then local data = {} @@ -271,7 +272,7 @@ end function this.GetLeftRewardData() local actData = this.GetBaoKuData() local finalCardDatas = actData.finalCardDatas - local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",actData.curLevel)--初始所有奖励数据 + local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",actData.poolId)--初始所有奖励数据 local data={} for i = 1, #RewardConfig do data[RewardConfig[i].Id] = {} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua index e6ecc4fdc1..bb5b0c265f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview.lua @@ -81,7 +81,7 @@ function this:OnShow(_parent,...) table.insert(tempData,value) end this.ScrollView:SetData(tempData, function(index, go) - this:SetSingleData(index,go,leftRewardData[index + (ActData.curLevel-1)*10]) + this:SetSingleData(index,go,leftRewardData[index + (ActData.poolId-1)*10]) end) end From 50f2a7389857a33d1001507057f383b4271bc34f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 15:53:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E5=AF=BB=E5=AE=9D=E8=BF=B7?= =?UTF-8?q?=E8=B8=AA=E3=80=91=E4=BF=AE=E5=A4=8D=E7=95=8C=E9=9D=A2=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E4=B8=8D=E5=8F=8A=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua index 3ab50c3801..d346409d3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XunBaoMiZong/XunBaoMiZongPanel.lua @@ -69,10 +69,16 @@ end --添加事件监听(用于子类重写) function XunBaoMiZong:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, self.UpdateGoldVal, self) end --移除事件监听(用于子类重写) function XunBaoMiZong:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, self.UpdateGoldVal, self) +end + +function XunBaoMiZong:UpdateGoldVal() + self:Refresh() end function XunBaoMiZong:OnSortingOrderChange(_sortingOrder) From a3ff527bc9444ceb1a8559f9a6df137928004a47 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 16:14:03 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D?= =?UTF-8?q?=E5=BA=93=E3=80=91=E9=80=89=E6=8B=A9=E5=A5=96=E5=8A=B1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=80=89=E4=B8=AD=E5=A5=96=E5=8A=B1=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index a346db65c4..3dd14a4d9c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -137,11 +137,13 @@ function this:SetSingleData(index,item,data) t2 = false end -- LogRed(ActData.allData[index].rewardId..":"..tostring(ActData.allData[index].progress)) - if ActData.allData[index].progress > data.InitializeNum then + 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.."" + -- 如果是当前层选中的特殊奖励 + if ActData.allData[index].progress == data.InitializeNum and ActData.selectId == data.Id then--and ActData.curLevel > data.InitializeNum + t3 = true + num.text = ""..(data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum.."" + end else t3 = true num.text = (data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum From e3f480893676e2e2394c7cdd1343313ef568e78f Mon Sep 17 00:00:00 2001 From: gaoxin Date: Sat, 18 Sep 2021 16:32:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D?= =?UTF-8?q?=E5=BA=93=E3=80=91=E9=80=89=E6=8B=A9=E5=A5=96=E5=8A=B1=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua index 3dd14a4d9c..7eb7f770e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -142,8 +142,8 @@ function this:SetSingleData(index,item,data) -- 如果是当前层选中的特殊奖励 if ActData.allData[index].progress == data.InitializeNum and ActData.selectId == data.Id then--and ActData.curLevel > data.InitializeNum t3 = true - num.text = ""..(data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum.."" end + num.text = ""..(data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum.."" else t3 = true num.text = (data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum