From 7a5cc54d35b6ad56fd0287c5b6607a15153d513a Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Fri, 5 Sep 2025 20:24:44 -0700 Subject: [PATCH] Reuse scripts instead of copypaste code --- Assets/Scenes/AccountMenu.unity | 32 ++- Assets/Scenes/ChatroomMenu.unity | 266 +++++++++--------- Assets/Scenes/GamePlayer.unity | 16 +- Assets/Scenes/IconsMenu.unity | 17 +- Assets/Scenes/LoadingMenu.unity | 16 +- Assets/Scripts/AccountMenu/AccountLoggedIn.cs | 1 - .../Scripts/AccountMenu/AccountLoggedOut.cs | 2 - Assets/Scripts/ChatroomMenu.cs | 1 - Assets/Scripts/GamePlayerPauseMenu.cs | 4 - Assets/Scripts/IconsMenu.cs | 5 - Assets/Scripts/LoadingMenu.cs | 4 - 11 files changed, 214 insertions(+), 150 deletions(-) diff --git a/Assets/Scenes/AccountMenu.unity b/Assets/Scenes/AccountMenu.unity index 7c046e6..0b6b4da 100644 --- a/Assets/Scenes/AccountMenu.unity +++ b/Assets/Scenes/AccountMenu.unity @@ -2538,6 +2538,7 @@ GameObject: - component: {fileID: 322453972} - component: {fileID: 322453971} - component: {fileID: 322453970} + - component: {fileID: 322453973} m_Layer: 5 m_Name: BackButton m_TagString: Untagged @@ -2647,6 +2648,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 322453968} m_CullTransparentMesh: 1 +--- !u!114 &322453973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 322453968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene + sceneName: MainMenu --- !u!1 &334073383 GameObject: m_ObjectHideFlags: 0 @@ -4887,7 +4901,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -4895,6 +4908,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!114 &720281948 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6634,8 +6648,6 @@ MonoBehaviour: m_EditorClassIdentifier: loggedOutLoginButton: {fileID: 1842378620} loggedOutRegisterButton: {fileID: 1888048651} - loggedOutBackButton: {fileID: 1848992338} - clearValues: 0 --- !u!1 &989136372 GameObject: m_ObjectHideFlags: 0 @@ -13203,6 +13215,7 @@ GameObject: - component: {fileID: 1848992340} - component: {fileID: 1848992339} - component: {fileID: 1848992338} + - component: {fileID: 1848992341} m_Layer: 5 m_Name: BackButton m_TagString: Untagged @@ -13312,6 +13325,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848992336} m_CullTransparentMesh: 1 +--- !u!114 &1848992341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1848992336} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene + sceneName: MainMenu --- !u!1 &1872663649 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ChatroomMenu.unity b/Assets/Scenes/ChatroomMenu.unity index 7c01c3b..9e7d3d9 100644 --- a/Assets/Scenes/ChatroomMenu.unity +++ b/Assets/Scenes/ChatroomMenu.unity @@ -620,6 +620,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 67716541} m_CullTransparentMesh: 1 +--- !u!21 &86122536 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &88778477 GameObject: m_ObjectHideFlags: 0 @@ -4838,47 +4879,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 595325419} m_CullTransparentMesh: 1 ---- !u!21 &609774588 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &612309673 GameObject: m_ObjectHideFlags: 0 @@ -5015,47 +5015,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 612309673} m_CullTransparentMesh: 1 ---- !u!21 &613167841 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &673775225 GameObject: m_ObjectHideFlags: 0 @@ -6388,7 +6347,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 613167841} + m_Material: {fileID: 1953813663} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -6690,7 +6649,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 1918697451} + m_Material: {fileID: 86122536} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -7018,6 +6977,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1057045262} m_CullTransparentMesh: 1 +--- !u!21 &1084746710 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1108294396 GameObject: m_ObjectHideFlags: 0 @@ -7407,7 +7407,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image - m_Material: {fileID: 609774588} + m_Material: {fileID: 1084746710} m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -7678,6 +7678,7 @@ GameObject: - component: {fileID: 1456366632} - component: {fileID: 1456366631} - component: {fileID: 1456366630} + - component: {fileID: 1456366633} m_Layer: 5 m_Name: BackButton m_TagString: Untagged @@ -7787,6 +7788,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1456366628} m_CullTransparentMesh: 1 +--- !u!114 &1456366633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456366628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene + sceneName: MainMenu --- !u!1 &1473579026 GameObject: m_ObjectHideFlags: 0 @@ -10229,47 +10243,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1865558840} m_CullTransparentMesh: 1 ---- !u!21 &1918697451 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/RoundedCorners - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _OuterUV: {r: 0, g: 0, b: 1, a: 1} - - _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0} - m_BuildTextureStacks: [] - m_AllowLocking: 1 --- !u!1 &1926638709 GameObject: m_ObjectHideFlags: 0 @@ -10397,6 +10370,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1940562850} m_CullTransparentMesh: 1 +--- !u!21 &1953813663 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/RoundedCorners + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _OuterUV: {r: 0, g: 0, b: 1, a: 1} + - _WidthHeightRadius: {r: 1180, g: 75, b: 20, a: 0} + m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!1 &1981853368 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GamePlayer.unity b/Assets/Scenes/GamePlayer.unity index e8f1d7b..ee786df 100644 --- a/Assets/Scenes/GamePlayer.unity +++ b/Assets/Scenes/GamePlayer.unity @@ -3463,7 +3463,7 @@ SpriteRenderer: m_Size: {x: 1.28, y: 1.28} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &808236451 @@ -4561,6 +4561,7 @@ GameObject: - component: {fileID: 1539199163} - component: {fileID: 1539199162} - component: {fileID: 1539199161} + - component: {fileID: 1539199164} m_Layer: 5 m_Name: BackButton m_TagString: Untagged @@ -4670,6 +4671,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1539199159} m_CullTransparentMesh: 1 +--- !u!114 &1539199164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1539199159} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene + sceneName: MainMenu --- !u!1 &1577031225 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/IconsMenu.unity b/Assets/Scenes/IconsMenu.unity index 7cbf656..38efb42 100644 --- a/Assets/Scenes/IconsMenu.unity +++ b/Assets/Scenes/IconsMenu.unity @@ -6686,7 +6686,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -6694,6 +6693,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!114 &1062570985 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6711,7 +6711,6 @@ MonoBehaviour: marketplaceIconsPanel: {fileID: 673274032} marketplaceIconsContent: {fileID: 1166831722} marketplaceIconsSample: {fileID: 1673908004} - backButton: {fileID: 1838138921} defaultIcon: {fileID: 6534417478244952628, guid: dbf71fe5f2caad1409da64bdbb781eb5, type: 3} placeholderButton: {fileID: 1429895470} selectionText: {fileID: 283532290} @@ -10852,6 +10851,7 @@ GameObject: - component: {fileID: 1838138923} - component: {fileID: 1838138922} - component: {fileID: 1838138921} + - component: {fileID: 1838138924} m_Layer: 5 m_Name: BackButton m_TagString: Untagged @@ -10961,6 +10961,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1838138918} m_CullTransparentMesh: 1 +--- !u!114 &1838138924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1838138918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene + sceneName: MainMenu --- !u!1 &1844786179 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/LoadingMenu.unity b/Assets/Scenes/LoadingMenu.unity index 639a0d3..9dabe17 100644 --- a/Assets/Scenes/LoadingMenu.unity +++ b/Assets/Scenes/LoadingMenu.unity @@ -385,7 +385,6 @@ MonoBehaviour: m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 - m_Version: 2 m_TaaSettings: m_Quality: 3 m_FrameInfluence: 0.1 @@ -393,6 +392,7 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!114 &705564547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -603,6 +603,7 @@ GameObject: - component: {fileID: 798394522} - component: {fileID: 798394521} - component: {fileID: 798394520} + - component: {fileID: 798394523} m_Layer: 5 m_Name: ContinueButton m_TagString: Untagged @@ -712,6 +713,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 798394518} m_CullTransparentMesh: 1 +--- !u!114 &798394523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798394518} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a45465fc8803364d968dc6bec70fca8, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::ButtonToScene + sceneName: MainMenu --- !u!1 &842325108 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs index 5ae61b9..b43adfc 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedIn.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedIn.cs @@ -32,7 +32,6 @@ public class AccountLoggedIn : MonoBehaviour BazookaManager.Instance.ResetSave(); AccountHandler.instance.SwitchPanel(1); }); - loggedInBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu")); } void OnEnable() diff --git a/Assets/Scripts/AccountMenu/AccountLoggedOut.cs b/Assets/Scripts/AccountMenu/AccountLoggedOut.cs index 1818513..110bede 100644 --- a/Assets/Scripts/AccountMenu/AccountLoggedOut.cs +++ b/Assets/Scripts/AccountMenu/AccountLoggedOut.cs @@ -6,12 +6,10 @@ public class AccountLoggedOut : MonoBehaviour { public Button loggedOutLoginButton; public Button loggedOutRegisterButton; - public Button loggedOutBackButton; void Awake() { loggedOutLoginButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(2)); loggedOutRegisterButton.onClick.AddListener(() => AccountHandler.instance.SwitchPanel(3)); - loggedOutBackButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu")); } } \ No newline at end of file diff --git a/Assets/Scripts/ChatroomMenu.cs b/Assets/Scripts/ChatroomMenu.cs index fe414a9..c85fb97 100644 --- a/Assets/Scripts/ChatroomMenu.cs +++ b/Assets/Scripts/ChatroomMenu.cs @@ -55,7 +55,6 @@ public class ChatroomMenu : MonoBehaviour messageInputField.interactable = false; ShowStatus("Warning: You are not logged in. Please log in to send messages."); } - backButton.onClick.AddListener(async () => await SceneManager.LoadSceneAsync("MainMenu")); sendButton.onClick.AddListener(async () => await HandleMessageSubmit()); downButton.onClick.AddListener(() => StartCoroutine(ScrollToBottom())); messageInputField.textComponent.textWrappingMode = TextWrappingModes.Normal; diff --git a/Assets/Scripts/GamePlayerPauseMenu.cs b/Assets/Scripts/GamePlayerPauseMenu.cs index 8451eb8..4aad019 100644 --- a/Assets/Scripts/GamePlayerPauseMenu.cs +++ b/Assets/Scripts/GamePlayerPauseMenu.cs @@ -31,10 +31,6 @@ public class GamePlayerPauseMenu : MonoBehaviour Instance = this; musicSlider.value = BazookaManager.Instance.GetSettingMusicVolume(); sfxSlider.value = BazookaManager.Instance.GetSettingSFXVolume(); - backButton.onClick.AddListener(async () => - { - await UnityEngine.SceneManagement.SceneManager.LoadSceneAsync("MainMenu"); - }); continueButton.onClick.AddListener(GamePlayer.instance.DisablePause); musicSlider.onValueChanged.AddListener(value => { diff --git a/Assets/Scripts/IconsMenu.cs b/Assets/Scripts/IconsMenu.cs index dd8f720..f485f2b 100644 --- a/Assets/Scripts/IconsMenu.cs +++ b/Assets/Scripts/IconsMenu.cs @@ -12,7 +12,6 @@ public class Iconsmenu : MonoBehaviour public GameObject marketplaceIconsPanel; public GameObject marketplaceIconsContent; public GameObject marketplaceIconsSample; - public Button backButton; public Sprite defaultIcon; public Button placeholderButton; public TMP_Text selectionText; @@ -91,10 +90,6 @@ public class Iconsmenu : MonoBehaviour SwitchToMarketplaceIcons(); } placeholderButton.onClick.AddListener(ToggleKit); - backButton.onClick.AddListener(async () => - { - await SceneManager.LoadSceneAsync("MainMenu"); - }); previewBird.GetComponentInParent