From 1dcd03e01827a33dad2d65f3a936564ae687a247 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Tue, 29 Oct 2024 15:45:18 +0900 Subject: [PATCH] =?UTF-8?q?0.3.2.14=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01.Scenes/01.Tycoon.unity | 152 ++++++++++++++++-- .../Character/Player/Combat/CombatInput.cs | 8 +- .../Character/Player/Combat/CombatPlayer.cs | 2 +- .../Character/Player/Tycoon/TycoonInput.cs | 14 +- Assets/02.Scripts/EventManager.cs | 7 +- Assets/02.Scripts/NewBlueWater.inputactions | 52 +----- Assets/02.Scripts/PlayerInputExtensions.cs | 14 ++ .../02.Scripts/PlayerInputExtensions.cs.meta | 2 + Assets/02.Scripts/Prop/Tycoon/Board.cs | 2 +- .../Tycoon/TycoonStageController.cs | 11 +- Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs | 5 +- .../02.Scripts/Ui/Combat/CombatUiManager.cs | 50 +----- Assets/02.Scripts/Ui/Combat/DiscardPopupUi.cs | 4 +- .../02.Scripts/Ui/Combat/GameOverPopupUi.cs | 4 +- Assets/02.Scripts/Ui/MenuPopupUi.cs | 6 +- Assets/02.Scripts/Ui/PopupUi.cs | 16 +- Assets/02.Scripts/Ui/PopupUiController.cs | 50 ++++++ .../02.Scripts/Ui/PopupUiController.cs.meta | 2 + Assets/02.Scripts/Ui/SwitchActionPopupUi.cs | 6 +- Assets/02.Scripts/Ui/Tycoon/Manual.cs | 4 +- Assets/02.Scripts/Ui/Tycoon/ManualBook.cs | 4 +- .../Ui/Tycoon/TycoonManagementUi.cs | 6 +- .../02.Scripts/Ui/Tycoon/TycoonUiManager.cs | 47 ------ .../Characters/Players/TycoonPlayer.prefab | 15 +- 24 files changed, 277 insertions(+), 206 deletions(-) create mode 100644 Assets/02.Scripts/PlayerInputExtensions.cs create mode 100644 Assets/02.Scripts/PlayerInputExtensions.cs.meta create mode 100644 Assets/02.Scripts/Ui/PopupUiController.cs create mode 100644 Assets/02.Scripts/Ui/PopupUiController.cs.meta diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 701df8fa3..ea9b77d15 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -5778,6 +5778,20 @@ Transform: m_Children: [] m_Father: {fileID: 1360757596} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &480314625 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/Point + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 52083aa7-62f5-41d7-b37e-4db100ef2cda --- !u!1 &510358306 GameObject: m_ObjectHideFlags: 0 @@ -6026,6 +6040,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 510483949} m_CullTransparentMesh: 1 +--- !u!114 &512160919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/TrackedDeviceOrientation + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1 --- !u!1001 &515003792 PrefabInstance: m_ObjectHideFlags: 0 @@ -6628,6 +6656,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 547484572} m_CullTransparentMesh: 1 +--- !u!114 &561341741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/ScrollWheel + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 30ef3965-cc51-452e-8df9-6a3567a53f4d --- !u!1001 &566176540 PrefabInstance: m_ObjectHideFlags: 0 @@ -11414,6 +11456,20 @@ MonoBehaviour: m_Spacing: {x: 10, y: 10} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!114 &992297820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/TrackedDevicePosition + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 49ed4722-bfe5-47b7-b724-008d9ca57edc --- !u!1 &1006730364 GameObject: m_ObjectHideFlags: 0 @@ -12060,6 +12116,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1058006973} m_CullTransparentMesh: 1 +--- !u!114 &1063900526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/Navigate + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 66824a18-0819-44a4-92c2-6395511e3d0d --- !u!1 &1070845212 GameObject: m_ObjectHideFlags: 0 @@ -18806,6 +18876,20 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!114 &1543616885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/RightClick + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 4849bf4c-7b3b-43c4-8bbf-7178f536fb94 --- !u!1 &1543999676 GameObject: m_ObjectHideFlags: 0 @@ -19611,17 +19695,17 @@ MonoBehaviour: m_MoveRepeatDelay: 0.5 m_MoveRepeatRate: 0.1 m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ActionsAsset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_PointAction: {fileID: 480314625} + m_MoveAction: {fileID: 1063900526} + m_SubmitAction: {fileID: 1861358548} + m_CancelAction: {fileID: -1967631576421560919, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_LeftClickAction: {fileID: 1688493664} + m_MiddleClickAction: {fileID: 1972034606} + m_RightClickAction: {fileID: 1543616885} + m_ScrollWheelAction: {fileID: 561341741} + m_TrackedDevicePositionAction: {fileID: 992297820} + m_TrackedDeviceOrientationAction: {fileID: 512160919} m_DeselectOnBackgroundClick: 1 m_PointerBehavior: 0 m_CursorLockBehavior: 0 @@ -21021,6 +21105,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1676572567} m_CullTransparentMesh: 1 +--- !u!114 &1688493664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/Click + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 42e6067b-0d00-4787-92d8-ddf60510de83 --- !u!1 &1688541096 GameObject: m_ObjectHideFlags: 0 @@ -24382,6 +24480,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1858836598} m_CullTransparentMesh: 1 +--- !u!114 &1861358548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/Submit + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: 93ed1c14-2900-4d30-91fb-a9f2353a9540 --- !u!1 &1862417069 GameObject: m_ObjectHideFlags: 0 @@ -25791,6 +25903,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1966407669} m_CullTransparentMesh: 1 +--- !u!114 &1972034606 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc1515ab76e54f068e2f2207940fab32, type: 3} + m_Name: UI/MiddleClick + m_EditorClassIdentifier: + m_Asset: {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + m_ActionId: b99f7e4b-30f0-4936-9e55-c383951d6f58 --- !u!1 &1978509263 GameObject: m_ObjectHideFlags: 0 @@ -29267,6 +29393,10 @@ PrefabInstance: propertyPath: m_LocalRotation.z value: 0.32760355 objectReference: {fileID: 0} + - target: {fileID: 6054159730444663926, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} + propertyPath: m_UIInputModule + value: + objectReference: {fileID: 1619849091} - target: {fileID: 6110939913361161778, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x value: -0.01015869 diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs b/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs index 125ed7fce..0cac68654 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatInput.cs @@ -144,7 +144,7 @@ namespace BlueWater.Players.Combat { if (context.performed) { - CombatUiManager.Instance.CombatItemInventoryUi.Open(CombatUiManager.Instance.PopupUiList); + CombatUiManager.Instance.CombatItemInventoryUi.Open(); } } @@ -162,7 +162,7 @@ namespace BlueWater.Players.Combat { if (context.performed) { - CombatUiManager.Instance.CombatMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList); + CombatUiManager.Instance.CombatMenuPopupUi.Open(); } } @@ -170,7 +170,7 @@ namespace BlueWater.Players.Combat { if (context.performed) { - CombatUiManager.Instance.DevelopMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList); + CombatUiManager.Instance.DevelopMenuPopupUi.Open(); } } @@ -194,7 +194,7 @@ namespace BlueWater.Players.Combat { if (context.performed) { - CombatUiManager.Instance.CloseLastPopup(); + PopupUiController.CloseLastPopup(); } } diff --git a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs index 4ef230b38..98d1cb5b5 100644 --- a/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs @@ -170,7 +170,7 @@ namespace BlueWater.Players.Combat yield return new WaitForSeconds(1f); Destroy(gameObject); - CombatUiManager.Instance.GameOverPopupUi.Open(CombatUiManager.Instance.PopupUiList); + CombatUiManager.Instance.GameOverPopupUi.Open(); } public void ActivateInvincibility() => PlayerHealthPoint.ActivateInvincibility(); diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 1f64814b7..9e33846e3 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using BlueWater.Interfaces; using BlueWater.Tycoons; @@ -37,7 +38,7 @@ namespace BlueWater.Players.Tycoons private void Start() { - Initialize(); + StartCoroutine(nameof(Initialize)); } private void Update() @@ -71,11 +72,14 @@ namespace BlueWater.Players.Tycoons _playerInput = GetComponent(); } - private void Initialize() + private IEnumerator Initialize() { - _playerInput.enabled = true; PlayerInputKeyManager.Instance.SetCurrentPlayerInput(_playerInput); + yield return new WaitUntil(() => _playerInput.IsInitialized()); + + PlayerInputKeyManager.Instance.DisableAllActionMaps(); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Tycoon); + EventManager.InvokeInitializedPlayerInput(); } #endregion @@ -116,7 +120,7 @@ namespace BlueWater.Players.Tycoons { if (context.performed) { - TycoonUiManager.Instance.ManualBook.Open(TycoonUiManager.Instance.PopupUiList); + TycoonUiManager.Instance.ManualBook.Open(); } } @@ -125,7 +129,7 @@ namespace BlueWater.Players.Tycoons { if (context.performed) { - TycoonUiManager.Instance.CloseLastPopup(); + PopupUiController.CloseLastPopup(); } } diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 008bd9af9..88d20f43c 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -4,7 +4,6 @@ using BlueWater.Npcs.Crews.Bartender; using BlueWater.Npcs.Crews.Cleaner; using BlueWater.Npcs.Crews.Server; using BlueWater.Npcs.Customers; -using BlueWater.Tycoons; using UnityEngine; namespace BlueWater @@ -14,6 +13,12 @@ namespace BlueWater // Global events #region Global events + public static Action OnInitializedPlayerInput; + public static void InvokeInitializedPlayerInput() + { + OnInitializedPlayerInput?.Invoke(); + } + // Ui public static Action OnFadeInOut; public static void InvokeFadeInOut(float fadeInTime, float fadeOutTime, Color? fadeColor = null, float delayAfterFadeIn = 0f) diff --git a/Assets/02.Scripts/NewBlueWater.inputactions b/Assets/02.Scripts/NewBlueWater.inputactions index 801a9eb1f..686f12a13 100644 --- a/Assets/02.Scripts/NewBlueWater.inputactions +++ b/Assets/02.Scripts/NewBlueWater.inputactions @@ -620,7 +620,7 @@ "path": "/e", "interactions": "", "processors": "", - "groups": "", + "groups": ";Keyboard&Mouse", "action": "Interaction", "isComposite": false, "isPartOfComposite": false @@ -631,7 +631,7 @@ "path": "/f1", "interactions": "", "processors": "", - "groups": "", + "groups": ";Keyboard&Mouse", "action": "DevelopKey01", "isComposite": false, "isPartOfComposite": false @@ -1055,54 +1055,6 @@ "isPartOfComposite": false } ] - }, - { - "name": "Bar", - "id": "63082564-263a-4430-8f7a-13c3cd4e93e7", - "actions": [ - { - "name": "Pour", - "type": "Button", - "id": "b02d861a-39ed-4c5e-abd0-7ce3c2a44707", - "expectedControlType": "", - "processors": "", - "interactions": "Press", - "initialStateCheck": false - }, - { - "name": "EscapeBar", - "type": "Button", - "id": "4752dd64-7a31-42ae-bfc9-45a01927bd07", - "expectedControlType": "", - "processors": "", - "interactions": "", - "initialStateCheck": false - } - ], - "bindings": [ - { - "name": "", - "id": "01fa3267-e5c0-48c1-8194-592530fbca87", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "", - "action": "Pour", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "646d58bf-d879-47c1-99c9-c534c83eb9f4", - "path": "/escape", - "interactions": "", - "processors": "", - "groups": "", - "action": "EscapeBar", - "isComposite": false, - "isPartOfComposite": false - } - ] } ], "controlSchemes": [ diff --git a/Assets/02.Scripts/PlayerInputExtensions.cs b/Assets/02.Scripts/PlayerInputExtensions.cs new file mode 100644 index 000000000..3b7f587a0 --- /dev/null +++ b/Assets/02.Scripts/PlayerInputExtensions.cs @@ -0,0 +1,14 @@ +using UnityEngine.InputSystem; + +namespace BlueWater +{ + // PlayerInput 확장 + public static class PlayerInputExtensions + { + public static bool IsInitialized(this PlayerInput playerInput) + { + // currentActionMap이 할당되면 초기화 완료로 간주 + return playerInput.currentActionMap != null; + } + } +} diff --git a/Assets/02.Scripts/PlayerInputExtensions.cs.meta b/Assets/02.Scripts/PlayerInputExtensions.cs.meta new file mode 100644 index 000000000..1573c759e --- /dev/null +++ b/Assets/02.Scripts/PlayerInputExtensions.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: cfdd20a7e0c8ae649b5c4a6ca553133c \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Board.cs b/Assets/02.Scripts/Prop/Tycoon/Board.cs index 38859e7d5..7498a6d21 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Board.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Board.cs @@ -7,7 +7,7 @@ namespace BlueWater.Tycoons public override void Interaction() { var tycoonUiManager = TycoonUiManager.Instance; - tycoonUiManager.TycoonManagementUi.Open(tycoonUiManager.PopupUiList); + tycoonUiManager.TycoonManagementUi.Open(); } public override bool CanInteraction() diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 5c7eb8fbc..fe894ab66 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -23,19 +23,20 @@ namespace BlueWater.Tycoons private void Start() { - EventManager.OnTycoonGameOvered += GameOver; - _tycoonManager = TycoonManager.Instance; _dailyCustomerVisitInfos = new List(); - StartStage(); + EventManager.OnInitializedPlayerInput += StartStage; + } + + private void OnDestroy() + { + EventManager.OnInitializedPlayerInput -= StartStage; } private void StartStage() { - EventManager.OnTycoonGameOvered -= GameOver; - _dailyCustomerVisitInfos.Clear(); Utils.StartUniqueCoroutine(this, ref _startStageCoroutineInstance, StartStageCoroutine()); diff --git a/Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs b/Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs index f0893e8a1..dd916e1b4 100644 --- a/Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs +++ b/Assets/02.Scripts/Ui/Combat/ClearPopupUi.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.UI; @@ -17,9 +16,9 @@ namespace BlueWater.Uis _moveNextStageButton = transform.Find("ClearPanel/Popup Base - Concave/Bottom/Background/Border/MoveNextStageButton").GetComponent