From 8a1b13d075c3ac90073921609896061e5b1d4f3e Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Fri, 29 Aug 2025 16:50:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Interactor=20=EC=9D=B8=ED=84=B0=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=8A=A4=EC=97=90=20Solver=20type=20fetch=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Scripts/Game/GameEvent/IInteractable.cs | 1 + .../Character/Core/CharacterInteraction.cs | 2 +- .../Character/Player/PlayerInteraction.cs | 2 +- .../Event/RestaurantInteractionEvents.cs | 46 +++++++++---------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs index 093af0d2f..834137f1f 100644 --- a/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs +++ b/Assets/_DDD/_Scripts/Game/GameEvent/IInteractable.cs @@ -56,6 +56,7 @@ public interface IInteractor GameObject GetInteractorGameObject(); IInteractable GetFocusedInteractable(); bool CanSolveInteractionType(InteractionType interactionType); + bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType); bool IsInteractionHidden(IInteractable interactable); bool CanInteractTo(IInteractable interactable, ScriptableObject payloadSo = null); diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs index ee8e89e6b..7dcb8ab7a 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/CharacterInteraction.cs @@ -108,7 +108,7 @@ public bool IsInteractionHidden(IInteractable interactable) return true; } - protected virtual bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) + public virtual bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) { return RestaurantInteractionEventSolvers.TypeToSolver.TryGetValue(type, out solverType); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs index b22e70148..ad6c189f7 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Player/PlayerInteraction.cs @@ -201,7 +201,7 @@ protected IInteractable GetNearestInteractable() return closest; } - protected override bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) + public override bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) { if (RestaurantInteractionEventSolvers.TypeToPlayerSolver.TryGetValue(type, out solverType)) { diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs index 99e36aa31..772d4e02e 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionEvents.cs @@ -1,18 +1,19 @@ using System; using System.Collections.Generic; +using JetBrains.Annotations; using UnityEngine; namespace DDD.Restaurant { public static class RestaurantInteractionEventSolvers { - public static Dictionary TypeToSolver = new() + public static readonly Dictionary TypeToSolver = new() { {InteractionType.RestaurantManagement, typeof(RestaurantManagementSolver)}, {InteractionType.RestaurantOrder, typeof(RestaurantOrderSolver)}, {InteractionType.RestaurantCook, typeof(RestaurantCookSolver)} }; - public static Dictionary TypeToPlayerSolver = new() + public static readonly Dictionary TypeToPlayerSolver = new() { {InteractionType.RestaurantOrder, typeof(RestaurantOrderPlayerSolver)}, }; @@ -46,31 +47,28 @@ public bool RequestInteraction(GameObject causer, GameObject target, Interaction var evt = MakeInteractionEvent(causer, target, interactionType, payload); evt.EventResult = false; - // Solve event directly. 이벤트 처리는 여기서 하고, 이벤트 호출로는 이런 이벤트가 호출되었고 결과가 어떻다는 거 전파하는 식으로. - if (RestaurantInteractionEventSolvers.TypeToSolver.TryGetValue(interactionType, out var solverType)) + + IInteractor interactor = causer.GetComponent(); + if (interactor != null && interactor.CanSolveInteractionType(interactionType)) { - Component solverComponent = causer.GetComponent(solverType); - IInteractionSolver solver = solverComponent as IInteractionSolver; - IInteractor interactor = causer.GetComponent(); - IInteractable interactable = target.GetComponent(); - - // Cast solverComponent to IInteractable - if (solver is not null && interactor is not null) + if (interactor.FetchSolverTypeForInteraction(interactionType, out var solverType)) { - bool canExecute = solver.CanExecuteInteraction(interactor, interactable, evt.Payload); - if (canExecute) + // Solve event directly. 이벤트 처리는 여기서 하고, 이벤트 호출로는 이런 이벤트가 호출되었고 결과가 어떻다는 거 전파하는 식으로. + if (solverType != null) { - evt.EventResult = solver.ExecuteInteraction(interactor, interactable, evt.Payload); - } - else - { - evt.EventResult = false; - } - } - else - { - // Should not reach here! - Debug.Assert(false, "Solver Component or Interactor is null"); + IInteractionSolver solver = causer.GetComponent(solverType) as IInteractionSolver; + IInteractable interactable = target.GetComponent(); + if (solver is not null) + { + bool canExecute = solver.CanExecuteInteraction(interactor, interactable, evt.Payload); + evt.EventResult = canExecute && solver.ExecuteInteraction(interactor, interactable, evt.Payload); + } + else + { + // Should not reach here! + Debug.Assert(false, "Solver Component or Interactor is null"); + } + } } } -- 2.45.2 From c903c0c2105f9d753ea06c62cc7e4bba87c90bf4 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Fri, 29 Aug 2025 16:51:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Bill=20Hud=20=EC=B4=88=EC=95=88=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Addressables/Prefabs/CustomerNpc.prefab | 203 ++++ .../Prefabs/Uis/GameUi/Huds/Restaurant.meta | 8 + .../Uis/GameUi/Huds/Restaurant/BillHud.prefab | 937 ++++++++++++++++++ .../Huds/Restaurant/BillHud.prefab.meta | 7 + .../GameUi/Huds/Restaurant/BillItem.prefab | 98 ++ .../Huds/Restaurant/BillItem.prefab.meta | 7 + .../Uis/GameUi/Huds/RestaurantHud.prefab | 105 ++ .../RestaurantOrderSolver_Order.cs | 10 +- Assets/_DDD/_Scripts/Restaurant/Ui/Hud.meta | 3 + .../_Scripts/Restaurant/Ui/Hud/BillHud.cs | 24 + .../Restaurant/Ui/Hud/BillHud.cs.meta | 3 + ProjectSettings/EditorBuildSettings.asset | 2 +- 12 files changed, 1405 insertions(+), 2 deletions(-) create mode 100644 Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant.meta create mode 100644 Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab create mode 100644 Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab.meta create mode 100644 Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab create mode 100644 Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab.meta create mode 100644 Assets/_DDD/_Scripts/Restaurant/Ui/Hud.meta create mode 100644 Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs create mode 100644 Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs.meta diff --git a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab index bdc58f52b..5ee65ca4d 100644 --- a/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/CustomerNpc.prefab @@ -1782,6 +1782,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} insertIndex: -1 addedObject: {fileID: 3825874317044733320} + - targetCorrespondingSourceObject: {fileID: 7462519206451630147, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} + insertIndex: -1 + addedObject: {fileID: 7166420413980924482} m_SourcePrefab: {fileID: 100100000, guid: ceeea618d8ee23642a0e56b3f963448c, type: 3} --- !u!1 &4266090516809920735 stripped GameObject: @@ -1824,3 +1827,203 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: af69e82818254bfa9cabb2dbf9430850, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &7166420413980924482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4266090516809920735} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} + m_Name: + m_EditorClassIdentifier: + profile: {fileID: 0} + profileSync: 0 + camerasLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + effectGroup: 0 + effectTarget: {fileID: 0} + effectGroupLayer: + serializedVersion: 2 + m_Bits: 4294967295 + effectNameFilter: + effectNameUseRegEx: 0 + combineMeshes: 0 + alphaCutOff: 0 + cullBackFaces: 1 + padding: 0 + ignoreObjectVisibility: 0 + reflectionProbes: 0 + GPUInstancing: 1 + sortingPriority: 0 + optimizeSkinnedMesh: 1 + depthClip: 0 + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + normalsOption: 0 + ignore: 0 + _highlighted: 0 + fadeInDuration: 0 + fadeOutDuration: 0 + flipY: 0 + constantWidth: 1 + extraCoveragePixels: 0 + minimumWidth: 0 + subMeshMask: -1 + overlay: 0 + overlayMode: 0 + overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + overlayAnimationSpeed: 1 + overlayMinIntensity: 0.5 + overlayBlending: 1 + overlayTexture: {fileID: 0} + overlayTextureUVSpace: 0 + overlayTextureScale: 1 + overlayTextureScrolling: {x: 0, y: 0} + overlayVisibility: 0 + outline: 1 + outlineColor: {r: 0, g: 0, b: 0, a: 1} + outlineColorStyle: 0 + outlineGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + outlineGradientInLocalSpace: 0 + outlineWidth: 0.45 + outlineBlurPasses: 2 + outlineQuality: 3 + outlineEdgeMode: 0 + outlineEdgeThreshold: 0.995 + outlineSharpness: 1 + outlineDownsampling: 1 + outlineVisibility: 0 + glowBlendMode: 0 + outlineBlitDebug: 0 + outlineIndependent: 0 + outlineContourStyle: 0 + outlineMaskMode: 0 + glow: 0 + glowWidth: 0.4 + glowQuality: 3 + glowBlurMethod: 0 + glowDownsampling: 2 + glowHQColor: {r: 0.64, g: 1, b: 0, a: 1} + glowDithering: 1 + glowDitheringStyle: 0 + glowMagicNumber1: 0.75 + glowMagicNumber2: 0.5 + glowAnimationSpeed: 1 + glowVisibility: 0 + glowBlitDebug: 0 + glowBlendPasses: 1 + glowPasses: + - offset: 4 + alpha: 0.1 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 3 + alpha: 0.2 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 2 + alpha: 0.3 + color: {r: 0.64, g: 1, b: 0, a: 1} + - offset: 1 + alpha: 0.4 + color: {r: 0.64, g: 1, b: 0, a: 1} + glowMaskMode: 0 + innerGlow: 0 + innerGlowWidth: 1 + innerGlowColor: {r: 1, g: 1, b: 1, a: 1} + innerGlowBlendMode: 0 + innerGlowVisibility: 0 + targetFX: 0 + targetFXTexture: {fileID: 0} + targetFXColor: {r: 1, g: 1, b: 1, a: 1} + targetFXCenter: {fileID: 0} + targetFXRotationSpeed: 50 + targetFXInitialScale: 4 + targetFXEndScale: 1.5 + targetFXScaleToRenderBounds: 1 + targetFXUseEnclosingBounds: 0 + targetFXAlignToGround: 0 + targetFXOffset: {x: 0, y: 0, z: 0} + targetFXFadePower: 32 + targetFXGroundMaxDistance: 10 + targetFXGroundLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + targetFXTransitionDuration: 0.5 + targetFXStayDuration: 1.5 + targetFXVisibility: 1 + iconFX: 0 + iconFXMesh: {fileID: 0} + iconFXLightColor: {r: 1, g: 1, b: 1, a: 1} + iconFXDarkColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + iconFXCenter: {fileID: 0} + iconFXRotationSpeed: 50 + iconFXAnimationOption: 0 + iconFXAnimationAmount: 0.1 + iconFXAnimationSpeed: 3 + iconFXScale: 1 + iconFXScaleToRenderBounds: 0 + iconFXOffset: {x: 0, y: 1, z: 0} + iconFXTransitionDuration: 0.5 + iconFXStayDuration: 1.5 + seeThrough: 2 + seeThroughOccluderMask: + serializedVersion: 2 + m_Bits: 4294967295 + seeThroughOccluderThreshold: 0.3 + seeThroughOccluderMaskAccurate: 0 + seeThroughOccluderCheckInterval: 1 + seeThroughOccluderCheckIndividualObjects: 0 + seeThroughDepthOffset: 0 + seeThroughMaxDepth: 0 + seeThroughIntensity: 0.8 + seeThroughTintAlpha: 0.5 + seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1} + seeThroughNoise: 1 + seeThroughBorder: 0 + seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1} + seeThroughBorderOnly: 0 + seeThroughBorderWidth: 0.45 + seeThroughOrdered: 0 + seeThroughTexture: {fileID: 0} + seeThroughTextureUVSpace: 0 + seeThroughTextureScale: 1 + seeThroughChildrenSortingMode: 0 + rmsCount: 1 + hitFxInitialIntensity: 0 + hitFxMode: 0 + hitFxFadeOutDuration: 0.25 + hitFxColor: {r: 1, g: 1, b: 1, a: 1} + hitFxRadius: 0.5 diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant.meta b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant.meta new file mode 100644 index 000000000..8c050fa24 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 676e0be57cee240fb920fa7b479381a8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab new file mode 100644 index 000000000..74d3b4b02 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab @@ -0,0 +1,937 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &814517478318027419 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3398312569174398082} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3398312569174398082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 814517478318027419} + 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: 1 + m_Children: + - {fileID: 9025676572794853099} + - {fileID: 5705342858583213996} + m_Father: {fileID: 562282041309223089} + 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!1 &5496390006033382959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9025676572794853099} + - component: {fileID: 6092122108886496063} + - component: {fileID: 6887818348231159516} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9025676572794853099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496390006033382959} + 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: 1 + m_Children: [] + m_Father: {fileID: 3398312569174398082} + 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 &6092122108886496063 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496390006033382959} + m_CullTransparentMesh: 1 +--- !u!114 &6887818348231159516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5496390006033382959} + 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: 0, g: 0, b: 0, a: 0.78431374} + 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: 0} + 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!1 &6333764397848776115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 562282041309223089} + - component: {fileID: 4402599963139080453} + m_Layer: 5 + m_Name: BillHud + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &562282041309223089 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6333764397848776115} + 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: 1 + m_Children: + - {fileID: 3398312569174398082} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 480, y: 80} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &4402599963139080453 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6333764397848776115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 531d1bd66fd24e70b3ebd6dd120bfb09, type: 3} + m_Name: + m_EditorClassIdentifier: + _billItemsLayoutTransform: {fileID: 5705342858583213996} + _billItemPrefab: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!1001 &2365489880424560794 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5705342858583213996} + m_Modifications: + - target: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Name + value: BillItem_005 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!224 &1531966926992972741 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + m_PrefabInstance: {fileID: 2365489880424560794} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2439310556047834854 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3398312569174398082} + m_Modifications: + - target: {fileID: 697573095730933344, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_Name + value: BaseHorizontalLayout + objectReference: {fileID: 0} + - target: {fileID: 2420418148532494408, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5815511086215988644, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildAlignment + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildScaleWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildScaleHeight + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildControlWidth + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildControlHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildForceExpandWidth + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8459888520532805033, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + propertyPath: m_ChildForceExpandHeight + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + insertIndex: -1 + addedObject: {fileID: 7655645677637562558} + - targetCorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + insertIndex: -1 + addedObject: {fileID: 6244044418086159105} + - targetCorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + insertIndex: -1 + addedObject: {fileID: 7813888696583048993} + - targetCorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + insertIndex: -1 + addedObject: {fileID: 1003698800654844653} + - targetCorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + insertIndex: -1 + addedObject: {fileID: 7568171459681496761} + - targetCorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + insertIndex: -1 + addedObject: {fileID: 1531966926992972741} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} +--- !u!224 &5705342858583213996 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7995964240802183498, guid: c40aab0ea6318ea49a4aecbc0218e971, type: 3} + m_PrefabInstance: {fileID: 2439310556047834854} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4070288636298928562 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5705342858583213996} + m_Modifications: + - target: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Name + value: BillItem_003 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!224 &1003698800654844653 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + m_PrefabInstance: {fileID: 4070288636298928562} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6476678811490020478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5705342858583213996} + m_Modifications: + - target: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Name + value: BillItem_002 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!224 &7813888696583048993 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + m_PrefabInstance: {fileID: 6476678811490020478} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6671731652717972966 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5705342858583213996} + m_Modifications: + - target: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Name + value: BillItem_004 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!224 &7568171459681496761 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + m_PrefabInstance: {fileID: 6671731652717972966} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6894758556105167841 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5705342858583213996} + m_Modifications: + - target: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Name + value: BillItem + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!224 &7655645677637562558 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + m_PrefabInstance: {fileID: 6894758556105167841} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7148908184896659550 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5705342858583213996} + m_Modifications: + - target: {fileID: 3089361617529558395, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Name + value: BillItem_001 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5e5950286477b41e79236646f59562c4, type: 3} +--- !u!224 &6244044418086159105 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3859949157257880415, guid: 5e5950286477b41e79236646f59562c4, type: 3} + m_PrefabInstance: {fileID: 7148908184896659550} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab.meta b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab.meta new file mode 100644 index 000000000..4b1b2dc25 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillHud.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c294ac1c8c9b0430a90d6e463ef94015 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab new file mode 100644 index 000000000..71aaa4ca1 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3089361617529558395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3859949157257880415} + - component: {fileID: 1046976758703906450} + - component: {fileID: 4054510850230341450} + - component: {fileID: 2747939510476076652} + m_Layer: 5 + m_Name: BillItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3859949157257880415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3089361617529558395} + 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: 1 + m_Children: [] + m_Father: {fileID: 0} + 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: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1046976758703906450 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3089361617529558395} + m_CullTransparentMesh: 1 +--- !u!114 &4054510850230341450 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3089361617529558395} + 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: 862241056335df649b6a424c88ad34c7, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 7 +--- !u!114 &2747939510476076652 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3089361617529558395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 64 + m_PreferredHeight: 64 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab.meta b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab.meta new file mode 100644 index 000000000..3617abec4 --- /dev/null +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/Restaurant/BillItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5e5950286477b41e79236646f59562c4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab index db2495a0a..4c3b02178 100644 --- a/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab +++ b/Assets/_DDD/_Addressables/Prefabs/Uis/GameUi/Huds/RestaurantHud.prefab @@ -561,6 +561,108 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1001 &2720881871446132019 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3940853162783645140} + m_Modifications: + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_SizeDelta.x + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_SizeDelta.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6333764397848776115, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + propertyPath: m_Name + value: BillHud + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} +--- !u!224 &2454218997995511170 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 562282041309223089, guid: c294ac1c8c9b0430a90d6e463ef94015, type: 3} + m_PrefabInstance: {fileID: 2720881871446132019} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5387070474184109230 PrefabInstance: m_ObjectHideFlags: 0 @@ -660,6 +762,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 8967231042952671610, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3} insertIndex: -1 addedObject: {fileID: 743749051989927098} + - targetCorrespondingSourceObject: {fileID: 8967231042952671610, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3} + insertIndex: -1 + addedObject: {fileID: 2454218997995511170} - targetCorrespondingSourceObject: {fileID: 8967231042952671610, guid: 4f2bf029cb06b084ba41defc8fc76731, type: 3} insertIndex: -1 addedObject: {fileID: 8229589654595845064} diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs index 369947a00..483ded96b 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs @@ -13,6 +13,11 @@ public string MenuId } } + public class RestaurantOrderEvent : IEvent + { + public string MenuId; + } + public class RestaurantOrderSolver_Order : RestaurantOrderSolverBase { public override bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null) @@ -36,7 +41,10 @@ public override bool ExecuteInteractionSubsystem(IInteractor interactor, IIntera // Create payload and set the menu RestaurantOrderMenuPayload orderPayload = ScriptableObject.CreateInstance(); orderPayload.MenuId = foodMenu; - payload = orderPayload; + + RestaurantOrderEvent evt = new RestaurantOrderEvent(); + evt.MenuId = foodMenu; + EventBus.Broadcast(evt); return base.ExecuteInteractionSubsystem(interactor, interactable, payload); } diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud.meta new file mode 100644 index 000000000..092e9b135 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 7b993aa93ea64d1182e1d502f908817b +timeCreated: 1756449365 \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs new file mode 100644 index 000000000..c9d157409 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs @@ -0,0 +1,24 @@ +using System; +using UnityEngine; +using UnityEngine.UI; + +namespace DDD.Restaurant +{ + public class BillHud : MonoBehaviour, IEventHandler + { + [SerializeField] private RectTransform _billItemsLayoutTransform; + [SerializeField] private GameObject _billItemPrefab; + + private void Start() + { + EventBus.Register(this); + + Utils.DestroyAllChildren(_billItemsLayoutTransform); + } + + public void HandleEvent(RestaurantOrderEvent evt) + { + var billItem = Instantiate(_billItemPrefab, _billItemsLayoutTransform); + } + } +} \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs.meta b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs.meta new file mode 100644 index 000000000..2c5c933e6 --- /dev/null +++ b/Assets/_DDD/_Scripts/Restaurant/Ui/Hud/BillHud.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 531d1bd66fd24e70b3ebd6dd120bfb09 +timeCreated: 1756449373 \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index b1d747c7b..ed8485fa0 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d69f9ac4352f59df16943fd905dd7351328f295b2a8e4f74e8346f7bd4dc1bc +oid sha256:f86abe14bf9fc4c7c93dfa96efd110ef0f56c3fb96a952c57e06a723fc87c352 size 1075 -- 2.45.2 From bf253cd9880c163a97d4e37c373320f0f9b333e6 Mon Sep 17 00:00:00 2001 From: Jeonghyeon Ha Date: Fri, 29 Aug 2025 19:09:42 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=9D=B8=ED=84=B0?= =?UTF-8?q?=EB=9E=99=EC=85=98=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/RestaurantOrder.prefab | 19 +++----------- .../Customer/Actions/StartRestaurantOrder.cs | 8 +++--- .../Character/Core/RestaurantCharacter.cs | 6 +++++ .../InteractionSubsystem_Order.cs | 25 ++++++++++++++++++- .../Event/RestaurantInteractionComponent.cs | 6 ++--- .../RestaurantOrderSolverBase.cs | 23 +++++++++++++---- .../RestaurantOrderSolver_Order.cs | 7 ++++++ .../RestaurantOrderSolver_Serve.cs | 2 +- .../RestaurantOrderSolver_Wait.cs | 7 ++++++ 9 files changed, 74 insertions(+), 29 deletions(-) diff --git a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab index 416b52c32..c6b9273d8 100644 --- a/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab +++ b/Assets/_DDD/Restaurant/Environments/Interactables/Common/RestaurantOrder.prefab @@ -141,11 +141,12 @@ MonoBehaviour: _executionParameters: _holdTime: 0 _displayParameters: - _messageKey: + k__BackingField: + k__BackingField: _interactionAvailableFlows: 2 _aiInteractionPoints: - {fileID: 1664322405549350652} - autoInitialize: 1 + _autoInitialize: 1 --- !u!114 &4456475204957017828 MonoBehaviour: m_ObjectHideFlags: 0 @@ -221,7 +222,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 2 + Data: 1 - Name: Entry: 7 Data: @@ -234,18 +235,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 3 - Data: 4 - - Name: $v - Entry: 10 - Data: 0 - - Name: - Entry: 8 - Data: - Name: Entry: 13 Data: diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs index ba29130bd..045256e15 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/AI/Customer/Actions/StartRestaurantOrder.cs @@ -10,13 +10,13 @@ public class StartRestaurantOrder : Action [SerializeField] private RestaurantOrderType _targetOrderType = RestaurantOrderType.Wait; private IInteractor _interactor; - private bool _isGetInteractor; + private bool _isInteractorValid; public override void OnStart() { - _isGetInteractor = gameObject.TryGetComponent(out _interactor); + _isInteractorValid = gameObject.TryGetComponent(out _interactor); - if (!_isGetInteractor) + if (!_isInteractorValid) Debug.LogError($"[{GetType().Name}] IInteractor를 찾을 수 없습니다: {gameObject.name}"); } @@ -61,7 +61,7 @@ public override TaskStatus OnUpdate() } // 상호작용 수행: 액션이 붙은 에이전트를 Interactor로 사용 - if (!_isGetInteractor) + if (!_isInteractorValid) { return TaskStatus.Failure; } diff --git a/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs index 5599e61ac..b5142beef 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Character/Core/RestaurantCharacter.cs @@ -1,3 +1,4 @@ +using System; using Sirenix.OdinInspector; using UnityEngine; @@ -37,6 +38,11 @@ public bool CanSolveInteractionType(InteractionType interactionType) return _interactionComponent.CanSolveInteractionType(interactionType); } + public bool FetchSolverTypeForInteraction(InteractionType type, out Type solverType) + { + return _interactionComponent.FetchSolverTypeForInteraction(type, out solverType); + } + public bool IsInteractionHidden(IInteractable interactable) { return _interactionComponent.IsInteractionHidden(interactable); diff --git a/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs index 4d2bb9848..6b8a4ad8d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Environment/Interactions/InteractionSubsystem_Order.cs @@ -14,14 +14,27 @@ public enum RestaurantOrderType : uint Dirty = 1u << 4, } + public class RestaurantOrderObjectState + { + public GameObject Customer; + public GameObject Worker; + + public string FoodId; + } + public interface IRestaurantOrderObject { void TransitionToNextPhase(); + RestaurantOrderType GetCurrentOrderPhase(); + RestaurantOrderObjectState GetOrderObjectState(); } + // TODO : 도중에 이탈할 경우, 순차적으로 다음 페이즈로 넘어가는 게 아니라 바로 Wait, Dirty로 전이시킬 필요가 있음 + public class InteractionSubsystem_Order : MonoBehaviour, IInteractionSubsystemObject, IRestaurantOrderObject { [SerializeField] private RestaurantOrderType _currentRestaurantOrderType = RestaurantOrderType.Wait; + [SerializeField] private RestaurantOrderObjectState _orderObjectState = new(); public bool CanInteract() { @@ -39,7 +52,17 @@ public void TransitionToNextPhase() var nextState = GetNextState(currentState); SetInteractionSubsystemType(nextState); } - + + public RestaurantOrderType GetCurrentOrderPhase() + { + return _currentRestaurantOrderType; + } + + public RestaurantOrderObjectState GetOrderObjectState() + { + return _orderObjectState; + } + public bool OnInteracted(IInteractor interactor, ScriptableObject payloadSo = null) { return true; diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs index 8568b690e..25b408a71 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/RestaurantInteractionComponent.cs @@ -4,6 +4,7 @@ using System.Linq; using UnityEngine; using Sirenix.OdinInspector; +using UnityEngine.Serialization; namespace DDD.Restaurant { @@ -27,7 +28,7 @@ public class RestaurantInteractionComponent : MonoBehaviour, IInteractable, IInt [SerializeField] protected InteractionDisplayParameters _displayParameters; [SerializeField] protected GameFlowState _interactionAvailableFlows; [SerializeField] private Transform[] _aiInteractionPoints; - [SerializeField] private bool autoInitialize = true; + [FormerlySerializedAs("autoInitialize")] [SerializeField] private bool _autoInitialize = true; private bool _isInitialized = false; private Dictionary _subsystems = new(); @@ -44,7 +45,7 @@ private void Start() var environmentState = RestaurantState.Instance?.EnvironmentState; environmentState?.RegisterInteractable(this); - if (autoInitialize && !_isInitialized) + if (_autoInitialize && !_isInitialized) { InitializeInteraction(_interactionType); } @@ -70,7 +71,6 @@ public virtual bool CanInteract() public virtual bool IsInteractionAvailable() { - var currentGameFlowState = GameFlowManager.Instance.GameFlowDataSo.CurrentGameState; var flowDisabled = (currentGameFlowState & _interactionAvailableFlows) == 0; if (flowDisabled) diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolverBase.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolverBase.cs index 63c0a89e3..de1562422 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolverBase.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolverBase.cs @@ -8,11 +8,11 @@ public virtual bool ExecuteInteractionSubsystem(IInteractor interactor, IInterac { if (CanExecuteInteractionSubsystem(interactor, interactable, payload) == false) return false; - if (interactable is not IInteractionSubsystemOwner subsystemOwner) - return false; - if (!subsystemOwner.TryGetSubsystemObject(out var subsystem)) - return false; - if (subsystem is IRestaurantOrderObject orderObject) + + if (GetRestaurantOrderObject(interactable) == null) return false; + + var orderObject = GetRestaurantOrderObject(interactable); + if (orderObject != null) { orderObject.TransitionToNextPhase(); } @@ -20,6 +20,19 @@ public virtual bool ExecuteInteractionSubsystem(IInteractor interactor, IInterac } public abstract bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null); + + protected static IRestaurantOrderObject GetRestaurantOrderObject(IInteractable interactable) + { + var subsystemOwner = interactable.GetInteractableGameObject().GetComponent(); + IInteractionSubsystemObject subsystemObject = null; + subsystemOwner?.TryGetSubsystemObject(out subsystemObject); + if (subsystemObject is IRestaurantOrderObject restaurantOrderObject) + { + return restaurantOrderObject; + } + + return null; + } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs index 483ded96b..67e8b8344 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Order.cs @@ -27,6 +27,13 @@ public override bool ExecuteInteractionSubsystem(IInteractor interactor, IIntera var highlightComponent = highlightObject?.GetComponent(); highlightComponent?.ClearHighlightProxy(); + // Worker takes the order + var orderObject = GetRestaurantOrderObject(interactable); + if (orderObject != null) + { + orderObject.GetOrderObjectState().Worker = interactor.GetInteractorGameObject(); + } + // Pick random menu from today's menu list var foodCandidates = RestaurantState.Instance.ManagementState.GetTodayFoodMenus(); if (foodCandidates == null || foodCandidates.Count == 0) diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs index 8a524e274..d4718a97d 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Serve.cs @@ -11,7 +11,7 @@ public override bool ExecuteInteractionSubsystem(IInteractor interactor, IIntera public override bool CanExecuteInteractionSubsystem(IInteractor interactor = null, IInteractable interactable = null, ScriptableObject payload = null) { - return true; + return false; } } } \ No newline at end of file diff --git a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs index c76745736..2a4a374f9 100644 --- a/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs +++ b/Assets/_DDD/_Scripts/Restaurant/Event/Solvers/RestaurantOrders/RestaurantOrderSolver_Wait.cs @@ -1,5 +1,6 @@ using Opsive.BehaviorDesigner.Runtime.Tasks; using UnityEngine; +using UnityEngine.UIElements; namespace DDD.Restaurant { @@ -7,6 +8,12 @@ public class RestaurantOrderSolver_Wait : RestaurantOrderSolverBase { public override bool ExecuteInteractionSubsystem(IInteractor interactor, IInteractable interactable, ScriptableObject payload = null) { + var orderObject = GetRestaurantOrderObject(interactable); + if (orderObject != null) + { + orderObject.GetOrderObjectState().Customer = interactor.GetInteractorGameObject(); + } + return base.ExecuteInteractionSubsystem(interactor, interactable, payload); } -- 2.45.2