From 90a45733801612f7b47da99f400b39c809e1d58a Mon Sep 17 00:00:00 2001 From: kittyegg Date: Mon, 25 May 2026 01:36:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=BF=D0=BE=D0=B1=D0=B5=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Island.unity | 82 ++++++++++++++++++++++++++++++- Assets/Scripts/UI/GameOverMenu.cs | 8 +-- 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/Assets/Scenes/Island.unity b/Assets/Scenes/Island.unity index fc18685..85b1d23 100644 --- a/Assets/Scenes/Island.unity +++ b/Assets/Scenes/Island.unity @@ -3118,7 +3118,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 79c22679605c9274ab2a50d6c80e2b19, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::GameOverMenu - _tower: {fileID: 1739395621} + _winLoseController: {fileID: 884308129} _menuPanel: {fileID: 473347664} --- !u!1001 &360688809 PrefabInstance: @@ -3940,6 +3940,7 @@ Transform: - {fileID: 1311268618} - {fileID: 1282261902} - {fileID: 709556714} + - {fileID: 884308128} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &486141168 @@ -6876,6 +6877,71 @@ Transform: m_CorrespondingSourceObject: {fileID: 5368672011475721328, guid: 8dd20c91f0d7a7b419f6bedcd1870cba, type: 3} m_PrefabInstance: {fileID: 882956954} m_PrefabAsset: {fileID: 0} +--- !u!1 &884308127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 884308128} + - component: {fileID: 884308129} + m_Layer: 0 + m_Name: WinLoseController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &884308128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 884308127} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 481586150} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &884308129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 884308127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 199999b988ecd0f4a941aa248771f8ed, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::WinLoseController + _gameManager: {fileID: 1875710079} + _spawnDeathEnemyController: {fileID: 694046010} + _tower: {fileID: 1739395621} + _onGameOver: + m_PersistentCalls: + m_Calls: [] + _onWin: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2003066704} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1001 &923277425 PrefabInstance: m_ObjectHideFlags: 0 @@ -7378,7 +7444,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 971801079} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 844851692} + m_TargetAssemblyTypeName: GameMenuButtons, Assembly-CSharp + m_MethodName: ExitToMainMenu + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &971801079 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/GameOverMenu.cs b/Assets/Scripts/UI/GameOverMenu.cs index e9c0367..e773341 100644 --- a/Assets/Scripts/UI/GameOverMenu.cs +++ b/Assets/Scripts/UI/GameOverMenu.cs @@ -3,17 +3,17 @@ using UnityEngine.SceneManagement; public class GameOverMenu : MonoBehaviour { - [SerializeField] private Tower _tower; + [SerializeField] private WinLoseController _winLoseController; [SerializeField] private Transform _menuPanel; private void OnEnable() { - _tower.OnGameOver += OnGameOver; + _winLoseController.OnGameOver += OnGameOver; } private void OnDisable() { - _tower.OnGameOver -= OnGameOver; + _winLoseController.OnGameOver -= OnGameOver; } public void RestartGame() @@ -28,7 +28,7 @@ public class GameOverMenu : MonoBehaviour SceneManager.LoadScene("MainMenu"); } - private void OnGameOver() + private void OnGameOver(WinLoseController.OnGameOverEventArgs args) { Time.timeScale = 0f; _menuPanel.gameObject.SetActive(true);