diff --git a/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab index fe1fb0b3ee..81929192b5 100644 --- a/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/SevenDayCarnival/SevenDayCarnivalPanelV2.prefab @@ -3480,7 +3480,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1} + m_Color: {r: 0.37254903, g: 0.37254903, b: 0.37254903, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3497,9 +3497,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u524D\u5F80" LanguageIndex: 10003 --- !u!1 &1584588913057476276 @@ -9095,7 +9095,7 @@ ParticleSystem: --- !u!199 &7934974870279269867 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15488,7 +15488,7 @@ ParticleSystem: --- !u!199 &7772862485208066586 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -21055,7 +21055,7 @@ ParticleSystem: --- !u!199 &2711218892555644603 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23191,8 +23191,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -3.1999817, y: -1.5999985} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.9425, y: -1.5999985} + m_SizeDelta: {x: -8.9949, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5804886190782248402 CanvasRenderer: @@ -23247,9 +23247,9 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 1 - m_LineSpacing: 1 + m_LineSpacing: 0.7 m_Text: "\u798F\u5229\u9886\u53D6" LanguageIndex: 11667 --- !u!1 &6751588268895532480 diff --git a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua index a9bdeed090..729f4f0d81 100644 --- a/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua @@ -299,7 +299,7 @@ function this.TabAdapter(tab, index, status) local tabLab = Util.GetGameObject(tab, "Text") local tabImage = Util.GetGameObject(tab,"Image") tabImage:GetComponent("Image").sprite = Util.LoadSprite(_TabData[index][status]) - tabLab:GetComponent("Text").text = _TabData[index].name + tabLab:GetComponent("Text").text = GetCurLanguage() ~= 2 and _TabData[index].name or "".._TabData[index].name..""-- = _TabData[index].name tabLab:GetComponent("Text").color = _TabFontColor[status] end --切换视图 @@ -473,6 +473,7 @@ function this.SingleItemDataShow(go, data) jumpBtn:SetActive(true) local isJump = data.Jump and data.Jump[1] and data.Jump[1] ~= 0 local btnText = Util.GetGameObject(jumpBtn, "Text"):GetComponent("Text") + btnText.fontSize = GetCurLanguage() ~= 2 and 45 or 30 btnText.text = isJump and Language[10019] or Language[10317] Util.SetGray(jumpBtn, not isJump) Util.AddOnceClick(jumpBtn, function()