From 072c44d495479b7d71c689541fd5bbb2bbe05813 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 14 Oct 2021 16:35:34 +0800 Subject: [PATCH] =?UTF-8?q?[bug]=3D=3D=3D=3D=3D=3D=E3=80=90ID1018713?= =?UTF-8?q?=E3=80=91=20=E3=80=90=E6=88=90=E5=B0=B1=E3=80=91=E6=88=98?= =?UTF-8?q?=E5=8A=9B=E7=9B=AE=E6=A0=87=E6=88=90=E5=B0=B1=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E8=B6=85=E6=A1=86=EF=BC=8C=E9=9C=80=E8=A6=81=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E7=BC=A9=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Mission/MissionDailyPanel.prefab | 30 +++++++++---------- .../Mission/MissionDailyPanel_Achievement.lua | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab index f2a7b384e6..9d16c17b37 100644 --- a/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Mission/MissionDailyPanel.prefab @@ -3090,7 +3090,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135.70001, y: -0.29989624} + m_AnchoredPosition: {x: -153.30008, y: -0.29989624} m_SizeDelta: {x: 210.65002, y: 77.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6356434684782085281 @@ -4156,7 +4156,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1918779212793027703 RectTransform: m_ObjectHideFlags: 0 @@ -4700,10 +4700,10 @@ RectTransform: m_Father: {fileID: 7559358737188565728} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120.88501, y: -44.525} + m_SizeDelta: {x: 168, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1918779213686181055 CanvasRenderer: @@ -5147,7 +5147,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -202, y: 41.399933} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 135, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &462056855713613971 MonoBehaviour: @@ -6472,7 +6472,7 @@ 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: 282, y: -66} + m_AnchoredPosition: {x: 264.39987, y: -66} m_SizeDelta: {x: 73.9, y: 42.04} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5532919626185401892 @@ -6839,10 +6839,10 @@ RectTransform: m_Father: {fileID: 7559358737188565728} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 358.285, y: -44.525} + m_SizeDelta: {x: 168, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4580382491728856826 CanvasRenderer: @@ -7310,7 +7310,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135.70001, y: -1.7999873} + m_AnchoredPosition: {x: -153.30014, y: -1.7999873} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4265660881893781513 @@ -9798,7 +9798,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 10, y: 41.399933} - m_SizeDelta: {x: 0, y: 100} + m_SizeDelta: {x: 135, y: 100} m_Pivot: {x: 0, y: 1} --- !u!114 &327137578093138444 MonoBehaviour: @@ -11563,7 +11563,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -135.70001, y: -1.0999985} + m_AnchoredPosition: {x: -155, y: -1.0999985} m_SizeDelta: {x: 210.65002, y: 77.61} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2225116492002713069 diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua index 0f7747d793..a714d2900a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_Achievement.lua @@ -110,7 +110,7 @@ function this.SingleDataShow(go,rewardData) qianwangButton:SetActive(state == 0) getFinishText:SetActive(state == 2) getRewardProgress:SetActive(state == 0) - getRewardProgress:GetComponent("Text").text = math.abs(rewardData.progress) .."/"..math.abs(value) + getRewardProgress:GetComponent("Text").text =PrintWanNum(math.abs(rewardData.progress)) .."/"..PrintWanNum(math.abs(value)) Util.AddOnceClick(qianwangButton, function() if sConFigData.Jump then JumpManager.GoJump(sConFigData.Jump[1])