From fae1c1bb2a106a15f9fa13a58088131d89ffece5 Mon Sep 17 00:00:00 2001 From: Jay <96156114+jaydev00a@users.noreply.github.com> Date: Fri, 28 Mar 2025 17:08:31 +0900 Subject: [PATCH] =?UTF-8?q?DO-71=20[Feat]=20=EA=B2=8C=EC=9E=84=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B0=94=EC=9D=B8=EB=94=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/GameUIController.cs | 18 + .../Prefabs/Panels/InGameMenu Panel.prefab | 2 +- .../Prefabs/Panels/Rating Panel.prefab | 212 ++++---- .../Resources/Prefabs/[Canvas] Game UI.prefab | 467 +++++++++++++++++- Assets/Script/Game/GameLogic.cs | 11 +- Assets/Script/Game/GameManager.cs | 6 + Assets/Script/Game/GameUtility/GameRoutine.cs | 2 + Assets/Sprites/Game UI/btn_game_exit 1.png | Bin 0 -> 552 bytes .../btn_game_exit 1.png.meta} | 12 +- .../Sprites/Game UI/btn_game_exit_ivory.png | Bin 0 -> 549 bytes .../btn_game_exit_ivory.png.meta} | 12 +- Assets/Sprites/Panel UI/close_button-bg.png | Bin 1105 -> 0 bytes Assets/Sprites/Panel UI/settings_icon.png | Bin 795 -> 0 bytes 13 files changed, 612 insertions(+), 130 deletions(-) create mode 100644 Assets/Sprites/Game UI/btn_game_exit 1.png rename Assets/Sprites/{Panel UI/close_button-bg.png.meta => Game UI/btn_game_exit 1.png.meta} (96%) create mode 100644 Assets/Sprites/Game UI/btn_game_exit_ivory.png rename Assets/Sprites/{Panel UI/settings_icon.png.meta => Game UI/btn_game_exit_ivory.png.meta} (96%) delete mode 100644 Assets/Sprites/Panel UI/close_button-bg.png delete mode 100644 Assets/Sprites/Panel UI/settings_icon.png diff --git a/Assets/GameUIController.cs b/Assets/GameUIController.cs index 49883f4..761fc20 100644 --- a/Assets/GameUIController.cs +++ b/Assets/GameUIController.cs @@ -17,6 +17,11 @@ public class GameUIController : MonoBehaviour [SerializeField] private Image profileImageB; [SerializeField] private Sprite[] profileImageSprites; //0. 기본 드래곤 1. 기본 호랑이 2.아이보리 드래곤 3. 아이보리 호랑이 [SerializeField] private Sprite[] indicatorSprites; //0. active 1. inactive + [SerializeField] private GameObject timerObject; + [SerializeField] private GameObject inGameMenuButtonsObject; + [SerializeField] private GameObject exitButtonObject; + [SerializeField] private GameObject revengeRetryButtonObject; + [SerializeField] private GameObject confirmButtonObject; private Sprite _originalSpriteA; private Sprite _originalSpriteB; @@ -156,4 +161,17 @@ public class GameUIController : MonoBehaviour }); } + /// + /// 게임 종료 시 인게임 장면 변경 + /// + /// 게임 진행이면 true + public void SetButtonsIndicator(bool gameInProgress) + { + Debug.Log("gameInProgress" + gameInProgress); + inGameMenuButtonsObject.SetActive(gameInProgress); + confirmButtonObject.SetActive(gameInProgress); + timerObject.SetActive(!gameInProgress); + exitButtonObject.SetActive(!gameInProgress); + revengeRetryButtonObject.SetActive(!gameInProgress); + } } diff --git a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab index b3daebf..4ed12ce 100644 --- a/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab @@ -61,7 +61,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.74509805} + m_Color: {r: 0, g: 0, b: 0, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 diff --git a/Assets/Resources/Prefabs/Panels/Rating Panel.prefab b/Assets/Resources/Prefabs/Panels/Rating Panel.prefab index 7a7ba8d..b87b2d0 100644 --- a/Assets/Resources/Prefabs/Panels/Rating Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Rating Panel.prefab @@ -194,10 +194,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 218, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2311241288947242098 CanvasRenderer: @@ -1127,9 +1127,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5531721779183282605 @@ -1261,10 +1261,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 146, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6361210597513350889 CanvasRenderer: @@ -1534,10 +1534,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 434, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3908811810989572573 CanvasRenderer: @@ -1609,10 +1609,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 182, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3572997787055944256 CanvasRenderer: @@ -1684,10 +1684,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 506, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2472997966147577436 CanvasRenderer: @@ -1911,10 +1911,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 650, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2627303802870471009 CanvasRenderer: @@ -1986,10 +1986,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 470, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6753383988544108710 CanvasRenderer: @@ -2080,10 +2080,10 @@ RectTransform: - {fileID: 7062801385519056563} m_Father: {fileID: 5005196437681606412} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -105} + m_SizeDelta: {x: 760, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2746564917350217772 MonoBehaviour: @@ -2143,10 +2143,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 542, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4957044415776570954 CanvasRenderer: @@ -2285,10 +2285,10 @@ RectTransform: - {fileID: 7055028789553681920} m_Father: {fileID: 5005196437681606412} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -25} + m_SizeDelta: {x: 760, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3709340827146638613 MonoBehaviour: @@ -2423,10 +2423,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 398, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &463354477484058703 CanvasRenderer: @@ -2766,10 +2766,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 362, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3023405256669732314 CanvasRenderer: @@ -2841,10 +2841,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 38, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4925124962761219917 CanvasRenderer: @@ -3216,10 +3216,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 686, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8304064098521273095 CanvasRenderer: @@ -3366,10 +3366,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 578, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &38250642525452373 CanvasRenderer: @@ -3575,9 +3575,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 126.666664, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3598980560550055195 @@ -3709,10 +3709,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5005196437681606412} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -180} + m_SizeDelta: {x: 760, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5504192916126514736 CanvasRenderer: @@ -3843,10 +3843,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 722, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &236167123989522431 CanvasRenderer: @@ -3918,10 +3918,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 326, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4723433955710229165 CanvasRenderer: @@ -3993,10 +3993,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 254, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5741181229934659086 CanvasRenderer: @@ -4068,10 +4068,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 74, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4822107155440733888 CanvasRenderer: @@ -4561,10 +4561,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 290, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1673543598988799056 CanvasRenderer: @@ -4894,9 +4894,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 5796448683050343687} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 633.3333, y: -15} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6950779524205521337 @@ -5168,10 +5168,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4800625733471548410 CanvasRenderer: @@ -5362,7 +5362,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5005196437681606412 RectTransform: m_ObjectHideFlags: 0 @@ -5380,10 +5380,10 @@ RectTransform: - {fileID: 6720057764648462601} m_Father: {fileID: 6614054331963984893} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 200} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 380, y: -100} + m_SizeDelta: {x: 760, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &34476411273760990 MonoBehaviour: @@ -5478,10 +5478,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6990167235583131140} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 80} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 614, y: -50} + m_SizeDelta: {x: 36, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1415772658403238602 CanvasRenderer: diff --git a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab index 1fa8870..e7db964 100644 --- a/Assets/Resources/Prefabs/[Canvas] Game UI.prefab +++ b/Assets/Resources/Prefabs/[Canvas] Game UI.prefab @@ -266,6 +266,7 @@ RectTransform: - {fileID: 8758049298581854606} - {fileID: 2785359725927864505} - {fileID: 1286412008661516750} + - {fileID: 6653720175714615235} m_Father: {fileID: 8942070830740152784} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -273,6 +274,139 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 40} m_SizeDelta: {x: -100, y: 300} m_Pivot: {x: 0.5, y: 0} +--- !u!1 &2097219097053835497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6653720175714615235} + - component: {fileID: 9155184108605558784} + - component: {fileID: 3177637891523162420} + - component: {fileID: 534779203392079463} + m_Layer: 5 + m_Name: RevengeRetry Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6653720175714615235 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + 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: + - {fileID: 8243510049546773539} + m_Father: {fileID: 6209444297678801107} + 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: 0} + m_SizeDelta: {x: 349, y: 296} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9155184108605558784 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + m_CullTransparentMesh: 1 +--- !u!114 &3177637891523162420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9607844, b: 0.8980393, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 5266a12fcd3491445b1e487c9359fff0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &534779203392079463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2097219097053835497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3177637891523162420} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3933575647777291622} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickConfirmButton + 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!1 &2180157736785062510 GameObject: m_ObjectHideFlags: 0 @@ -305,8 +439,8 @@ RectTransform: m_Children: - {fileID: 4020956126151567600} - {fileID: 5290633878409985} - - {fileID: 6017735879343076712} - - {fileID: 8624964855925532225} + - {fileID: 5469898051918508443} + - {fileID: 3394360760151733370} m_Father: {fileID: 2843270827267453358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -352,6 +486,138 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2183639868091494604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3394360760151733370} + - component: {fileID: 7251970583950155674} + - component: {fileID: 2813314589835438985} + - component: {fileID: 403017146611159122} + m_Layer: 5 + m_Name: Exit Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3394360760151733370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4044003808430543235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 60, y: -118} + m_SizeDelta: {x: 63, y: 63} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7251970583950155674 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + m_CullTransparentMesh: 1 +--- !u!114 &2813314589835438985 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 488ca1767f0dae24195cd77590bf308f, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &403017146611159122 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2183639868091494604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 1, g: 0.9607843, b: 0.8980392, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300000, guid: 04b20bf7cb802174db748b752be5178f, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2813314589835438985} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3933575647777291622} + m_TargetAssemblyTypeName: GameUIController, Assembly-CSharp + m_MethodName: OnClickInGameMenuOpenButton + 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!1 &2293916685100220953 GameObject: m_ObjectHideFlags: 0 @@ -1286,6 +1552,140 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 250, y: 300} m_Pivot: {x: 0, y: 0.5} +--- !u!1 &5073825591103575574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8243510049546773539} + - component: {fileID: 5022558977162242817} + - component: {fileID: 3869650863187247196} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8243510049546773539 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073825591103575574} + 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: 6653720175714615235} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5022558977162242817 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073825591103575574} + m_CullTransparentMesh: 1 +--- !u!114 &3869650863187247196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5073825591103575574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uC7AC\uB300\uACB0" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4284115536 + m_fontColor: {r: 0.3137255, g: 0.4156863, b: 0.3529412, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 60 + m_fontSizeBase: 60 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 0 + m_fontSizeMax: 0 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &5258332010899716781 GameObject: m_ObjectHideFlags: 0 @@ -1692,16 +2092,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7907733484671223743} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4044003808430543235} + m_Father: {fileID: 5469898051918508443} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -80} + m_AnchoredPosition: {x: 60, y: -21.2} m_SizeDelta: {x: 62, y: 47} m_Pivot: {x: 0, y: 1} --- !u!222 &2463258542306401490 @@ -1900,16 +2300,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8300296172192540436} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.2, y: 1.2, z: 1} + m_LocalScale: {x: 1.4, y: 1.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4044003808430543235} + m_Father: {fileID: 5469898051918508443} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -50, y: -75} + m_AnchoredPosition: {x: -60, y: 0} m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 1, y: 1} --- !u!222 &1366668917766278638 @@ -2112,6 +2512,11 @@ MonoBehaviour: indicatorSprites: - {fileID: 21300000, guid: 91965db86e05b144f840b523e83d3816, type: 3} - {fileID: 21300000, guid: 8379c97a1509fbc42abb3da34d2e647c, type: 3} + timerObject: {fileID: 8100393348720881591} + inGameMenuButtonsObject: {fileID: 9031393605967390458} + exitButtonObject: {fileID: 2183639868091494604} + revengeRetryButtonObject: {fileID: 2097219097053835497} + confirmButtonObject: {fileID: 3856590192762510114} --- !u!225 &5999196603484244259 CanvasGroup: m_ObjectHideFlags: 0 @@ -2161,6 +2566,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &9031393605967390458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5469898051918508443} + m_Layer: 5 + m_Name: InGameMenu Buttons + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5469898051918508443 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9031393605967390458} + 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: + - {fileID: 6017735879343076712} + - {fileID: 8624964855925532225} + m_Father: {fileID: 4044003808430543235} + 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: 3.5, y: 3} + m_SizeDelta: {x: 1073.8, y: 100.8} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &4056566997434591085 PrefabInstance: m_ObjectHideFlags: 0 @@ -2387,3 +2829,8 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4060305112283542636, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} m_PrefabInstance: {fileID: 4056566997434591085} m_PrefabAsset: {fileID: 0} +--- !u!1 &8100393348720881591 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5197632138137602266, guid: bc5dc0bc67605dd499783a057c62c12d, type: 3} + m_PrefabInstance: {fileID: 4056566997434591085} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Script/Game/GameLogic.cs b/Assets/Script/Game/GameLogic.cs index 3da75d0..41ba2ab 100644 --- a/Assets/Script/Game/GameLogic.cs +++ b/Assets/Script/Game/GameLogic.cs @@ -370,7 +370,8 @@ public partial class GameLogic : IDisposable { ChangeGameInProgress(true); Debug.Log("GameInProgress 변경 true"); - + GameButtonSetter(GameInProgress); // 버튼 상태 교체 + ExecuteOnMainThread(() => { // 로딩 패널 열려있으면 닫기 @@ -380,6 +381,14 @@ public partial class GameLogic : IDisposable SetState(FirstPlayerState); }); } + // 버튼 상태 교체 함수 + private void GameButtonSetter(bool gameInProgress) + { + ExecuteOnMainThread(() => + { + GameManager.Instance.SetButtonsIndicator(gameInProgress); + }); + } // 방 데이터 유효성 검사 헬퍼 함수 private bool ValidateRoomData(object roomData, string operationName) diff --git a/Assets/Script/Game/GameManager.cs b/Assets/Script/Game/GameManager.cs index 10bc6fc..9b396cd 100644 --- a/Assets/Script/Game/GameManager.cs +++ b/Assets/Script/Game/GameManager.cs @@ -119,6 +119,12 @@ public class GameManager : Singleton if (_gameUIController == null) return; _gameUIController.SetTurnIndicator(isFirstPlayer); } + + public void SetButtonsIndicator(bool gameInProgress) + { + if (_gameUIController == null) return; + _gameUIController.SetButtonsIndicator(gameInProgress); + } public bool GetRequestDrawChance() { diff --git a/Assets/Script/Game/GameUtility/GameRoutine.cs b/Assets/Script/Game/GameUtility/GameRoutine.cs index fd79021..f8f4b54 100644 --- a/Assets/Script/Game/GameUtility/GameRoutine.cs +++ b/Assets/Script/Game/GameUtility/GameRoutine.cs @@ -89,6 +89,8 @@ public partial class GameLogic //TODO: 게임 종료 후 행동 구현 ChangeGameInProgress(false); Debug.Log("GameInProgress 변경 false"); + // 인게임 버튼 표시 + GameManager.Instance.SetButtonsIndicator(false); } public void SetLastPositioned(int row, int col) diff --git a/Assets/Sprites/Game UI/btn_game_exit 1.png b/Assets/Sprites/Game UI/btn_game_exit 1.png new file mode 100644 index 0000000000000000000000000000000000000000..0bebb3449d253beac037503840c6b2d8939241df GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`3?vg8AG`%pjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%t^bC&U#<2V_N|A^*%spa_ukOACifK?H$Z-_$Vw43Gi@0;>mdJ!1nQ zg8ms1K=nY{J`JP2TyD{uh0hALrZHm;br>e*WD0H-FO4+kg9$zTW=L*Y~#^WpAm} zzg^(``OaVW(g~44wOjt1Ez{og{N4Zck1x-QtlxRP{^pajuc!2CY=0v5KDx@xd^h8* z>b8`UmHT&owg3L-W5vIdZPSbXnV-wQ|GM8=vdiKBq!++gW?=Ai^>bP0l+XkKN!b5R literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Panel UI/close_button-bg.png.meta b/Assets/Sprites/Game UI/btn_game_exit 1.png.meta similarity index 96% rename from Assets/Sprites/Panel UI/close_button-bg.png.meta rename to Assets/Sprites/Game UI/btn_game_exit 1.png.meta index 2b9b648..58b7add 100644 --- a/Assets/Sprites/Panel UI/close_button-bg.png.meta +++ b/Assets/Sprites/Game UI/btn_game_exit 1.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 18ae4aac85f6d444b9ffb2ac80f27c45 +guid: 488ca1767f0dae24195cd77590bf308f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -94,7 +94,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Android + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,11 +107,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/Game UI/btn_game_exit_ivory.png b/Assets/Sprites/Game UI/btn_game_exit_ivory.png new file mode 100644 index 0000000000000000000000000000000000000000..34fbe62eb58aee507ade21d1996238845c1ef72e GIT binary patch literal 549 zcmeAS@N?(olHy`uVBq!ia0vp^_8`o`3?vg8AG`%pjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkNMV3ah%1o(|Me;D(1!LMAiESwg8YIRO7H)F->>?3>fzO}Pai)_P&@v0=@R8FH_rkcZsh6W7*a9k?e&*jhYWZa9xS`esa5fyQDNWz?#c&^ zpPMY7H_rYV5$!AN!ur`c;%<2C^lh3PaR=@vzhkP{(=}%gf8jD!`CUK$IOcOz#+5ew z{vWqwt7t;=w?%XA&1ut76MxEj&)%(c>WLYzT;EmvyEA!j%l4}O8V>RWTiRa*g(SFr zeK4PWo0;mbDe?PCzjs|%SE+w$u&hF6dzH%eN}cT$Cg#;P=2h%@pY-lLn7iYhXuVKx zZo+q=jXWmqW$*Vs`)=Iz<@ef!cUM1Oe|GI2NxRCrcRx1Yx3~U(2QjkE_4& z`u^HxvoD_it{rT6w)1!Ys|7n2{Yv@&mL+@B^LPK(KfXLKvVQ0F`lWa7zMe8yW&0Dp z_tjNq_g~emdAb~q@<+@BhBSkxtDnm{ Hr-UW|Dqu9S literal 0 HcmV?d00001 diff --git a/Assets/Sprites/Panel UI/settings_icon.png.meta b/Assets/Sprites/Game UI/btn_game_exit_ivory.png.meta similarity index 96% rename from Assets/Sprites/Panel UI/settings_icon.png.meta rename to Assets/Sprites/Game UI/btn_game_exit_ivory.png.meta index ceb858e..ac3594e 100644 --- a/Assets/Sprites/Panel UI/settings_icon.png.meta +++ b/Assets/Sprites/Game UI/btn_game_exit_ivory.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 17abb32a02ecec341b8b2396c7830408 +guid: 04b20bf7cb802174db748b752be5178f TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -34,7 +34,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 0 + filterMode: 1 aniso: 1 mipBias: 0 wrapU: 1 @@ -72,7 +72,7 @@ TextureImporter: maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -94,7 +94,7 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: Android + buildTarget: iPhone maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 @@ -107,11 +107,11 @@ TextureImporter: androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 - buildTarget: iPhone + buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 0 + textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Sprites/Panel UI/close_button-bg.png b/Assets/Sprites/Panel UI/close_button-bg.png deleted file mode 100644 index 1a60a09919561e2efffe64e12193ccc6c93975d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1105 zcmV-X1g`suP)ztEJe9orLy#PmiA@ zw!TPKWJi9Yw3u0$TT!*(cUDV-o0Uubd9J@7>+cT%kXcwMtz4~`9&)YQS`nu7K?=`%hFu0SJMT! z4%e?%s}QRf6d8M;jyIc)(OR3BKzr-;+L!o_BB7NqEE}7wi~MrA9E5lwbzsM*+3)ve zNbGjIs$WXv>Mv5mHW($hE(i3B{#%HzDG-W;XRwXJqY=I*4n0VImMaQ?mI!x^%CP}G zT8N)~2^Ta$m*(K%>UkSsMT}b`cub9O1L!3LH}DaYsgk>6Lr3XQAgT-2E+s2FFG6PY z2td9d5YK|F?CaJzZ$6(#9R?w7;v5Pb+uC(9QcGXunt&23;B{$JNLjy(?NwhZ|LU4g z8jLi+5l=Nw=eYf%9}4G~PO*MHq3$v823Ch?L4k3t{nlB&0 zyNv58Of7xp(?A)+#iz1}AiUiy?@2E>ckt~jrhE4F7QwZb_oOq<#eG*pr?N08tcGfG zAn#*sJ%J_Q7Au!7(iwMw@7PACv8xh7+H9#*P{g3*F2cK_DWmJVtj5~k@vWtz7UbL= zOEvH9gSOcldAy%)z*Yo4SS5m{04Vx_H7CGEXz&rLi?-AexzsR%$IwyTvyRMr9CL8a zx9t4(IeU^}{Q@%V0XZz0^C8;!CeQC3jXXyGGmNS(n?w)nEPfl z46vuw>ah>q5lu`?Oc*jFBLK|#$8Cb>6Su=`HhZG?1RJ@jLG8U5+WZTp$!q0pr1FW{FW_unn*`_K3d6qZa?znXU88PmT^ekfi zdi`6kqb|PlQ+C`I7i1ohk373M>r)KB$IE`#R1=w5ZvDuh52b6* zim3p&Rg6t!55<;Dt|r(G59C~Zh}i#QI*#EasKbvX32i+XJ6i*lGf>$WUSN4A(*#-r zW7$GS<#hBvNOdwOthQ0v$)qZ6F-)we2HepP=;-lwfqp}|z-`IgYl!w!HRR`^&qm_y zlI_u=Jmf_WRK}8<%U_2?#maiNaEJk8!->abCV3mNE@-zSd002ovPDHLkV1k}dbE^OV