From 7f10b9695c22409134ff47f59b531ede7050cdd4 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Thu, 14 Aug 2025 20:59:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=88=9C?= =?UTF-8?q?=EC=84=9C=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=84=B8=ED=8C=85,=20=EA=B2=BD?= =?UTF-8?q?=EA=B3=A0=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Addressables/So/RestaurantDataSo.asset | 2 +- .../So/RestaurantManagementDataSo.asset | 3 +++ ... => RestaurantManagementDataSo.asset.meta} | 2 +- .../So/RestaurantManagementSo.asset | 3 --- .../Player/RestaurantPlayerInput.cs | 2 +- .../Player/RestaurantPlayerInteraction.cs | 4 +++- .../Player/RestaurantPlayerMovement.cs | 4 +++- .../RestaurantEnvironmentController.cs | 13 ++++++++----- .../RestaurantManagementController.cs | 12 ++++++++---- .../Conrtollers/RestaurantPlayerController.cs | 19 +++++++++---------- .../Conrtollers/RestaurantRunController.cs | 9 +++++++-- .../Tasks/CreateRestaurantEnvironment.cs | 8 ++++++-- .../Tasks/CreateRestaurantPlayer.cs | 9 ++++++--- .../RestaurantController.cs | 5 +++-- 14 files changed, 59 insertions(+), 36 deletions(-) create mode 100644 Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset rename Assets/_DDD/_Addressables/So/{RestaurantManagementSo.asset.meta => RestaurantManagementDataSo.asset.meta} (79%) delete mode 100644 Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset diff --git a/Assets/_DDD/_Addressables/So/RestaurantDataSo.asset b/Assets/_DDD/_Addressables/So/RestaurantDataSo.asset index 094dfb49c..39c210c48 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantDataSo.asset +++ b/Assets/_DDD/_Addressables/So/RestaurantDataSo.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5a5ef3a8df040601bdc67f5e7263d5901dbc8b6e874c138876b00df1da7a2d4 +oid sha256:2f1d72dffa804297d96e89ddda2031e141e11a4d537e3424dbcd16aae483d89b size 749 diff --git a/Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset b/Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset new file mode 100644 index 000000000..cbd223d21 --- /dev/null +++ b/Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb071df6011343b2428a3b245a2583cb6d6e6f5a4479f5490b213dee2ed612a0 +size 722 diff --git a/Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset.meta b/Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset.meta similarity index 79% rename from Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset.meta rename to Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset.meta index 093d18048..f065b1be5 100644 --- a/Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset.meta +++ b/Assets/_DDD/_Addressables/So/RestaurantManagementDataSo.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8c4fcb278b09f944cbfa342ace27fcd4 +guid: d4af913216da4468ea23c8f910d86644 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset b/Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset deleted file mode 100644 index 413fea693..000000000 --- a/Assets/_DDD/_Addressables/So/RestaurantManagementSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5e99855f3991c4d22ebd4efb2c8aa37dc2b83234e858ea545bd32a1b18e0d37 -size 949 diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs index 3b57a8a6f..3d71fce80 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInput.cs @@ -7,7 +7,7 @@ public class RestaurantPlayerInput : MonoBehaviour { private RestaurantPlayerDataSo _playerDataSo; - private async void Start() + private void Start() { _playerDataSo = RestaurantDataSo.instance.PlayerData; _playerDataSo.OpenManagementUiAction = InputManager.Instance.GetAction(InputActionMaps.Restaurant, nameof(RestaurantActions.OpenManagementUi)); diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs index 920475c81..dc8fde2fa 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerInteraction.cs @@ -15,7 +15,7 @@ protected override void Start() _ = Initialize(); } - private async Task Initialize() + private Task Initialize() { _restaurantPlayerDataSo = RestaurantDataSo.instance.PlayerData; Debug.Assert(_restaurantPlayerDataSo != null, "_restaurantPlayerDataSo is null"); @@ -28,6 +28,8 @@ private async Task Initialize() _interactionLayerMask = _restaurantPlayerDataSo.InteractionLayerMask; EventBus.Register(this); + + return Task.CompletedTask; } protected override void OnDestroy() diff --git a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs b/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs index 58adbc083..5257a9761 100644 --- a/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs +++ b/Assets/_DDD/_Scripts/RestaurantCharacter/Player/RestaurantPlayerMovement.cs @@ -77,7 +77,7 @@ private void InitializeComponents() #endif } - private async System.Threading.Tasks.Task InitializePlayerData() + private System.Threading.Tasks.Task InitializePlayerData() { try { @@ -89,6 +89,8 @@ private async System.Threading.Tasks.Task InitializePlayerData() { Debug.LogError($"Player data load failed\n{e}"); } + + return System.Threading.Tasks.Task.CompletedTask; } private void SubscribeToInputEvents() diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs index 397c48cd6..595bbcbef 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantEnvironmentController.cs @@ -6,23 +6,26 @@ namespace DDD public class RestaurantEnvironmentController : RestaurantFlowController { private RestaurantEnvironmentStateSo _environmentState; - public override async Task InitializeController() + public override Task InitializeController() { + return Task.CompletedTask; } - public override async Task InitializeState() + public override Task InitializeState() { _environmentState = RestaurantState.instance.EnvironmentState; - + return Task.CompletedTask; } - public override async Task OnReadyNewFlow(GameFlowState newFlowState) + public override Task OnReadyNewFlow(GameFlowState newFlowState) { // if(newFlowState == GameFlowState.ReadyForRestaurant) GenerateDummyEnvironmentProps(); // XXX : DUMMY! REMOVE THIS + return Task.CompletedTask; } - public override async Task OnExitCurrentFlow(GameFlowState exitingFlowState) + public override Task OnExitCurrentFlow(GameFlowState exitingFlowState) { + return Task.CompletedTask; } private void GenerateDummyEnvironmentProps() diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs index e46162816..b4781258e 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantManagementController.cs @@ -5,22 +5,26 @@ namespace DDD { public class RestaurantManagementController : RestaurantFlowController { - public override async Task InitializeController() + public override Task InitializeController() { + return Task.CompletedTask; } - public override async Task InitializeState() + public override Task InitializeState() { // Load default asset RestaurantState.instance.ManagementState.InitializeReadyForRestaurant(); + return Task.CompletedTask; } - public override async Task OnReadyNewFlow(GameFlowState newFlowState) + public override Task OnReadyNewFlow(GameFlowState newFlowState) { + return Task.CompletedTask; } - public override async Task OnExitCurrentFlow(GameFlowState exitingFlowState) + public override Task OnExitCurrentFlow(GameFlowState exitingFlowState) { + return Task.CompletedTask; } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs index a9c240966..e02b74a49 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantPlayerController.cs @@ -6,12 +6,14 @@ namespace DDD { public class RestaurantPlayerController : RestaurantFlowController { - public override async Task InitializeController() + public override Task InitializeController() { + return Task.CompletedTask; } - public override async Task InitializeState() + public override Task InitializeState() { + return Task.CompletedTask; } public override async Task OnReadyNewFlow(GameFlowState newFlowState) @@ -20,23 +22,20 @@ public override async Task OnReadyNewFlow(GameFlowState newFlowState) { List tasks = new List(); // Spawn player job - CreateRestaurantPlayer createRestaurantPlayerJob = new CreateRestaurantPlayer(); + CreateRestaurantPlayer createRestaurantPlayerJob = CreateInstance(); - var createPlayerReadyHandle = createRestaurantPlayerJob.ReadyFlowTask(); - var createPlayerHandle = createRestaurantPlayerJob.RunFlowTask(); - tasks.Add(createPlayerReadyHandle); - tasks.Add(createPlayerHandle); - - Task.WhenAll(tasks); + await createRestaurantPlayerJob.ReadyFlowTask(); + await createRestaurantPlayerJob.RunFlowTask(); } } - public override async Task OnExitCurrentFlow(GameFlowState exitingFlowState) + public override Task OnExitCurrentFlow(GameFlowState exitingFlowState) { if (exitingFlowState == GameFlowState.SettlementRestaurant) { // TODO : Remove player character } + return Task.CompletedTask; } } } diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs index 0cfce07d9..c05aff1f7 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/RestaurantRunController.cs @@ -6,17 +6,22 @@ namespace DDD public class RestaurantRunController : RestaurantFlowController { RestaurantCustomerStateSo _restaurantCustomerStateSo; - public override async Task InitializeController() + public override Task InitializeController() { + return Task.CompletedTask; + } - public override async Task InitializeState() + public override Task InitializeState() { + return Task.CompletedTask; + } public override async Task OnReadyNewFlow(GameFlowState newFlowState) { var restaurantCustomerStateHandle = _restaurantCustomerStateSo.OnReadyNewFlow(newFlowState); + await Task.WhenAll(restaurantCustomerStateHandle); } public override async Task OnExitCurrentFlow(GameFlowState exitingFlowState) { diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs index 12003a9d5..c203fa67c 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantEnvironment.cs @@ -5,11 +5,13 @@ namespace DDD { public class CreateRestaurantEnvironment : RestaurantFlowTask { - public override async Task ReadyFlowTask() + public override Task ReadyFlowTask() { + return Task.CompletedTask; + } - public override async Task RunFlowTask() + public override Task RunFlowTask() { // TODO : Base prefab from EnvironmentDataSo @@ -18,6 +20,8 @@ public override async Task RunFlowTask() { // TODO : Instantiate and Initialize } + return Task.CompletedTask; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs index 19213fd40..3c17ceceb 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/Conrtollers/Tasks/CreateRestaurantPlayer.cs @@ -9,22 +9,25 @@ public class CreateRestaurantPlayer : RestaurantFlowTask [SerializeField] private Vector3 _spawnPosition; + private GameObject playerPrefab; + public override async Task ReadyFlowTask() { - + playerPrefab = await AssetManager.LoadAsset(CommonConstants.RestaurantPlayer); } - public override async Task RunFlowTask() + public override Task RunFlowTask() { // TODO : Player exist check - var playerPrefab = await AssetManager.LoadAsset(CommonConstants.RestaurantPlayer); var player = PrefabUtility.InstantiatePrefab(playerPrefab) as GameObject; player.transform.position = _spawnPosition; player.transform.rotation = playerPrefab.transform.rotation; player.name = CommonConstants.RestaurantPlayer; CameraManager.Instance.GetCameraGameObject(CameraType.RestaurantBaseCamera) .SetFollowAndLookAtTarget(player.transform); + + return Task.CompletedTask; } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs b/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs index 03d371437..a94350b54 100644 --- a/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs +++ b/Assets/_DDD/_Scripts/RestaurantController/RestaurantController.cs @@ -30,11 +30,11 @@ public async Task Init() { await LoadData(); await RestaurantDataSo.instance.LoadData(); + InitializeAllFlowControllers(); } public void PostInit() { - InitializeAllFlowControllers(); } private void RegisterFlowHandler() @@ -60,8 +60,9 @@ private void InitializeAllFlowControllers() } } - private async Task LoadData() + private Task LoadData() { + return Task.CompletedTask; } public async Task OnReadyNewFlow(GameFlowState newFlowState)