From e9d548d5b6beb80bba2d0b0bcc85f131977f4c03 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 12 May 2021 11:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E3=80=91=E6=AF=8F=E6=97=A5=E8=B1=AA=E7=A4=BC=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyRecharge/DailyRechargePanel.lua | 32 ++++++++++--------- .../~Lua/View/MoneyNumView.lua | 12 ++++++- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 573832b493..720a25783a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -18,7 +18,7 @@ function DailyRechargePanel:InitComponent() self.grid = Util.GetGameObject(self.transform, "grid") self.items = {} - for i = 1,#self.grid.transform.childCout do + for i = 1,self.grid.transform.childCount do self.items[i] = {} self.items[i].go = Util.GetGameObject(self.grid,"item"..i) self.items[i].priceText = Util.GetGameObject(self.items[i].go,"Text"):GetComponent("Text") @@ -46,6 +46,18 @@ function DailyRechargePanel:InitComponent() self.dealBtn = Util.GetGameObject(self.backBtn,"bg/dealBtn") self.dealText = Util.GetGameObject(self.dealBtn, "Text"):GetComponent("Text") self.UI_effect_DailyRechargePanel_particle = Util.GetGameObject(self.transform, "frame/UI_effect_DailyRechargePanel_particle") + + if self.moneyNum then + SubUIManager.Close(self.moneyNum) + self.moneyNum = nil + end + if not self.moneyNum then + self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.extra.transform, + 0, MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) + end + self.moneyNum:SetOffsetPosition(Vector2.New(480, -90)) + self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, -10)) + self.moneyNum.transform:SetSiblingIndex(2) end function DailyRechargePanel:BindEvent() @@ -61,7 +73,7 @@ function DailyRechargePanel:BindEvent() end) for i = 1, #self.items do - Util.AddClick(self.items[i], function() + Util.AddClick(self.items[i].go, function() if i ~= index then index = i self:RefreshPanel() @@ -142,7 +154,7 @@ function DailyRechargePanel:RefreshPanel() self.missionInfo = self.actInfo.mission[index] local actRewardConfig1 = actRewardConfig[self.missionInfo.missionId] if self.missionInfo.state == 0 then - if DailyRechargeManager.ReceivedEnabled() then + if DailyRechargeManager.ReceivedEnabled(self.missionInfo.missionId) then self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[3]) self.dealText.text = Language[10018] self.moneyNum.gameObject:SetActive(false) @@ -150,11 +162,13 @@ function DailyRechargePanel:RefreshPanel() self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) self.dealText.text = Language[10420] self.moneyNum.gameObject:SetActive(true) + self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) end else self.dealText.text = Language[10101] self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) self.moneyNum.gameObject:SetActive(true) + self.moneyNum:SetNumShow(1,actRewardConfig1.Values[1][1]) end self.extraIcon:SetNativeSize() table.walk(self.rewardContent, function(rewardPosItem) @@ -168,18 +182,6 @@ function DailyRechargePanel:RefreshPanel() self.titleText.text = Language[12109] SetTextVerTial(self.titleText,Vector3.New(102.07,18.2,0)) - if self.moneyNum then - SubUIManager.Close(self.moneyNum) - self.moneyNum = nil - end - if not self.moneyNum then - self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, self.extra.transform, - actRewardConfig1.Values[1][1], MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) - end - self.moneyNum:SetOffsetPosition(Vector2.New(480, -90)) - self.moneyNum:SetOffsetRotation(Vector3.New(0, 0, -10)) - self.moneyNum.transform:SetSiblingIndex(2) - end function DailyRechargePanel:OnDealBtnClicked() diff --git a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua index b535722ca6..5bacddcaa4 100644 --- a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua +++ b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua @@ -150,7 +150,15 @@ function MoneyNumView:SetTextShow(txt) end -- 设置图片数字显示 -function MoneyNumView:SetNumShow(numList) +function MoneyNumView:SetNumShow(numList,num) + if num then + self.num = tostring(num) + if numList == 1 then + numList = self.H_Num + elseif numList == 2 then + numList = self.V_Num + end + end local numTb = StringConvertToTable(self.num) for i = 1, 10 do if numTb[i] then @@ -164,6 +172,8 @@ function MoneyNumView:SetNumShow(numList) numList[i].gameObject:SetActive(false) end end + ForceRebuildLayout(self.Image_Num_Horizontal.transform) + ForceRebuildLayout(self.Image_Num_Vertical.transform) end -- 设置图片数字显示 function MoneyNumView:SetMarkShow(img1, img2)