From 9af080fda291a61c0755c0fb72a7edd74823e65b Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Tue, 24 Sep 2024 19:35:49 +0900 Subject: [PATCH] =?UTF-8?q?Ver=200.3.0.2=20=EC=97=85=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01.Scenes/01.Tycoon.unity | 996 ++++++++++++------ Assets/01.Scenes/02.Combat/GlobalVolume.asset | 8 +- Assets/02.Scripts/Character/Npc/Customer.cs | 2 + Assets/02.Scripts/EventManager.cs | 7 + .../Interface/IPlayerInteraction.cs | 4 +- Assets/02.Scripts/Item/Cocktail/LiquidData.cs | 10 + Assets/02.Scripts/Item/Item.cs | 17 +- Assets/02.Scripts/Liquid.cs | 52 - Assets/02.Scripts/Prop/Tycoon/Barrel.cs | 11 +- .../Prop/Tycoon/InteractionFuniture.cs | 19 +- Assets/02.Scripts/Prop/Tycoon/ServingTable.cs | 8 +- .../Item/LiquidDataTable.asset | 11 +- Assets/02.Scripts/Tycoon/Garnish.cs | 32 + Assets/02.Scripts/Tycoon/Garnish.cs.meta | 2 + Assets/02.Scripts/Tycoon/Liquid.cs | 32 + Assets/02.Scripts/{ => Tycoon}/Liquid.cs.meta | 0 .../{ => Tycoon}/LiquidController.cs | 160 ++- .../{ => Tycoon}/LiquidController.cs.meta | 0 Assets/02.Scripts/Tycoon/LiquidIngredient.cs | 41 + .../Tycoon/LiquidIngredient.cs.meta | 2 + .../{ => Tycoon}/LiquidInteractionRegion.cs | 0 .../LiquidInteractionRegion.cs.meta | 0 Assets/02.Scripts/TycoonCameraManager.cs | 84 +- Assets/02.Scripts/Ui/InteractionUi.cs | 40 + Assets/02.Scripts/Ui/InteractionUi.cs.meta | 2 + .../{Ice.prefab => GarnishObject.prefab} | 112 +- ....prefab.meta => GarnishObject.prefab.meta} | 2 +- .../05.Prefabs/Maps/Tycoon/TycoonMap.prefab | 401 +------ .../Interactions/LiquidBarrel01.prefab | 26 +- .../Interactions/ServingTable.prefab | 10 +- .../Furniture/Interactions/TrashCan.prefab | 1 + .../05.Prefabs/Uis/InteractionCanvas.prefab | 8 +- Assets/Resources/Excel/LiquidDataTable.xlsx | Bin 8936 -> 9006 bytes Assets/Resources/JSON/LiquidDataTable.json | 7 + ProjectSettings/Physics2DSettings.asset | 26 +- ProjectSettings/TagManager.asset | 2 +- 36 files changed, 1155 insertions(+), 980 deletions(-) delete mode 100644 Assets/02.Scripts/Liquid.cs create mode 100644 Assets/02.Scripts/Tycoon/Garnish.cs create mode 100644 Assets/02.Scripts/Tycoon/Garnish.cs.meta create mode 100644 Assets/02.Scripts/Tycoon/Liquid.cs rename Assets/02.Scripts/{ => Tycoon}/Liquid.cs.meta (100%) rename Assets/02.Scripts/{ => Tycoon}/LiquidController.cs (70%) rename Assets/02.Scripts/{ => Tycoon}/LiquidController.cs.meta (100%) create mode 100644 Assets/02.Scripts/Tycoon/LiquidIngredient.cs create mode 100644 Assets/02.Scripts/Tycoon/LiquidIngredient.cs.meta rename Assets/02.Scripts/{ => Tycoon}/LiquidInteractionRegion.cs (100%) rename Assets/02.Scripts/{ => Tycoon}/LiquidInteractionRegion.cs.meta (100%) create mode 100644 Assets/02.Scripts/Ui/InteractionUi.cs create mode 100644 Assets/02.Scripts/Ui/InteractionUi.cs.meta rename Assets/05.Prefabs/{Ice.prefab => GarnishObject.prefab} (68%) rename Assets/05.Prefabs/{Ice.prefab.meta => GarnishObject.prefab.meta} (74%) diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 5314cc5bd..b5ccd7983 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -2764,6 +2764,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 232070477} m_CullTransparentMesh: 1 +--- !u!1 &242229609 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 242229610} + - component: {fileID: 242229612} + - component: {fileID: 242229611} + m_Layer: 5 + m_Name: KeyText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &242229610 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242229609} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1540383231} + 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: 2.5} + m_SizeDelta: {x: 0, y: -25} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &242229611 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242229609} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: E + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24.15 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &242229612 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 242229609} + m_CullTransparentMesh: 1 --- !u!1 &270061732 GameObject: m_ObjectHideFlags: 0 @@ -3530,6 +3666,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 346596724} m_CullTransparentMesh: 1 +--- !u!114 &350928419 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 529622739828575346, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &357166929 GameObject: m_ObjectHideFlags: 0 @@ -4112,17 +4259,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 393212792} m_CullTransparentMesh: 1 ---- !u!114 &405502709 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 182135209563034965, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &414363377 GameObject: m_ObjectHideFlags: 0 @@ -4204,6 +4340,17 @@ MonoBehaviour: m_EditorClassIdentifier: propertyName: _OffsetX propertyValue: -1 +--- !u!114 &420943202 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1795547803945282972, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &421610954 GameObject: m_ObjectHideFlags: 0 @@ -4747,17 +4894,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444009244} m_CullTransparentMesh: 1 ---- !u!114 &455003948 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8972014786941749689, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &510358306 GameObject: m_ObjectHideFlags: 0 @@ -5749,152 +5885,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 571612559} m_CullTransparentMesh: 1 ---- !u!1 &572107773 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 572107774} - - component: {fileID: 572107777} - - component: {fileID: 572107776} - - component: {fileID: 572107775} - - component: {fileID: 572107778} - m_Layer: 8 - m_Name: FixedCameraTrigger - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &572107774 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572107773} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 1} - m_LocalScale: {x: 16, y: 2, z: 10} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1634548838} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &572107775 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572107773} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &572107776 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572107773} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &572107777 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572107773} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &572107778 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 572107773} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e46ac8d61dc065848bd5a1aa7cd8c006, type: 3} - m_Name: - m_EditorClassIdentifier: - LayerMask: - serializedVersion: 2 - m_Bits: 512 - WithTag: - WithoutTag: - SkipFirst: 0 - Repeating: 1 - OnObjectEnter: - Action: 1 - Target: {fileID: 613509647} - BoostAmount: 2 - StartTime: 0 - Mode: 0 - Event: - m_PersistentCalls: - m_Calls: [] - OnObjectExit: - Action: 1 - Target: {fileID: 545850347} - BoostAmount: 2 - StartTime: 0 - Mode: 0 - Event: - m_PersistentCalls: - m_Calls: [] --- !u!1 &578755295 GameObject: m_ObjectHideFlags: 0 @@ -6459,7 +6449,7 @@ GameObject: - component: {fileID: 613509651} - component: {fileID: 613509650} m_Layer: 0 - m_Name: FixedCamera + m_Name: StorageCamera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6546,17 +6536,6 @@ MonoBehaviour: BarrelClipping: 0.25 Anamorphism: 0 BlendHint: 0 ---- !u!114 &620853359 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2407405612995933340, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &626632725 GameObject: m_ObjectHideFlags: 0 @@ -7143,81 +7122,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 713557313} m_CullTransparentMesh: 1 ---- !u!1 &735925259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 735925260} - - component: {fileID: 735925261} - m_Layer: 0 - m_Name: BarCamera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &735925260 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 735925259} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -300, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1634548838} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &735925261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 735925259} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9dfa5b682dcd46bda6128250e975f58, type: 3} - m_Name: - m_EditorClassIdentifier: - Priority: - Enabled: 1 - m_Value: 0 - OutputChannel: 1 - StandbyUpdate: 2 - m_StreamingVersion: 20230301 - m_LegacyPriority: 0 - Target: - TrackingTarget: {fileID: 0} - LookAtTarget: {fileID: 0} - CustomLookAtTarget: 0 - Lens: - FieldOfView: 60 - OrthographicSize: 50 - NearClipPlane: 0.3 - FarClipPlane: 300 - Dutch: 0 - ModeOverride: 1 - PhysicalProperties: - GateFit: 2 - SensorSize: {x: 21.946, y: 16.002} - LensShift: {x: 0, y: 0} - FocusDistance: 10 - Iso: 200 - ShutterSpeed: 0.005 - Aperture: 16 - BladeCount: 5 - Curvature: {x: 2, y: 11} - BarrelClipping: 0.25 - Anamorphism: 0 - BlendHint: 0 --- !u!1001 &738295682 PrefabInstance: m_ObjectHideFlags: 0 @@ -8683,7 +8587,7 @@ Camera: m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 2147876855 + m_Bits: 2147614711 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -8724,10 +8628,9 @@ MonoBehaviour: m_EditorClassIdentifier: _persistent: 0 k__BackingField: {fileID: 873223991} - k__BackingField: {fileID: 0} cameraLocation: {fileID: 1634548838} k__BackingField: {fileID: 545850352} - k__BackingField: {fileID: 735925261} + k__BackingField: {fileID: 613509651} --- !u!1001 &874559119 PrefabInstance: m_ObjectHideFlags: 0 @@ -8990,6 +8893,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} m_PrefabInstance: {fileID: 909457639} m_PrefabAsset: {fileID: 0} +--- !u!114 &911535447 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7860033871478238356, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &963867002 GameObject: m_ObjectHideFlags: 0 @@ -9502,13 +9416,14 @@ MonoBehaviour: _pushDirection: {x: -5, y: -1, z: 0} _pushPower: 50 _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} + _garnishObject: {fileID: 5803694563079548352, guid: f051d09e1e3043d4285ae8e0ff4c4f12, type: 3} _liquidsPerSecond: 80 _maxLiquidCount: 400 _colorLerpSpeed: 0.5 _colorIntensity: 2 _objectPoolCount: 1000 _moveDuration: 0.5 - _currentBarrel: {fileID: 0} + endPosition: {x: -230, y: 23, z: 0} --- !u!1001 &1011627381 PrefabInstance: m_ObjectHideFlags: 0 @@ -9896,6 +9811,7 @@ RectTransform: - {fileID: 102499728} - {fileID: 1733600342} - {fileID: 1909799357} + - {fileID: 2032162537} - {fileID: 2055805161} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11140,7 +11056,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1110, y: -540} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 40, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1172519050 @@ -11423,6 +11339,17 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!114 &1222400257 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 352929351692761553, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1222632320 GameObject: m_ObjectHideFlags: 0 @@ -11874,9 +11801,9 @@ Transform: m_GameObject: {fileID: 1247057678} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -150, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: -130, y: 23, z: 0} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1321215893} - {fileID: 2070548848} @@ -13501,6 +13428,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356312470} m_CullTransparentMesh: 1 +--- !u!114 &1356909584 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5623516395497252574, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &1357481970 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} @@ -14266,6 +14204,7 @@ GameObject: - component: {fileID: 1400792460} - component: {fileID: 1400792459} - component: {fileID: 1400792462} + - component: {fileID: 1400792463} m_Layer: 8 m_Name: LiquidInteractionRegion m_TagString: Untagged @@ -14282,8 +14221,8 @@ Transform: m_GameObject: {fileID: 1400792457} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -10.46, y: 0, z: -1.52} - m_LocalScale: {x: 9, y: 2, z: 5} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 16, y: 2, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1006730365} @@ -14374,6 +14313,43 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f0f3dc568d0721b48ad5f24339d24951, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1400792463 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400792457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e46ac8d61dc065848bd5a1aa7cd8c006, type: 3} + m_Name: + m_EditorClassIdentifier: + LayerMask: + serializedVersion: 2 + m_Bits: 512 + WithTag: + WithoutTag: + SkipFirst: 0 + Repeating: 1 + OnObjectEnter: + Action: 1 + Target: {fileID: 613509647} + BoostAmount: 2 + StartTime: 0 + Mode: 0 + Event: + m_PersistentCalls: + m_Calls: [] + OnObjectExit: + Action: 1 + Target: {fileID: 545850347} + BoostAmount: 2 + StartTime: 0 + Mode: 0 + Event: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1418585147 GameObject: m_ObjectHideFlags: 0 @@ -15440,6 +15416,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1508199804} m_CullTransparentMesh: 1 +--- !u!114 &1510997260 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6311786782779888448, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &1518298343 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} @@ -15491,6 +15478,103 @@ MonoBehaviour: m_EditorClassIdentifier: propertyName: _OffsetX propertyValue: -1 +--- !u!1 &1540383230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1540383231} + - component: {fileID: 1540383233} + - component: {fileID: 1540383232} + - component: {fileID: 1540383234} + m_Layer: 5 + m_Name: KeyImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1540383231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540383230} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000022299464} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 242229610} + m_Father: {fileID: 1983229438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -50} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1540383232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540383230} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} + m_Type: 1 + 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!222 &1540383233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540383230} + m_CullTransparentMesh: 1 +--- !u!114 &1540383234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1540383230} + 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: 60 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &1543999676 GameObject: m_ObjectHideFlags: 0 @@ -16059,17 +16143,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604407184} m_CullTransparentMesh: 1 ---- !u!114 &1605879905 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8131739000100095639, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1617241974 GameObject: m_ObjectHideFlags: 0 @@ -16450,8 +16523,6 @@ Transform: m_Children: - {fileID: 545850348} - {fileID: 613509648} - - {fileID: 735925260} - - {fileID: 572107774} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1645948246 @@ -16965,7 +17036,7 @@ MonoBehaviour: _persistent: 0 k__BackingField: {fileID: 1665075870} k__BackingField: {fileID: 1665075872} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1665075873} _dailyBgm: TycoonDailyBgm1 k__BackingField: _maxPlayerHealth: 0 @@ -17021,13 +17092,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 72638ccfaf7778d42808e233d2eb6e8c, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: {fileID: 455003948} - k__BackingField: {fileID: 1605879905} - k__BackingField: {fileID: 405502709} - k__BackingField: {fileID: 1950956315} - k__BackingField: {fileID: 620853359} - k__BackingField: {fileID: 0} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 420943202} + k__BackingField: {fileID: 1510997260} + k__BackingField: {fileID: 1356909584} + k__BackingField: {fileID: 1222400257} + k__BackingField: {fileID: 1814475234} + k__BackingField: {fileID: 350928419} + k__BackingField: {fileID: 911535447} --- !u!1 &1670140492 GameObject: m_ObjectHideFlags: 0 @@ -17672,6 +17743,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723000583} m_CullTransparentMesh: 1 +--- !u!1 &1728335877 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1728335878} + - component: {fileID: 1728335880} + - component: {fileID: 1728335879} + m_Layer: 5 + m_Name: InteractionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1728335878 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728335877} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.000022299464} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1983229438} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 90, y: -50} + m_SizeDelta: {x: 99.37, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1728335879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728335877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uD14C\uC2A4\uD2B8" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1728335880 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728335877} + m_CullTransparentMesh: 1 --- !u!1 &1730992466 GameObject: m_ObjectHideFlags: 0 @@ -17701,14 +17908,14 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1172519049} m_Father: {fileID: 1247057679} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 1110, y: 540} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1730992468 @@ -19244,6 +19451,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} m_PrefabInstance: {fileID: 1813968672} m_PrefabAsset: {fileID: 0} +--- !u!114 &1814475234 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6711412744544918905, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + m_PrefabInstance: {fileID: 7827484746149782377} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1815544842 GameObject: m_ObjectHideFlags: 0 @@ -20950,17 +21168,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 2 m_SpriteSortPoint: 0 ---- !u!114 &1950956315 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3218250623459008295, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1957839369 PrefabInstance: m_ObjectHideFlags: 0 @@ -21315,6 +21522,125 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978509263} m_CullTransparentMesh: 1 +--- !u!1 &1983229437 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1983229438} + - component: {fileID: 1983229443} + - component: {fileID: 1983229442} + - component: {fileID: 1983229441} + - component: {fileID: 1983229440} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1983229438 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983229437} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1540383231} + - {fileID: 1728335878} + m_Father: {fileID: 2032162537} + 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: 209.37, y: 0} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &1983229440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983229437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &1983229441 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983229437} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + m_Top: 20 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1983229442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983229437} + 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: c7ef1b7221f0b5b4f94a1d2685ff92c2, type: 3} + m_Type: 1 + 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!222 &1983229443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983229437} + m_CullTransparentMesh: 1 --- !u!1 &1985878517 GameObject: m_ObjectHideFlags: 0 @@ -21416,7 +21742,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 2147614719 + m_Bits: 2147876863 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -21953,6 +22279,58 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 0 +--- !u!1 &2032162536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2032162537} + - component: {fileID: 2032162542} + m_Layer: 5 + m_Name: InteractionUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2032162537 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032162536} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1983229438} + m_Father: {fileID: 1049919592} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 100} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0} +--- !u!114 &2032162542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032162536} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 10de0d138ea1afc4f9eaf86af55076ff, type: 3} + m_Name: + m_EditorClassIdentifier: + _panel: {fileID: 1983229437} + _keyText: {fileID: 242229611} + _interactionText: {fileID: 1728335879} --- !u!114 &2041095998 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6803430367898605830, guid: 5fcdc9afc13ca2e49bc954e4fd607a47, type: 3} @@ -22218,7 +22596,7 @@ Transform: m_GameObject: {fileID: 2070548847} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -10, z: 0} + m_LocalPosition: {x: 0, y: -10.5, z: 0} m_LocalScale: {x: 20, y: 2, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -24941,6 +25319,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 490029608455326010, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + propertyPath: m_LocalPosition.x + value: 0.17 + objectReference: {fileID: 0} - target: {fileID: 2700294535905665279, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -24981,6 +25363,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2851820576960244662, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3235314206077419821, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: _liquidController value: @@ -25001,6 +25387,14 @@ PrefabInstance: propertyPath: _targetTransform value: objectReference: {fileID: 0} + - target: {fileID: 6178600683525776299, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + propertyPath: m_LocalPosition.x + value: 0.17 + objectReference: {fileID: 0} + - target: {fileID: 6197673153302173192, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} + propertyPath: m_LocalPosition.x + value: 0.17 + objectReference: {fileID: 0} - target: {fileID: 9041926907780427371, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_Name value: TycoonMap diff --git a/Assets/01.Scenes/02.Combat/GlobalVolume.asset b/Assets/01.Scenes/02.Combat/GlobalVolume.asset index efadb2a8e..202a49350 100644 --- a/Assets/01.Scenes/02.Combat/GlobalVolume.asset +++ b/Assets/01.Scenes/02.Combat/GlobalVolume.asset @@ -18,13 +18,13 @@ MonoBehaviour: m_Value: 1 threshold: m_OverrideState: 1 - m_Value: 1.5 + m_Value: 1.3 intensity: m_OverrideState: 1 - m_Value: 2 + m_Value: 50 scatter: - m_OverrideState: 0 - m_Value: 0.7 + m_OverrideState: 1 + m_Value: 0.3 clamp: m_OverrideState: 0 m_Value: 65472 diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index 45dd6f0ba..d4de5fcd7 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -81,6 +81,8 @@ namespace BlueWater.Npcs.Customers [field: SerializeField] public float InteractionRadius { get; private set; } = 2f; + public string InteractionMessage { get; private set; } + private IAstarAI _astarAi; public TableSeat TableSeat { get; private set; } public ItemData ItemData { get; private set; } diff --git a/Assets/02.Scripts/EventManager.cs b/Assets/02.Scripts/EventManager.cs index 49131d498..da8dfd635 100644 --- a/Assets/02.Scripts/EventManager.cs +++ b/Assets/02.Scripts/EventManager.cs @@ -9,10 +9,17 @@ namespace BlueWater // Global events #region Global events + // Ui public static Action FadeInOut; + + // Player public static Action OnMaxHealthChanged; public static Action OnHealthChanged; public static Action OnDead; + + // 상호작용 + public static Action OnShowInteractionUi; + public static Action OnHideInteractionUi; #endregion diff --git a/Assets/02.Scripts/Interface/IPlayerInteraction.cs b/Assets/02.Scripts/Interface/IPlayerInteraction.cs index 0ff2a7d9a..33dc07980 100644 --- a/Assets/02.Scripts/Interface/IPlayerInteraction.cs +++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using System; +using UnityEngine; namespace BlueWater.Interfaces { @@ -9,6 +10,7 @@ namespace BlueWater.Interfaces Transform InteractionUi { get; } bool EnableInteraction { get; } float InteractionRadius { get; } + string InteractionMessage { get; } void Interaction(); void CancelInteraction(); diff --git a/Assets/02.Scripts/Item/Cocktail/LiquidData.cs b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs index 28ad63817..de25848e0 100644 --- a/Assets/02.Scripts/Item/Cocktail/LiquidData.cs +++ b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs @@ -5,6 +5,13 @@ using UnityEngine; namespace BlueWater.Items { + public enum LiquidType + { + None = 0, + Liquid = 1, + Garnish = 2 + } + [Serializable] public class LiquidData : IIdx { @@ -15,6 +22,9 @@ namespace BlueWater.Items [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } + [field: SerializeField, Tooltip("종류"), BoxGroup("Json 데이터 영역")] + public LiquidType Type { get; set; } + [field: SerializeField, Tooltip("총량"), BoxGroup("Json 데이터 영역")] public int Amount { get; set; } diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs index 11c5de912..6a603ae50 100644 --- a/Assets/02.Scripts/Item/Item.cs +++ b/Assets/02.Scripts/Item/Item.cs @@ -38,6 +38,8 @@ namespace BlueWater.Items [field: SerializeField] public float InteractionRadius { get; private set; } = 2f; + public string InteractionMessage { get; private set; } + [SerializeField] protected bool UseAutoDestroy = true; @@ -212,16 +214,19 @@ namespace BlueWater.Items public void ShowInteractionUi() { - if (!InteractionCanvas) return; - - InteractionCanvas.gameObject.SetActive(true); + InteractionMessage = $"{ItemData.Name} 줍기"; + EventManager.OnShowInteractionUi?.Invoke(InteractionMessage); + // if (!InteractionCanvas) return; + // + // InteractionCanvas.gameObject.SetActive(true); } public void HideInteractionUi() { - if (!InteractionCanvas) return; - - InteractionCanvas.gameObject.SetActive(false); + EventManager.OnHideInteractionUi?.Invoke(); + // if (!InteractionCanvas) return; + // + // InteractionCanvas.gameObject.SetActive(false); } private void DestroySelf() => Destroy(gameObject); diff --git a/Assets/02.Scripts/Liquid.cs b/Assets/02.Scripts/Liquid.cs deleted file mode 100644 index acd309fca..000000000 --- a/Assets/02.Scripts/Liquid.cs +++ /dev/null @@ -1,52 +0,0 @@ -using UnityEngine; -using UnityEngine.Pool; - -namespace BlueWater -{ - public class Liquid : MonoBehaviour - { - [SerializeField] - private SpriteRenderer _spriteRenderer; - - [SerializeField] - private Rigidbody2D _rigidbody2D; - - [SerializeField, Range(0f, 2f)] - private float _distanceThreshold = 0.5f; - - private IObjectPool _managedPool; - private LiquidController _liquidController; - private Collider2D _targetCollider; - - public void SetManagedPool(IObjectPool pool) => _managedPool = pool; - public void Destroy() => _managedPool.Release(this); - - public void Initialize(LiquidController liquidController, Collider2D targetCollider, Color color, Vector3 pushForce) - { - _liquidController = liquidController; - _targetCollider = targetCollider; - _spriteRenderer.color = color; - _rigidbody2D.linearVelocity = Vector2.zero; - _rigidbody2D.AddForce(pushForce, ForceMode2D.Impulse); - } - - private void Update() - { - if (!_targetCollider) return; - - var closestPoint = _targetCollider.ClosestPoint(transform.position); - var distance = Vector2.Distance(transform.position, closestPoint); - - if (distance < _distanceThreshold) - { - OnReached(); - } - } - - private void OnReached() - { - Destroy(); - _liquidController.OnLiquidReached(); - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs index bfe9b22c8..9b62a854f 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -29,6 +29,8 @@ namespace BlueWater.Tycoons private Material _instanceMaterial; public event Action OnAmountChanged; + public static event Action OnBarrelInteracted; + public static event Action OnBarrelCancelInteracted; // Hashes private static readonly int LiquidAmountHash = Shader.PropertyToID("_LiquidAmount"); @@ -47,6 +49,7 @@ namespace BlueWater.Tycoons { _liquidData = ItemManager.Instance.LiquidDataSo.GetDataByIdx(_idx); + InteractionMessage = $"{_liquidData.Name} 따르기"; _liquidImage.sprite = _liquidData.Sprite; _instanceMaterial.SetColor(LiquidColorHash, _liquidData.Color * _colorIntensity); SetCurrentAmount(_liquidData.GetMaxAmount()); @@ -54,12 +57,14 @@ namespace BlueWater.Tycoons public override void Interaction() { - _liquidController.ActiveIsPouring(this); + OnBarrelInteracted?.Invoke(this); + //_liquidController.ActiveIsPouring(this); } public override void CancelInteraction() { - _liquidController.InActiveIsPouring(); + OnBarrelCancelInteracted?.Invoke(); + //_liquidController.InActiveIsPouring(); } /// @@ -67,7 +72,7 @@ namespace BlueWater.Tycoons /// public override bool CanInteraction() { - return !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem(); + return !CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem() && CanConsume(1); } public bool CanConsume(int amount) diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index fab08da57..87cdbb973 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -1,3 +1,4 @@ +using System; using BlueWater.Interfaces; using BlueWater.Players.Tycoons; using Sirenix.OdinInspector; @@ -29,7 +30,10 @@ namespace BlueWater.Tycoons [field: SerializeField, BoxGroup("변수")] public float InteractionRadius { get; private set; } = 2f; - + + [field: SerializeField, BoxGroup("변수")] + public string InteractionMessage { get; protected set; } + [Title("실시간 데이터")] [SerializeField] protected bool IsOpened; @@ -100,18 +104,21 @@ namespace BlueWater.Tycoons public virtual void ShowInteractionUi() { - if (!InteractionCanvas) return; + // if (!InteractionCanvas) return; + // + // InteractionCanvas.gameObject.SetActive(true); - InteractionCanvas.gameObject.SetActive(true); VisualLook.material = OutlineMaterial; + EventManager.OnShowInteractionUi?.Invoke(InteractionMessage); } public virtual void HideInteractionUi() { - if (!InteractionCanvas) return; - - InteractionCanvas.gameObject.SetActive(false); + // if (!InteractionCanvas) return; + // + // InteractionCanvas.gameObject.SetActive(false); VisualLook.material = OriginalMaterial; + EventManager.OnHideInteractionUi?.Invoke(); } protected void RegisterPlayerInteraction() diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs index 1c1e2fef3..8c4a6680c 100644 --- a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs @@ -12,6 +12,7 @@ namespace BlueWater.Tycoons [SerializeField] private BalloonUi _balloonUi; + // 서빙 테이블 기준 아이템이 있는지 없는지 private IPickup _currentPickupItem; private Material _originalCocktailGlassMaterial; @@ -56,17 +57,16 @@ namespace BlueWater.Tycoons public override void ShowInteractionUi() { - if (!InteractionCanvas) return; + InteractionMessage = _currentPickupItem != null ? "음료 들기" : "음료 내려놓기"; + base.ShowInteractionUi(); - VisualLook.material = OutlineMaterial; _cocktailGlassImage.material = OutlineMaterial; } public override void HideInteractionUi() { - if (!InteractionCanvas) return; + base.HideInteractionUi(); - VisualLook.material = OriginalMaterial; _cocktailGlassImage.material = _originalCocktailGlassMaterial; } } diff --git a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset index 6b44684d8..4b227c3f6 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset @@ -17,6 +17,7 @@ MonoBehaviour: k__BackingField: k__BackingField: LiquidA k__BackingField: "\uC220 \uC6D0\uC561A" + k__BackingField: 1 k__BackingField: 99999 k__BackingField: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} k__BackingField: {r: 1, g: 0, b: 0, a: 1} @@ -24,6 +25,7 @@ MonoBehaviour: k__BackingField: k__BackingField: LiquidB k__BackingField: "\uC220 \uC6D0\uC561B" + k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3} k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1} @@ -31,6 +33,7 @@ MonoBehaviour: k__BackingField: k__BackingField: LiquidC k__BackingField: "\uC220 \uC6D0\uC561C" + k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3} k__BackingField: {r: 1, g: 1, b: 0, a: 1} @@ -38,6 +41,7 @@ MonoBehaviour: k__BackingField: k__BackingField: LiquidD k__BackingField: "\uC220 \uC6D0\uC561D" + k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3} k__BackingField: {r: 0, g: 1, b: 0, a: 1} @@ -45,6 +49,7 @@ MonoBehaviour: k__BackingField: k__BackingField: LiquidE k__BackingField: "\uC220 \uC6D0\uC561E" + k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} k__BackingField: {r: 0, g: 0, b: 1, a: 1} @@ -52,13 +57,15 @@ MonoBehaviour: k__BackingField: k__BackingField: Garnish1 k__BackingField: "\uAC00\uB098\uC26C1" + k__BackingField: 2 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0, g: 1, b: 1, a: 1} - k__BackingField: Garnish2 k__BackingField: k__BackingField: Garnish2 k__BackingField: "\uAC00\uB098\uC26C2" + k__BackingField: 2 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0.5019608, g: 0, b: 1, a: 1} diff --git a/Assets/02.Scripts/Tycoon/Garnish.cs b/Assets/02.Scripts/Tycoon/Garnish.cs new file mode 100644 index 000000000..7cc51352f --- /dev/null +++ b/Assets/02.Scripts/Tycoon/Garnish.cs @@ -0,0 +1,32 @@ +using UnityEngine; +using UnityEngine.Pool; + +namespace BlueWater.Tycoons +{ + public class Garnish : LiquidIngredient + { + private IObjectPool _managedPool; + + public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Sprite sprite) + { + transform.position = spawnPosition; + transform.rotation = rotation; + TargetCollider = targetCollider; + SpriteRenderer.sprite = sprite; + Rigidbody2D.linearVelocity = Vector2.zero; + + CanInteraction = true; + gameObject.SetActive(true); + Rigidbody2D.AddForce(pushForce, ForceMode2D.Impulse); + } + + public void SetManagedPool(IObjectPool pool) => _managedPool = pool; + public void Destroy() => _managedPool.Release(this); + + public override void ReachedObject() + { + CanInteraction = false; + Destroy(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/Garnish.cs.meta b/Assets/02.Scripts/Tycoon/Garnish.cs.meta new file mode 100644 index 000000000..4aed5516a --- /dev/null +++ b/Assets/02.Scripts/Tycoon/Garnish.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3abf680e4b23d8b4f9c511a1ca85eead diff --git a/Assets/02.Scripts/Tycoon/Liquid.cs b/Assets/02.Scripts/Tycoon/Liquid.cs new file mode 100644 index 000000000..a88c220fc --- /dev/null +++ b/Assets/02.Scripts/Tycoon/Liquid.cs @@ -0,0 +1,32 @@ +using UnityEngine; +using UnityEngine.Pool; + +namespace BlueWater.Tycoons +{ + public class Liquid : LiquidIngredient + { + private IObjectPool _managedPool; + + public void Initialize(Vector3 spawnPosition, Quaternion rotation, Collider2D targetCollider, Vector3 pushForce, Color color) + { + transform.position = spawnPosition; + transform.rotation = rotation; + TargetCollider = targetCollider; + SpriteRenderer.color = color; + Rigidbody2D.linearVelocity = Vector2.zero; + + CanInteraction = true; + gameObject.SetActive(true); + Rigidbody2D.AddForce(pushForce, ForceMode2D.Impulse); + } + + public void SetManagedPool(IObjectPool pool) => _managedPool = pool; + public void Destroy() => _managedPool.Release(this); + + public override void ReachedObject() + { + CanInteraction = false; + Destroy(); + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Liquid.cs.meta b/Assets/02.Scripts/Tycoon/Liquid.cs.meta similarity index 100% rename from Assets/02.Scripts/Liquid.cs.meta rename to Assets/02.Scripts/Tycoon/Liquid.cs.meta diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/Tycoon/LiquidController.cs similarity index 70% rename from Assets/02.Scripts/LiquidController.cs rename to Assets/02.Scripts/Tycoon/LiquidController.cs index 09a67cb13..216f4504c 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/Tycoon/LiquidController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -54,9 +55,12 @@ namespace BlueWater [SerializeField] private float _pushPower; - [Title("액체")] - [SerializeField, Required, Tooltip("액체 프리팹")] + [Title("Liquid / Garnish")] + [SerializeField, Required, Tooltip("원액 프리팹")] private Liquid _liquidObject; + + [SerializeField, Required, Tooltip("가니쉬 프리팹")] + private Garnish _garnishObject; [SerializeField, Tooltip("초당 생성되는 액체 수(ml)")] private int _liquidsPerSecond = 80; @@ -77,13 +81,15 @@ namespace BlueWater [Title("패널")] [SerializeField] private float _moveDuration = 0.5f; - - [Title("실시간 정보")] + [SerializeField] + private Vector3 endPosition = new(-230f, 23f, 0f); + private Barrel _currentBarrel; - - private IObjectPool _objectPool; - private List _activeLiquids = new(); + private IObjectPool _liquidObjectPool; + private IObjectPool _garnishObjectPool; + private List _activeLiquidDatas = new(); + private List _activeGarnishDatas = new(); private Dictionary _liquidDataCounts = new(7); private Material _instanceMaterial; private Tween _showTween; @@ -110,12 +116,13 @@ namespace BlueWater private void Awake() { - _objectPool = new ObjectPool(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount); + _liquidObjectPool = new ObjectPool(CreateLiquidObject, OnGetLiquidObject, OnReleaseLiquidObject, OnDestroyLiquidObject, maxSize: _objectPoolCount); + _garnishObjectPool = new ObjectPool(CreateGarnishObject, OnGetGarnishObject, OnReleaseGarnishObject, OnDestroyGarnishObject, maxSize: _objectPoolCount); - _hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).Pause() + _hideTween = _liquidPanel.transform.DOMoveX(endPosition.x + 100f, _moveDuration).Pause() .SetAutoKill(false); - _showTween = _liquidPanel.transform.DOMoveX(-250f, _moveDuration).Pause() + _showTween = _liquidPanel.transform.DOMoveX(endPosition.x, _moveDuration).Pause() .SetAutoKill(false); } @@ -125,6 +132,9 @@ namespace BlueWater EventManager.OnLiquidRegionExited += HidePanel; EventManager.OnCocktailDiscarded += ReleaseAllObject; EventManager.OnPlaceOnServingTable += ReleaseAllObject; + LiquidIngredient.OnReachedTarget += OnTargetReached; + Barrel.OnBarrelInteracted += HandleBarrelInteraction; + Barrel.OnBarrelCancelInteracted += HandleBarrelCancelInteraction; _instanceMaterial = Instantiate(_liquidRenderer.material); _liquidRenderer.material = _instanceMaterial; @@ -143,12 +153,7 @@ namespace BlueWater { if (_isPouring) { - // 현재 술의 재고가 없을 때 - if (!_currentBarrel.CanConsume(1)) - { - InActiveIsPouring(); - return; - } + var currentBarrel = _currentBarrel; // 술이 완성되었을 때 if (_instanceLiquidCount >= _maxLiquidCount) @@ -159,14 +164,27 @@ namespace BlueWater if (Time.time - _startTime >= _timeInterval) { - _objectPool.Get(); - - if (!_liquidDataCounts.TryAdd(_currentBarrel.GetLiquidData(), 1)) + switch (currentBarrel.GetLiquidData().Type) { - _liquidDataCounts[_currentBarrel.GetLiquidData()] += 1; + case LiquidType.None: + Debug.LogError("원액 종류 None 오류"); + break; + case LiquidType.Liquid: + _liquidObjectPool.Get(); + break; + case LiquidType.Garnish: + _garnishObjectPool.Get(); + break; + default: + throw new ArgumentOutOfRangeException(); } - _currentBarrel.Consume(1); + if (!_liquidDataCounts.TryAdd(currentBarrel.GetLiquidData(), 1)) + { + _liquidDataCounts[currentBarrel.GetLiquidData()] += 1; + } + + currentBarrel.Consume(1); _startTime = Time.time; } } @@ -184,6 +202,10 @@ namespace BlueWater EventManager.OnLiquidRegionExited -= HidePanel; EventManager.OnCocktailDiscarded -= ReleaseAllObject; EventManager.OnPlaceOnServingTable -= ReleaseAllObject; + + LiquidIngredient.OnReachedTarget -= OnTargetReached; + Barrel.OnBarrelInteracted -= HandleBarrelInteraction; + Barrel.OnBarrelCancelInteracted -= HandleBarrelCancelInteraction; } #endregion @@ -191,34 +213,60 @@ namespace BlueWater // Object pooling system #region Object pooling system - private Liquid CreateObject() + // 원액 오브젝트 풀 + private Liquid CreateLiquidObject() { var instance = Instantiate(_liquidObject, _spawnTransform.position, Quaternion.identity, _spawnLocation); - instance.SetManagedPool(_objectPool); + instance.SetManagedPool(_liquidObjectPool); return instance; } - private void OnGetObject(Liquid liquid) + private void OnGetLiquidObject(Liquid liquid) { - liquid.transform.position = _spawnTransform.position; - liquid.transform.rotation = Quaternion.identity; - liquid.gameObject.SetActive(true); _instanceLiquidCount++; var liquidColor = _currentBarrel.GetLiquidData().Color; - liquid.Initialize(this, _reachedCollider, liquidColor, _pushDirection.normalized * _pushPower); - _activeLiquids.Add(liquid); + liquid.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidColor); + _activeLiquidDatas.Add(liquid); } - private void OnReleaseObject(Liquid liquid) + private void OnReleaseLiquidObject(Liquid liquid) { liquid.gameObject.SetActive(false); - _activeLiquids.Remove(liquid); + _activeLiquidDatas.Remove(liquid); } - private void OnDestroyObject(Liquid liquid) + private void OnDestroyLiquidObject(Liquid liquid) { Destroy(liquid.gameObject); - _activeLiquids.Remove(liquid); + _activeLiquidDatas.Remove(liquid); + } + + // 가니쉬 오브젝트 풀 + private Garnish CreateGarnishObject() + { + var instance = Instantiate(_garnishObject, _spawnTransform.position, Quaternion.identity, _spawnLocation); + instance.SetManagedPool(_garnishObjectPool); + return instance; + } + + private void OnGetGarnishObject(Garnish garnish) + { + _instanceLiquidCount++; + var liquidSprite = _currentBarrel.GetLiquidData().Sprite; + garnish.Initialize(_spawnTransform.position, Quaternion.identity, _reachedCollider, _pushDirection.normalized * _pushPower, liquidSprite); + _activeGarnishDatas.Add(garnish); + } + + private void OnReleaseGarnishObject(Garnish garnish) + { + garnish.gameObject.SetActive(false); + _activeGarnishDatas.Remove(garnish); + } + + private void OnDestroyGarnishObject(Garnish garnish) + { + Destroy(garnish.gameObject); + _activeGarnishDatas.Remove(garnish); } #endregion @@ -232,9 +280,9 @@ namespace BlueWater public void ReleaseAllObject() { // 리스트 삭제는 뒤에서부터 해야 오류가 없음 - for (var i = _activeLiquids.Count - 1; i >= 0; i--) + for (var i = _activeLiquidDatas.Count - 1; i >= 0; i--) { - _activeLiquids[i].Destroy(); + _activeLiquidDatas[i].Destroy(); } _liquidDataCounts.Clear(); @@ -243,8 +291,8 @@ namespace BlueWater SetCurrentAmount(0f); HidePanel(); } - - public void ActiveIsPouring(Barrel barrel) + + public void HandleBarrelInteraction(Barrel barrel) { _currentBarrel = barrel; if (_instanceLiquidCount == 0) @@ -254,7 +302,7 @@ namespace BlueWater _amountText.enabled = true; _completeCocktailImage.enabled = false; _completeText.enabled = false; - _currentMixedColor = _currentBarrel.GetLiquidData().Color; + _currentMixedColor = barrel.GetLiquidData().Color; _instanceMaterial.SetColor(LiquidColorHash, _currentMixedColor * _colorIntensity); EventManager.OnCocktailStarted?.Invoke(); } @@ -262,12 +310,36 @@ namespace BlueWater _startTime = Time.time; _isPouring = true; } - - public void InActiveIsPouring() + + public void HandleBarrelCancelInteraction() { _isPouring = false; } + // public void ActiveIsPouring(Barrel barrel) + // { + // _currentBarrel = barrel; + // if (_instanceLiquidCount == 0) + // { + // ShowPanelFast(); + // _shaker.SetActive(true); + // _amountText.enabled = true; + // _completeCocktailImage.enabled = false; + // _completeText.enabled = false; + // _currentMixedColor = _currentBarrel.GetLiquidData().Color; + // _instanceMaterial.SetColor(LiquidColorHash, _currentMixedColor * _colorIntensity); + // EventManager.OnCocktailStarted?.Invoke(); + // } + // + // _startTime = Time.time; + // _isPouring = true; + // } + + // public void InActiveIsPouring() + // { + // _isPouring = false; + // } + private void SetCurrentAmount(float value) { _currentLiquidAmount = value; @@ -291,7 +363,7 @@ namespace BlueWater /// private IEnumerator CompleteCocktail() { - InActiveIsPouring(); + HandleBarrelCancelInteraction(); yield return new WaitUntil(() => _currentLiquidAmount >= _maxLiquidCount); @@ -405,7 +477,7 @@ namespace BlueWater /// /// 액체가 특정 오브젝트에 충돌했을 때, 실행해야하는 과정 /// - public void OnLiquidReached() + public void OnTargetReached() { _liquidReachedTime = Time.time; SetCurrentAmount(++_currentLiquidAmount); @@ -415,7 +487,7 @@ namespace BlueWater if (liquidAmount >= 1f) { - InActiveIsPouring(); + HandleBarrelCancelInteraction(); } } @@ -423,7 +495,7 @@ namespace BlueWater { if (_isShowingPanel) return; - _liquidPanel.transform.position = new Vector3(-250f, 0f, 0f); + _liquidPanel.transform.position = endPosition; _liquidPanel.SetActive(true); _isShowingPanel = true; _hideTween.Pause(); diff --git a/Assets/02.Scripts/LiquidController.cs.meta b/Assets/02.Scripts/Tycoon/LiquidController.cs.meta similarity index 100% rename from Assets/02.Scripts/LiquidController.cs.meta rename to Assets/02.Scripts/Tycoon/LiquidController.cs.meta diff --git a/Assets/02.Scripts/Tycoon/LiquidIngredient.cs b/Assets/02.Scripts/Tycoon/LiquidIngredient.cs new file mode 100644 index 000000000..92ce5d594 --- /dev/null +++ b/Assets/02.Scripts/Tycoon/LiquidIngredient.cs @@ -0,0 +1,41 @@ +using System; +using UnityEngine; +using UnityEngine.Serialization; + +namespace BlueWater.Tycoons +{ + public abstract class LiquidIngredient : MonoBehaviour + { + [FormerlySerializedAs("_spriteRenderer")] + [SerializeField] + protected SpriteRenderer SpriteRenderer; + + [FormerlySerializedAs("_rigidbody2D")] + [SerializeField] + protected Rigidbody2D Rigidbody2D; + + [SerializeField, Range(0f, 2f)] + protected float _distanceThreshold = 0.5f; + + protected bool CanInteraction; + protected Collider2D TargetCollider; + + public static event Action OnReachedTarget; + + private void Update() + { + if (!TargetCollider || !CanInteraction) return; + + var closestPoint = TargetCollider.ClosestPoint(transform.position); + var distance = Vector2.Distance(transform.position, closestPoint); + + if (distance < _distanceThreshold) + { + OnReachedTarget?.Invoke(); + ReachedObject(); + } + } + + public abstract void ReachedObject(); + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/LiquidIngredient.cs.meta b/Assets/02.Scripts/Tycoon/LiquidIngredient.cs.meta new file mode 100644 index 000000000..269540790 --- /dev/null +++ b/Assets/02.Scripts/Tycoon/LiquidIngredient.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 277380dc389c51d429f006371e4d246f diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs b/Assets/02.Scripts/Tycoon/LiquidInteractionRegion.cs similarity index 100% rename from Assets/02.Scripts/LiquidInteractionRegion.cs rename to Assets/02.Scripts/Tycoon/LiquidInteractionRegion.cs diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs.meta b/Assets/02.Scripts/Tycoon/LiquidInteractionRegion.cs.meta similarity index 100% rename from Assets/02.Scripts/LiquidInteractionRegion.cs.meta rename to Assets/02.Scripts/Tycoon/LiquidInteractionRegion.cs.meta diff --git a/Assets/02.Scripts/TycoonCameraManager.cs b/Assets/02.Scripts/TycoonCameraManager.cs index ab781d406..149dc1fc4 100644 --- a/Assets/02.Scripts/TycoonCameraManager.cs +++ b/Assets/02.Scripts/TycoonCameraManager.cs @@ -5,8 +5,6 @@ using BlueWater.Utility; using Sirenix.OdinInspector; using Unity.Cinemachine; using UnityEngine; -using UnityEngine.Rendering; -using UnityEngine.Rendering.Universal; using UnityEngine.Serialization; namespace BlueWater @@ -14,7 +12,7 @@ namespace BlueWater public enum TycoonCameraType { Base = 0, - Bar + Storage } public class TycoonCameraManager : Singleton @@ -26,10 +24,6 @@ namespace BlueWater [field: SerializeField] public Camera MainCamera { get; private set; } - [field: SerializeField] - public Camera UiCamera { get; private set; } - - [FormerlySerializedAs("_cinemachineCameras")] [SerializeField] private Transform cameraLocation; @@ -37,15 +31,12 @@ namespace BlueWater public CinemachineCamera BaseCamera { get; private set; } [field: SerializeField] - public CinemachineCamera BarCamera { get; private set; } + public CinemachineCamera StorageCamera { get; private set; } // Variables private CinemachineBrain _cinemachineBrain; private List _cinemachineCameras = new(); - private Vignette _vignette; - private Coroutine _lowHpVignetteCoroutine; - #endregion // Unity events @@ -82,16 +73,12 @@ namespace BlueWater MainCamera = GetComponent(); _cinemachineBrain = GetComponent(); - //UiCamera = MainCamera.transform.Find("UiCamera").GetComponent(); BaseCamera = cameraLocation.Find("BaseCamera").GetComponent(); - BarCamera = cameraLocation.Find("BarCamera").GetComponent(); - - _vignette = GetEffect(); - _vignette.active = false; + StorageCamera = cameraLocation.Find("StorageCamera").GetComponent(); _cinemachineCameras.Add(BaseCamera); - _cinemachineCameras.Add(BarCamera); + _cinemachineCameras.Add(StorageCamera); SetMainCamera(TycoonCameraType.Base); } @@ -117,7 +104,7 @@ namespace BlueWater var newMainCamera = tycoonCameraType switch { TycoonCameraType.Base => BaseCamera, - TycoonCameraType.Bar => BarCamera, + TycoonCameraType.Storage => StorageCamera, _ => throw new ArgumentOutOfRangeException(nameof(tycoonCameraType), tycoonCameraType, null) }; @@ -129,68 +116,7 @@ namespace BlueWater //_cinemachineBrain.DefaultBlend.Style = styles; newMainCamera.Priority = 1; } - - #endregion - // PostProcessing - #region PostProcessing - - public void ToggleEffect(bool value) where T : VolumeComponent - { - var effect = GetEffect(); - if (effect == null) - { - print(typeof(T) + "효과가 없습니다."); - return; - } - effect.active = value; - } - - private T GetEffect() where T : VolumeComponent - { - var postProcessVolume = FindAnyObjectByType(); - if (postProcessVolume == null) - { - print("Volume 컴포넌트를 가진 오브젝트가 없습니다."); - return null; - } - postProcessVolume.profile.TryGet(out T effect); - return effect; - } - - public void LowHpVignette() - { - _lowHpVignetteCoroutine ??= StartCoroutine(LowHpVignetteCoroutine()); - } - - public void DefaultHpVignette() - { - Utils.EndUniqueCoroutine(this, ref _lowHpVignetteCoroutine); - _vignette.active = false; - } - - private IEnumerator LowHpVignetteCoroutine() - { - var startValue = 0.2f; - var endValue = 0.3f; - var time = 0f; - - _vignette.intensity.value = startValue; - _vignette.active = true; - - while (true) - { - time += Time.deltaTime * 2f; - _vignette.intensity.value = Mathf.Lerp(startValue, endValue, time); - if (time >= 1f) - { - (startValue, endValue) = (endValue, startValue); - time = 0f; - } - yield return null; - } - } - #endregion } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/InteractionUi.cs b/Assets/02.Scripts/Ui/InteractionUi.cs new file mode 100644 index 000000000..5b1561e77 --- /dev/null +++ b/Assets/02.Scripts/Ui/InteractionUi.cs @@ -0,0 +1,40 @@ +using TMPro; +using UnityEngine; + +namespace BlueWater.Uis +{ + public class InteractionUi : MonoBehaviour + { + [SerializeField] + private GameObject _panel; + + [SerializeField] + private TMP_Text _keyText; + + [SerializeField] + private TMP_Text _interactionText; + + private void Start() + { + EventManager.OnShowInteractionUi += ShowUi; + EventManager.OnHideInteractionUi += HideUi; + } + + private void OnDestroy() + { + EventManager.OnShowInteractionUi -= ShowUi; + EventManager.OnHideInteractionUi -= HideUi; + } + + public void ShowUi(string message) + { + _interactionText.text = message; + _panel.SetActive(true); + } + + public void HideUi() + { + _panel.SetActive(false); + } + } +} diff --git a/Assets/02.Scripts/Ui/InteractionUi.cs.meta b/Assets/02.Scripts/Ui/InteractionUi.cs.meta new file mode 100644 index 000000000..47cc95e67 --- /dev/null +++ b/Assets/02.Scripts/Ui/InteractionUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 10de0d138ea1afc4f9eaf86af55076ff \ No newline at end of file diff --git a/Assets/05.Prefabs/Ice.prefab b/Assets/05.Prefabs/GarnishObject.prefab similarity index 68% rename from Assets/05.Prefabs/Ice.prefab rename to Assets/05.Prefabs/GarnishObject.prefab index b09c348ef..364026da4 100644 --- a/Assets/05.Prefabs/Ice.prefab +++ b/Assets/05.Prefabs/GarnishObject.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4182144982868500803 +--- !u!1 &8577553974540900224 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,39 +8,40 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7412895653495447626} - - component: {fileID: 2516316322156046459} - - component: {fileID: 8452260105535798107} - - component: {fileID: 8043191264785836122} - m_Layer: 8 - m_Name: Ice + - component: {fileID: 6150662252133649813} + - component: {fileID: 3772201455671009312} + - component: {fileID: 7204670366666436681} + - component: {fileID: 3470010340248184897} + - component: {fileID: 5803694563079548352} + m_Layer: 18 + m_Name: GarnishObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7412895653495447626 +--- !u!4 &6150662252133649813 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4182144982868500803} + m_GameObject: {fileID: 8577553974540900224} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 330.7, y: 17.7, z: 0} - m_LocalScale: {x: 5, y: 5, z: 5} + m_LocalPosition: {x: 296.1, y: 16.4, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2516316322156046459 +--- !u!212 &3772201455671009312 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4182144982868500803} + m_GameObject: {fileID: 8577553974540900224} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -75,54 +76,27 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 2 - m_Sprite: {fileID: 21300000, guid: 5317214c6c3a1d74c97c68e6ba525593, type: 3} + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 12 + m_Sprite: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 1, y: 1} + m_Size: {x: 1.4, y: 1.4} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!50 &8452260105535798107 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4182144982868500803} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 50 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_GravityScale: 3 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!58 &8043191264785836122 +--- !u!58 &7204670366666436681 CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4182144982868500803} + m_GameObject: {fileID: 8577553974540900224} m_Enabled: 1 serializedVersion: 3 m_Density: 1 @@ -151,4 +125,46 @@ CircleCollider2D: m_CompositeOperation: 0 m_CompositeOrder: 0 m_Offset: {x: 0, y: 0} - m_Radius: 0.45 + m_Radius: 0.2 +--- !u!50 &3470010340248184897 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8577553974540900224} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 10 + m_LinearDamping: 0 + m_AngularDamping: 0 + m_GravityScale: 3 + m_Material: {fileID: 6200000, guid: 98be3277bd162b947a951461d0862c30, type: 2} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &5803694563079548352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8577553974540900224} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3abf680e4b23d8b4f9c511a1ca85eead, type: 3} + m_Name: + m_EditorClassIdentifier: + SpriteRenderer: {fileID: 3772201455671009312} + Rigidbody2D: {fileID: 3470010340248184897} + _distanceThreshold: 0.5 diff --git a/Assets/05.Prefabs/Ice.prefab.meta b/Assets/05.Prefabs/GarnishObject.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Ice.prefab.meta rename to Assets/05.Prefabs/GarnishObject.prefab.meta index 7c7eaf35d..962003e86 100644 --- a/Assets/05.Prefabs/Ice.prefab.meta +++ b/Assets/05.Prefabs/GarnishObject.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c5e5fa01b84c9f64ba05b7c9f481acc1 +guid: f051d09e1e3043d4285ae8e0ff4c4f12 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index 98b7307e8..783bcb5ac 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -496,42 +496,6 @@ Transform: - {fileID: 3381794055646013358} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3683421095321577965 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7679049083161624399} - m_Layer: 0 - m_Name: Barrels - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &7679049083161624399 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3683421095321577965} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8405745420066320434} - - {fileID: 8717973323817189148} - - {fileID: 766412411975822558} - - {fileID: 2633566611002910380} - - {fileID: 2976063118053674263} - m_Father: {fileID: 1402113424960589398} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3763383041433937158 GameObject: m_ObjectHideFlags: 0 @@ -2683,7 +2647,6 @@ Transform: m_Children: - {fileID: 1582116343231843844} - {fileID: 1829148020791446333} - - {fileID: 7679049083161624399} - {fileID: 4798925548635759970} - {fileID: 3032369304281183765} - {fileID: 1031605920973182729} @@ -3070,76 +3033,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: d4d2c09313763694785f13d2ff8c1303, type: 3} m_PrefabInstance: {fileID: 14371358608898358} m_PrefabAsset: {fileID: 0} ---- !u!1001 &117039659876036668 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidC - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidC - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &766412411975822558 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 117039659876036668} - m_PrefabAsset: {fileID: 0} --- !u!1001 &128984391524895884 PrefabInstance: m_ObjectHideFlags: 0 @@ -3260,7 +3153,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Name - value: LiquidBarrel01 (4) + value: Garnish1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3466,7 +3359,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Name - value: LiquidBarrel01 (2) + value: LiquidD objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3850,7 +3743,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} propertyPath: m_Name - value: LiquidStatue + value: LiquidA objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -3862,76 +3755,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a95c8459c64ddc0429e25ed5876f2120, type: 3} m_PrefabInstance: {fileID: 2014178616186210549} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2481500261763568117 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidE - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -7 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidE - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &2976063118053674263 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 2481500261763568117} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2688904294653212210 PrefabInstance: m_ObjectHideFlags: 0 @@ -4184,76 +4007,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} m_PrefabInstance: {fileID: 3244279087710839214} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3436624839453424206 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidD - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -8.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidD - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &2633566611002910380 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 3436624839453424206} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4008788609714014428 PrefabInstance: m_ObjectHideFlags: 0 @@ -4902,7 +4655,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Name - value: LiquidBarrel01 (1) + value: LiquidC objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5294,7 +5047,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Name - value: LiquidBarrel01 + value: LiquidB objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -5818,7 +5571,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Name - value: LiquidBarrel01 (3) + value: LiquidE objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -6082,7 +5835,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5897095096647521783, guid: 224465767a13abb44b0d3adb16ca76c1, type: 3} propertyPath: m_Name - value: LiquidBarrel01 (5) + value: Garnish2 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -6156,76 +5909,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: a46735af9ffe7684fb0f19bc9b351e30, type: 3} m_PrefabInstance: {fileID: 8043172050540613190} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8341054054180037630 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidB - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -11.5 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidB - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &8717973323817189148 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 8341054054180037630} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8371898322285731839 PrefabInstance: m_ObjectHideFlags: 0 @@ -6436,73 +6119,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 8672589958834113685} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9194699079792504016 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 7679049083161624399} - m_Modifications: - - target: {fileID: 223172209862223209, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: _idx - value: LiquidA - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.x - value: -13 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Name - value: LiquidA - objectReference: {fileID: 0} - - target: {fileID: 6817574259189873408, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} ---- !u!4 &8405745420066320434 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 7787d3d2cd258714d816e70592966cb3, type: 3} - m_PrefabInstance: {fileID: 9194699079792504016} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab index 25b8058d9..611576567 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/LiquidBarrel01.prefab @@ -103,7 +103,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &3246572212746126634 Transform: m_ObjectHideFlags: 0 @@ -163,7 +163,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3} + m_Sprite: {fileID: 21300000, guid: dc898802dffd29648918e86867a22ee9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -190,10 +190,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_Size.x - value: 0.7 - objectReference: {fileID: 0} - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x value: 1 @@ -213,7 +209,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 76cc7f947fec33b488919688cf130e73, type: 3} + objectReference: {fileID: 21300000, guid: dc898802dffd29648918e86867a22ee9, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -222,6 +218,10 @@ PrefabInstance: propertyPath: m_Name value: LiquidBarrel01 objectReference: {fileID: 0} + - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.17 + objectReference: {fileID: 0} - target: {fileID: 4011269187381704965, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalPosition.z value: 0 @@ -254,14 +254,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.y - value: 0.034091078 - objectReference: {fileID: 0} - - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} - propertyPath: m_LocalPosition.z - value: -0.1814631 - objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalRotation.w value: 0.9396927 @@ -386,9 +378,10 @@ MonoBehaviour: k__BackingField: {fileID: 6077686033771388879} k__BackingField: {fileID: 8975593228546502023} k__BackingField: {fileID: 8793236136028073839} - k__BackingField: {fileID: 2100000, guid: 9bce0db68fc4c4d428fa601508de489d, type: 2} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 0.8 + k__BackingField: IsOpened: 0 _liquidImage: {fileID: 6817574259189873408} _fill: {fileID: 7052380446467937511} @@ -397,6 +390,7 @@ MonoBehaviour: _liquidData: k__BackingField: k__BackingField: + k__BackingField: 0 k__BackingField: 0 k__BackingField: {fileID: 0} k__BackingField: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab index a677ba19d..98ddaad08 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/ServingTable.prefab @@ -240,6 +240,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_SizeDelta.y + value: 1 + objectReference: {fileID: 0} - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 40 @@ -282,7 +290,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7624213675240184438, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_LocalScale.x diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index 5d265bfcf..fe725fa99 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -136,6 +136,7 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 0.7 + k__BackingField: "\uC4F0\uB808\uAE30 \uBC84\uB9AC\uAE30" IsOpened: 0 --- !u!4 &5927803667513949971 stripped Transform: diff --git a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab index 139aa8e48..36b760027 100644 --- a/Assets/05.Prefabs/Uis/InteractionCanvas.prefab +++ b/Assets/05.Prefabs/Uis/InteractionCanvas.prefab @@ -140,16 +140,16 @@ RectTransform: m_GameObject: {fileID: 5611097802189151736} m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5695967080072346038} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 800, y: 600} + m_SizeDelta: {x: 1, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!223 &5297442833789713246 Canvas: diff --git a/Assets/Resources/Excel/LiquidDataTable.xlsx b/Assets/Resources/Excel/LiquidDataTable.xlsx index b11135563d54e08c0ecdebee621f15160da1f4b6..2b9be83d0bb17bc5a6d217c7b326112fd7bcfd55 100644 GIT binary patch delta 2475 zcmYjTXE@sn7ysK8G_m(iTw7a|600hNn5k826t!YgtE5!JRjXp8~H$IYfco#ffv{Aq8j(;5YAZI-(30lp? zt!ekASohfx2~=L6KW^-9Ni%rsI$tcR0u z&@6kS#9cux3YflU7&V18#uyhSxU`5qq>4v2uc-BZ+>Oirri0Hud$6VxZ~1M=i>vI7 z4=iCRM(XWuT>e8a_^Jez`bQ{xO?7VVrKjVU$L;H=Rnzd)Kmgsgmd>)2?NjY7i4AVh z=%etv9_{MAWMSYOJ%P?SW~26=%Bvb}75vH_uO2G!;JA^JbDW5fzSu;^K^tD=fgGLP zkKbTbl}+E3ckCh(r*hX<-hAsobIAn_*wT@`X4{MubFDsSE9<_-&xM3uzLu}l6IWeQ z7UMW4nqGN%1RZ*~J+QcgJ)%~Cu{9mev8S7dI@=%4yg%ujf`;E1UcY-}y(d~W!NG|X zESZa>r0S$X)vNoR>RIX_De0@6M)NWqarE)1S4Y3Jajceyji{SON{c_bcOvwJ?C_Rw zQs;*Ioz!wY7xsWpnY}uo-UA+@Wh}vHcKwT!AfraV$OYG_?^^Hnd5rrJ*s^q$523Em z!7C5V^FAERs$|>+B2vRW|Df_Tkn|k89aW=qt3}FHi z{Y5=fMlOT+ct=gFd!m_MK^@jO6dGMwR~NC2xSy}}$)Mi1ez#E@6{d~moKO;aqGf}(*2U4$ zsO9J4qcN$8elr|hXUVsgM_HyywZ|Z=U=RD%j^6%z^TBfY$){##P3&p*>#uynosRT* z_Yf=0iM2_OnoC3*gMS*$-x1lQCMI-6dvH!|@>+<&ix3E;^we8|Y2f|gDz4uZHRvUH zowk=GrLAYC7;Jt#tBjKZH9YS3J*sU^W;hwjWW3dFeOfb*rES}Wk849$S9)+*@5FYQ z{8bKOZ~TyMCKAGq5ND4rfjPn7`%Qv_-oF?Q=T^uhM-WUse`aM05S_=0bbqI41bm;u zqj^?SYkSUF^6czym6hdiG5!+7pyhfyP~557^!s!w1p3t^6;|01?u9f-%(Uws?P^&L z6}c2Ch_eiJ8=2qyn&yP{ypDtxF5K>aC-d7(;-}l#_Shk@qh;*^Wbi1n=ZR3)gnbxo zDD&q*P9AgO&`G9OGxKMuTSkP}SEQr{`S|zOT5YPaq|>Ubv$nwR|}Fo5^}am2W7l z4$T-$Oyfv_W+9~QKK{6KualJcWKW3x8QZAPv$6rV<}QOj_M|7`Uj(hikj#_hy4kFP{Ow5;IU$H?Yn zMIiEJflk>eg*?Gs^pjOq$sV705X#kM4}{`_ZO+6Vr}*+K>&*Dh*e)CHtJq}|j(N<^ zfKC5G%frw`t8I5!gy50knB*8+m!Eqx&$?iw~Sv{I5{>@xA;!cxwrW;6KBr b1pxN{<^XW~0|{-KVSJB-BqKrWuh9PiY07!U delta 2369 zcmY*bX*3%M7mX#hiZ%9938JO;w$u_)Vx)>9Drkn2gbrzf*484CsijhDO|2cl zSV|j4N-1hDwX~LDYA>R;e4Y6*J>UEB&b#NnU+=wp&#SgwLOy>ZKvJ`f0hsUs0DOV~ zfH(jEAma3*@V7#J@%T_(Vi>N{?QQs^iA0;;K$L34BjlUfvnOsgN2>e9ziqfjgURvn z=)9AZL=C&3R|=L25jC;#y90N`Ex^Izu|zI45xYAFsO=LTQn1KS``j2b2w ztM73uQyetN67VHOtNSvZfF8L2AU$Ms^;xjW5PBXLe7$y%*mkh;M?O8{uM?0yNx=NV zfL)f>FFjht2?2F0NtA_I50M;a;8Szvn@fg@kA(fS>~)m<#@?Lne;~kmB+ioP(MZRr z7HRo4g&@@JpYiSow5Qf0dy4MA3P3a56BUvx0ZBlorshhL6(|dNeC(mCjxCYc&D|dG zZ0}FBWa*EuUY?!s)SAl#mtxAr5MH3=sy*Qbp(Yw-CsIu1-aLkiC15*1+RJb%y@hoP z|4Jy%P?6`S5zkFXbh^#wu*Uc7wLWUuN@J#O5pt6f*zEF*?BZFjznIc#T`c|-^Lw74 z1idolCaKePW8#RssxZ1{+vh4QFdUbq1-o57&ghb{Tg}~f4RG^Y*Wk5D3tU-Gu@`9N zlcErON-~|~7P89u-3*l#$(AGoQ?a0>`Gu8!Yp`7$Yf<@JmF$^x$Dm8UHBDK~#k)gH z6_gX1GldmG)ivQ`%0!!%c!TB`?!uFFZ*DAy6cD$w+|iGpsevC4>`wO2KAw>>oLbBE z&M)MP>eOgbb+-}gqqe~p>;2)#UUQ;#f-%%~^8NHAUS}fmXY+y7t z-T=(%YqSdVj8Wxn>(LP6Ubf`#V^9C)~&+QaIEK`FO9W(}AkBUOw#qHc*vPSUjKRHk08_O zR~IbGLi6r8`rL1glTVmq=w`t654nDmm3P>9C+J(lLKkI}Vt&Wh^L{-BI#$jOh*xs_ z?`s<-Y9hIOv`juQ(@4aKSERo^URCd#!19G?1W^bHKc_13dR=?ROm)qG9ahXvadmrE zv>I05Z^WLH2d2ppR6JLsX2>||7vU2cEYRBk23&6q{x)hf>=!`^A*mSece)9M{=Ge7X&X7p1+OzlP1Sgh zo6nQJ#Phu?LE18*{bjvEBSUJ15r638CbfiXu00gkCnT5*Kz$C|T;na@rM&y;@3^yv9Z~X%gB=&x3*ci-mh;mDE8T; zZ@$Ro{+qIfS4AlLV1Ze$Oe`WiPV;s~j9Q1lQEjmA&m3iq-J54|$JBgxVk9y1bE=E0 zp5~doqy3~c&<*uLy$UL98qDhz(Es5ptg93=w-phhg&3YtY9(p&gGuDO1yJjZIl~(gYANxcSFuP`{ z2`(*H@RA;Pd1~2Lq48!F8IVbXc^-i-#dz%JiGtC512jW-#tO_Mq}Qd$Z>@}LEv%Zk zypp1fR4BMx={D;dWBsA`)(_6W)2g8|jXBd2?#%ttq}B9!5HnQ#j);gLS*t{c2LL$Y zr)?-`lVni0AMc0@LdEt0h22=bw|eJM3*pk5Q`h-f$SA=l_6HJ+D-c~u_CwTO?3ZpS z(;t@=g2Z@T4eko$VhPnDlA*>v*QEtu*4t(W=d}x$*SSzfhpGe-(*1wTeX?w8gS{=}PXj5b3op@@5 z=HuqOkBpbvew&pS(^Uz|Lvpt7&<7{Z0J+xPck=wF z*s>F1=-qh)p=eK*+EO)M0!fZM;5=QurY(Kyc7M~11&50J8SS%Qe&+d#s$=5nJ!32??!C_5^ttxPH@8wOAr?ho$!>G=}>eTkLyj=`8F^ zc5g!jYl&Jq#ED$1IlkcOef6(pu9W6b_E|G%0P~D}cM_2YtkAYE)@e+07L}p>4HaX4 zQbzCz|M#rWv>}c>5LygGN9nu20s!*gH2OWzv~~!Rr->#6Meu~vP*7E+?{^FUfWJ3> kt4e4IP)()(cE<|