From e27c51ee93160b334592c4b49824a5fdff034260 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 11 Feb 2022 15:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=80=BC=E8=BF=94=E5=88=A9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab | 8 ++++---- .../~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab index c6e62e94fc..f6b9a2b974 100644 --- a/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab @@ -1267,8 +1267,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 300, y: 100} + m_AnchoredPosition: {x: -0.000011444, y: 25} + m_SizeDelta: {x: 714.7, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8963526475966860363 CanvasRenderer: @@ -2182,8 +2182,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -48, y: -683} - m_SizeDelta: {x: 700, y: 54} + m_AnchoredPosition: {x: 4.7, y: -683} + m_SizeDelta: {x: 714.7, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7805140256559782348 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index 36f1dd5d83..817974c9c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -7,8 +7,8 @@ local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig) local TabBox = require("Modules/Common/TabBox") local BTNS = { - [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli6}, - [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_30yuan",text2 = "c_czfl_30yuan2",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30}, + [1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_6yuan",text2 = "c_czfl_6yuan2",showType = 48,actType = ActivityTypeDef.chaozhifanli,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli6,price = 6}, + [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_30yuan",text2 = "c_czfl_30yuan2",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30}, } local curPage = 1 local redList = {} @@ -107,9 +107,9 @@ function PremiumRebatePanel:Refresh(isTop,isAni) local missionData = ActivityGiftManager.GetActivityInfo(this.actData.activityId,missionConfig.Id) if missionData.state == 1 or (missionData.state == 0 and missionData.progress >= activityRewardConfig[missionConfig.Id].Values[1][1]) then - this.leftTime.text = string.format("累计天数:%s/15",this.actData.value + 1) + this.leftTime.text = string.format("每日仅需充值%s 累计天数:%s/15",MoneyUtil.GetMoneyUnitNameWithMoney(BTNS[curPage].price),this.actData.value + 1) else - this.leftTime.text = string.format("累计天数:%s/15",this.actData.value) + this.leftTime.text = string.format("每日仅需充值%s 累计天数:%s/15",MoneyUtil.GetMoneyUnitNameWithMoney(BTNS[curPage].price),this.actData.value) end this:SetRewardShow(isTop,isAni) this:SetTime()