From d1f88d5b3386b4249bdfacd7fc6be46324c53d84 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 20:03:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E3=80=90=E7=BA=A2=E7=82=B9=E3=80=91?= =?UTF-8?q?=E9=80=80=E5=87=BA=E5=85=AC=E4=BC=9A=EF=BC=8C=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E4=BE=9D=E7=84=B6=E6=98=BE=E7=A4=BA=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/GuildInfoPopup.lua | 1 + .../~Lua/Modules/Guild/GuildManager.lua | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua index 844ad486d3..e352621520 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildInfoPopup.lua @@ -187,6 +187,7 @@ function GuildInfoPopup:BindEvent() MsgPanel.ShowTwo(Language[10901],nil, function() MyGuildManager.RequestQuitGuild(function() this:ClosePanel() + GuildManager.RefreshGuildAllRedState() end) end) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua index 68f4fc5882..9b04358fb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua @@ -188,5 +188,22 @@ function GuildManager.CheckGuildTip() _TipTimer:Start() end end - +function this.RefreshGuildAllRedState() + CheckRedPointStatus(RedPointType.Guild_Aid) + CheckRedPointStatus(RedPointType.Guild_AidBox) + CheckRedPointStatus(RedPointType.Guild_AidMy) + CheckRedPointStatus(RedPointType.Guild_Apply) + CheckRedPointStatus(RedPointType.Guild_DeathPos) + CheckRedPointStatus(RedPointType.Guild_Fete) + CheckRedPointStatus(RedPointType.Guild_House) + CheckRedPointStatus(RedPointType.Guild_House_Apply) + CheckRedPointStatus(RedPointType.Guild_RedPacket) + CheckRedPointStatus(RedPointType.Guild_Shop) + CheckRedPointStatus(RedPointType.Guild_Skill) + CheckRedPointStatus(RedPointType.Guild_Transcript) + CheckRedPointStatus(RedPointType.Guild_Boss) + CheckRedPointStatus(RedPointType.Guild_AidGuild) + CheckRedPointStatus(RedPointType.Gui) + CheckRedPointStatus(RedPointType.Guild_Shop) +end return GuildManager \ No newline at end of file From 645fc528690ce6d277b62e84075f4688f4aad16d Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:06:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E3=80=90=E9=87=91=E9=92=B1=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=91=E6=B7=BB=E5=8A=A0=E6=97=8B=E8=BD=AC=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/View/MoneyNumView.lua | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua index 4e21efc082..05b723e1a5 100644 --- a/Assets/ManagedResources/~Lua/View/MoneyNumView.lua +++ b/Assets/ManagedResources/~Lua/View/MoneyNumView.lua @@ -204,6 +204,13 @@ function MoneyNumView:SetOffsetPosition(position) self:RefreshOffsetPosition() end +function MoneyNumView:SetOffsetRotation(rotation) + if not rotation then + return + end + self.offsetRotation = rotation + self:RefreshOffsetRotation() +end -- -- function MoneyNumView:Update() -- -- 延迟3帧刷新大小 @@ -225,10 +232,10 @@ function MoneyNumView:RefreshSize() self.transform.sizeDelta = self.Image_Num_Horizontal.transform.sizeDelta end end --- 刷新组件大小 +-- 修正组件位置 function MoneyNumView:RefreshOffsetPosition() if not self.offsetPosition then - self.offsetPosition = Vector3.New(0, 0) + self.offsetPosition = Vector2.New(0, 0) return end if self.viewType == MoneyNumViewType.Text_Vertical or self.viewType == MoneyNumViewType.Text_Horizontal then @@ -239,6 +246,20 @@ function MoneyNumView:RefreshOffsetPosition() self.Image_Num_Horizontal.transform.localPosition = self.offsetPosition end end +-- 修正组件角度 +function MoneyNumView:RefreshOffsetRotation() + if not self.offsetRotation then + self.offsetRotation = Vector3.New(0, 0, 0) + return + end + if self.viewType == MoneyNumViewType.Text_Vertical or self.viewType == MoneyNumViewType.Text_Horizontal then + self.Text_Num.transform.rotation = Quaternion.Euler(self.offsetRotation) + elseif self.viewType == MoneyNumViewType.Image_Vertical then + self.Image_Num_Vertical.transform.rotation = Quaternion.Euler(self.offsetRotation) + elseif self.viewType == MoneyNumViewType.Image_Horizontal then + self.Image_Num_Horizontal.transform.rotation = Quaternion.Euler(self.offsetRotation) + end +end --界面关闭时调用(用于子类重写) function MoneyNumView:OnClose() From 4a3d61b159345a2111a164da125c0447a5b161e6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:07:19 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E3=80=90=E6=AF=8F=E6=97=A5=E8=B1=AA?= =?UTF-8?q?=E7=A4=BC=E3=80=91=E9=87=91=E9=92=B1=E6=98=BE=E7=A4=BA=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DailyRecharge/DailyRechargePanel.lua | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index d5f6e1350f..e3e582bdcb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -16,6 +16,11 @@ local rechargeBgDef = { [3] = "r_mrcz_zi_33_zh", [4] = "r_mrcz_zi_4_zh", } + +local rechargeNum = { + [MoneyType.RMB] = 18, + [MoneyType.USD] = 3, +} local cursortingOrder local isFirstOpen = false function DailyRechargePanel:InitComponent() @@ -24,8 +29,10 @@ function DailyRechargePanel:InitComponent() self.extraIcon = Util.GetGameObject(self.transform,"frame/bg/descbg/extraIcon"):GetComponent("Image") self.desc = Util.GetGameObject(self.transform, "frame/bg/descbg/value"):GetComponent("Text") + self.desc.text = "" self.dollar = Util.GetGameObject(self.transform,"frame/bg/descbg/dollar") self.dollar:SetActive(false) + self.rewardContent = {} self.rewardContentEffect = {} self.rewardList = {} @@ -36,6 +43,15 @@ function DailyRechargePanel:InitComponent() self.rewardList[i] = SubUIManager.Open(SubUIConfig.ItemView, self.rewardContent[i].transform) end + if not self.moneyNum then + self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, Util.GetGameObject(self.transform,"frame/bg/descbg").transform, + rechargeNum[MoneyUtil.MT], 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) + + self.dealBtn = Util.GetGameObject(self.transform, "frame/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") @@ -43,17 +59,6 @@ function DailyRechargePanel:InitComponent() local titleText = Util.GetGameObject(parent, "Text"):GetComponent("Text") titleText.text = Language[12109] SetTextVerTial(titleText,Vector3.New(102.07,18.2,0)) - local yuanIma = Util.GetGameObject(self.transform, "frame/bg/descbg/dollar"):GetComponent("Image") - local yuanText = Util.GetGameObject(self.transform, "frame/bg/descbg/value") - if MoneyUtil.MT == MoneyType.RMB then - yuanIma.sprite = Util.LoadSprite("c_czlb_yuan1") - yuanIma.transform.localPosition = Vector3.New(163,10,0) - yuanText.transform.localPosition = Vector3.New(78,21,0) - else - yuanIma.sprite = Util.LoadSprite("c_czlb_yuan2") - yuanIma.transform.localPosition = Vector3.New(75.21,25.8,0) - yuanText.transform.localPosition = Vector3.New(166.34,15.9,0) - end end function DailyRechargePanel:BindEvent() @@ -99,28 +104,27 @@ function DailyRechargePanel:RefreshPanel() if self.missionInfo.state == 0 then if DailyRechargeManager.GetRechargeValue()==0 then self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) - self.dollar:SetActive(true) - self.desc.text = actRewardConfig.Values[1][1] self.dealText.text = Language[10420] + self.moneyNum.gameObject:SetActive(true) + self.moneyNum:SetNum(actRewardConfig.Values[1][1]) else if DailyRechargeManager.ReceivedEnabled() then self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[3]) - self.dollar:SetActive(false) self.dealText.text = Language[10018] - self.desc.text = "" + self.moneyNum.gameObject:SetActive(false) else self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) - self.dollar:SetActive(true) -- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue() -- remainValue = remainValue < 0 and 0 or remainValue - self.desc.text = actRewardConfig.Values[1][1]--remainValue self.dealText.text = Language[10420] + self.moneyNum.gameObject:SetActive(true) + self.moneyNum:SetNum(actRewardConfig.Values[1][1]) end end else self.dealText.text = Language[10101] self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) - self.dollar:SetActive(true) + self.moneyNum.gameObject:SetActive(true) end self.extraIcon:SetNativeSize() table.walk(self.rewardContent, function(rewardPosItem) From effab480746306f3e3090b975fdb9c8a29108386 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:10:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90=E6=AF=8F=E6=97=A5=E8=B1=AA?= =?UTF-8?q?=E7=A4=BC=E3=80=91=E9=87=91=E9=92=B1=E6=95=B0=E9=87=8F=E8=B5=B0?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DailyRecharge/DailyRechargePanel.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index e3e582bdcb..7ab7769035 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -17,10 +17,6 @@ local rechargeBgDef = { [4] = "r_mrcz_zi_4_zh", } -local rechargeNum = { - [MoneyType.RMB] = 18, - [MoneyType.USD] = 3, -} local cursortingOrder local isFirstOpen = false function DailyRechargePanel:InitComponent() @@ -45,7 +41,7 @@ function DailyRechargePanel:InitComponent() if not self.moneyNum then self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, Util.GetGameObject(self.transform,"frame/bg/descbg").transform, - rechargeNum[MoneyUtil.MT], MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) + math.round(MoneyUtil.GetMoney(18)), 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)) From f49bb4904163bc82481e8b39527195758b69cdc9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:20:09 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90=E6=AF=8F=E6=97=A5=E8=B1=AA?= =?UTF-8?q?=E7=A4=BC=E3=80=91=E9=87=91=E9=92=B1=E6=98=BE=E7=A4=BA=E8=B5=B0?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DailyRecharge/DailyRechargePanel.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua index 7ab7769035..4ec12172b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua @@ -40,8 +40,10 @@ function DailyRechargePanel:InitComponent() end if not self.moneyNum then + local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge) + local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, dailyActInfo.mission[1].missionId) self.moneyNum = SubUIManager.Open(SubUIConfig.MoneyNumView, Util.GetGameObject(self.transform,"frame/bg/descbg").transform, - math.round(MoneyUtil.GetMoney(18)), MoneyNumViewType.Image_Horizontal, "LevelFont", 42, 1, Vector2.New(60, 100), Vector2.New(20, 0), MoneyNumViewImageType.Big_1) + actRewardConfig.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)) @@ -102,7 +104,6 @@ function DailyRechargePanel:RefreshPanel() self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4]) self.dealText.text = Language[10420] self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNum(actRewardConfig.Values[1][1]) else if DailyRechargeManager.ReceivedEnabled() then self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[3]) @@ -114,7 +115,6 @@ function DailyRechargePanel:RefreshPanel() -- remainValue = remainValue < 0 and 0 or remainValue self.dealText.text = Language[10420] self.moneyNum.gameObject:SetActive(true) - self.moneyNum:SetNum(actRewardConfig.Values[1][1]) end end else From 4a1a95d9fde901fb032820fd5813f72534096918 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:23:06 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E3=80=90=E5=85=AB=E6=97=A5=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E3=80=91=E4=BF=AE=E5=A4=8D=E7=AC=AC=E5=9B=9B=E5=A4=A9?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=E7=99=BD=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/EightDay/EightDayGiftPanel.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua index d74021be09..4a2ea8eb22 100644 --- a/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/EightDay/EightDayGiftPanel.lua @@ -99,7 +99,7 @@ function EightDayGiftPanel:SetBg(i) this.btnPreview:SetActive(false) elseif i > 3 then ren.transform.localPosition = Vector3.New(-35,258,0) - text = "b_baridenglu_slogan08_zh 1"--文字 + text = "b_baridenglu_slogan08_zh_1_zh"--文字 id = day_picture[i][4]--itemviewId bgName = "b_baridenglu_slogan08_4geren"--动效资源名字 tip.sprite = Util.LoadSprite(text) @@ -133,7 +133,7 @@ function EightDayGiftPanel:SetBg(i) elseif curDay > 3 or (curDay == 3 and rewardData.mission[3].state == 1) then this.btnPreview:SetActive(false) ren.transform.localPosition = Vector3.New(-35,258,0) - text = "b_baridenglu_slogan08_zh 1"--文字 + text = "b_baridenglu_slogan08_zh_1_zh"--文字 id = day_picture[3][4]--itemviewId bgName = "b_baridenglu_slogan08_4geren"--动效资源名字 tip.sprite = Util.LoadSprite(text) From 393a05ee9981c6a9960b391e536a0b5dd9a060ec Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 8 Apr 2021 20:27:21 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E5=A4=A7=E9=97=B9=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E3=80=91=E7=94=9F=E6=AD=BB=E7=B0=BF=E7=A5=9E=E5=B0=86?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2=E4=B8=8E?= =?UTF-8?q?=E5=93=81=E8=B4=A8=E4=B8=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Expedition/ExpeditionHeroListResurgencePopup.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua index 0569f4915e..2551c877c2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua @@ -148,7 +148,7 @@ function this.SingleHeroDataShow(_go, _heroData) --if cueSelectHeroDid == heroData.dynamicId then -- choosed:SetActive(true) --end - Util.GetGameObject(go, "info/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality)) + Util.GetGameObject(go, "info/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) Util.GetGameObject(go, "info/icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) Util.GetGameObject(go, "info/lv/Text"):GetComponent("Text").text = heroData.lv Util.GetGameObject(go, "info/icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) From eab8a42191e1529c714ac796968256ff26cc4978 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 8 Apr 2021 20:40:00 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=89=B9?= =?UTF-8?q?=E6=83=A0=E3=80=91=E9=87=91=E9=92=B1=E6=98=BE=E7=A4=BA=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/LingShowTeHui.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua index 06ea612da6..a5c5df0c72 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua @@ -17,6 +17,7 @@ end function LingShowTeHui:InitComponent(gameObject) this.time = Util.GetGameObject(gameObject, "time/times"):GetComponent("Text") this.buyBtn = Util.GetGameObject(gameObject, "layout/buyBtn") + this.buyBtnText = Util.GetGameObject(gameObject, "layout/buyBtn/Text"):GetComponent("Text") this.scrollItem = Util.GetGameObject(gameObject, "scroller/grid") this.buytimes = Util.GetGameObject(gameObject, "layout/buytimes"):GetComponent("Text") this.giftItemView = {} @@ -72,6 +73,7 @@ function LingShowTeHui:OnShowData() local activityConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,activityId) rechargeConfigId = activityConfig.CanBuyRechargeId[1] allData = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,rechargeConfigId) + this.buyBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(allData.Price) if not itemsGrid then itemsGrid = {} end