diff --git a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab index 379860c791..13bffd0846 100644 --- a/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GodWeapon/GodWeaponInfoPanel.prefab @@ -38,7 +38,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 25, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &784533625 @@ -3179,8 +3179,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6280\u80FD" --- !u!1 &2696076605080798649 @@ -6833,7 +6833,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000030517578} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3992972364876945023 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua index 2cf351f803..ce201c2a0c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua @@ -186,9 +186,12 @@ function this.PageTabAdapter(tab, index, status) local nameText = Util.GetGameObject(tab, "name"):GetComponent("Text") local lock = Util.GetGameObject(tab, "lock") local redpot = Util.GetGameObject(tab, "redpot") - if status == "lock" then + if status == "lock" then lock.gameObject:SetActive(true) Util.SetGray(tab.gameObject, true) + elseif status =="default" then + lock.gameObject:SetActive(false) + Util.SetGray(tab.gameObject, true) else Util.SetGray(tab.gameObject, false) lock.gameObject:SetActive(false)