From 2bf115a8d8f3c16e8b096c39312b528b78293011 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 6 Dec 2022 11:07:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E6=9C=BA=E5=A5=96=E5=8A=B1=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Recruit/SingleRecruitPanel.prefab | 36 +++++++++---------- .../Modules/Fight/FightAreaRewardPopup.lua | 3 +- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab index 694b0e36e3..33e4e2a8ef 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/SingleRecruitPanel.prefab @@ -43129,10 +43129,10 @@ RectTransform: m_Father: {fileID: 6244008752771984325} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 37.5, y: -37.5} - m_SizeDelta: {x: 75, y: 75} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222699331404461296 CanvasRenderer: @@ -48128,7 +48128,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: 0, y: 5} + m_AnchoredPosition: {x: 0, y: -1} m_SizeDelta: {x: 160, y: 67.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222607665050084970 @@ -62892,8 +62892,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: 255, y: 21} - m_SizeDelta: {x: 362, y: 114} + m_AnchoredPosition: {x: 255, y: 28.4} + m_SizeDelta: {x: 260, y: 88.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222107646204298368 CanvasRenderer: @@ -63085,7 +63085,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &224681068575272128 RectTransform: m_ObjectHideFlags: 0 @@ -87335,8 +87335,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: -255, y: 21} - m_SizeDelta: {x: 362, y: 114} + m_AnchoredPosition: {x: -255, y: 28.400005} + m_SizeDelta: {x: 260, y: 88.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222844082346859594 CanvasRenderer: @@ -97001,7 +97001,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -90} - m_SizeDelta: {x: 362, y: 91.28} + m_SizeDelta: {x: 260, y: 88} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1189331336437135001 CanvasRenderer: @@ -182504,7 +182504,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: 0, y: 5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 160, y: 67.06} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7231343193368052110 @@ -197730,7 +197730,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: 6, y: 9.1} + m_AnchoredPosition: {x: 0, y: 1} m_SizeDelta: {x: 281.2, y: 75.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3795219319425298249 @@ -221795,10 +221795,10 @@ RectTransform: m_Father: {fileID: 6244008752771984325} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 117.5, y: -37.5} - m_SizeDelta: {x: 85, y: 48} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3795333767312625095 CanvasRenderer: @@ -255349,7 +255349,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -82.160034} - m_SizeDelta: {x: 160, y: 75} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4025742625318526769 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index 751a23f3dc..9fbf17838f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -149,7 +149,8 @@ function FightAreaRewardPopup:OnShow() end end end - + --屏蔽好感度加成 + this.extraReward.gameObject:SetActive(false) ForceRebuildLayout(this.scroller.transform) ForceRebuildLayout(this.extraRewardGrid.transform) end