From 90fbe78773e1a9d3c7c4d336ae4e120e8018a2fb Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Apr 2021 18:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A7=AF=E5=A4=A9=E8=B1=AA=E7=A4=BC?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/ConRechargePage.prefab | 4 ++-- .../~Lua/Modules/NewActivity/CommonActPageManager.lua | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab index f81d2cebb1..6cac8b7e84 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab @@ -34,8 +34,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: 0, y: -398.7} - m_SizeDelta: {x: 1040, y: 842.2} + m_AnchoredPosition: {x: 0, y: -375.7} + m_SizeDelta: {x: 1040, y: 796.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2720652094624033988 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index e8d2a0a146..9fd73cc795 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -108,14 +108,13 @@ function this.GetExpertData(indexType,actType) if curData.rewards[i].missionId == actRewardConfigs[j].Id then if indexType == 3 then -- 3 积天豪礼 curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2] - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) + curData.rewards[i].otherData.info = "" if curData.rewards[i].state == 1 then curData.rewards[i].otherData.state = 2 elseif curData.rewards[i].progress == 1 then curData.rewards[i].otherData.state = 0 else curData.rewards[i].otherData.state = 1 - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) end else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper then