From 7d3f76c3c0579172d5a67fd7467e1518c47b0be3 Mon Sep 17 00:00:00 2001 From: NTG Date: Tue, 2 Sep 2025 18:56:34 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=B7=EC=82=B0=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=86=90=EB=8B=98?= =?UTF-8?q?=20exitSubtree=20=EA=B2=B0=EC=82=B0=20action=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_DDD/_Addressables/AI/Customer/Subtree/ExitSubtree.asset | 4 ++-- .../Prefabs/Uis/GameUi/PopupUis/RestaurantSettlementUi.prefab | 2 +- .../RestaurantManagementUi_InputBindingSo 1.asset | 3 --- .../RestaurantManagementUi_InputBindingSo.asset | 3 +++ ....meta => RestaurantManagementUi_InputBindingSo.asset.meta} | 0 .../RestaurantSettlementUi_InputBindingSo.asset | 3 --- .../RestaurantSettlementtUi_InputBindingSo.asset | 3 +++ ...meta => RestaurantSettlementtUi_InputBindingSo.asset.meta} | 0 .../Restaurant/Controller/Conrtollers/SettlementController.cs | 3 +++ Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta | 3 --- 10 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo 1.asset create mode 100644 Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo.asset rename Assets/_DDD/_Addressables/So/UiActionInputBinding/{RestaurantSettlementUi_InputBindingSo.asset.meta => RestaurantManagementUi_InputBindingSo.asset.meta} (100%) delete mode 100644 Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementUi_InputBindingSo.asset create mode 100644 Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementtUi_InputBindingSo.asset rename Assets/_DDD/_Addressables/So/UiActionInputBinding/{RestaurantManagementUi_InputBindingSo 1.asset.meta => RestaurantSettlementtUi_InputBindingSo.asset.meta} (100%) delete mode 100644 Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta diff --git a/Assets/_DDD/_Addressables/AI/Customer/Subtree/ExitSubtree.asset b/Assets/_DDD/_Addressables/AI/Customer/Subtree/ExitSubtree.asset index e9b40e0ff..3cfdfeee9 100644 --- a/Assets/_DDD/_Addressables/AI/Customer/Subtree/ExitSubtree.asset +++ b/Assets/_DDD/_Addressables/AI/Customer/Subtree/ExitSubtree.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d69caf8e4dc80980db7130ab251485b09628eb7105428d29ebac9336e915adee -size 18724 +oid sha256:63a036d7331f9f380e05fc650465d4e4c2ed8b3c61cba7c38c6b902cdf7d4b93 +size 19843 diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantSettlementUi.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantSettlementUi.prefab index 95db47e86..3dd4bab81 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantSettlementUi.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/PopupUis/RestaurantSettlementUi.prefab @@ -475,7 +475,7 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: 3 _enableBlockImage: 1 - _uiActionsInputBinding: {fileID: 11400000, guid: 8073fcaf56fc7c34e996d0d47044f146, type: 2} + _uiActionsInputBinding: {fileID: 11400000, guid: b30903e1ac3d36240aa6bc3eef41cea8, type: 2} _confirmButton: {fileID: 1780169173096483685} _totalRevenueLabel: {fileID: 4534954305663344253} _normalCustomersLabel: {fileID: 6702012078445801388} diff --git a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo 1.asset b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo 1.asset deleted file mode 100644 index 767294101..000000000 --- a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo 1.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:412e151341169a32e4ba791b99162a4b264d88209e0ec6934f10cd8aee3d4811 -size 470 diff --git a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo.asset b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo.asset new file mode 100644 index 000000000..6a0024958 --- /dev/null +++ b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac93465aba4266ea03085e75f08ca4cfb799f45a3c10d82cfedeea292ed75ab4 +size 468 diff --git a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementUi_InputBindingSo.asset.meta b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo.asset.meta similarity index 100% rename from Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementUi_InputBindingSo.asset.meta rename to Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo.asset.meta diff --git a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementUi_InputBindingSo.asset b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementUi_InputBindingSo.asset deleted file mode 100644 index 27d030c14..000000000 --- a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementUi_InputBindingSo.asset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37461ee69322c1a9b306e28fb446546447fdfb465660812519c2e399f58015a1 -size 468 diff --git a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementtUi_InputBindingSo.asset b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementtUi_InputBindingSo.asset new file mode 100644 index 000000000..debc688de --- /dev/null +++ b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementtUi_InputBindingSo.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c62fadd919a5601bbcc868b6ab2fb367ecf3705289f350df6ddbab60c7c22810 +size 469 diff --git a/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo 1.asset.meta b/Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementtUi_InputBindingSo.asset.meta similarity index 100% rename from Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantManagementUi_InputBindingSo 1.asset.meta rename to Assets/_DDD/_Addressables/So/UiActionInputBinding/RestaurantSettlementtUi_InputBindingSo.asset.meta diff --git a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/SettlementController.cs b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/SettlementController.cs index f231ec135..53be5aeb0 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/SettlementController.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Controller/Conrtollers/SettlementController.cs @@ -26,6 +26,9 @@ public override Task OnReadyNewFlow(GameFlowState newFlowState) else if (newFlowState == GameFlowState.SettlementRestaurant) { // TODO : UI 띄우기 + var evt = GameEvents.OpenPopupUiEvent; + evt.UiType = typeof(SettlementUi); + EventBus.Broadcast(evt); _settlementState.SaveSettlementResult(); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta deleted file mode 100644 index a4ec90de2..000000000 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: c463c6dc93a04ffea1ab895e7c4a3063 -timeCreated: 1755082332 \ No newline at end of file