diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index f1c83b2b3..6a46c019a 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -1107,6 +1107,83 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} m_PrefabInstance: {fileID: 65862157} m_PrefabAsset: {fileID: 0} +--- !u!1001 &75333518 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.x + value: -13 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.z + value: 4.47 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _idx + value: LiquidD + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _liquidController + value: + objectReference: {fileID: 1006730367} + - target: {fileID: 5897095096647521783, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_Name + value: Barrel (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} --- !u!1 &79484690 GameObject: m_ObjectHideFlags: 0 @@ -1272,83 +1349,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f1852e60e7132046b79863fb1d23af0, type: 3} ---- !u!1 &96563358 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 96563359} - - component: {fileID: 96563361} - - component: {fileID: 96563360} - m_Layer: 5 - m_Name: Status (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &96563359 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96563358} - 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: 973035632} - - {fileID: 2124007320} - m_Father: {fileID: 1536229209} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -215} - m_SizeDelta: {x: 579.9999, y: 52.5} - m_Pivot: {x: 0, y: 0} ---- !u!114 &96563360 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96563358} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &96563361 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 96563358} - m_CullTransparentMesh: 1 --- !u!1 &102499727 GameObject: m_ObjectHideFlags: 0 @@ -1493,86 +1493,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &119061669 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 119061670} - - component: {fileID: 119061672} - - component: {fileID: 119061671} - m_Layer: 5 - m_Name: Panel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &119061670 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119061669} - 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: 963357681} - - {fileID: 440467577} - - {fileID: 2074441848} - - {fileID: 1034828053} - - {fileID: 1730879243} - m_Father: {fileID: 587277061} - 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: -400, y: -200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &119061671 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119061669} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.24528301, g: 0.24528301, b: 0.24528301, a: 0.5882353} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &119061672 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 119061669} - m_CullTransparentMesh: 1 --- !u!1001 &138827959 PrefabInstance: m_ObjectHideFlags: 0 @@ -2481,82 +2401,83 @@ Transform: m_CorrespondingSourceObject: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} m_PrefabInstance: {fileID: 5626406452199475265} m_PrefabAsset: {fileID: 0} ---- !u!1 &214971301 -GameObject: +--- !u!1001 &214275878 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 214971302} - - component: {fileID: 214971303} - - component: {fileID: 214971304} - m_Layer: 5 - m_Name: DrinkIngredientSlotUiList - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &214971302 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214971301} - 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: 896317475} - m_Father: {fileID: 1811946556} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00042329115} - m_SizeDelta: {x: 0, y: 280} - m_Pivot: {x: 0, y: 1} ---- !u!114 &214971303 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214971301} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 20 - m_Right: 20 - m_Top: 20 - m_Bottom: 20 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 240, y: 240} - m_Spacing: {x: 20, y: 20} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &214971304 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214971301} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.x + value: -14 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.z + value: 4.47 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _idx + value: LiquidC + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _liquidController + value: + objectReference: {fileID: 1006730367} + - target: {fileID: 5897095096647521783, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_Name + value: Barrel (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} --- !u!1 &215611423 GameObject: m_ObjectHideFlags: 0 @@ -3884,278 +3805,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 360820267} m_CullTransparentMesh: 1 ---- !u!1 &362057567 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 362057568} - - component: {fileID: 362057570} - - component: {fileID: 362057569} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &362057568 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362057567} - 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: 1458274723} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &362057569 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362057567} - 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: "\uB3C4\uC218" - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - 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 &362057570 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 362057567} - m_CullTransparentMesh: 1 ---- !u!1 &373047578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 373047579} - - component: {fileID: 373047581} - - component: {fileID: 373047580} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &373047579 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373047578} - 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: 1423213612} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &373047580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373047578} - 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: "\uB3C4\uC218" - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - 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 &373047581 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 373047578} - m_CullTransparentMesh: 1 --- !u!1 &373177638 GameObject: m_ObjectHideFlags: 0 @@ -4206,93 +3855,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &379763494 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 379763495} - - component: {fileID: 379763496} - m_Layer: 0 - m_Name: Liquid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &379763495 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 379763494} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 324.16, y: -7.69, z: 0} - m_LocalScale: {x: 18, y: 20, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1045118482} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &379763496 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 379763494} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d5d9120849e43474aaafba12ab84fc47, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -403788685 - m_SortingLayer: 1 - m_SortingOrder: 12 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &389901520 GameObject: m_ObjectHideFlags: 0 @@ -4581,140 +4143,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 393212792} m_CullTransparentMesh: 1 ---- !u!1 &400400197 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 400400198} - - component: {fileID: 400400200} - - component: {fileID: 400400199} - m_Layer: 7 - m_Name: Reached - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &400400198 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400400197} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 324.4, y: -18.3, z: 0} - m_LocalScale: {x: 2, y: 20, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1045118482} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!61 &400400199 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400400197} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &400400200 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 400400197} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -403788685 - m_SortingLayer: 1 - m_SortingOrder: 13 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &414363377 GameObject: m_ObjectHideFlags: 0 @@ -5079,95 +4507,6 @@ MonoBehaviour: m_EditorClassIdentifier: _goldAnimator: {fileID: 1308258170} _goldText: {fileID: 677143483} ---- !u!1 &440467576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 440467577} - - component: {fileID: 440467579} - - component: {fileID: 440467578} - - component: {fileID: 440467580} - m_Layer: 5 - m_Name: DrinkIngredientUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &440467577 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440467576} - 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: 1253837990} - m_Father: {fileID: 119061670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 350, y: 220} - m_SizeDelta: {x: -700, y: -440} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &440467578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440467576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.40392157} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &440467579 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440467576} - m_CullTransparentMesh: 1 ---- !u!114 &440467580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 440467576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 63ce83525ba260f46904cfce776fc892, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &440736213 GameObject: m_ObjectHideFlags: 0 @@ -5428,132 +4767,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444009244} m_CullTransparentMesh: 1 ---- !u!1 &509659629 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 509659630} - - component: {fileID: 509659633} - - component: {fileID: 509659632} - - component: {fileID: 509659631} - m_Layer: 5 - m_Name: Scrollbar Vertical - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &509659630 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509659629} - 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: 2070543085} - m_Father: {fileID: 1662184026} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} - m_Pivot: {x: 1, y: 1} ---- !u!114 &509659631 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509659629} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1337712416} - m_HandleRect: {fileID: 1337712415} - m_Direction: 2 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &509659632 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509659629} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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 &509659633 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 509659629} - m_CullTransparentMesh: 1 --- !u!1 &510358306 GameObject: m_ObjectHideFlags: 0 @@ -6000,10 +5213,11 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 12.92, y: 25.711502, z: -20.48178} + m_LocalPosition: {x: -4.78, y: 12.855751, z: -20.08089} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 2105041733} m_Father: {fileID: 1634548838} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!114 &545850349 @@ -6094,7 +5308,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3} m_Name: m_EditorClassIdentifier: - CameraDistance: 40 + CameraDistance: 20 DeadZoneDepth: 0 Composition: ScreenPosition: {x: 0, y: 0} @@ -6458,81 +5672,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 571612559} m_CullTransparentMesh: 1 ---- !u!1 &574589641 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 574589642} - - component: {fileID: 574589644} - - component: {fileID: 574589643} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &574589642 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574589641} - 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: 2074503437} - 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: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &574589643 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574589641} - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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 &574589644 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 574589641} - m_CullTransparentMesh: 1 --- !u!1 &578755295 GameObject: m_ObjectHideFlags: 0 @@ -6608,58 +5747,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 578755295} m_CullTransparentMesh: 1 ---- !u!1 &587277060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 587277061} - - component: {fileID: 587277062} - m_Layer: 5 - m_Name: DrinkUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &587277061 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587277060} - 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: 1415103797} - - {fileID: 119061670} - m_Father: {fileID: 1049919592} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &587277062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 587277060} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1e18fddab7a69284394b8b5bad8d1dbe, type: 3} - m_Name: - m_EditorClassIdentifier: - SwitchMapsOpened: 6 - SwitchMapsClosed: 1 --- !u!1 &593921700 GameObject: m_ObjectHideFlags: 0 @@ -7137,81 +6224,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 ---- !u!1 &620839191 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 620839192} - - component: {fileID: 620839194} - - component: {fileID: 620839193} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &620839192 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 620839191} - 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: 1458274723} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 12.5} - m_SizeDelta: {x: 0, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &620839193 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 620839191} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: b325a13e94f3bac4199e75b91fa98449, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &620839194 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 620839191} - m_CullTransparentMesh: 1 --- !u!1 &626632725 GameObject: m_ObjectHideFlags: 0 @@ -7662,6 +6674,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 677143481} m_CullTransparentMesh: 1 +--- !u!1001 &679106599 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.x + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.z + value: 4.47 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _idx + value: LiquidB + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _liquidController + value: + objectReference: {fileID: 1006730367} + - target: {fileID: 5897095096647521783, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_Name + value: Barrel (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} --- !u!1 &713557313 GameObject: m_ObjectHideFlags: 0 @@ -7798,140 +6887,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 713557313} m_CullTransparentMesh: 1 ---- !u!1 &734598537 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 734598538} - - component: {fileID: 734598540} - - component: {fileID: 734598539} - m_Layer: 7 - m_Name: Wall - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &734598538 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734598537} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 315, y: -6.8, z: 0} - m_LocalScale: {x: 2, y: 25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1045118482} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &734598539 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734598537} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &734598540 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 734598537} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -403788685 - m_SortingLayer: 1 - m_SortingOrder: 13 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &735925259 GameObject: m_ObjectHideFlags: 0 @@ -7948,7 +6903,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &735925260 Transform: m_ObjectHideFlags: 0 @@ -8530,11 +7485,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 310 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -8688,6 +7643,83 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5685570007726524012, guid: 7e6ba4001b3b92a4d8fdd586f6d0f731, type: 3} m_PrefabInstance: {fileID: 810401071} m_PrefabAsset: {fileID: 0} +--- !u!1001 &828349206 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.x + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.z + value: 4.47 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _idx + value: LiquidE + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _liquidController + value: + objectReference: {fileID: 1006730367} + - target: {fileID: 5897095096647521783, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_Name + value: Barrel (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} --- !u!1001 &842924126 PrefabInstance: m_ObjectHideFlags: 0 @@ -9388,7 +8420,8 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_Cameras: [] + m_Cameras: + - {fileID: 1985878519} m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 @@ -9471,7 +8504,7 @@ Camera: m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 2147745783 + m_Bits: 2147876855 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -9492,7 +8525,7 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: 12.92, y: 25.711502, z: -20.48178} + m_LocalPosition: {x: -4.78, y: 12.855751, z: -20.08089} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -9573,11 +8606,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} ---- !u!4 &884456513 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6495816087516714767, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - m_PrefabInstance: {fileID: 8752897640629310614} - m_PrefabAsset: {fileID: 0} --- !u!1 &891021167 GameObject: m_ObjectHideFlags: 0 @@ -9614,11 +8642,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!224 &896317475 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - m_PrefabInstance: {fileID: 2580721080138599371} - m_PrefabAsset: {fileID: 0} --- !u!1 &908699583 GameObject: m_ObjectHideFlags: 0 @@ -9788,18 +8811,7 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} m_PrefabInstance: {fileID: 909457639} m_PrefabAsset: {fileID: 0} ---- !u!114 &909457641 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 267286335665872847, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} - m_PrefabInstance: {fileID: 909457639} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9cbe519b68d07ad4285f091528d6a34d, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &963357680 +--- !u!1 &963867002 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -9807,118 +8819,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 963357681} - - component: {fileID: 963357683} - - component: {fileID: 963357682} + - component: {fileID: 963867003} + - component: {fileID: 963867005} + - component: {fileID: 963867004} m_Layer: 5 - m_Name: MainPanel + m_Name: AmountText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &963357681 +--- !u!224 &963867003 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963357680} - 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: 1231981355} - m_Father: {fileID: 119061670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -409.99994, y: 150} - m_SizeDelta: {x: -820, y: -300} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &963357682 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963357680} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.30588236} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &963357683 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 963357680} - m_CullTransparentMesh: 1 ---- !u!1 &973035631 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 973035632} - - component: {fileID: 973035634} - - component: {fileID: 973035633} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &973035632 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973035631} + m_GameObject: {fileID: 963867002} 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: 96563359} + m_Father: {fileID: 1172519049} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 8} + m_SizeDelta: {x: 0, y: 5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &973035633 +--- !u!114 &963867004 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973035631} + m_GameObject: {fileID: 963867002} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -9932,17 +8868,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uB3C4\uC218" + m_text: 100% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} - m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4278255615 + m_fontColor: {r: 1, g: 1, b: 0, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -9959,15 +8895,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 18 - m_fontSizeBase: 18 + m_fontSize: 3.45 + m_fontSizeBase: 36 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 + m_enableAutoSizing: 1 + m_fontSizeMin: 1 + m_fontSizeMax: 10 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -10003,14 +8939,45 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &973035634 +--- !u!222 &963867005 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973035631} + m_GameObject: {fileID: 963867002} m_CullTransparentMesh: 1 +--- !u!1 &970735071 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 970735072} + m_Layer: 0 + m_Name: Spawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &970735072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 970735071} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.100006, y: 18.8, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1247057679} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &977582642 GameObject: m_ObjectHideFlags: 0 @@ -10297,6 +9264,70 @@ MonoBehaviour: m_Spacing: {x: 10, y: 10} m_Constraint: 0 m_ConstraintCount: 2 +--- !u!1 &1006730364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1006730365} + - component: {fileID: 1006730367} + m_Layer: 8 + m_Name: LiquidController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1006730365 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006730364} + 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: 1247057679} + - {fileID: 1400792458} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1006730367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006730364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 278ab2f13d3f1e24594035530325c0ac, type: 3} + m_Name: + m_EditorClassIdentifier: + _liquidPanel: {fileID: 1247057678} + _renderTexture: {fileID: 2105041734} + _liquidRenderer: {fileID: 1947402520} + _reachedCollider: {fileID: 2070548849} + _amountText: {fileID: 963867004} + _spawnTransform: {fileID: 970735072} + _spawnLocation: {fileID: 218784750} + _pushDirection: {x: -5, y: -1, z: 0} + _pushPower: 50 + _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} + _liquidColor: {r: 1, g: 0.8431373, b: 0, a: 1} + _liquidsPerSecond: 80 + _maxLiquidCount: 400 + _colorLerpSpeed: 0.5 + _colorIntensity: 2 + _objectPoolCount: 1000 + _moveDuration: 0.5 + _currentBarrel: {fileID: 0} --- !u!1001 &1011627381 PrefabInstance: m_ObjectHideFlags: 0 @@ -10454,82 +9485,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1034828052 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1034828053} - - component: {fileID: 1034828055} - - component: {fileID: 1034828054} - m_Layer: 5 - m_Name: DrinkStatusUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1034828053 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034828052} - 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: 1536229209} - m_Father: {fileID: 119061670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -409.99994, y: -290} - m_SizeDelta: {x: -820, y: -580} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1034828054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034828052} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.26415092, g: 0.26415092, b: 0.26415092, 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1034828055 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034828052} - m_CullTransparentMesh: 1 --- !u!4 &1038321203 stripped Transform: m_CorrespondingSourceObject: {fileID: 6190127373159935981, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} @@ -10656,70 +9611,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1045118481 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1045118482} - - component: {fileID: 1045118483} - m_Layer: 7 - m_Name: LiquidController - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1045118482 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1045118481} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -663, y: 21.9, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 400400198} - - {fileID: 734598538} - - {fileID: 1788669765} - - {fileID: 1757976623} - - {fileID: 379763495} - - {fileID: 1511911897} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1045118483 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1045118481} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 278ab2f13d3f1e24594035530325c0ac, type: 3} - m_Name: - m_EditorClassIdentifier: - _renderTexture: {fileID: 2105041734} - _liquidRenderer: {fileID: 379763496} - _reachedCollider: {fileID: 400400199} - _spawnTransform: {fileID: 1511911897} - _spawnLocation: {fileID: 218784750} - _pushDirection: {x: -5, y: -1, z: 0} - _pushPower: 70 - _liquidObject: {fileID: -7612237390858616641, guid: 231c2f369e2946745a955eb49243702b, type: 3} - _liquidColor: {r: 1, g: 0.8431373, b: 0, a: 1} - _liquidsPerSecond: 80 - _maxLiquidCount: 400 - _colorLerpSpeed: 0.5 - _colorIntensity: 2 - _objectPoolCount: 10000 --- !u!1 &1049919588 GameObject: m_ObjectHideFlags: 0 @@ -10823,7 +9714,6 @@ RectTransform: - {fileID: 102499728} - {fileID: 1733600342} - {fileID: 1909799357} - - {fileID: 587277061} - {fileID: 2055805161} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10850,8 +9740,6 @@ MonoBehaviour: k__BackingField: {fileID: 1496452083} k__BackingField: {fileID: 102499729} k__BackingField: {fileID: 1733600343} - k__BackingField: {fileID: 1909799358} - k__BackingField: {fileID: 587277062} _fadeImage: {fileID: 2055805162} --- !u!114 &1049919594 MonoBehaviour: @@ -11367,132 +10255,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!1 &1087754862 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1087754863} - - component: {fileID: 1087754866} - - component: {fileID: 1087754865} - - component: {fileID: 1087754864} - m_Layer: 5 - m_Name: Scrollbar Vertical - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1087754863 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1087754862} - 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: 2074503437} - m_Father: {fileID: 1253837990} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: -17} - m_Pivot: {x: 1, y: 1} ---- !u!114 &1087754864 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1087754862} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 574589643} - m_HandleRect: {fileID: 574589642} - m_Direction: 2 - m_Value: 0 - m_Size: 1 - m_NumberOfSteps: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1087754865 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1087754862} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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 &1087754866 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1087754862} - m_CullTransparentMesh: 1 --- !u!1 &1101945424 GameObject: m_ObjectHideFlags: 0 @@ -11852,11 +10614,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -12160,6 +10922,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1170066054} m_CullTransparentMesh: 1 +--- !u!1 &1172519048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1172519049} + - component: {fileID: 1172519051} + - component: {fileID: 1172519050} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1172519049 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172519048} + 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: 963867003} + m_Father: {fileID: 1730992467} + 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_SizeDelta: {x: 40, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1172519050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172519048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1172519051 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1172519048} + m_CullTransparentMesh: 1 --- !u!1 &1173162350 GameObject: m_ObjectHideFlags: 0 @@ -12402,159 +11240,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 ---- !u!1 &1187688484 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1187688485} - - component: {fileID: 1187688487} - - component: {fileID: 1187688486} - m_Layer: 5 - m_Name: DrinkIngredientSlotUiList - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1187688485 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187688484} - 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: 1802924190} - m_Father: {fileID: 1461241037} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.0003077442} - m_SizeDelta: {x: 0, y: 280} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1187688486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187688484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 1 ---- !u!114 &1187688487 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1187688484} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 20 - m_Right: 20 - m_Top: 20 - m_Bottom: 20 - m_ChildAlignment: 0 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 240, y: 240} - m_Spacing: {x: 20, y: 20} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!1 &1188635219 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1188635220} - - component: {fileID: 1188635222} - - component: {fileID: 1188635221} - m_Layer: 5 - m_Name: Status (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1188635220 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188635219} - 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: 1996928412} - - {fileID: 1486904930} - m_Father: {fileID: 1536229209} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -110} - m_SizeDelta: {x: 579.9999, y: 52.5} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1188635221 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188635219} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1188635222 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1188635219} - m_CullTransparentMesh: 1 --- !u!1 &1222632320 GameObject: m_ObjectHideFlags: 0 @@ -12726,142 +11411,6 @@ Transform: - {fileID: 1572330890} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1231981354 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1231981355} - - component: {fileID: 1231981357} - - component: {fileID: 1231981356} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1231981355 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231981354} - 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: 963357681} - 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: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1231981356 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231981354} - 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: 100% - 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: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - 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 &1231981357 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231981354} - m_CullTransparentMesh: 1 --- !u!1 &1238956751 GameObject: m_ObjectHideFlags: 0 @@ -13117,7 +11666,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ccb8b4cf4e054704a8bfa9e1334764a7, type: 3} ---- !u!1 &1253837989 +--- !u!1 &1247057678 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13125,106 +11674,33 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1253837990} - - component: {fileID: 1253837993} - - component: {fileID: 1253837992} - - component: {fileID: 1253837991} - m_Layer: 5 - m_Name: Scroll View + - component: {fileID: 1247057679} + m_Layer: 0 + m_Name: LiquidPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1253837990 -RectTransform: +--- !u!4 &1247057679 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253837989} + m_GameObject: {fileID: 1247057678} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -150, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1811946556} - - {fileID: 1087754863} - m_Father: {fileID: 440467577} + - {fileID: 1321215893} + - {fileID: 2070548848} + - {fileID: 970735072} + - {fileID: 1730992467} + m_Father: {fileID: 1006730365} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1253837991 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253837989} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 214971302} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 1811946556} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 1087754864} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1253837992 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253837989} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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 &1253837993 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1253837989} - m_CullTransparentMesh: 1 --- !u!1 &1256380695 GameObject: m_ObjectHideFlags: 0 @@ -13723,7 +12199,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1284216888} m_CullTransparentMesh: 1 ---- !u!1 &1286954427 +--- !u!1 &1287977492 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -13731,73 +12207,146 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1286954428} - - component: {fileID: 1286954430} - - component: {fileID: 1286954429} - m_Layer: 5 - m_Name: Image + - component: {fileID: 1287977493} + - component: {fileID: 1287977494} + - component: {fileID: 1287977495} + m_Layer: 8 + m_Name: ShakerForward m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1286954428 -RectTransform: +--- !u!4 &1287977493 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1286954427} + m_GameObject: {fileID: 1287977492} + 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: [] - m_Father: {fileID: 1423213612} + m_Children: + - {fileID: 1947402519} + m_Father: {fileID: 1321215893} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 12.5} - m_SizeDelta: {x: 0, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1286954429 -MonoBehaviour: +--- !u!212 &1287977494 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1286954427} + m_GameObject: {fileID: 1287977492} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: b325a13e94f3bac4199e75b91fa98449, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1286954430 -CanvasRenderer: + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 14 + m_Sprite: {fileID: 21300000, guid: 5a9ee647b3d218d4c8542007b7a75433, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!60 &1287977495 +PolygonCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1286954427} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1287977492} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 0.38178396, y: 0.07641856} + - {x: 0.40796375, y: 0.498057} + - {x: 0.33482218, y: 0.46745357} + - {x: 0.32064104, y: 0.107120514} + - {x: 0.18580961, y: -0.39122197} + - {x: -0.18910313, y: -0.39563268} + - {x: -0.31274748, y: 0.055722244} + - {x: -0.3478675, y: 0.46739} + - {x: -0.40516746, y: 0.4997826} + - {x: -0.39247894, y: 0.053767204} + - {x: -0.23258972, y: -0.48126158} + - {x: 0.2394929, y: -0.48302492} + m_UseDelaunayMesh: 0 --- !u!1 &1297637640 GameObject: m_ObjectHideFlags: 0 @@ -14123,6 +12672,94 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &1321215892 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1321215893} + - component: {fileID: 1321215894} + m_Layer: 0 + m_Name: ShakerBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1321215893 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321215892} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 25, y: 25, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1287977493} + m_Father: {fileID: 1247057679} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1321215894 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321215892} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 11 + m_Sprite: {fileID: 21300000, guid: d39d76f18f907014a9979953fb5d43a0, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1323941952 GameObject: m_ObjectHideFlags: 0 @@ -14290,81 +12927,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &1337712414 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1337712415} - - component: {fileID: 1337712417} - - component: {fileID: 1337712416} - m_Layer: 5 - m_Name: Handle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1337712415 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1337712414} - 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: 2070543085} - 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: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1337712416 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1337712414} - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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 &1337712417 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1337712414} - m_CullTransparentMesh: 1 --- !u!1001 &1341201517 PrefabInstance: m_ObjectHideFlags: 0 @@ -14411,11 +12973,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -15025,7 +13587,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1909799358} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: BlueWater.Uis.BrewingUi, Assembly-CSharp m_MethodName: ConvertButton m_Mode: 1 @@ -15507,7 +14069,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1396147845} m_CullTransparentMesh: 1 ---- !u!1 &1415103796 +--- !u!1 &1400792457 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -15515,73 +14077,119 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1415103797} - - component: {fileID: 1415103799} - - component: {fileID: 1415103798} - m_Layer: 5 - m_Name: Background + - component: {fileID: 1400792458} + - component: {fileID: 1400792461} + - component: {fileID: 1400792460} + - component: {fileID: 1400792459} + - component: {fileID: 1400792462} + m_Layer: 8 + m_Name: LiquidInteractionRegion m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1415103797 -RectTransform: +--- !u!4 &1400792458 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415103796} + m_GameObject: {fileID: 1400792457} + 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_LocalPosition: {x: -13.61, y: 0, z: 3.6} + m_LocalScale: {x: 10, y: 2, z: 5} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 587277061} + m_Father: {fileID: 1006730365} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1415103798 +--- !u!65 &1400792459 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400792457} + 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 &1400792460 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400792457} + 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 &1400792461 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1400792457} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1400792462 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415103796} + m_GameObject: {fileID: 1400792457} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: f0f3dc568d0721b48ad5f24339d24951, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.5882353} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1415103799 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415103796} - m_CullTransparentMesh: 1 --- !u!1 &1418585147 GameObject: m_ObjectHideFlags: 0 @@ -15672,83 +14280,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1418585147} m_CullTransparentMesh: 1 ---- !u!1 &1423213611 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1423213612} - - component: {fileID: 1423213614} - - component: {fileID: 1423213613} - m_Layer: 5 - m_Name: Status - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1423213612 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423213611} - 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: 373047579} - - {fileID: 1286954428} - m_Father: {fileID: 1536229209} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -57.5} - m_SizeDelta: {x: 579.9999, y: 52.5} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1423213613 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423213611} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1423213614 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1423213611} - m_CullTransparentMesh: 1 --- !u!1001 &1438594026 PrefabInstance: m_ObjectHideFlags: 0 @@ -16044,173 +14575,6 @@ MonoBehaviour: _pots: [] _grills: [] _skewers: [] ---- !u!1 &1458274722 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1458274723} - - component: {fileID: 1458274725} - - component: {fileID: 1458274724} - m_Layer: 5 - m_Name: Status (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1458274723 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1458274722} - 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: 362057568} - - {fileID: 620839192} - m_Father: {fileID: 1536229209} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 30, y: -162.5} - m_SizeDelta: {x: 579.9999, y: 52.5} - m_Pivot: {x: 0, y: 0} ---- !u!114 &1458274724 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1458274722} - 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1458274725 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1458274722} - m_CullTransparentMesh: 1 ---- !u!1 &1461241036 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1461241037} - - component: {fileID: 1461241040} - - component: {fileID: 1461241039} - - component: {fileID: 1461241038} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1461241037 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461241036} - 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: 1187688485} - m_Father: {fileID: 1662184026} - 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: -17, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1461241038 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461241036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &1461241039 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461241036} - 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: 10917, guid: 0000000000000000f000000000000000, type: 0} - 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 &1461241040 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1461241036} - m_CullTransparentMesh: 1 --- !u!1 &1471090205 GameObject: m_ObjectHideFlags: 0 @@ -16647,81 +15011,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1486904929 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1486904930} - - component: {fileID: 1486904932} - - component: {fileID: 1486904931} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1486904930 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1486904929} - 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: 1188635220} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 12.5} - m_SizeDelta: {x: 0, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1486904931 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1486904929} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: b325a13e94f3bac4199e75b91fa98449, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1486904932 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1486904929} - m_CullTransparentMesh: 1 --- !u!1 &1496452081 GameObject: m_ObjectHideFlags: 0 @@ -16910,53 +15199,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1508199804} m_CullTransparentMesh: 1 ---- !u!1 &1511911896 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1511911897} - m_Layer: 0 - m_Name: Spawn - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1511911897 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1511911896} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 332.13, y: 12.66, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1045118482} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!224 &1518298343 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} m_PrefabInstance: {fileID: 8086743652407108747} m_PrefabAsset: {fileID: 0} ---- !u!114 &1518298344 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 267286335665872847, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} - m_PrefabInstance: {fileID: 8086743652407108747} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9cbe519b68d07ad4285f091528d6a34d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1527652764 GameObject: m_ObjectHideFlags: 0 @@ -17003,112 +15250,6 @@ MonoBehaviour: m_EditorClassIdentifier: propertyName: _OffsetX propertyValue: -1 ---- !u!1 &1536229208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1536229209} - - component: {fileID: 1536229212} - - component: {fileID: 1536229211} - - component: {fileID: 1536229210} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1536229209 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536229208} - 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: 1423213612} - - {fileID: 1188635220} - - {fileID: 1458274723} - - {fileID: 96563359} - m_Father: {fileID: 1034828053} - 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: -60, y: -80} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1536229210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536229208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 30 - m_Right: 30 - m_Top: 5 - m_Bottom: 5 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &1536229211 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536229208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.85098046, g: 0.9607844, 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: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1536229212 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1536229208} - m_CullTransparentMesh: 1 --- !u!1 &1543999676 GameObject: m_ObjectHideFlags: 0 @@ -17320,11 +15461,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -17917,7 +16058,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.z @@ -17969,17 +16110,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} m_PrefabInstance: {fileID: 1627308700} m_PrefabAsset: {fileID: 0} ---- !u!114 &1627308702 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 267286335665872847, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} - m_PrefabInstance: {fileID: 1627308700} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9cbe519b68d07ad4285f091528d6a34d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &1628404463 PrefabInstance: m_ObjectHideFlags: 0 @@ -18429,114 +16559,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 7001217081995887542, guid: 87f21262cc4185343b43e1f62249a4d1, type: 3} m_PrefabInstance: {fileID: 1660733460} m_PrefabAsset: {fileID: 0} ---- !u!1 &1662184025 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1662184026} - - component: {fileID: 1662184029} - - component: {fileID: 1662184028} - - component: {fileID: 1662184027} - m_Layer: 5 - m_Name: Scroll View - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1662184026 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662184025} - 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: 1461241037} - - {fileID: 509659630} - m_Father: {fileID: 2074441848} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1662184027 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662184025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Content: {fileID: 1187688485} - m_Horizontal: 0 - m_Vertical: 1 - m_MovementType: 1 - m_Elasticity: 0.1 - m_Inertia: 1 - m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 - m_Viewport: {fileID: 1461241037} - m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 509659631} - m_HorizontalScrollbarVisibility: 2 - m_VerticalScrollbarVisibility: 2 - m_HorizontalScrollbarSpacing: -3 - m_VerticalScrollbarSpacing: -3 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1662184028 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662184025} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5566038, g: 0.5566038, b: 0.5566038, a: 0.392} - 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - 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 &1662184029 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1662184025} - m_CullTransparentMesh: 1 --- !u!1001 &1664171138 PrefabInstance: m_ObjectHideFlags: 0 @@ -18933,7 +16955,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1701236784 RectTransform: m_ObjectHideFlags: 0 @@ -19360,7 +17382,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723000583} m_CullTransparentMesh: 1 ---- !u!1 &1730879242 +--- !u!1 &1730992466 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -19368,119 +17390,100 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1730879243} - - component: {fileID: 1730879246} - - component: {fileID: 1730879245} - - component: {fileID: 1730879244} + - component: {fileID: 1730992467} + - component: {fileID: 1730992470} + - component: {fileID: 1730992469} + - component: {fileID: 1730992468} m_Layer: 5 - m_Name: MenualButton + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1730879243 +--- !u!224 &1730992467 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1730879242} + m_GameObject: {fileID: 1730992466} 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: 2002371754} - m_Father: {fileID: 119061670} + - {fileID: 1172519049} + m_Father: {fileID: 1247057679} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -80, y: 40} - m_SizeDelta: {x: 160, y: 80} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1110, y: 540} + m_SizeDelta: {x: 1920, y: 1080} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1730879244 +--- !u!114 &1730992468 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1730879242} + m_GameObject: {fileID: 1730992466} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1730879245} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1730879245 + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2148007935 +--- !u!114 &1730992469 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1730879242} + m_GameObject: {fileID: 1730992466} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - 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 &1730879246 -CanvasRenderer: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &1730992470 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1730879242} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 1730992466} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 873223991} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: -403788685 + m_SortingOrder: 10 + m_TargetDisplay: 0 --- !u!1 &1731335579 GameObject: m_ObjectHideFlags: 0 @@ -20017,140 +18020,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1757976620 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1757976623} - - component: {fileID: 1757976622} - - component: {fileID: 1757976621} - m_Layer: 7 - m_Name: Square (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!61 &1757976621 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757976620} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1757976622 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757976620} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -403788685 - m_SortingLayer: 1 - m_SortingOrder: 11 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.86666673, g: 0.86666673, b: 0.86666673, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1757976623 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1757976620} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0.38268343, w: 0.92387956} - m_LocalPosition: {x: 334.06, y: 12.3, z: 0} - m_LocalScale: {x: 2, y: 10, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1045118482} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -45} --- !u!1 &1759838089 GameObject: m_ObjectHideFlags: 0 @@ -20494,7 +18363,7 @@ Camera: m_GameObject: {fileID: 1774013116} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 + m_ClearFlags: 4 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -20521,7 +18390,7 @@ Camera: field of view: 60 orthographic: 1 orthographic size: 50 - m_Depth: 5 + m_Depth: 3 m_CullingMask: serializedVersion: 2 m_Bits: 131072 @@ -20529,7 +18398,7 @@ Camera: m_TargetTexture: {fileID: 8400000, guid: 8e8b4ed6ab8541d44aed8cc8f69d3eff, type: 2} m_TargetDisplay: 0 m_TargetEye: 3 - m_HDR: 1 + m_HDR: 0 m_AllowMSAA: 1 m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 @@ -20545,11 +18414,10 @@ Transform: m_GameObject: {fileID: 1774013116} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -300, y: 0, z: -10} + m_LocalPosition: {x: -250, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2105041733} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1774270789 @@ -20811,140 +18679,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1786369329} m_CullTransparentMesh: 1 ---- !u!1 &1788669764 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1788669765} - - component: {fileID: 1788669767} - - component: {fileID: 1788669766} - m_Layer: 7 - m_Name: Wall (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1788669765 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1788669764} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 333.3, y: -6.8, z: 0} - m_LocalScale: {x: 2, y: 25, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1045118482} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1788669766 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1788669764} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 0, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!212 &1788669767 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1788669764} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -403788685 - m_SortingLayer: 1 - m_SortingOrder: 13 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1795712517 GameObject: m_ObjectHideFlags: 0 @@ -21081,210 +18815,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795712517} m_CullTransparentMesh: 1 ---- !u!1001 &1802924189 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1187688485} - m_Modifications: - - target: {fileID: 3318603451250692738, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Name - value: DrinkIngredientSlotUi - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_SizeDelta.x - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_SizeDelta.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 140 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -140 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4395687013142119211, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_text - value: "\uC5BC\uC74C" - objectReference: {fileID: 0} - - target: {fileID: 4395687013142119211, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_fontSize - value: 36 - objectReference: {fileID: 0} - - target: {fileID: 7812366238446595861, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 5317214c6c3a1d74c97c68e6ba525593, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} ---- !u!224 &1802924190 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - m_PrefabInstance: {fileID: 1802924189} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1811946555 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1811946556} - - component: {fileID: 1811946559} - - component: {fileID: 1811946558} - - component: {fileID: 1811946557} - m_Layer: 5 - m_Name: Viewport - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1811946556 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1811946555} - 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: 214971302} - m_Father: {fileID: 1253837990} - 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: -17, y: 0} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1811946557 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1811946555} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &1811946558 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1811946555} - 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: 10917, guid: 0000000000000000f000000000000000, type: 0} - 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 &1811946559 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1811946555} - m_CullTransparentMesh: 1 --- !u!1001 &1813968672 PrefabInstance: m_ObjectHideFlags: 0 @@ -22474,11 +20004,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 310 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -22561,6 +20091,83 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1899123652 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.x + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalPosition.z + value: 4.47 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _idx + value: LiquidA + objectReference: {fileID: 0} + - target: {fileID: 1535180298174803447, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: _liquidController + value: + objectReference: {fileID: 1006730367} + - target: {fileID: 5897095096647521783, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} + propertyPath: m_Name + value: Barrel + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7cb398d57f4c7ff468b50dbf1d226ca5, type: 3} --- !u!1 &1909799356 GameObject: m_ObjectHideFlags: 0 @@ -22570,7 +20177,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1909799357} - - component: {fileID: 1909799358} m_Layer: 5 m_Name: BrewingUi m_TagString: Untagged @@ -22599,47 +20205,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1909799358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1909799356} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e31b5881c81ad924b93ec7dcfe7baf19, type: 3} - m_Name: - m_EditorClassIdentifier: - SwitchMapsOpened: 2 - SwitchMapsClosed: 1 - _drinkRecipeSlotUiPrefab: {fileID: 282528693430034096, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} - _drinkRecipeSpawnLocation: {fileID: 1858488035} - _recipeName: {fileID: 713557315} - _drinkImage: {fileID: 1835523529} - _convertButton: {fileID: 1381895787} - _brewingIngredientSlotUis: - - {fileID: 1518298344} - - {fileID: 909457641} - - {fileID: 1627308702} - _selectedDrinkData: - k__BackingField: - k__BackingField: - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - _currentBrewing: {fileID: 0} --- !u!1 &1918605129 GameObject: m_ObjectHideFlags: 0 @@ -22973,6 +20538,93 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1925779217} m_CullTransparentMesh: 1 +--- !u!1 &1947402518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1947402519} + - component: {fileID: 1947402520} + m_Layer: 0 + m_Name: Liquid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1947402519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1947402518} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.8, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1287977493} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1947402520 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1947402518} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d5d9120849e43474aaafba12ab84fc47, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -403788685 + m_SortingLayer: 1 + m_SortingOrder: 13 + m_Sprite: {fileID: 21300000, guid: d39d76f18f907014a9979953fb5d43a0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.5, y: 0.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 2 + m_SpriteSortPoint: 0 --- !u!1001 &1957839369 PrefabInstance: m_ObjectHideFlags: 0 @@ -23327,6 +20979,134 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1978509263} m_CullTransparentMesh: 1 +--- !u!1 &1985878517 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1985878520} + - component: {fileID: 1985878519} + - component: {fileID: 1985878518} + m_Layer: 0 + m_Name: LiquidOverlayCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1985878518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985878517} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 0 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 +--- !u!20 &1985878519 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985878517} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 50 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 2147614719 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1985878520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1985878517} + 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: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1987164071 GameObject: m_ObjectHideFlags: 0 @@ -23581,278 +21361,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1993214433} m_CullTransparentMesh: 1 ---- !u!1 &1996928411 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1996928412} - - component: {fileID: 1996928414} - - component: {fileID: 1996928413} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1996928412 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996928411} - 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: 1188635220} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: -25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1996928413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996928411} - 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: "\uB3C4\uC218" - 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: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 18 - m_fontSizeBase: 18 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - 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 &1996928414 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1996928411} - m_CullTransparentMesh: 1 ---- !u!1 &2002371753 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2002371754} - - component: {fileID: 2002371756} - - component: {fileID: 2002371755} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2002371754 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002371753} - 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: 1730879243} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2002371755 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002371753} - 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: "\uBA54\uB274\uC5BC" - 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: 44 - m_fontSizeBase: 44 - m_fontWeight: 400 - m_enableAutoSizing: 0 - 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 &2002371756 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2002371753} - m_CullTransparentMesh: 1 --- !u!1 &2017406340 GameObject: m_ObjectHideFlags: 0 @@ -24347,7 +21855,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2055968243} m_CullTransparentMesh: 1 ---- !u!1 &2070543084 +--- !u!1 &2070548847 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -24355,146 +21863,132 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2070543085} - m_Layer: 5 - m_Name: Sliding Area + - component: {fileID: 2070548848} + - component: {fileID: 2070548850} + - component: {fileID: 2070548849} + m_Layer: 8 + m_Name: ReachedCollider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2070543085 -RectTransform: +--- !u!4 &2070548848 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2070543084} + m_GameObject: {fileID: 2070548847} + 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_LocalPosition: {x: 0, y: -10, z: 0} + m_LocalScale: {x: 20, y: 2, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1337712415} - m_Father: {fileID: 509659630} + m_Children: [] + m_Father: {fileID: 1247057679} 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: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2074441847 -GameObject: +--- !u!61 &2070548849 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2074441848} - - component: {fileID: 2074441850} - - component: {fileID: 2074441849} - m_Layer: 5 - m_Name: GarnishIngredientUi - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2074441848 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074441847} - 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: 1662184026} - m_Father: {fileID: 119061670} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 350, y: -220} - m_SizeDelta: {x: -700, y: -440} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2074441849 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074441847} + m_GameObject: {fileID: 2070548847} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: + serializedVersion: 3 + m_Density: 1 m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2074441850 -CanvasRenderer: + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &2070548850 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074441847} - m_CullTransparentMesh: 1 ---- !u!1 &2074503436 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2074503437} - m_Layer: 5 - m_Name: Sliding Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2074503437 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2074503436} - 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: 574589642} - m_Father: {fileID: 1087754863} - 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: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} + m_GameObject: {fileID: 2070548847} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2105041732 GameObject: m_ObjectHideFlags: 0 @@ -24507,7 +22001,7 @@ GameObject: - component: {fileID: 2105041735} - component: {fileID: 2105041734} - component: {fileID: 2105041736} - m_Layer: 0 + m_Layer: 18 m_Name: LiquidRenderTexture m_TagString: Untagged m_Icon: {fileID: 0} @@ -24523,12 +22017,12 @@ Transform: m_GameObject: {fileID: 2105041732} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 10} - m_LocalScale: {x: 100, y: 100, z: 1} + m_LocalPosition: {x: 1.35, y: 0.02, z: 5} + m_LocalScale: {x: 2.56, y: 2.56, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1774013120} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Father: {fileID: 545850348} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!23 &2105041734 MeshRenderer: m_ObjectHideFlags: 0 @@ -24537,12 +22031,12 @@ MeshRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2105041732} m_Enabled: 1 - m_CastShadows: 1 + m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 m_StaticShadowCaster: 0 m_MotionVectors: 1 - m_LightProbeUsage: 1 + m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 @@ -24550,7 +22044,7 @@ MeshRenderer: m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 - m_RendererPriority: 0 + m_RendererPriority: 11 m_Materials: - {fileID: 2100000, guid: 9fe24a2fb24bf734cb466d3a0d8d9c1e, type: 2} m_StaticBatchInfo: @@ -24592,7 +22086,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: -403788685 m_SortingLayer: 1 - m_SortingOrder: 11 + m_SortingOrder: 12 m_SortAtRoot: 0 --- !u!1 &2105772111 GameObject: @@ -24785,81 +22279,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108304083} m_CullTransparentMesh: 1 ---- !u!1 &2124007319 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2124007320} - - component: {fileID: 2124007322} - - component: {fileID: 2124007321} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2124007320 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124007319} - 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: 96563359} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 12.5} - m_SizeDelta: {x: 0, y: 25} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2124007321 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124007319} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 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: b325a13e94f3bac4199e75b91fa98449, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 0 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2124007322 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2124007319} - m_CullTransparentMesh: 1 --- !u!1001 &2130676465 PrefabInstance: m_ObjectHideFlags: 0 @@ -24906,11 +22325,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 425 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -25008,11 +22427,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.x - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.y - value: -80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} propertyPath: m_LocalPosition.z @@ -25064,103 +22483,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 5298106837865694066, guid: 5d001eb1c848ebd468b622667d90cad8, type: 3} m_PrefabInstance: {fileID: 604670658564826510} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2580721080138599371 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 214971302} - m_Modifications: - - target: {fileID: 3318603451250692738, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Name - value: DrinkIngredientSlotUi - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_SizeDelta.x - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_SizeDelta.y - value: 240 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchoredPosition.x - value: 140 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_AnchoredPosition.y - value: -140 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3591675408625319010, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 148877ddcea0d6349af9d828455dff2e, type: 3} --- !u!1001 &5626406452199475265 PrefabInstance: m_ObjectHideFlags: 0 @@ -25571,7 +22893,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: 12.92 + value: -4.78 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y @@ -25579,7 +22901,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.z - value: 10.16 + value: -4.76 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalRotation.w @@ -27029,7 +24351,7 @@ PrefabInstance: - target: {fileID: 3235314206077419821, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: _liquidController value: - objectReference: {fileID: 1045118483} + objectReference: {fileID: 0} - target: {fileID: 3235314206077419821, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: _liquidController2 value: @@ -27045,7 +24367,7 @@ PrefabInstance: - target: {fileID: 4385792948314753237, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: _targetTransform value: - objectReference: {fileID: 884456513} + objectReference: {fileID: 0} - target: {fileID: 9041926907780427371, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} propertyPath: m_Name value: TycoonMap @@ -27055,11 +24377,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} ---- !u!4 &7827484746149782378 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4353418070280708860, guid: 981817fdc4897a34bafc0040f15656b9, type: 3} - m_PrefabInstance: {fileID: 7827484746149782377} - m_PrefabAsset: {fileID: 0} --- !u!1001 &8086743652407108747 PrefabInstance: m_ObjectHideFlags: 0 @@ -27114,7 +24431,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.y - value: 80 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4291285538023367731, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} propertyPath: m_LocalPosition.z @@ -27161,127 +24478,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9e46dadb5448ee4883f8b114e9c6488, type: 3} ---- !u!1001 &8752897640629310614 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 912470863235380595, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 1086074593099002285, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 1666635675717542762, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 1890371639221043381, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 2722074097486048961, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalPosition.x - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2886802892998475356, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2996670218762927670, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 3095287805770434576, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 3693116244118559590, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 4219651580152309109, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 4997544144761056320, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 5779811900454425323, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 6130559905385202114, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 6526493802215800102, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: _targetTransform - value: - objectReference: {fileID: 7827484746149782378} - - target: {fileID: 6957473214045006851, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 7151238213608218518, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - - target: {fileID: 7174987760914822137, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Name - value: BreweryMap - objectReference: {fileID: 0} - - target: {fileID: 8465324282818528478, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} - propertyPath: m_Camera - value: - objectReference: {fileID: 873223991} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f7c3d6c0326461c4a97315587aa777d3, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -27289,6 +24485,7 @@ SceneRoots: - {fileID: 166220741} - {fileID: 88262798} - {fileID: 873223992} + - {fileID: 1985878520} - {fileID: 1774013120} - {fileID: 1634548838} - {fileID: 355668244} @@ -27310,8 +24507,12 @@ SceneRoots: - {fileID: 141729588} - {fileID: 852387592} - {fileID: 7827484746149782377} - - {fileID: 8752897640629310614} - {fileID: 5626406452199475265} - - {fileID: 1045118482} + - {fileID: 1899123652} + - {fileID: 679106599} + - {fileID: 214275878} + - {fileID: 75333518} + - {fileID: 828349206} + - {fileID: 1006730365} - {fileID: 20736010} - {fileID: 218784750} diff --git a/Assets/01.Scenes/99.Tycoon41.unity b/Assets/01.Scenes/99.Tycoon41.unity index 9b8fc5395..1902707c1 100644 --- a/Assets/01.Scenes/99.Tycoon41.unity +++ b/Assets/01.Scenes/99.Tycoon41.unity @@ -5077,7 +5077,7 @@ Transform: m_GameObject: {fileID: 545850347} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -9.2, y: 18.705118, z: -26.991896} + m_LocalPosition: {x: -8.39, y: 9.641813, z: -17.050667} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -5171,7 +5171,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 886251e9a18ece04ea8e61686c173e1b, type: 3} m_Name: m_EditorClassIdentifier: - CameraDistance: 29.1 + CameraDistance: 15 DeadZoneDepth: 0 Composition: ScreenPosition: {x: 0, y: 0} @@ -7843,7 +7843,7 @@ Transform: m_GameObject: {fileID: 873223985} serializedVersion: 2 m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -9.2, y: 18.705118, z: -26.991896} + m_LocalPosition: {x: -8.39, y: 9.641813, z: -17.050667} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -19994,7 +19994,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.x - value: -9.2 + value: -8.39 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.y @@ -20002,7 +20002,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalPosition.z - value: -4.7 + value: -5.56 objectReference: {fileID: 0} - target: {fileID: 2798544366308408093, guid: 9ce588004bafc1e4e9617fdaa2d77c8d, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/02.Scripts/Character/Npc/Customer.cs b/Assets/02.Scripts/Character/Npc/Customer.cs index 0e8d4b869..7917a683f 100644 --- a/Assets/02.Scripts/Character/Npc/Customer.cs +++ b/Assets/02.Scripts/Character/Npc/Customer.cs @@ -252,6 +252,8 @@ namespace BlueWater.Npcs.Customers { OnInteraction?.Invoke(); } + + public virtual void CancelInteraction() { } public bool CanInteraction() => true; diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs index 87914f918..da8329ac5 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonInput.cs @@ -98,6 +98,10 @@ namespace BlueWater.Players.Tycoons { _closestInteraction?.Interaction(); } + else if (context.canceled) + { + _closestInteraction?.CancelInteraction(); + } } public void OnDevelopKey01(InputAction.CallbackContext context) diff --git a/Assets/02.Scripts/Interface/IPlayerInteraction.cs b/Assets/02.Scripts/Interface/IPlayerInteraction.cs index 77321230a..0ff2a7d9a 100644 --- a/Assets/02.Scripts/Interface/IPlayerInteraction.cs +++ b/Assets/02.Scripts/Interface/IPlayerInteraction.cs @@ -11,6 +11,7 @@ namespace BlueWater.Interfaces float InteractionRadius { get; } void Interaction(); + void CancelInteraction(); bool CanInteraction(); void ShowInteractionUi(); void HideInteractionUi(); diff --git a/Assets/02.Scripts/Item/Drink.meta b/Assets/02.Scripts/Item/Cocktail.meta similarity index 100% rename from Assets/02.Scripts/Item/Drink.meta rename to Assets/02.Scripts/Item/Cocktail.meta diff --git a/Assets/02.Scripts/Item/Drink/CocktailData.cs b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs similarity index 75% rename from Assets/02.Scripts/Item/Drink/CocktailData.cs rename to Assets/02.Scripts/Item/Cocktail/CocktailData.cs index a319fea1d..22546007f 100644 --- a/Assets/02.Scripts/Item/Drink/CocktailData.cs +++ b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using BlueWater.Interfaces; -using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -24,31 +23,31 @@ namespace BlueWater.Items public string IngredientIdx1 { get; set; } [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientRatio1 { get; set; } + public int IngredientAmount1 { get; set; } [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx2 { get; set; } [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientRatio2 { get; set; } + public int IngredientAmount2 { get; set; } [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx3 { get; set; } [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientRatio3 { get; set; } + public int IngredientAmount3 { get; set; } [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx4 { get; set; } [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientRatio4 { get; set; } + public int IngredientAmount4 { get; set; } [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx5 { get; set; } [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientRatio5 { get; set; } + public int IngredientAmount5 { get; set; } [BoxGroup("직접 추가하는 영역")] [field: SerializeField, BoxGroup("직접 추가하는 영역")] @@ -58,13 +57,24 @@ namespace BlueWater.Items { var ingredients = new List(5); - if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new CocktailIngredient(IngredientIdx1, IngredientRatio1)); - if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new CocktailIngredient(IngredientIdx2, IngredientRatio2)); - if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new CocktailIngredient(IngredientIdx3, IngredientRatio3)); - if (!string.IsNullOrEmpty(IngredientIdx4)) ingredients.Add(new CocktailIngredient(IngredientIdx4, IngredientRatio4)); - if (!string.IsNullOrEmpty(IngredientIdx5)) ingredients.Add(new CocktailIngredient(IngredientIdx5, IngredientRatio5)); + if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new CocktailIngredient(IngredientIdx1, IngredientAmount1)); + if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new CocktailIngredient(IngredientIdx2, IngredientAmount2)); + if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new CocktailIngredient(IngredientIdx3, IngredientAmount3)); + if (!string.IsNullOrEmpty(IngredientIdx4)) ingredients.Add(new CocktailIngredient(IngredientIdx4, IngredientAmount4)); + if (!string.IsNullOrEmpty(IngredientIdx5)) ingredients.Add(new CocktailIngredient(IngredientIdx5, IngredientAmount5)); return ingredients; } + + public int GetCocktailAmount(List cocktailIngredients) + { + var amount = 0; + foreach (var element in cocktailIngredients) + { + amount += element.Amount; + } + + return amount; + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Drink/CocktailData.cs.meta b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs.meta similarity index 100% rename from Assets/02.Scripts/Item/Drink/CocktailData.cs.meta rename to Assets/02.Scripts/Item/Cocktail/CocktailData.cs.meta diff --git a/Assets/02.Scripts/Item/Drink/CocktailDataSo.cs b/Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs similarity index 100% rename from Assets/02.Scripts/Item/Drink/CocktailDataSo.cs rename to Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs diff --git a/Assets/02.Scripts/Item/Drink/CocktailDataSo.cs.meta b/Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs.meta similarity index 100% rename from Assets/02.Scripts/Item/Drink/CocktailDataSo.cs.meta rename to Assets/02.Scripts/Item/Cocktail/CocktailDataSo.cs.meta diff --git a/Assets/02.Scripts/Item/Drink/CocktailIngredient.cs b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs similarity index 60% rename from Assets/02.Scripts/Item/Drink/CocktailIngredient.cs rename to Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs index b28fb3076..92d79027d 100644 --- a/Assets/02.Scripts/Item/Drink/CocktailIngredient.cs +++ b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs @@ -6,12 +6,12 @@ namespace BlueWater.Items public class CocktailIngredient { public string Idx { get; set; } - public int Ratio { get; set; } + public int Amount { get; set; } - public CocktailIngredient(string idx, int quantity) + public CocktailIngredient(string idx, int amount) { Idx = idx; - Ratio = quantity; + Amount = amount; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Drink/CocktailIngredient.cs.meta b/Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs.meta similarity index 100% rename from Assets/02.Scripts/Item/Drink/CocktailIngredient.cs.meta rename to Assets/02.Scripts/Item/Cocktail/CocktailIngredient.cs.meta diff --git a/Assets/02.Scripts/Item/Cocktail/LiquidData.cs b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs new file mode 100644 index 000000000..28ad63817 --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs @@ -0,0 +1,34 @@ +using System; +using BlueWater.Interfaces; +using Sirenix.OdinInspector; +using UnityEngine; + +namespace BlueWater.Items +{ + [Serializable] + public class LiquidData : IIdx + { + [BoxGroup("Json 데이터 영역")] + [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] + public string Idx { get; set; } + + [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] + public string Name { get; set; } + + [field: SerializeField, Tooltip("총량"), BoxGroup("Json 데이터 영역")] + public int Amount { get; set; } + + [BoxGroup("직접 추가하는 영역")] + [field: SerializeField, BoxGroup("직접 추가하는 영역")] + public Sprite Sprite { get; set; } + + [BoxGroup("직접 추가하는 영역")] + [field: SerializeField, BoxGroup("직접 추가하는 영역")] + public Color Color { get; set; } + + public int GetMaxAmount() + { + return Amount == 99999 ? int.MaxValue : Amount; + } + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Drink/DrinkData.cs.meta b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs.meta similarity index 100% rename from Assets/02.Scripts/Item/Drink/DrinkData.cs.meta rename to Assets/02.Scripts/Item/Cocktail/LiquidData.cs.meta diff --git a/Assets/02.Scripts/Item/Cocktail/LiquidDataSo.cs b/Assets/02.Scripts/Item/Cocktail/LiquidDataSo.cs new file mode 100644 index 000000000..373ab9179 --- /dev/null +++ b/Assets/02.Scripts/Item/Cocktail/LiquidDataSo.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +namespace BlueWater.Items +{ + [CreateAssetMenu(fileName = "LiquidDataTable", menuName = "ScriptableObjects/LiquidDataTable")] + public class LiquidDataSo : DataSo + { + + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Drink/DrinkDataSo.cs.meta b/Assets/02.Scripts/Item/Cocktail/LiquidDataSo.cs.meta similarity index 100% rename from Assets/02.Scripts/Item/Drink/DrinkDataSo.cs.meta rename to Assets/02.Scripts/Item/Cocktail/LiquidDataSo.cs.meta diff --git a/Assets/02.Scripts/Item/Drink/DrinkData.cs b/Assets/02.Scripts/Item/Drink/DrinkData.cs deleted file mode 100644 index 967afd6b9..000000000 --- a/Assets/02.Scripts/Item/Drink/DrinkData.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Collections.Generic; -using BlueWater.Interfaces; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace BlueWater.Items -{ - public enum DrinkCategory - { - None = 0, - Alcohol, - Garnish - } - - [Serializable] - public class DrinkData : IIdx - { - [BoxGroup("Json 데이터 영역")] - [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] - public string Idx { get; set; } - - [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] - public string Name { get; set; } - - [field: SerializeField, Tooltip("종류"), BoxGroup("Json 데이터 영역")] - public DrinkCategory Category { get; set; } - - [field: SerializeField, Tooltip("총량"), BoxGroup("Json 데이터 영역")] - public int Amount { get; set; } - - [field: SerializeField, Tooltip("도수"), BoxGroup("Json 데이터 영역")] - public int AlcoholVolume { get; set; } - - [field: SerializeField, Tooltip("온도"), BoxGroup("Json 데이터 영역")] - public int CoolWarm { get; set; } - - [field: SerializeField, Tooltip("맛"), BoxGroup("Json 데이터 영역")] - public int BitterSweet { get; set; } - - [field: SerializeField, Tooltip("향"), BoxGroup("Json 데이터 영역")] - public int Scent { get; set; } - - [field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx1 { get; set; } - - [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientQuantity1 { get; set; } - - [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx2 { get; set; } - - [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientQuantity2 { get; set; } - - [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] - public string IngredientIdx3 { get; set; } - - [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] - public int IngredientQuantity3 { get; set; } - - [BoxGroup("직접 추가하는 영역")] - [field: SerializeField, BoxGroup("직접 추가하는 영역")] - public Sprite Sprite { get; set; } - - [BoxGroup("직접 추가하는 영역")] - [field: SerializeField, BoxGroup("직접 추가하는 영역")] - public Color Color { get; set; } - - public List GetValidIngredients() - { - var ingredients = new List(3); - - if (!string.IsNullOrEmpty(IngredientIdx1)) ingredients.Add(new Ingredient(IngredientIdx1, IngredientQuantity1)); - if (!string.IsNullOrEmpty(IngredientIdx2)) ingredients.Add(new Ingredient(IngredientIdx2, IngredientQuantity2)); - if (!string.IsNullOrEmpty(IngredientIdx3)) ingredients.Add(new Ingredient(IngredientIdx3, IngredientQuantity3)); - - return ingredients; - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Drink/DrinkDataSo.cs b/Assets/02.Scripts/Item/Drink/DrinkDataSo.cs deleted file mode 100644 index ff6e6b123..000000000 --- a/Assets/02.Scripts/Item/Drink/DrinkDataSo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using UnityEngine; - -namespace BlueWater.Items -{ - [CreateAssetMenu(fileName = "DrinkDataTable", menuName = "ScriptableObjects/DrinkDataTable")] - public class DrinkDataSo : DataSo - { - - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Item/Item.cs b/Assets/02.Scripts/Item/Item.cs index 623d21cdd..d81d632e2 100644 --- a/Assets/02.Scripts/Item/Item.cs +++ b/Assets/02.Scripts/Item/Item.cs @@ -206,6 +206,8 @@ namespace BlueWater.Items OnAcquired(); } + public virtual void CancelInteraction() { } + public virtual bool CanInteraction() => true; public void ShowInteractionUi() diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index fd53436b0..fcbd7ef4b 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.Serialization; using Random = UnityEngine.Random; namespace BlueWater.Items @@ -28,9 +29,9 @@ namespace BlueWater.Items private CocktailDataSo _cocktailDataSo; private Dictionary _cocktailDatas; - [SerializeField, Required] - private DrinkDataSo _drinkDataSo; - private Dictionary _drinkDatas; + [FormerlySerializedAs("_drinkDataSo")] [SerializeField, Required] + private LiquidDataSo liquidDataSo; + private Dictionary _liquidDatas; [field: SerializeField, Required] public ItemSlotDataSo ItemSlotDataSo { get; private set; } @@ -57,7 +58,7 @@ namespace BlueWater.Items _itemDropTables = InitializeDictionary(_itemDropTableSo.ItemDropTables, table => table.CharacterData.CharacterIdx); _foodDatas = InitializeDictionary(_foodDataSo.Datas, data => data.Idx); _cocktailDatas = InitializeDictionary(_cocktailDataSo.Datas, data => data.Idx); - _drinkDatas = InitializeDictionary(_drinkDataSo.Datas, data => data.Idx); + _liquidDatas = InitializeDictionary(liquidDataSo.Datas, data => data.Idx); } private Dictionary InitializeDictionary(List dataList, Func keySelector) @@ -133,6 +134,7 @@ namespace BlueWater.Items public FoodData GetFoodDataByIdx(string idx) => GetDataByIdx(_foodDatas, idx); public CocktailData GetCocktailDataByIdx(string idx) => GetDataByIdx(_cocktailDatas, idx); - public DrinkData GetDrinkDataByIdx(string idx) => GetDataByIdx(_drinkDatas, idx); + public Dictionary GetCocktailDatas() => _cocktailDatas; + public LiquidData GetLiquidDataByIdx(string idx) => GetDataByIdx(_liquidDatas, idx); } } \ No newline at end of file diff --git a/Assets/02.Scripts/LiquidController.cs b/Assets/02.Scripts/LiquidController.cs index 7b62d82cc..4d1a6328c 100644 --- a/Assets/02.Scripts/LiquidController.cs +++ b/Assets/02.Scripts/LiquidController.cs @@ -1,9 +1,13 @@ -using System; using System.Collections.Generic; using System.Linq; +using BlueWater.Items; +using BlueWater.Tycoons; +using DG.Tweening; using Sirenix.OdinInspector; +using TMPro; using UnityEngine; using UnityEngine.Pool; +using UnityEngine.Serialization; namespace BlueWater { @@ -12,6 +16,9 @@ namespace BlueWater #region Variables [Title("컴포넌트")] + [SerializeField] + private GameObject _liquidPanel; + [SerializeField] private Renderer _renderTexture; @@ -20,6 +27,9 @@ namespace BlueWater [SerializeField] private Collider2D _reachedCollider; + + [SerializeField] + private TMP_Text _amountText; [Title("스폰 데이터")] [SerializeField, Required] @@ -37,9 +47,6 @@ namespace BlueWater [Title("액체")] [SerializeField, Required, Tooltip("액체 프리팹")] private Liquid _liquidObject; - - [SerializeField, Tooltip("떨어지는 액체의 색상")] - private Color _liquidColor = new(1f, 0.8431373f, 0f, 1f); [SerializeField, Tooltip("초당 생성되는 액체 수(ml)")] private int _liquidsPerSecond = 80; @@ -57,10 +64,20 @@ namespace BlueWater [SerializeField, Tooltip("오브젝트 풀링 최대 개수")] private int _objectPoolCount = 1000; + [Title("패널")] + [SerializeField] + private float _moveDuration = 0.5f; + + [Title("실시간 정보")] + [SerializeField] + private Barrel _currentBarrel; + private IObjectPool _objectPool; private List _activeLiquids = new(); - private Dictionary _colorCounts = new(); + private Dictionary _liquidDataCounts = new(); private Material _instanceMaterial; + private Tween _showTween; + private Tween _hideTween; private bool _isPouring; private float _startTime = float.PositiveInfinity; @@ -84,39 +101,56 @@ namespace BlueWater private void Awake() { _objectPool = new ObjectPool(CreateObject, OnGetObject, OnReleaseObject, OnDestroyObject, maxSize: _objectPoolCount); + + _hideTween = _liquidPanel.transform.DOMoveX(-150f, _moveDuration).From(-249f).Pause() + .SetAutoKill(false); + + _showTween = _liquidPanel.transform.DOMoveX(-249f, _moveDuration).From(-150f).Pause() + .SetAutoKill(false); } private void Start() { - TycoonEvents.OnDrinkUiOpened += Initialize; - TycoonEvents.OnDrinkUiClosed += ReleaseAllObject; + TycoonEvents.OnLiquidRegionEntered += ShowPanel; + TycoonEvents.OnLiquidRegionExited += HidePanel; _instanceMaterial = Instantiate(_liquidRenderer.material); _liquidRenderer.material = _instanceMaterial; - _timeInterval = 1f / _liquidsPerSecond; _instanceMaterial.SetFloat(_liquidAmountHash, 0f); + _timeInterval = 1f / _liquidsPerSecond; + _instanceLiquidCount = 0; + SetCurrentAmount(0f); } private void Update() { if (_isPouring) { - if (_instanceLiquidCount >= _maxLiquidCount) + // 현재 술의 재고가 없을 때 + if (!_currentBarrel.CanConsume(1)) { InActiveIsPouring(); return; } + // 술이 완성되었을 때 + if (_instanceLiquidCount >= _maxLiquidCount) + { + CompleteLiquid(); + return; + } + if (Time.time - _startTime >= _timeInterval) { _objectPool.Get(); - if (!_colorCounts.TryAdd(_liquidColor, 1)) + if (!_liquidDataCounts.TryAdd(_currentBarrel.GetLiquidData(), 1)) { - _colorCounts[_liquidColor] += 1; + _liquidDataCounts[_currentBarrel.GetLiquidData()] += 1; } + _currentBarrel.Consume(1); _startTime = Time.time; } } @@ -130,21 +164,8 @@ namespace BlueWater private void OnDestroy() { - TycoonEvents.OnDrinkUiOpened -= Initialize; - TycoonEvents.OnDrinkUiClosed -= ReleaseAllObject; - } - - #endregion - - // Initialize methods - #region Initialize methods - - public void Initialize() - { - _instanceLiquidCount = 0; - _currentLiquidAmount = 0f; - _currentMixedColor = _liquidColor; - _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity); + TycoonEvents.OnLiquidRegionEntered -= ShowPanel; + TycoonEvents.OnLiquidRegionExited -= HidePanel; } #endregion @@ -165,10 +186,11 @@ namespace BlueWater liquid.transform.rotation = Quaternion.identity; liquid.gameObject.SetActive(true); _instanceLiquidCount++; - liquid.Initialize(this, _reachedCollider, _liquidColor, _pushDirection.normalized * _pushPower); - if (_renderTexture && _renderTexture.material.GetColor(_renderTextureColorHash) != _liquidColor) + var liquidColor = _currentBarrel.GetLiquidData().Color; + liquid.Initialize(this, _reachedCollider, liquidColor, _pushDirection.normalized * _pushPower); + if (_renderTexture && _renderTexture.material.GetColor(_renderTextureColorHash) != liquidColor) { - _renderTexture.material.SetColor(_renderTextureColorHash, _liquidColor); + _renderTexture.material.SetColor(_renderTextureColorHash, liquidColor); } _activeLiquids.Add(liquid); } @@ -190,9 +212,6 @@ namespace BlueWater // Custom methods #region Custom methods - [Button("기본 색상")] - private void DefaultColor() => _liquidColor = new Color(1f, 0.8431373f, 0f, 1f); - /// /// 술 제조 과정 초기화 함수 /// @@ -204,14 +223,29 @@ namespace BlueWater _activeLiquids[i].Destroy(); } - _colorCounts.Clear(); + _liquidDataCounts.Clear(); _instanceLiquidCount = 0; - _currentLiquidAmount = 0f; + SetCurrentAmount(0f); _instanceMaterial.SetFloat(_liquidAmountHash, 0f); } + /// + /// 현재 상호작용 중인 Barrel 연동 + /// + /// + public void SetBarrel(Barrel barrel) + { + _currentBarrel = barrel; + } + public void ActiveIsPouring() { + if (_instanceLiquidCount == 0) + { + _currentMixedColor = _currentBarrel.GetLiquidData().Color; + _instanceMaterial.SetColor(_liquidColorHash, _currentMixedColor * _colorIntensity); + } + _startTime = Time.time; _isPouring = true; } @@ -220,19 +254,114 @@ namespace BlueWater { _isPouring = false; } + + private void SetCurrentAmount(float value) + { + _currentLiquidAmount = value; + + if (_amountText) + { + var percent = (int)(_currentLiquidAmount / _maxLiquidCount * 100); + _amountText.text = $"{percent}%"; + } + else + { + if (_amountText.enabled) + { + _amountText.enabled = false; + } + } + } + + /// + /// 술을 완성한 경우 + /// + private void CompleteLiquid() + { + InActiveIsPouring(); + // TODO : 완성된 음료를 데이터베이스와 비교하기 + var currentCocktailIngredients = new List(5); + foreach (var element in _liquidDataCounts) + { + var idx = element.Key.Idx; + var amount = element.Value; + currentCocktailIngredients.Add(new CocktailIngredient(idx, amount)); + } + + // ItemManager를 통해 모든 CocktailData 가져오기 + var cocktailDatas = ItemManager.Instance.GetCocktailDatas(); + CocktailData matchingCocktail = null; + + // 모든 칵테일 데이터를 순회하면서 조건에 맞는 칵테일 찾기 + foreach (var cocktailData in cocktailDatas.Values) + { + var validIngredients = cocktailData.GetValidIngredients(); + + // 조건 1: 재료 개수 동일 체크 + if (validIngredients.Count != currentCocktailIngredients.Count) + continue; + + var allIngredientsMatch = true; + + // 현재 음료 재료를 하나씩 validIngredients와 비교 + foreach (var currentIngredient in currentCocktailIngredients) + { + // 동일한 Idx를 가진 재료가 있는지 찾음 + var matchingValidIngredient = validIngredients.FirstOrDefault(ingredient => ingredient.Idx == currentIngredient.Idx); + + // 만약 Idx가 일치하는 재료가 없으면 조건 불충족 + if (matchingValidIngredient == null) + { + allIngredientsMatch = false; + break; + } + + // 조건 2: Amount 값이 RatioRange에 따른 오차 범위 내에 있는지 체크 + var validAmount = matchingValidIngredient.Amount; + //var maxLiquidCount = cocktailData.GetCocktailAmount(validIngredients); + var range = _maxLiquidCount / 100 * cocktailData.RatioRange; + var minAmount = validAmount - range; + var maxAmount = validAmount + range; + + if (currentIngredient.Amount < minAmount || currentIngredient.Amount > maxAmount) + { + allIngredientsMatch = false; + break; + } + } + + // 조건이 모두 만족하면 매칭되는 칵테일을 찾음 + if (allIngredientsMatch) + { + matchingCocktail = cocktailData; + break; + } + } + + // 조건에 만족하는 칵테일이 없음 + if (matchingCocktail == null) + { + matchingCocktail = ItemManager.Instance.GetCocktailDataByIdx("Cocktail000"); + } + + Debug.Log($"{matchingCocktail.Idx} 음료 완성"); + + + // TODO : 플레이어 이벤트를 통해 음료 들기 + } /// /// 사용된 색상의 비율에 맞게 색을 혼합시키는 함수 /// private Color MixColorsByTime() { - var totalCounts = _colorCounts.Values.Sum(); + var totalCounts = _liquidDataCounts.Values.Sum(); var mixedColor = Color.black; - foreach (var element in _colorCounts) + foreach (var element in _liquidDataCounts) { - var color = element.Key; + var color = element.Key.Color; var count = element.Value; var ratio = count / (float)totalCounts; @@ -250,7 +379,7 @@ namespace BlueWater public void OnLiquidReached() { _liquidReachedTime = Time.time; - _currentLiquidAmount++; + SetCurrentAmount(++_currentLiquidAmount); var liquidAmount = Mathf.Clamp(_currentLiquidAmount / _maxLiquidCount, 0f, 1f); _instanceMaterial.SetFloat(_liquidAmountHash, liquidAmount); _targetColor = MixColorsByTime(); @@ -261,8 +390,18 @@ namespace BlueWater } } + public void ShowPanel() + { + _hideTween.Pause(); + _showTween.Restart(); + } + + public void HidePanel() + { + _showTween.Pause(); + _hideTween.Restart(); + } + #endregion - - } } \ No newline at end of file diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs b/Assets/02.Scripts/LiquidInteractionRegion.cs new file mode 100644 index 000000000..095128577 --- /dev/null +++ b/Assets/02.Scripts/LiquidInteractionRegion.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +namespace BlueWater +{ + public class LiquidInteractionRegion : MonoBehaviour + { + private void OnTriggerEnter(Collider other) + { + TycoonEvents.OnLiquidRegionEntered?.Invoke(); + } + + private void OnTriggerExit(Collider other) + { + TycoonEvents.OnLiquidRegionExited?.Invoke(); + } + } +} diff --git a/Assets/02.Scripts/LiquidInteractionRegion.cs.meta b/Assets/02.Scripts/LiquidInteractionRegion.cs.meta new file mode 100644 index 000000000..c4a7d27de --- /dev/null +++ b/Assets/02.Scripts/LiquidInteractionRegion.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f0f3dc568d0721b48ad5f24339d24951 \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Bar.cs b/Assets/02.Scripts/Prop/Tycoon/Bar.cs index 3ab90a347..eddacc049 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Bar.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Bar.cs @@ -1,4 +1,3 @@ -using BlueWater.Uis; using UnityEngine; namespace BlueWater.Tycoons @@ -10,7 +9,7 @@ namespace BlueWater.Tycoons public override void Interaction() { - TycoonUiManager.Instance.DrinkUi.Open(TycoonUiManager.Instance.PopupUiList); + // TycoonUiManager.Instance.BarUi.Open(TycoonUiManager.Instance.PopupUiList); } public void ActiveIsPouring() diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs new file mode 100644 index 000000000..d32e8ef58 --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs @@ -0,0 +1,72 @@ +using BlueWater.Items; +using UnityEngine; + +namespace BlueWater.Tycoons +{ + public class Barrel : InteractionFurniture + { + [SerializeField] + private string _idx; + + [SerializeField] + private LiquidData _liquidData; + + [SerializeField] + private int _currentAmount; + + private LiquidController _liquidController; + + protected override void Awake() + { + base.Awake(); + + _liquidController = FindAnyObjectByType(); + _liquidData = ItemManager.Instance.GetLiquidDataByIdx(_idx); + _currentAmount = _liquidData.GetMaxAmount(); + } + + public override void Interaction() + { + _liquidController.SetBarrel(this); + _liquidController.ActiveIsPouring(); + } + + public override void CancelInteraction() + { + _liquidController.InActiveIsPouring(); + } + + /// + /// 1. 플레이어가 빈 잔을 들고 있거나 완성되지 않은 잔을 들고 있을 때 + /// + public override bool CanInteraction() + { + return true; + } + + public bool CanConsume(int amount) + { + return _currentAmount - amount > 0; + } + + public void Consume(int amount) + { + if (_currentAmount == int.MaxValue) + { + return; + } + + _currentAmount -= amount; + } + + public bool TryConsume(int amount) + { + if (!CanConsume(amount)) return false; + + Consume(amount); + return true; + } + + public LiquidData GetLiquidData() => _liquidData; + } +} \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta new file mode 100644 index 000000000..113cff08c --- /dev/null +++ b/Assets/02.Scripts/Prop/Tycoon/Barrel.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 2568fe8d4d702ed4698ed46b9c2ad25a diff --git a/Assets/02.Scripts/Prop/Tycoon/Brewing.cs b/Assets/02.Scripts/Prop/Tycoon/Brewing.cs index d9fc93e3e..6cb9c3348 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Brewing.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Brewing.cs @@ -1,46 +1,47 @@ -using BlueWater.Items; -using BlueWater.Uis; -using UnityEngine; - -namespace BlueWater.Tycoons -{ - public class Brewing : InteractionFurniture - { - [SerializeField] - private DrinkCategory _category; - - [SerializeField] - private DrinkData _currentDrinkData; - - [SerializeField] - private int _currentQuantity; - - public override void Interaction() - { - var brewingUi = TycoonUiManager.Instance.BrewingUi; - brewingUi.SetBrewing(this); - brewingUi.Open(TycoonUiManager.Instance.PopupUiList); - } - - public override bool CanInteraction() - { - return !IsOpened; - } - - public void SetDrink(DrinkData drinkData) - { - _currentDrinkData = drinkData; - _currentQuantity = _currentDrinkData.Amount; - } - - public bool IsEmptyDrink() - { - return _currentDrinkData == null || _currentQuantity <= 0; - } - - public DrinkCategory GetDrinkCategory() - { - return _category; - } - } -} \ No newline at end of file +// using BlueWater.Items; +// using BlueWater.Uis; +// using UnityEngine; +// using UnityEngine.Serialization; +// +// namespace BlueWater.Tycoons +// { +// public class Brewing : InteractionFurniture +// { +// [SerializeField] +// private DrinkCategory _category; +// +// [FormerlySerializedAs("_currentDrinkData")] [SerializeField] +// private LiquidData currentLiquidData; +// +// [SerializeField] +// private int _currentQuantity; +// +// public override void Interaction() +// { +// var brewingUi = TycoonUiManager.Instance.BrewingUi; +// brewingUi.SetBrewing(this); +// brewingUi.Open(TycoonUiManager.Instance.PopupUiList); +// } +// +// public override bool CanInteraction() +// { +// return !IsOpened; +// } +// +// public void SetDrink(LiquidData liquidData) +// { +// currentLiquidData = liquidData; +// _currentQuantity = currentLiquidData.Amount; +// } +// +// public bool IsEmptyDrink() +// { +// return currentLiquidData == null || _currentQuantity <= 0; +// } +// +// public DrinkCategory GetDrinkCategory() +// { +// return _category; +// } +// } +// } \ No newline at end of file diff --git a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs index c8a3de1d8..d70c62a8d 100644 --- a/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs +++ b/Assets/02.Scripts/Prop/Tycoon/InteractionFuniture.cs @@ -93,7 +93,9 @@ namespace BlueWater.Tycoons } public abstract void Interaction(); - + + public virtual void CancelInteraction() { } + public virtual bool CanInteraction() => true; public virtual void ShowInteractionUi() diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index c8b9f147f..2b6e03411 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -13,143 +13,227 @@ MonoBehaviour: m_Name: CocktailDataTable m_EditorClassIdentifier: k__BackingField: - - k__BackingField: Cocktail300 - k__BackingField: "\uB2EC\uBE5B \uC0D8\uBB3C" + - k__BackingField: Cocktail000 + k__BackingField: "\uC4F0\uB808\uAE30" k__BackingField: 0 - k__BackingField: Drink100 - k__BackingField: 100 + k__BackingField: + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail301 - k__BackingField: "\uB9DD\uB839 \uB9E5\uC8FC" + - k__BackingField: Cocktail001 + k__BackingField: "\uCE75\uD14C\uC77CA" k__BackingField: 0 - k__BackingField: Drink101 - k__BackingField: 100 + k__BackingField: LiquidA + k__BackingField: 400 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail302 - k__BackingField: "\uAC80\uC740 \uC218\uC5FC" + - k__BackingField: Cocktail002 + k__BackingField: "\uCE75\uD14C\uC77CB" k__BackingField: 0 - k__BackingField: Drink102 - k__BackingField: 100 + k__BackingField: LiquidB + k__BackingField: 400 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail303 - k__BackingField: "\uC6A9\uC554 \uB9E5\uC8FC" + - k__BackingField: Cocktail003 + k__BackingField: "\uCE75\uD14C\uC77CC" k__BackingField: 0 - k__BackingField: Drink103 - k__BackingField: 100 + k__BackingField: LiquidC + k__BackingField: 400 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail304 - k__BackingField: "\uC8FD\uC74C\uC758 \uC774\uC2AC" + - k__BackingField: Cocktail004 + k__BackingField: "\uCE75\uD14C\uC77CD" k__BackingField: 0 - k__BackingField: Drink104 - k__BackingField: 100 + k__BackingField: LiquidD + k__BackingField: 400 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail305 - k__BackingField: "\uC5BC\uC74C" + - k__BackingField: Cocktail005 + k__BackingField: "\uCE75\uD14C\uC77CE" k__BackingField: 0 - k__BackingField: Ice200 - k__BackingField: 100 + k__BackingField: LiquidE + k__BackingField: 400 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail306 - k__BackingField: "\uC5BC\uC5B4\uBD99\uC740 \uB9DD\uB839" + - k__BackingField: Cocktail006 + k__BackingField: "\uCE75\uD14C\uC77CAC" + k__BackingField: 5 + k__BackingField: LiquidA + k__BackingField: 200 + k__BackingField: LiquidC + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail007 + k__BackingField: "\uCE75\uD14C\uC77CBD" + k__BackingField: 5 + k__BackingField: LiquidB + k__BackingField: 200 + k__BackingField: LiquidD + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail008 + k__BackingField: "\uCE75\uD14C\uC77CCD" + k__BackingField: 5 + k__BackingField: LiquidC + k__BackingField: 200 + k__BackingField: LiquidD + k__BackingField: 200 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail009 + k__BackingField: "\uCE75\uD14C\uC77CABE" k__BackingField: 10 - k__BackingField: Drink101 - k__BackingField: 80 - k__BackingField: Ice200 - k__BackingField: 20 - k__BackingField: - k__BackingField: 0 + k__BackingField: LiquidA + k__BackingField: 100 + k__BackingField: LiquidB + k__BackingField: 100 + k__BackingField: LiquidE + k__BackingField: 200 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail307 - k__BackingField: "\uC2AC\uB77C\uC784 \uD480" - k__BackingField: 25 - k__BackingField: Drink100 - k__BackingField: 50 - k__BackingField: Ice200 - k__BackingField: 50 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: - k__BackingField: 0 - k__BackingField: {fileID: 0} - - k__BackingField: Cocktail308 - k__BackingField: "\uBD88\uD0C4 \uC218\uC5FC" + - k__BackingField: Cocktail010 + k__BackingField: "\uCE75\uD14C\uC77CCDE" k__BackingField: 10 - k__BackingField: Drink102 - k__BackingField: 20 - k__BackingField: Drink103 - k__BackingField: 80 - k__BackingField: - k__BackingField: 0 + k__BackingField: LiquidC + k__BackingField: 100 + k__BackingField: LiquidD + k__BackingField: 100 + k__BackingField: LiquidE + k__BackingField: 200 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: {fileID: 0} - - k__BackingField: Cocktail309 - k__BackingField: "\uB77C\uBC14 \uACE0\uC2A4\uD2B8" - k__BackingField: 15 - k__BackingField: Drink101 - k__BackingField: 50 - k__BackingField: Drink103 - k__BackingField: 50 + - k__BackingField: Cocktail011 + k__BackingField: "\uCE75\uD14C\uC77CB1" + k__BackingField: 10 + k__BackingField: LiquidB + k__BackingField: 320 + k__BackingField: Garnish1 + k__BackingField: 80 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 k__BackingField: - k__BackingField: 0 + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail012 + k__BackingField: "\uCE75\uD14C\uC77CD1" + k__BackingField: 10 + k__BackingField: LiquidD + k__BackingField: 320 + k__BackingField: Garnish1 + k__BackingField: 80 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail013 + k__BackingField: "\uCE75\uD14C\uC77CA2" + k__BackingField: 5 + k__BackingField: LiquidA + k__BackingField: 360 + k__BackingField: Garnish2 + k__BackingField: 40 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail014 + k__BackingField: "\uCE75\uD14C\uC77CC2" + k__BackingField: 5 + k__BackingField: LiquidC + k__BackingField: 360 + k__BackingField: Garnish2 + k__BackingField: 40 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: {fileID: 0} + - k__BackingField: Cocktail015 + k__BackingField: "\uCE75\uD14C\uC77CE2" + k__BackingField: 5 + k__BackingField: LiquidE + k__BackingField: 360 + k__BackingField: Garnish2 + k__BackingField: 40 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 + k__BackingField: + k__BackingField: 0 k__BackingField: {fileID: 0} diff --git a/Assets/02.Scripts/ScriptableObject/Item/DrinkDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/DrinkDataTable.asset deleted file mode 100644 index 475241544..000000000 --- a/Assets/02.Scripts/ScriptableObject/Item/DrinkDataTable.asset +++ /dev/null @@ -1,111 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1f91e197a0d142b40ae1ec8bd1300fb3, type: 3} - m_Name: DrinkDataTable - m_EditorClassIdentifier: - k__BackingField: - - k__BackingField: Drink100 - k__BackingField: "\uB2EC\uBE5B \uC0D8\uBB3C" - k__BackingField: 1 - k__BackingField: 99999 - k__BackingField: 0 - k__BackingField: 10 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - - k__BackingField: Drink101 - k__BackingField: "\uB9DD\uB839 \uB9E5\uC8FC" - k__BackingField: 1 - k__BackingField: 2000 - k__BackingField: 7 - k__BackingField: -20 - k__BackingField: -10 - k__BackingField: 0 - k__BackingField: Item00 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - - k__BackingField: Drink102 - k__BackingField: "\uAC80\uC740 \uC218\uC5FC \uB7FC" - k__BackingField: 1 - k__BackingField: 1200 - k__BackingField: 20 - k__BackingField: -30 - k__BackingField: -15 - k__BackingField: 0 - k__BackingField: Item01 - k__BackingField: 3 - k__BackingField: Item00 - k__BackingField: 1 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - - k__BackingField: Drink103 - k__BackingField: "\uC6A9\uC554 \uB9E5\uC8FC" - k__BackingField: 1 - k__BackingField: 2800 - k__BackingField: 6 - k__BackingField: 20 - k__BackingField: 10 - k__BackingField: 0 - k__BackingField: Item02 - k__BackingField: 1 - k__BackingField: Item03 - k__BackingField: 3 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - - k__BackingField: Drink104 - k__BackingField: "\uC8FD\uC74C\uC758 \uC774\uC2AC" - k__BackingField: 1 - k__BackingField: 800 - k__BackingField: 30 - k__BackingField: -25 - k__BackingField: 20 - k__BackingField: 0 - k__BackingField: Item04 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} - - k__BackingField: Ice200 - k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC870\uAC01" - k__BackingField: 2 - k__BackingField: 1000 - k__BackingField: 0 - k__BackingField: -20 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: Item05 - k__BackingField: 2 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: 0 - k__BackingField: {fileID: 0} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset index 12ee3e760..67e01a9dd 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset @@ -553,7 +553,7 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - - k__BackingField: Item00 + - k__BackingField: Ingredient00 k__BackingField: "\uC800\uC8FC \uBC1B\uC740 \uBCF4\uB9AC" k__BackingField: 1 k__BackingField: 0 @@ -563,7 +563,7 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - - k__BackingField: Item01 + - k__BackingField: Ingredient01 k__BackingField: "\uC2EC\uC5F0\uC758 \uD574\uCD08" k__BackingField: 1 k__BackingField: 0 @@ -573,7 +573,7 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - - k__BackingField: Item02 + - k__BackingField: Ingredient02 k__BackingField: "\uB3C4\uAE68\uBE44 \uBD88" k__BackingField: 1 k__BackingField: 0 @@ -583,7 +583,7 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - - k__BackingField: Item03 + - k__BackingField: Ingredient03 k__BackingField: "\uC6A9\uC554 \uBCF4\uB9AC" k__BackingField: 1 k__BackingField: 0 @@ -593,7 +593,7 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - - k__BackingField: Item04 + - k__BackingField: Ingredient04 k__BackingField: "\uC601\uD63C\uC758 \uC548\uAC1C" k__BackingField: 1 k__BackingField: 0 @@ -603,7 +603,7 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} - - k__BackingField: Item05 + - k__BackingField: Ingredient05 k__BackingField: "\uC5BC\uC74C \uC2AC\uB77C\uC784\uC758 \uC601\uD63C" k__BackingField: 1 k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset new file mode 100644 index 000000000..dd40ac3de --- /dev/null +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset @@ -0,0 +1,50 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f91e197a0d142b40ae1ec8bd1300fb3, type: 3} + m_Name: LiquidDataTable + m_EditorClassIdentifier: + k__BackingField: + - k__BackingField: Garnish1 + k__BackingField: "\uAC00\uB098\uC26C1" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 0, a: 1} + - k__BackingField: Garnish2 + k__BackingField: "\uAC00\uB098\uC26C2" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 0, a: 1} + - k__BackingField: LiquidA + k__BackingField: "\uC220 \uC6D0\uC561A" + k__BackingField: 99999 + k__BackingField: {fileID: 0} + k__BackingField: {r: 1, g: 0, b: 0, a: 1} + - k__BackingField: LiquidB + k__BackingField: "\uC220 \uC6D0\uC561B" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 1, g: 0.5019608, b: 0, a: 1} + - k__BackingField: LiquidC + k__BackingField: "\uC220 \uC6D0\uC561C" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 1, g: 1, b: 0, a: 1} + - k__BackingField: LiquidD + k__BackingField: "\uC220 \uC6D0\uC561D" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 1, b: 0, a: 1} + - k__BackingField: LiquidE + k__BackingField: "\uC220 \uC6D0\uC561E" + k__BackingField: 2000 + k__BackingField: {fileID: 0} + k__BackingField: {r: 0, g: 0, b: 1, a: 1} diff --git a/Assets/02.Scripts/ScriptableObject/Item/DrinkDataTable.asset.meta b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset.meta similarity index 79% rename from Assets/02.Scripts/ScriptableObject/Item/DrinkDataTable.asset.meta rename to Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset.meta index 8c5d98386..0412b5b12 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/DrinkDataTable.asset.meta +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 24a7d2ebd11ba314684a6d3ef72f76a0 +guid: d912288eee347ea4b98718ff38ef5d78 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/02.Scripts/Tycoon/TycoonData.cs b/Assets/02.Scripts/Tycoon/TycoonData.cs index 7b8e73a62..a0d7904e2 100644 --- a/Assets/02.Scripts/Tycoon/TycoonData.cs +++ b/Assets/02.Scripts/Tycoon/TycoonData.cs @@ -34,11 +34,11 @@ namespace BlueWater.Tycoons { if (DrinkRecipes.Contains(idx)) return; - var drinkData = ItemManager.Instance.GetDrinkDataByIdx(idx); + var drinkData = ItemManager.Instance.GetLiquidDataByIdx(idx); if (drinkData == null) return; DrinkRecipes.Add(idx); - TycoonEvents.OnDrinkRecipeAcquired?.Invoke(idx); + //TycoonEvents.OnDrinkRecipeAcquired?.Invoke(idx); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/TycoonEvents.cs b/Assets/02.Scripts/Tycoon/TycoonEvents.cs index b1922e0c8..21f50d0bd 100644 --- a/Assets/02.Scripts/Tycoon/TycoonEvents.cs +++ b/Assets/02.Scripts/Tycoon/TycoonEvents.cs @@ -6,14 +6,12 @@ namespace BlueWater public static class TycoonEvents { // 음료 - public static Action OnDrinkRecipeAcquired; - - public static Action OnBrewingUiOpened; - public static Action OnBrewingUiClosed; - public static Action OnDrinkRecipeSelected; + // public static Action OnDrinkRecipeAcquired; + // public static Action OnDrinkRecipeSelected; - public static Action OnDrinkUiOpened; - public static Action OnDrinkUiClosed; + public static Action OnLiquidRegionEntered; + public static Action OnLiquidRegionExited; + // 요리 diff --git a/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs b/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs index df7b0aaf8..12f98e60f 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BrewingUi.cs @@ -1,188 +1,189 @@ -using System.Collections.Generic; -using BlueWater.Items; -using BlueWater.Tycoons; -using Sirenix.OdinInspector; -using TMPro; -using UnityEngine; -using UnityEngine.UI; - -namespace BlueWater.Uis -{ - public class BrewingUi : SwitchActionPopupUi - { - [SerializeField, Required] - private DrinkRecipeSlotUi _drinkRecipeSlotUiPrefab; - - [SerializeField, Required] - private Transform _drinkRecipeSpawnLocation; - - [SerializeField] - private TMP_Text _recipeName; - - [SerializeField] - private Image _drinkImage; - - [SerializeField] - private Button _convertButton; - - [Title("실시간 데이터")] - [SerializeField] - private List _brewingIngredientSlotUis = new(3); - - [SerializeField] - private DrinkData _selectedDrinkData; - - [SerializeField] - private Brewing _currentBrewing; - - private List _drinkRecipeSlotUis = new(); - - private void Start() - { - Initialize(); - - TycoonEvents.OnDrinkRecipeAcquired += AddDrinkRecipe; - TycoonEvents.OnDrinkRecipeSelected += SelectDrinkRecipe; - } - - private void OnDestroy() - { - TycoonEvents.OnDrinkRecipeAcquired -= AddDrinkRecipe; - TycoonEvents.OnDrinkRecipeSelected -= SelectDrinkRecipe; - } - - private void Initialize() - { - foreach (Transform element in _drinkRecipeSpawnLocation) - { - Destroy(element.gameObject); - } - - var drinkRecipes = DataManager.Instance.TycoonData.DrinkRecipes; - foreach (var element in drinkRecipes) - { - AddDrinkRecipe(element); - } - } - - public override void Open(List popupUiList) - { - base.Open(popupUiList); - - ResetBrewingUi(); - TycoonEvents.OnBrewingUiOpened?.Invoke(); - } - - public override void Close() - { - base.Close(); - - _currentBrewing = null; - ResetBrewingUi(); - TycoonEvents.OnBrewingUiClosed?.Invoke(); - } - - private void ResetBrewingUi() - { - _selectedDrinkData = null; - _recipeName.text = null; - _drinkImage.enabled = false; - SetBrewingIngredient(); - foreach (var element in _brewingIngredientSlotUis) - { - element.gameObject.SetActive(false); - } - } - - public void SetBrewing(Brewing brewing) - { - _currentBrewing = brewing; - ShowDrinkRecipeByCategory(); - } - - private void AddDrinkRecipe(string idx) - { - var instance = Instantiate(_drinkRecipeSlotUiPrefab, _drinkRecipeSpawnLocation); - instance.Initialize(idx); - _drinkRecipeSlotUis.Add(instance); - } - - private void ShowDrinkRecipeByCategory() - { - var currentDrinkCategory = _currentBrewing.GetDrinkCategory(); - foreach (var element in _drinkRecipeSlotUis) - { - element.gameObject.SetActive(currentDrinkCategory == element.GetDrinkData().Category); - } - } - - public void SelectDrinkRecipe(DrinkData drinkData) - { - _selectedDrinkData = drinkData; - - _recipeName.text = _selectedDrinkData.Name; - _drinkImage.sprite = drinkData.Sprite; - _drinkImage.enabled = true; - - var ingredients = _selectedDrinkData.GetValidIngredients(); - for (var i = 0; i < 3; i++) - { - if (ingredients.Count > i) - { - _brewingIngredientSlotUis[i].SetIngredient(ingredients[i].Idx, ingredients[i].Quantity); - _brewingIngredientSlotUis[i].gameObject.SetActive(true); - } - else - { - _brewingIngredientSlotUis[i].gameObject.SetActive(false); - } - } - - SetBrewingIngredient(); - } - - private void SetBrewingIngredient() - { - foreach (var element in _brewingIngredientSlotUis) - { - element.SetQuantity(); - } - - CheckConvertButton(); - } - - private void CheckConvertButton() - { - if (_selectedDrinkData == null || !_currentBrewing.IsEmptyDrink()) - { - _convertButton.interactable = false; - return; - } - - var ingredients = _selectedDrinkData.GetValidIngredients(); - if (ingredients.Count <= 0) - { - _convertButton.interactable = false; - return; - } - - for (var i = 0; i < ingredients.Count; i++) - { - if (_brewingIngredientSlotUis[i].GetIsEnough()) continue; - - _convertButton.interactable = false; - return; - } - - _convertButton.interactable = true; - } - - /// - /// 술을 만들 때 최종 버튼 - /// - public void ConvertButton() - { - _currentBrewing.SetDrink(_selectedDrinkData); - } - } -} \ No newline at end of file +// using System.Collections.Generic; +// using BlueWater.Items; +// using BlueWater.Tycoons; +// using Sirenix.OdinInspector; +// using TMPro; +// using UnityEngine; +// using UnityEngine.Serialization; +// using UnityEngine.UI; +// +// namespace BlueWater.Uis +// { +// public class BrewingUi : SwitchActionPopupUi +// { +// [FormerlySerializedAs("_drinkRecipeSlotUiPrefab")] [SerializeField, Required] +// private LiquidRecipeSlotUi liquidRecipeSlotUiPrefab; +// +// [SerializeField, Required] +// private Transform _drinkRecipeSpawnLocation; +// +// [SerializeField] +// private TMP_Text _recipeName; +// +// [SerializeField] +// private Image _drinkImage; +// +// [SerializeField] +// private Button _convertButton; +// +// [Title("실시간 데이터")] +// [SerializeField] +// private List _brewingIngredientSlotUis = new(3); +// +// [FormerlySerializedAs("_selectedDrinkData")] [SerializeField] +// private LiquidData selectedLiquidData; +// +// [SerializeField] +// private Brewing _currentBrewing; +// +// private List _drinkRecipeSlotUis = new(); +// +// private void Start() +// { +// Initialize(); +// +// TycoonEvents.OnDrinkRecipeAcquired += AddDrinkRecipe; +// TycoonEvents.OnDrinkRecipeSelected += SelectDrinkRecipe; +// } +// +// private void OnDestroy() +// { +// TycoonEvents.OnDrinkRecipeAcquired -= AddDrinkRecipe; +// TycoonEvents.OnDrinkRecipeSelected -= SelectDrinkRecipe; +// } +// +// private void Initialize() +// { +// foreach (Transform element in _drinkRecipeSpawnLocation) +// { +// Destroy(element.gameObject); +// } +// +// var drinkRecipes = DataManager.Instance.TycoonData.DrinkRecipes; +// foreach (var element in drinkRecipes) +// { +// AddDrinkRecipe(element); +// } +// } +// +// public override void Open(List popupUiList) +// { +// base.Open(popupUiList); +// +// ResetBrewingUi(); +// TycoonEvents.OnBrewingUiOpened?.Invoke(); +// } +// +// public override void Close() +// { +// base.Close(); +// +// _currentBrewing = null; +// ResetBrewingUi(); +// TycoonEvents.OnBrewingUiClosed?.Invoke(); +// } +// +// private void ResetBrewingUi() +// { +// selectedLiquidData = null; +// _recipeName.text = null; +// _drinkImage.enabled = false; +// SetBrewingIngredient(); +// foreach (var element in _brewingIngredientSlotUis) +// { +// element.gameObject.SetActive(false); +// } +// } +// +// public void SetBrewing(Brewing brewing) +// { +// _currentBrewing = brewing; +// ShowDrinkRecipeByCategory(); +// } +// +// private void AddDrinkRecipe(string idx) +// { +// var instance = Instantiate(liquidRecipeSlotUiPrefab, _drinkRecipeSpawnLocation); +// instance.Initialize(idx); +// _drinkRecipeSlotUis.Add(instance); +// } +// +// private void ShowDrinkRecipeByCategory() +// { +// var currentDrinkCategory = _currentBrewing.GetDrinkCategory(); +// foreach (var element in _drinkRecipeSlotUis) +// { +// element.gameObject.SetActive(currentDrinkCategory == element.GetDrinkData().Category); +// } +// } +// +// public void SelectDrinkRecipe(LiquidData liquidData) +// { +// selectedLiquidData = liquidData; +// +// _recipeName.text = selectedLiquidData.Name; +// _drinkImage.sprite = liquidData.Sprite; +// _drinkImage.enabled = true; +// +// var ingredients = selectedLiquidData.GetValidIngredients(); +// for (var i = 0; i < 3; i++) +// { +// if (ingredients.Count > i) +// { +// _brewingIngredientSlotUis[i].SetIngredient(ingredients[i].Idx, ingredients[i].Quantity); +// _brewingIngredientSlotUis[i].gameObject.SetActive(true); +// } +// else +// { +// _brewingIngredientSlotUis[i].gameObject.SetActive(false); +// } +// } +// +// SetBrewingIngredient(); +// } +// +// private void SetBrewingIngredient() +// { +// foreach (var element in _brewingIngredientSlotUis) +// { +// element.SetQuantity(); +// } +// +// CheckConvertButton(); +// } +// +// private void CheckConvertButton() +// { +// if (selectedLiquidData == null || !_currentBrewing.IsEmptyDrink()) +// { +// _convertButton.interactable = false; +// return; +// } +// +// var ingredients = selectedLiquidData.GetValidIngredients(); +// if (ingredients.Count <= 0) +// { +// _convertButton.interactable = false; +// return; +// } +// +// for (var i = 0; i < ingredients.Count; i++) +// { +// if (_brewingIngredientSlotUis[i].GetIsEnough()) continue; +// +// _convertButton.interactable = false; +// return; +// } +// +// _convertButton.interactable = true; +// } +// +// /// +// /// 술을 만들 때 최종 버튼 +// /// +// public void ConvertButton() +// { +// _currentBrewing.SetDrink(selectedLiquidData); +// } +// } +// } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs new file mode 100644 index 000000000..88a1e9550 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs @@ -0,0 +1,62 @@ +using Sirenix.OdinInspector; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater +{ + public class CenterSlider : MonoBehaviour + { + [SerializeField] + private RectTransform _fillRect; + + [SerializeField] + private Image _fill; + + [SerializeField] + private RectTransform _handleRect; + + [SerializeField] + private float _minValue; + + [SerializeField] + private float _maxValue = 1f; + + [SerializeField] + private float _value; + + [SerializeField] + private Color _minColor = Color.white; + + [SerializeField] + private Color _maxColor = Color.white; + + private readonly float _centerAnchorX = 0.5f; + + private void Start() + { + SetValue(_value); + } + + private void UpdateSlider(float value) + { + // 0 ~ 1값 + var normalizedValue = (value - _minValue) / (_maxValue - _minValue); + + _fill.color = normalizedValue < 0.5f ? _minColor : _maxColor; + + _handleRect.anchorMin = new Vector2(normalizedValue, 0f); + _handleRect.anchorMax = new Vector2(normalizedValue, 1f); + + _fillRect.anchorMin = new Vector2(Mathf.Clamp(_handleRect.anchorMin.x, 0, _centerAnchorX), 0); + _fillRect.anchorMax = new Vector2(Mathf.Clamp(_handleRect.anchorMin.x, _centerAnchorX, 1), 1); + } + + [Button("값 추가")] + public void SetValue(float value) + { + var newValue = Mathf.Clamp(value, _minValue, _maxValue); + _value = newValue; + UpdateSlider(_value); + } + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs.meta b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs.meta new file mode 100644 index 000000000..6b35c2245 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CenterSlider.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d0b242c6d3d747f48ab34ff4e8485aaf \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs new file mode 100644 index 000000000..f948ac7ef --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs @@ -0,0 +1,56 @@ +using Sirenix.OdinInspector; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +namespace BlueWater.Uis +{ + public class CocktailStatusUi : MonoBehaviour + { + [Title("알코올")] + [SerializeField] + private Slider _alcoholSlider; + + [SerializeField] + private TMP_Text _alcoholText; + + [Title("온도")] + [SerializeField] + private CenterSlider _temperatureSlider; + + [SerializeField] + private TMP_Text _temperatureText; + + [Title("맛")] + [SerializeField] + private CenterSlider _bitterSweetSlider; + + [SerializeField] + private TMP_Text _bitterSweetText; + + [Title("향")] + [SerializeField] + private Slider _scentSlider; + + [SerializeField] + private TMP_Text _scentText; + + private const string AlcoholUnitText = "(alc)"; + + public void ResetCocktailStatus() + { + _alcoholSlider.value = 0f; + _temperatureSlider.SetValue(0f); + _bitterSweetSlider.SetValue(0f); + _scentSlider.value = 0f; + } + + public void SetCocktailStatus(float alcohol, float temperature, float bitterSweet, float scent) + { + _alcoholSlider.value = alcohol; + _temperatureSlider.SetValue(temperature); + _bitterSweetSlider.SetValue(bitterSweet); + _scentSlider.value = scent; + } + } +} diff --git a/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs.meta new file mode 100644 index 000000000..13eee6a53 --- /dev/null +++ b/Assets/02.Scripts/Ui/Tycoon/CocktailStatusUi.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: f6deeba2587097647a0eeb3e8436bd9d \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs b/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs deleted file mode 100644 index fe312d5ee..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs +++ /dev/null @@ -1,9 +0,0 @@ - using UnityEngine; - -namespace BlueWater.Uis -{ - public class DrinkIngredientUi : MonoBehaviour - { - - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs.meta deleted file mode 100644 index b0c2777e2..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 63ce83525ba260f46904cfce776fc892 \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkUi.cs b/Assets/02.Scripts/Ui/Tycoon/DrinkUi.cs deleted file mode 100644 index c6b8ecc93..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkUi.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections.Generic; - -namespace BlueWater.Uis -{ - public class DrinkUi : SwitchActionPopupUi - { - public override void Open(List popupUiList) - { - base.Open(popupUiList); - - TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Bar); - TycoonEvents.OnDrinkUiOpened?.Invoke(); - } - - public override void Close() - { - base.Close(); - - TycoonCameraManager.Instance.SetMainCamera(TycoonCameraType.Base); - TycoonEvents.OnDrinkUiClosed?.Invoke(); - } - } -} \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/DrinkUi.cs.meta deleted file mode 100644 index 459a4ce86..000000000 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkUi.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 1e18fddab7a69284394b8b5bad8d1dbe \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs similarity index 52% rename from Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs rename to Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs index 62481b63f..615875f87 100644 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs @@ -1,12 +1,13 @@ using System; using BlueWater.Items; using UnityEngine; +using UnityEngine.Serialization; using UnityEngine.UI; namespace BlueWater.Uis { [Serializable] - public class DrinkRecipeSlotUi : MonoBehaviour + public class LiquidRecipeSlotUi : MonoBehaviour { [SerializeField] private Button _button; @@ -14,8 +15,8 @@ namespace BlueWater.Uis [SerializeField] private Image _image; - [SerializeField] - private DrinkData _drinkData; + [FormerlySerializedAs("_drinkData")] [SerializeField] + private LiquidData liquidData; private void Awake() { @@ -24,15 +25,15 @@ namespace BlueWater.Uis public void Initialize(string idx) { - _drinkData = ItemManager.Instance.GetDrinkDataByIdx(idx); - _image.sprite = _drinkData.Sprite; + liquidData = ItemManager.Instance.GetLiquidDataByIdx(idx); + _image.sprite = liquidData.Sprite; } public void OnButtonClick() { - TycoonEvents.OnDrinkRecipeSelected?.Invoke(_drinkData); + //TycoonEvents.OnDrinkRecipeSelected?.Invoke(liquidData); } - public DrinkData GetDrinkData() => _drinkData; + public LiquidData GetDrinkData() => liquidData; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/Tycoon/DrinkRecipeSlotUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/LiquidRecipeSlotUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientSlotUi.cs b/Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs similarity index 78% rename from Assets/02.Scripts/Ui/Tycoon/DrinkIngredientSlotUi.cs rename to Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs index ad5bbed30..c77c02455 100644 --- a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientSlotUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs @@ -6,17 +6,17 @@ using UnityEngine.UI; namespace BlueWater.Uis { [Serializable] - public class DrinkIngredientSlotUi : MonoBehaviour + public class LiquidSlotUi : MonoBehaviour { [SerializeField] private Button _button; + + [SerializeField] + private Image _fill; [SerializeField] private Image _image; - [SerializeField] - private TMP_Text _amount; - [SerializeField] private TMP_Text _name; } diff --git a/Assets/02.Scripts/Ui/Tycoon/DrinkIngredientSlotUi.cs.meta b/Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs.meta similarity index 100% rename from Assets/02.Scripts/Ui/Tycoon/DrinkIngredientSlotUi.cs.meta rename to Assets/02.Scripts/Ui/Tycoon/LiquidSlotUi.cs.meta diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index d97cc24fd..95bb8d04c 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -27,11 +27,8 @@ namespace BlueWater.Uis [field: SerializeField] public TycoonStageUi TycoonStageUi { get; private set; } - [field: SerializeField] - public BrewingUi BrewingUi { get; private set; } - - [field: SerializeField] - public DrinkUi DrinkUi { get; private set; } + // [field: SerializeField] + // public BrewingUi BrewingUi { get; private set; } [SerializeField] private Image _fadeImage; @@ -83,8 +80,7 @@ namespace BlueWater.Uis TycoonUpgradeUi = GetComponentInChildren(true); TycoonManagementUi = GetComponentInChildren(true); TycoonStageUi = GetComponentInChildren(true); - BrewingUi = GetComponentInChildren(true); - DrinkUi = GetComponentInChildren(true); + //BrewingUi = GetComponentInChildren(true); _fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent(); PopupUiList = new List(8); } diff --git a/Assets/03.Images/Props/Mini.meta b/Assets/03.Images/Props/Mini.meta new file mode 100644 index 000000000..09856986f --- /dev/null +++ b/Assets/03.Images/Props/Mini.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 36840e4297430054b9fdedb3ed9739ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/BarTable.png b/Assets/03.Images/Props/Mini/BarTable.png new file mode 100644 index 000000000..c170bb1c1 Binary files /dev/null and b/Assets/03.Images/Props/Mini/BarTable.png differ diff --git a/Assets/03.Images/Props/Mini/BarTable.png.meta b/Assets/03.Images/Props/Mini/BarTable.png.meta new file mode 100644 index 000000000..9c217e8d0 --- /dev/null +++ b/Assets/03.Images/Props/Mini/BarTable.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 4385ca50e81933c49aa259987339b498 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/BarTable02.png b/Assets/03.Images/Props/Mini/BarTable02.png new file mode 100644 index 000000000..10fd8a5de Binary files /dev/null and b/Assets/03.Images/Props/Mini/BarTable02.png differ diff --git a/Assets/03.Images/Props/Mini/BarTable02.png.meta b/Assets/03.Images/Props/Mini/BarTable02.png.meta new file mode 100644 index 000000000..759ab08ba --- /dev/null +++ b/Assets/03.Images/Props/Mini/BarTable02.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 36d530736d9579c418ddafc987341443 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/BarTable03.png b/Assets/03.Images/Props/Mini/BarTable03.png new file mode 100644 index 000000000..6d7bc9a3c Binary files /dev/null and b/Assets/03.Images/Props/Mini/BarTable03.png differ diff --git a/Assets/03.Images/Props/Mini/BarTable03.png.meta b/Assets/03.Images/Props/Mini/BarTable03.png.meta new file mode 100644 index 000000000..16f6f2a2a --- /dev/null +++ b/Assets/03.Images/Props/Mini/BarTable03.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 9e508ffd6f8853c4c8b20b63ad90622d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/BigBarrel.png b/Assets/03.Images/Props/Mini/BigBarrel.png new file mode 100644 index 000000000..63b70e615 Binary files /dev/null and b/Assets/03.Images/Props/Mini/BigBarrel.png differ diff --git a/Assets/03.Images/Props/Mini/BigBarrel.png.meta b/Assets/03.Images/Props/Mini/BigBarrel.png.meta new file mode 100644 index 000000000..ca4088c68 --- /dev/null +++ b/Assets/03.Images/Props/Mini/BigBarrel.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 9f7d82fbc664fbb4d98842fc46db319d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/BlueHead.png b/Assets/03.Images/Props/Mini/BlueHead.png similarity index 100% rename from Assets/03.Images/Props/BlueHead.png rename to Assets/03.Images/Props/Mini/BlueHead.png diff --git a/Assets/03.Images/Props/BlueHead.png.meta b/Assets/03.Images/Props/Mini/BlueHead.png.meta similarity index 100% rename from Assets/03.Images/Props/BlueHead.png.meta rename to Assets/03.Images/Props/Mini/BlueHead.png.meta diff --git a/Assets/03.Images/Props/Mini/Casper.png b/Assets/03.Images/Props/Mini/Casper.png new file mode 100644 index 000000000..351d8867a Binary files /dev/null and b/Assets/03.Images/Props/Mini/Casper.png differ diff --git a/Assets/03.Images/Props/Mini/Casper.png.meta b/Assets/03.Images/Props/Mini/Casper.png.meta new file mode 100644 index 000000000..1f782ea6e --- /dev/null +++ b/Assets/03.Images/Props/Mini/Casper.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f91087f473887fc43bd9641a69852f3c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/Column.png b/Assets/03.Images/Props/Mini/Column.png new file mode 100644 index 000000000..7dfac39b0 Binary files /dev/null and b/Assets/03.Images/Props/Mini/Column.png differ diff --git a/Assets/03.Images/Props/Mini/Column.png.meta b/Assets/03.Images/Props/Mini/Column.png.meta new file mode 100644 index 000000000..adb0f8cae --- /dev/null +++ b/Assets/03.Images/Props/Mini/Column.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f4c17f53385195f4e98fdf1f0da515d3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1024 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/ColumnDown02.png b/Assets/03.Images/Props/Mini/ColumnDown02.png new file mode 100644 index 000000000..d5a063089 Binary files /dev/null and b/Assets/03.Images/Props/Mini/ColumnDown02.png differ diff --git a/Assets/03.Images/Props/Mini/ColumnDown02.png.meta b/Assets/03.Images/Props/Mini/ColumnDown02.png.meta new file mode 100644 index 000000000..e3764aa2e --- /dev/null +++ b/Assets/03.Images/Props/Mini/ColumnDown02.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 06a2c6aed62612e41ad12d29e64f669e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/FloorTile.png b/Assets/03.Images/Props/Mini/FloorTile.png new file mode 100644 index 000000000..47bb79767 Binary files /dev/null and b/Assets/03.Images/Props/Mini/FloorTile.png differ diff --git a/Assets/03.Images/Props/Mini/FloorTile.png.meta b/Assets/03.Images/Props/Mini/FloorTile.png.meta new file mode 100644 index 000000000..fd45aacac --- /dev/null +++ b/Assets/03.Images/Props/Mini/FloorTile.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 3c873d1f63abbb8459c91a67c6e48712 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/TrashCan.png b/Assets/03.Images/Props/Mini/TrashCan.png new file mode 100644 index 000000000..da6bea146 Binary files /dev/null and b/Assets/03.Images/Props/Mini/TrashCan.png differ diff --git a/Assets/03.Images/Props/Mini/TrashCan.png.meta b/Assets/03.Images/Props/Mini/TrashCan.png.meta new file mode 100644 index 000000000..09a5d1731 --- /dev/null +++ b/Assets/03.Images/Props/Mini/TrashCan.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 3efc550bddc68a345b5400a832fb9a6a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/Mini/WoodenBeerMug.png b/Assets/03.Images/Props/Mini/WoodenBeerMug.png new file mode 100644 index 000000000..27352eb1e Binary files /dev/null and b/Assets/03.Images/Props/Mini/WoodenBeerMug.png differ diff --git a/Assets/03.Images/Props/Mini/WoodenBeerMug.png.meta b/Assets/03.Images/Props/Mini/WoodenBeerMug.png.meta new file mode 100644 index 000000000..6f14f73d3 --- /dev/null +++ b/Assets/03.Images/Props/Mini/WoodenBeerMug.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: cda1d961a563b6143a024170ed6f0f44 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Props/dark.png b/Assets/03.Images/Props/dark.png deleted file mode 100644 index 715f9c77e..000000000 Binary files a/Assets/03.Images/Props/dark.png and /dev/null differ diff --git a/Assets/03.Images/Tycoons.meta b/Assets/03.Images/Tycoons.meta new file mode 100644 index 000000000..0a9c41f24 --- /dev/null +++ b/Assets/03.Images/Tycoons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bfc283d23176d354d9a3cc74dbbdc21a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails.meta b/Assets/03.Images/Tycoons/Cocktails.meta new file mode 100644 index 000000000..708b2409f --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f30b1a671a4625f4a87e184abe523847 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails.meta new file mode 100644 index 000000000..12900d281 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83cf0a81abe398b4c86f8b6a2890f845 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png new file mode 100644 index 000000000..a4cc25571 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png differ diff --git a/Assets/03.Images/Props/dark.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta similarity index 98% rename from Assets/03.Images/Props/dark.png.meta rename to Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta index 5bbec3360..358b5027b 100644 --- a/Assets/03.Images/Props/dark.png.meta +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail300.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b57f93005908a754bb842b7dbcaddedd +guid: 06a07650d842ee94390ca2505955e94d TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -46,7 +46,7 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 7 + alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png new file mode 100644 index 000000000..d29302a3f Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta new file mode 100644 index 000000000..d82ed322d --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail301.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 19df9fcd0ddf5754890f7ea9c127b905 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png new file mode 100644 index 000000000..1e0fffedf Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta new file mode 100644 index 000000000..e0bfd0494 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail302.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: a51b37c5e512c7e488e80f986f5f8aac +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png new file mode 100644 index 000000000..b7f85b203 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta new file mode 100644 index 000000000..225bc4f83 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail303.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d74e702a3e490a54e8a159128222f175 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png new file mode 100644 index 000000000..5f09a091b Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta new file mode 100644 index 000000000..9362e4c8d --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail304.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: bff0ff1345b7ae446b330a01e6ef7bd3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png new file mode 100644 index 000000000..37004b0c3 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta new file mode 100644 index 000000000..b625f35e8 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail305.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 006a36cba2a146247a1d25b9e246faaa +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png new file mode 100644 index 000000000..c458b7a43 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta new file mode 100644 index 000000000..0502434e1 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail306.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 31d7e535d499d5f43ab64731acc3eec3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png new file mode 100644 index 000000000..26155b3ae Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta new file mode 100644 index 000000000..417d80f91 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail307.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 997d0aea13894a9428bf9d9f7fb66762 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png new file mode 100644 index 000000000..2f3cdd1ed Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta new file mode 100644 index 000000000..c8067b5ca --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail308.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 3d04bfa220b9ebe40a4ae3f0a68c0911 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png new file mode 100644 index 000000000..951dfc5d9 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta new file mode 100644 index 000000000..598eca195 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/FinishedCocktails/Cocktail309.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 09168d6395b3e9b41b195a2aa8ae0a82 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes.meta b/Assets/03.Images/Tycoons/Cocktails/Garnishes.meta new file mode 100644 index 000000000..77f76296c --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Garnishes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e9f97d7f975e294c9ed9fdc98a56f30 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png new file mode 100644 index 000000000..b9c730d45 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png.meta b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png.meta new file mode 100644 index 000000000..cd8493a5c --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Garnishes/Garnish200.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: ddde5976023f9be4e83dc3d867c2dc30 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients.meta new file mode 100644 index 000000000..eb829e074 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 107d94a0c1dbcaa4b82d2299f293d5a3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient00.png b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient00.png new file mode 100644 index 000000000..9a1fa7f35 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient00.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient00.png.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient00.png.meta new file mode 100644 index 000000000..80680d6a2 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient00.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d2a16eca65977be4e9926f930953c831 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient01.png b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient01.png new file mode 100644 index 000000000..cdf55a700 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient01.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient01.png.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient01.png.meta new file mode 100644 index 000000000..86e7d2e03 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient01.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 57572e431f8e5884e8812b507ef31450 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient02.png b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient02.png new file mode 100644 index 000000000..32b37695f Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient02.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient02.png.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient02.png.meta new file mode 100644 index 000000000..e2fb01c75 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient02.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 29676892d9f6a144393aeccb5dbf67ab +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient03.png b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient03.png new file mode 100644 index 000000000..396f0595f Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient03.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient03.png.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient03.png.meta new file mode 100644 index 000000000..1ad3c8208 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient03.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 0a02f9f8499d68e46b837bc16d6a5c78 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient04.png b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient04.png new file mode 100644 index 000000000..0ceffa88a Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient04.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient04.png.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient04.png.meta new file mode 100644 index 000000000..1fd14544f --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient04.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 23cec83c2204cbe4aa8f35463134fc05 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient05.png b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient05.png new file mode 100644 index 000000000..33e186f15 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient05.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient05.png.meta b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient05.png.meta new file mode 100644 index 000000000..4c377fed8 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Ingredients/Ingredient05.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 134459b56209a6f45b2d79d5a27f32e1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Shakers.meta b/Assets/03.Images/Tycoons/Cocktails/Shakers.meta new file mode 100644 index 000000000..9d5def91c --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Shakers.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39a4f115b4721d141a6b265e6b89db23 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerBack.png b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerBack.png new file mode 100644 index 000000000..e7be9ff81 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerBack.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerBack.png.meta b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerBack.png.meta new file mode 100644 index 000000000..890195be5 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerBack.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: d39d76f18f907014a9979953fb5d43a0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerForward.png b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerForward.png new file mode 100644 index 000000000..550d9c683 Binary files /dev/null and b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerForward.png differ diff --git a/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerForward.png.meta b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerForward.png.meta new file mode 100644 index 000000000..c867da474 --- /dev/null +++ b/Assets/03.Images/Tycoons/Cocktails/Shakers/ShakerForward.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 5a9ee647b3d218d4c8542007b7a75433 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 512 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Bar.meta b/Assets/03.Images/Ui/Tycoon/Bar.meta new file mode 100644 index 000000000..ceeba3d2b --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Bar.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef18522e16abbf44caafc2dca02be35c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Bar/BarBackground.png b/Assets/03.Images/Ui/Tycoon/Bar/BarBackground.png new file mode 100644 index 000000000..1ebae310b Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Bar/BarBackground.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Bar/BarBackground.png.meta b/Assets/03.Images/Ui/Tycoon/Bar/BarBackground.png.meta new file mode 100644 index 000000000..5c3559cdb --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Bar/BarBackground.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 081730cf3f79a8f4c89b3a28ab2ad62c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Bar/Cursor.png b/Assets/03.Images/Ui/Tycoon/Bar/Cursor.png new file mode 100644 index 000000000..0be8fbdeb Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Bar/Cursor.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Bar/Cursor.png.meta b/Assets/03.Images/Ui/Tycoon/Bar/Cursor.png.meta new file mode 100644 index 000000000..d6cb64f65 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Bar/Cursor.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: 23153b75264d22d46be1316354390558 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Cursor_0 + rect: + serializedVersion: 2 + x: 93 + y: 1 + width: 70 + height: 253 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cf9f9b2c4b2a65940bc6706b9906eeff + internalID: -492303599 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Cursor_0: -492303599 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Bar/GarnishBox.png b/Assets/03.Images/Ui/Tycoon/Bar/GarnishBox.png new file mode 100644 index 000000000..9a21888fe Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Bar/GarnishBox.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Bar/GarnishBox.png.meta b/Assets/03.Images/Ui/Tycoon/Bar/GarnishBox.png.meta new file mode 100644 index 000000000..6803d62ca --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Bar/GarnishBox.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 97cecad7339e748469247eeb50369689 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Bar/LiquidBox.png b/Assets/03.Images/Ui/Tycoon/Bar/LiquidBox.png new file mode 100644 index 000000000..19ce11d3a Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Bar/LiquidBox.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Bar/LiquidBox.png.meta b/Assets/03.Images/Ui/Tycoon/Bar/LiquidBox.png.meta new file mode 100644 index 000000000..207bb1f11 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Bar/LiquidBox.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 05f0f8e989806654ab3f111f0a9081a0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/Bar/Thermometer.png b/Assets/03.Images/Ui/Tycoon/Bar/Thermometer.png new file mode 100644 index 000000000..1c9ec6b34 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Bar/Thermometer.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Bar/Thermometer.png.meta b/Assets/03.Images/Ui/Tycoon/Bar/Thermometer.png.meta new file mode 100644 index 000000000..4bf01b5c3 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Bar/Thermometer.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: a80288d4938fc814898b89ca8b8b108c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Thermometer_0 + rect: + serializedVersion: 2 + x: 4 + y: 493 + width: 1016 + height: 48 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 430672ce259f72642b55ae0183e2ef19 + internalID: 566810980 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Thermometer_0: 566810980 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Liquid3.mat b/Assets/04.Materials/Liquid3.mat index 2ba7c0bfd..ec2b3c451 100644 --- a/Assets/04.Materials/Liquid3.mat +++ b/Assets/04.Materials/Liquid3.mat @@ -77,6 +77,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SampleTexture2D_4768904af7ef4db18a183030cfecc457_Texture_1_Texture2D: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _SampleTexture2D_a242d45af0654b8eadd44eaaf8c380c1_Texture_1_Texture2D: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -120,7 +124,7 @@ Material: - _GlossyReflections: 0 - _LiquidAmount: 1 - _LiquidFrequency: 18 - - _LiquidSpeed: 3 + - _LiquidSpeed: 1 - _LiquidTopWidth: 15 - _Metallic: 0 - _OcclusionStrength: 1 @@ -144,7 +148,7 @@ Material: - _WaterLevel: 1 - _WaterSpeed: 2 - _WaterTopWidth: 10 - - _WaveDepth: 2 + - _WaveDepth: 1.5 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/Assets/04.Materials/Uis/GradientSlider.mat b/Assets/04.Materials/Uis/GradientSlider.mat new file mode 100644 index 000000000..4c6bf07f1 --- /dev/null +++ b/Assets/04.Materials/Uis/GradientSlider.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4409874377547118702 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GradientSlider + m_Shader: {fileID: -6465566751694194690, guid: ae82fd6780cf2e54b850202306896be6, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _ColorMask: 15 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _Surface: 0 + - _UIMaskSoftnessX: 1 + - _UIMaskSoftnessY: 1 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _ClipRect: {r: 0, g: 0, b: 0, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04.Materials/Uis/GradientSlider.mat.meta b/Assets/04.Materials/Uis/GradientSlider.mat.meta new file mode 100644 index 000000000..3d98e2ec8 --- /dev/null +++ b/Assets/04.Materials/Uis/GradientSlider.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65422bd8c2510674dbaf427e79c76269 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index e62e60bcc..f932ff794 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -252,7 +252,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: 0, z: -1.439} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 6509241874729291456} diff --git a/Assets/05.Prefabs/LiquidObject.prefab b/Assets/05.Prefabs/LiquidObject.prefab index c69735bea..c21663b80 100644 --- a/Assets/05.Prefabs/LiquidObject.prefab +++ b/Assets/05.Prefabs/LiquidObject.prefab @@ -78,7 +78,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: -403788685 m_SortingLayer: 1 - m_SortingOrder: 11 + m_SortingOrder: 12 m_Sprite: {fileID: 21300000, guid: c6fd44c44ec0c504c9d09e9c3e421708, type: 3} m_Color: {r: 0, g: 0.7294118, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/05.Prefabs/Managers/ItemManager.prefab b/Assets/05.Prefabs/Managers/ItemManager.prefab index 6a789c526..8cfc1b23e 100644 --- a/Assets/05.Prefabs/Managers/ItemManager.prefab +++ b/Assets/05.Prefabs/Managers/ItemManager.prefab @@ -50,7 +50,7 @@ MonoBehaviour: _itemDropTableSo: {fileID: 11400000, guid: 9e1384a77106eb845ad86d6834ba9a52, type: 2} _foodDataSo: {fileID: 11400000, guid: 7b282dfe68d23cd48a8f437ae2cd7dde, type: 2} _cocktailDataSo: {fileID: 11400000, guid: b28d3497d1f428046bc82469f2056bac, type: 2} - _drinkDataSo: {fileID: 11400000, guid: 24a7d2ebd11ba314684a6d3ef72f76a0, type: 2} + liquidDataSo: {fileID: 11400000, guid: d912288eee347ea4b98718ff38ef5d78, type: 2} k__BackingField: {fileID: 11400000, guid: 1e74e5d3760c6a74c820233d292733c1, type: 2} _randomDropRadius: 3 _minSeparationDistance: 1.5 diff --git a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab index f1062f5a7..89868988c 100644 --- a/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab +++ b/Assets/05.Prefabs/Maps/Tycoon/TycoonMap.prefab @@ -88,7 +88,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &486796670898722635 Transform: m_ObjectHideFlags: 0 @@ -213,6 +213,93 @@ Transform: - {fileID: 7763188652203491876} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &506038298281816262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1862867649378056697} + - component: {fileID: 8208761638551006540} + m_Layer: 0 + m_Name: Casper (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1862867649378056697 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506038298281816262} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -3.0191998, y: -13.495887, z: 11.456} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &8208761638551006540 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 506038298281816262} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &806534525030859642 GameObject: m_ObjectHideFlags: 0 @@ -240,8 +327,8 @@ Transform: m_GameObject: {fileID: 806534525030859642} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -9.01, y: 0, z: -1.25} - m_LocalScale: {x: 5.5216007, y: 6.1862903, z: 3.71835} + m_LocalPosition: {x: -9.15, y: -0.016713, z: -4.26} + m_LocalScale: {x: 1.1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4374501888181262139} @@ -290,12 +377,12 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: c19baa66304058f47b77065b3bd04588, type: 3} + m_Sprite: {fileID: 21300000, guid: 3c873d1f63abbb8459c91a67c6e48712, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 2 - m_Size: {x: 4, y: 3.2} + m_Size: {x: 10.72, y: 9.1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 @@ -320,7 +407,7 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 4, y: 3.2, z: 0.20000005} + m_Size: {x: 20.2, y: 14.69, z: 0.20000005} m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &867242612611201267 GameObject: @@ -353,7 +440,7 @@ Transform: m_Children: [] m_Father: {fileID: 3249711671270954515} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &967112484648663966 +--- !u!1 &1066576603185734619 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -361,30 +448,172 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7219412584754126181} + - component: {fileID: 1203247946042117589} + - component: {fileID: 2831395360192373277} m_Layer: 0 - m_Name: Barrels + m_Name: Casper (11) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7219412584754126181 +--- !u!4 &1203247946042117589 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 967112484648663966} + m_GameObject: {fileID: 1066576603185734619} 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_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -4.9300003, y: -13.495887, z: 8.579} + m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6051159417414277454} - m_Father: {fileID: 7906693004392999617} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &2831395360192373277 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1066576603185734619} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1185694496727162058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3742380810754500338} + - component: {fileID: 4968372301708187792} + m_Layer: 0 + m_Name: Casper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3742380810754500338 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185694496727162058} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -5.31, y: -13.495887, z: 9.559} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &4968372301708187792 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185694496727162058} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1209340447500098857 GameObject: m_ObjectHideFlags: 0 @@ -410,12 +639,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1209340447500098857} serializedVersion: 2 - m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} - m_LocalPosition: {x: -8.52, y: -13.495887, z: 10.63} + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: 1.9, y: -5.000029, z: 5.53} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 842254293393057955} + m_Father: {fileID: 5604696651888245994} m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &4792280710971567238 SpriteRenderer: @@ -472,6 +701,41 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1284965268120230829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6670398587485089397} + m_Layer: 0 + m_Name: ColumnDown + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6670398587485089397 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1284965268120230829} + 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: 6041252937220550502} + - {fileID: 9191818572840013606} + - {fileID: 2007181338559251601} + - {fileID: 7575083140453970745} + m_Father: {fileID: 8219667795033202065} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1324449524685510213 GameObject: m_ObjectHideFlags: 0 @@ -639,8 +903,8 @@ Transform: m_GameObject: {fileID: 1693235488640573927} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -20.25, y: -0, z: -1} - m_LocalScale: {x: 15, y: 22.27682, z: 1} + m_LocalPosition: {x: -15.13, y: -0, z: -4.65} + m_LocalScale: {x: 8, y: 11.825439, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -690,7 +954,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 3 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -761,8 +1025,8 @@ Transform: m_GameObject: {fileID: 2719441393532135865} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -20, y: -0, z: -11.42} - m_LocalScale: {x: 15, y: 20.300024, z: 1} + m_LocalPosition: {x: -15.04, y: 0, z: -8.797} + m_LocalScale: {x: 8, y: 9.945997, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -812,7 +1076,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5849056, g: 0.5849056, b: 0.5849056, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -822,6 +1086,80 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &2860682002724169116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5806978480304762257} + m_Layer: 0 + m_Name: BarTable01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5806978480304762257 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2860682002724169116} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.390214, y: 8.495857, z: -4.7198915} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5465039636530628167} + - {fileID: 2294108577146112326} + - {fileID: 2669598217517900337} + - {fileID: 1638511973844291035} + - {fileID: 883194467903853233} + - {fileID: 4241127396383300414} + - {fileID: 3073304110347784108} + m_Father: {fileID: 5604696651888245994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3029829851894183194 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3665631389410855864} + m_Layer: 0 + m_Name: BigBarrel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3665631389410855864 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3029829851894183194} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.390214, y: 8.495857, z: -4.7198915} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2274837201465361650} + - {fileID: 821737684945626419} + - {fileID: 2663116222447318192} + - {fileID: 3377837882903524906} + - {fileID: 5581080337168947589} + m_Father: {fileID: 5604696651888245994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3055681835220623653 GameObject: m_ObjectHideFlags: 0 @@ -856,6 +1194,93 @@ Transform: - {fileID: 3089551071641191953} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3068323897584660167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4987046774236567263} + - component: {fileID: 7870898927542665641} + m_Layer: 0 + m_Name: Casper (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4987046774236567263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3068323897584660167} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -3.364, y: -13.495887, z: 8.579} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &7870898927542665641 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3068323897584660167} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &3152390303670554656 GameObject: m_ObjectHideFlags: 0 @@ -919,8 +1344,183 @@ Transform: m_Children: - {fileID: 1402113424960589398} - {fileID: 7906693004392999617} + - {fileID: 5604696651888245994} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &3249031389691096346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3128546715867486635} + - component: {fileID: 1474173484199835152} + m_Layer: 0 + m_Name: BlockLine (13) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3128546715867486635 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3249031389691096346} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: -8.279, y: 0, z: -8.658} + m_LocalScale: {x: 8, y: 5.16034, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8218453808976519578} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} +--- !u!212 &1474173484199835152 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3249031389691096346} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &3551379806339618448 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7557031369312933497} + - component: {fileID: 3249756228731690487} + m_Layer: 0 + m_Name: Casper (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7557031369312933497 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551379806339618448} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -11.576001, y: -13.495887, z: 9.501} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &3249756228731690487 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3551379806339618448} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &4053257104853021878 GameObject: m_ObjectHideFlags: 0 @@ -947,8 +1547,8 @@ Transform: m_GameObject: {fileID: 4053257104853021878} serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -20.4, y: 0, z: -11.31} - m_LocalScale: {x: 15, y: 22.582287, z: 1} + m_LocalPosition: {x: -15.201, y: 0, z: -8.658} + m_LocalScale: {x: 8, y: 5.1953893, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -998,7 +1598,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -1116,6 +1716,180 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &4531474335684695119 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7813625086657773066} + - component: {fileID: 1489516721957983783} + m_Layer: 0 + m_Name: Casper (8) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7813625086657773066 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4531474335684695119} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -13.029, y: -13.495887, z: 7.543} + m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &1489516721957983783 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4531474335684695119} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &4728157920811985718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6429542364118552516} + - component: {fileID: 2772551843559743956} + m_Layer: 0 + m_Name: Casper (12) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6429542364118552516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4728157920811985718} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -13.116001, y: -13.495887, z: 9.5199995} + m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &2772551843559743956 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4728157920811985718} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5173584522024905156 GameObject: m_ObjectHideFlags: 0 @@ -1154,7 +1928,7 @@ Transform: - {fileID: 7731103452280482797} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &5532882724186593404 +--- !u!1 &5319468534857577100 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1162,31 +1936,85 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 842254293393057955} + - component: {fileID: 3195312951363957278} + - component: {fileID: 8767483698691317651} m_Layer: 0 - m_Name: EXXX + m_Name: Casper (10) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &842254293393057955 +--- !u!4 &3195312951363957278 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5532882724186593404} + m_GameObject: {fileID: 5319468534857577100} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.8090009, y: 13.495887, z: -15.295991} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -11.56, y: -13.495887, z: 8.547} + m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1238131302938882443} - - {fileID: 5563229157638235859} - m_Father: {fileID: 2700294535905665279} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &8767483698691317651 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5319468534857577100} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5689147123933715216 GameObject: m_ObjectHideFlags: 0 @@ -1361,7 +2189,6 @@ Transform: - {fileID: 2999726225034473558} - {fileID: 4651683336050503231} - {fileID: 4777049926120389234} - - {fileID: 7219412584754126181} - {fileID: 486796670898722635} - {fileID: 6188623789039685238} - {fileID: 7876638241830506694} @@ -1579,8 +2406,229 @@ Transform: - {fileID: 7517107198582341405} - {fileID: 6205356118384669691} - {fileID: 9219827482834055853} + - {fileID: 4833354930744609416} + - {fileID: 1498097069264328506} + - {fileID: 7995278076708631733} + - {fileID: 2811844248114394154} m_Father: {fileID: 1402113424960589398} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6310975521269088007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7590203506491263094} + - component: {fileID: 2164615028114915559} + m_Layer: 0 + m_Name: Casper (13) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7590203506491263094 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6310975521269088007} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -6.9049997, y: -13.495887, z: 9.578} + m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &2164615028114915559 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6310975521269088007} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &6504144591618233958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5604696651888245994} + m_Layer: 0 + m_Name: Mini + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5604696651888245994 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6504144591618233958} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -9.199215, y: 5.000029, z: -10.576099} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5563229157638235859} + - {fileID: 654389987036801137} + - {fileID: 3166343339917656399} + - {fileID: 1419470226628917559} + - {fileID: 4972329663912231510} + - {fileID: 8833514766988139896} + - {fileID: 8148531330268556604} + - {fileID: 3659724498606878420} + - {fileID: 3381794055646013358} + - {fileID: 5806978480304762257} + - {fileID: 8219667795033202065} + - {fileID: 3665631389410855864} + m_Father: {fileID: 4449232531499695111} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6594407726909407406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6515545034587545199} + - component: {fileID: 6020849302600512485} + m_Layer: 0 + m_Name: Casper (14) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6515545034587545199 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6594407726909407406} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -3.0191998, y: -13.495887, z: 13.249001} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &6020849302600512485 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6594407726909407406} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6602221549203288876 GameObject: m_ObjectHideFlags: 0 @@ -1689,6 +2737,93 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &6777059617196781291 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7822176329765147616} + - component: {fileID: 1960514996889652347} + m_Layer: 0 + m_Name: Casper (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7822176329765147616 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6777059617196781291} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -5.274, y: -13.495887, z: 7.6159997} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &1960514996889652347 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6777059617196781291} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &6980906008572417858 GameObject: m_ObjectHideFlags: 0 @@ -1723,6 +2858,7 @@ Transform: - {fileID: 3944723234071144117} - {fileID: 6180495548060070243} - {fileID: 3864442333780485189} + - {fileID: 3128546715867486635} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7131422738260168279 @@ -1859,8 +2995,8 @@ Transform: m_GameObject: {fileID: 7296203630985359826} serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} - m_LocalPosition: {x: 1.94, y: -0, z: -11.42} - m_LocalScale: {x: 15, y: 20.300024, z: 1} + m_LocalPosition: {x: -3.22, y: 0, z: -8.794} + m_LocalScale: {x: 8, y: 9.288276, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} @@ -1910,7 +3046,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 4 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -1967,7 +3103,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &7876638241830506694 Transform: m_ObjectHideFlags: 0 @@ -1984,6 +3120,216 @@ Transform: - {fileID: 4545053108823979217} m_Father: {fileID: 7906693004392999617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7917293074903422816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6333685175231856257} + - component: {fileID: 2204459447281084629} + m_Layer: 0 + m_Name: Casper (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6333685175231856257 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7917293074903422816} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -3.0191998, y: -13.495887, z: 12.35} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &2204459447281084629 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7917293074903422816} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7946468324943106534 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1977558712039975322} + - component: {fileID: 1998603491148851833} + m_Layer: 0 + m_Name: Casper (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1977558712039975322 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7946468324943106534} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -10.064001, y: -13.495887, z: 8.547} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &1998603491148851833 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7946468324943106534} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7998228885484150600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8219667795033202065} + m_Layer: 0 + m_Name: Column + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8219667795033202065 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7998228885484150600} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.390214, y: 8.495857, z: -4.7198915} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2547465935184207189} + - {fileID: 6957115771938214560} + - {fileID: 9055034979907432301} + - {fileID: 5140497822655066026} + - {fileID: 6670398587485089397} + m_Father: {fileID: 5604696651888245994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8131054471693585233 GameObject: m_ObjectHideFlags: 0 @@ -2117,13 +3463,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8214513470296314391} serializedVersion: 2 - m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} - m_LocalPosition: {x: -20.25, y: -0, z: 8.93} - m_LocalScale: {x: 15, y: 22.33008, z: 1} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -6.1, y: -0, z: -4.856} + m_LocalScale: {x: 8, y: 5.023624, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8218453808976519578} - m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!212 &3420781671412190684 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2169,6 +3515,93 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 6d5a0df4482d61c46b29b842cf39f755, type: 3} + m_Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8293607409880774641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1875141663635600532} + - component: {fileID: 5321754810146447160} + m_Layer: 0 + m_Name: Casper (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1875141663635600532 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293607409880774641} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -6.8800006, y: -13.495887, z: 7.596} + m_LocalScale: {x: -0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &5321754810146447160 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8293607409880774641} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -2179,6 +3612,139 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &8402980888389107924 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7544648043288440224} + - component: {fileID: 1160670224365762396} + m_Layer: 0 + m_Name: Casper (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7544648043288440224 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8402980888389107924} + serializedVersion: 2 + m_LocalRotation: {x: 0.3420201, y: -0, z: -0, w: 0.9396927} + m_LocalPosition: {x: -11.491001, y: -13.495887, z: 7.563} + m_LocalScale: {x: 0.7, y: 0.70000005, z: 0.70000005} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3381794055646013358} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} +--- !u!212 &1160670224365762396 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8402980888389107924} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 5 + m_Sprite: {fileID: 21300000, guid: f91087f473887fc43bd9641a69852f3c, 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_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &8555244782544759037 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3381794055646013358} + m_Layer: 0 + m_Name: Casper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3381794055646013358 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8555244782544759037} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 8.390214, y: 8.495857, z: -4.7198915} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3742380810754500338} + - {fileID: 7557031369312933497} + - {fileID: 1862867649378056697} + - {fileID: 6333685175231856257} + - {fileID: 6515545034587545199} + - {fileID: 3195312951363957278} + - {fileID: 6429542364118552516} + - {fileID: 7590203506491263094} + - {fileID: 1203247946042117589} + - {fileID: 7813625086657773066} + - {fileID: 1875141663635600532} + - {fileID: 1977558712039975322} + - {fileID: 4987046774236567263} + - {fileID: 7822176329765147616} + - {fileID: 7544648043288440224} + m_Father: {fileID: 5604696651888245994} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8687938782894991681 GameObject: m_ObjectHideFlags: 0 @@ -2210,7 +3776,6 @@ Transform: m_Children: - {fileID: 6370990441483320482} - {fileID: 3241246486705127493} - - {fileID: 2846576861165937971} - {fileID: 1147213678061483695} - {fileID: 5816752459512434123} - {fileID: 3685666716780329301} @@ -2219,6 +3784,115 @@ Transform: - {fileID: 1582116343231843844} m_Father: {fileID: 4449232531499695111} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8697754653569273504 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1233910271586488284} + - component: {fileID: 7203915904178731977} + - component: {fileID: 2376073158761765534} + m_Layer: 6 + m_Name: Ground (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1233910271586488284 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697754653569273504} + serializedVersion: 2 + m_LocalRotation: {x: 0.24184473, y: -0.24184473, z: 0.66446304, w: 0.66446304} + m_LocalPosition: {x: -9.15, y: 3.29, z: 2.38} + m_LocalScale: {x: 1.38116, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4374501888181262139} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 90} +--- !u!212 &7203915904178731977 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697754653569273504} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a5b97318db98bd940b922d976a89bd22, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 3c873d1f63abbb8459c91a67c6e48712, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 2 + m_Size: {x: 7.94, y: 12.17} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!65 &2376073158761765534 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697754653569273504} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 20.2, y: 14.69, z: 0.20000005} + m_Center: {x: 0, y: 0, z: 0.1} --- !u!1 &9041926907780427371 GameObject: m_ObjectHideFlags: 0 @@ -2253,7 +3927,6 @@ Transform: - {fileID: 4449232531499695111} - {fileID: 3249711671270954515} - {fileID: 8503017458650113872} - - {fileID: 842254293393057955} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9141378804429029863 @@ -2394,8 +4067,83 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3872484906676281827} + - {fileID: 1233910271586488284} m_Father: {fileID: 2700294535905665279} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8966789157260970 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3665631389410855864} + m_Modifications: + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.x + value: -9.400998 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.z + value: 14.152 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9079599260925932303, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_Name + value: BigBarrel (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80d491129e76216469e1484503d636e4, type: 3} +--- !u!4 &2663116222447318192 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + m_PrefabInstance: {fileID: 8966789157260970} + m_PrefabAsset: {fileID: 0} --- !u!1001 &74397869649554437 PrefabInstance: m_ObjectHideFlags: 0 @@ -2594,6 +4342,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 9231d4accc6bed2418b02e2674b3da8d, type: 3} m_PrefabInstance: {fileID: 348657574202911309} m_PrefabAsset: {fileID: 0} +--- !u!1001 &566974549354246688 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8219667795033202065} + m_Modifications: + - target: {fileID: 4447667458379557269, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_Name + value: Column 1 (2) + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.x + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.y + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.z + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.x + value: -2.7159991 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.y + value: -12.928 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.z + value: 14.653 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} +--- !u!4 &6957115771938214560 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + m_PrefabInstance: {fileID: 566974549354246688} + m_PrefabAsset: {fileID: 0} --- !u!1001 &715352878371128445 PrefabInstance: m_ObjectHideFlags: 0 @@ -2664,6 +4490,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3} m_PrefabInstance: {fileID: 715352878371128445} m_PrefabAsset: {fileID: 0} +--- !u!1001 &723650789467327536 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3665631389410855864} + m_Modifications: + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.x + value: -7.8809996 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.z + value: 14.152 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9079599260925932303, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_Name + value: BigBarrel (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80d491129e76216469e1484503d636e4, type: 3} +--- !u!4 &3377837882903524906 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + m_PrefabInstance: {fileID: 723650789467327536} + m_PrefabAsset: {fileID: 0} --- !u!1001 &922330802858694173 PrefabInstance: m_ObjectHideFlags: 0 @@ -2946,6 +4846,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 4603432531822005868, guid: 3e9197d023786384d9ebd88bee2c3a51, type: 3} m_PrefabInstance: {fileID: 1285214752534804129} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1399077340140374731 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug (2) + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: -0.45678616 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: -4.418142 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 6.553108 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} +--- !u!4 &4972329663912231510 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + m_PrefabInstance: {fileID: 1399077340140374731} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1524361533534316878 PrefabInstance: m_ObjectHideFlags: 0 @@ -3242,6 +5216,162 @@ Transform: m_CorrespondingSourceObject: {fileID: 4603432531822005868, guid: 3e9197d023786384d9ebd88bee2c3a51, type: 3} m_PrefabInstance: {fileID: 1759129007082184380} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1863792370835691434 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6670398587485089397} + m_Modifications: + - target: {fileID: 1216240781480571353, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_Name + value: ColumnDown + objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: -0.044 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.x + value: -13.929 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.y + value: -13.49589 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: 6.5440006 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} +--- !u!4 &6041252937220550502 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + m_PrefabInstance: {fileID: 1863792370835691434} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1944180515460943853 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8219667795033202065} + m_Modifications: + - target: {fileID: 4447667458379557269, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_Name + value: Column 1 (3) + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.x + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.y + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.z + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.x + value: -14.002998 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.y + value: -12.928 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.z + value: 14.653 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} +--- !u!4 &9055034979907432301 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + m_PrefabInstance: {fileID: 1944180515460943853} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2259128091049337949 PrefabInstance: m_ObjectHideFlags: 0 @@ -3382,6 +5512,162 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 3f301faac738d7743b5242be145dedd4, type: 3} m_PrefabInstance: {fileID: 2269736607659825610} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2303408332314119128 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 203741387490724426, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.128 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.x + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.z + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: 2.83 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.z + value: -1.556 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_Name + value: CustomerTable3 (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} +--- !u!4 &1498097069264328506 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + m_PrefabInstance: {fileID: 2303408332314119128} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &2307065935205322538 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8219667795033202065} + m_Modifications: + - target: {fileID: 4447667458379557269, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_Name + value: Column 1 (1) + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.x + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.y + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.z + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.x + value: -13.915 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.y + value: -12.934 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.z + value: 6.970991 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} +--- !u!4 &5140497822655066026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + m_PrefabInstance: {fileID: 2307065935205322538} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2465013479802224901 PrefabInstance: m_ObjectHideFlags: 0 @@ -3452,6 +5738,92 @@ Transform: m_CorrespondingSourceObject: {fileID: 5408174685234625142, guid: c928e68200dd5ac4090671cbba2ed322, type: 3} m_PrefabInstance: {fileID: 2465013479802224901} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2534201935811136501 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6670398587485089397} + m_Modifications: + - target: {fileID: 1216240781480571353, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_Name + value: ColumnDown (4) + objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: -0.044 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.x + value: -13.98 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.y + value: -13.49589 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: 14.23 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} +--- !u!4 &7575083140453970745 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + m_PrefabInstance: {fileID: 2534201935811136501} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2545234240749759623 PrefabInstance: m_ObjectHideFlags: 0 @@ -3592,6 +5964,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 084afcf810163854e97fddb74e7d7762, type: 3} m_PrefabInstance: {fileID: 2554486916143218817} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2845887952749438369 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug (4) + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: -0.30281872 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.30281872 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.30281872 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: -4.0377865 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: -4.6961427 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 3.0431075 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} +--- !u!4 &8148531330268556604 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + m_PrefabInstance: {fileID: 2845887952749438369} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2866029296223591591 PrefabInstance: m_ObjectHideFlags: 0 @@ -3830,79 +6280,227 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 3112673737608038983} m_PrefabAsset: {fileID: 0} ---- !u!1001 &3223456272433789393 +--- !u!1001 &3186502922114083016 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1402113424960589398} + m_TransformParent: {fileID: 1582116343231843844} m_Modifications: - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -7.099 + value: 2.3509996 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: 5.565 + value: -5.3059998 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5897095096647521783, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} + - target: {fileID: 5897095096647521783, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_Name - value: TrashCan + value: CustomerTable3 (6) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} ---- !u!4 &2846576861165937971 stripped + m_SourcePrefab: {fileID: 100100000, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} +--- !u!4 &2811844248114394154 stripped Transform: - m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: f0b7d93a3fd80be429e7fdac2a2cce39, type: 3} - m_PrefabInstance: {fileID: 3223456272433789393} + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + m_PrefabInstance: {fileID: 3186502922114083016} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3241805517936596453 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug (3) + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0.38121414 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: -4.418142 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 6.553108 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} +--- !u!4 &8833514766988139896 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + m_PrefabInstance: {fileID: 3241805517936596453} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3426666700136750889 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3665631389410855864} + m_Modifications: + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.x + value: -10.910998 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.z + value: 14.152 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9079599260925932303, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_Name + value: BigBarrel (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80d491129e76216469e1484503d636e4, type: 3} +--- !u!4 &821737684945626419 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + m_PrefabInstance: {fileID: 3426666700136750889} m_PrefabAsset: {fileID: 0} --- !u!1001 &3578289723384366598 PrefabInstance: @@ -3926,7 +6524,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.x - value: -18.81 + value: -15.61 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.y @@ -3934,7 +6532,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalPosition.z - value: -2.15 + value: -5.48 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} propertyPath: m_LocalRotation.w @@ -3978,6 +6576,150 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 2320fb09a23919f469eaa789a3a89f82, type: 3} m_PrefabInstance: {fileID: 3578289723384366598} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3856405686373709802 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6670398587485089397} + m_Modifications: + - target: {fileID: 1216240781480571353, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_Name + value: ColumnDown (3) + objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: -0.044 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.x + value: -2.71 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.y + value: -13.49589 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: 6.5440006 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} +--- !u!4 &9191818572840013606 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + m_PrefabInstance: {fileID: 3856405686373709802} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3858679024849465919 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5806978480304762257} + m_Modifications: + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: BarTable01 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.x + value: -10.657999 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.z + value: 10.88 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} +--- !u!4 &5465039636530628167 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + m_PrefabInstance: {fileID: 3858679024849465919} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4210278958342568409 PrefabInstance: m_ObjectHideFlags: 0 @@ -4118,6 +6860,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 4603432531822005868, guid: 3e9197d023786384d9ebd88bee2c3a51, type: 3} m_PrefabInstance: {fileID: 4222919710587106839} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4286100038253035240 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3665631389410855864} + m_Modifications: + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.x + value: -12.430999 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.z + value: 14.152 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9079599260925932303, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_Name + value: BigBarrel + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80d491129e76216469e1484503d636e4, type: 3} +--- !u!4 &2274837201465361650 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + m_PrefabInstance: {fileID: 4286100038253035240} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4431717916556731376 PrefabInstance: m_ObjectHideFlags: 0 @@ -4274,6 +7090,84 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 4633496899233647850} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4902314923449089493 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 8219667795033202065} + m_Modifications: + - target: {fileID: 4447667458379557269, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_Name + value: Column 1 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.x + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.y + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalScale.z + value: 3.707472 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.x + value: -2.7159991 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.y + value: -12.934 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalPosition.z + value: 6.970991 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} +--- !u!4 &2547465935184207189 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7445276700660162688, guid: b23ca5f12ec57c34aa306900e3450fe1, type: 3} + m_PrefabInstance: {fileID: 4902314923449089493} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5018443200316386422 PrefabInstance: m_ObjectHideFlags: 0 @@ -4352,6 +7246,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 4603432531822005868, guid: 3e9197d023786384d9ebd88bee2c3a51, type: 3} m_PrefabInstance: {fileID: 5018443200316386422} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5033123015211643306 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug (1) + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: -1.3087864 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: -4.418142 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 6.553108 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} +--- !u!4 &1419470226628917559 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + m_PrefabInstance: {fileID: 5033123015211643306} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5035810302287944272 PrefabInstance: m_ObjectHideFlags: 0 @@ -4362,19 +7330,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.92045 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.92045 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.92045 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -4.6099997 + value: -5.724001 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -4382,7 +7350,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -8.14 + value: -6.362 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.w @@ -4504,6 +7472,158 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 785cea62243883549bddb71405b44456, type: 3} m_PrefabInstance: {fileID: 5064553687142776537} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5201253258313963114 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 203741387490724426, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.128 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.x + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.z + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: 2.83 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.z + value: -2.45 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_Name + value: CustomerTable3 (5) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} +--- !u!4 &4833354930744609416 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + m_PrefabInstance: {fileID: 5201253258313963114} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5421459654853303204 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 1784444314929232576, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_Name + value: TrashCan + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalScale.x + value: 0.70876 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.70876 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.70876 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalPosition.x + value: -3.097785 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalPosition.y + value: -5.0167413 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalPosition.z + value: 6.1400995 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} +--- !u!4 &654389987036801137 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + m_PrefabInstance: {fileID: 5421459654853303204} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5658778896760899218 PrefabInstance: m_ObjectHideFlags: 0 @@ -4638,7 +7758,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.x - value: -19.16 + value: -15.96 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.y @@ -4646,7 +7766,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalPosition.z - value: -3.25 + value: -6.58 objectReference: {fileID: 0} - target: {fileID: 1061695247072719575, guid: 28c8f2cd9a2817345b5d1fe15e1bebd3, type: 3} propertyPath: m_LocalRotation.w @@ -4752,6 +7872,88 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: c4421d320cae91143b529ff1324bc6c7, type: 3} m_PrefabInstance: {fileID: 5875651340141396067} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5895671552974814301 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6670398587485089397} + m_Modifications: + - target: {fileID: 1216240781480571353, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_Name + value: ColumnDown (2) + objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 4892476560227937892, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: -0.044 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.x + value: -2.693 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.y + value: -13.49589 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalPosition.z + value: 14.23 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} +--- !u!4 &2007181338559251601 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5335449170552453324, guid: dfa7ae42d29c44044a8bca8e68c9db21, type: 3} + m_PrefabInstance: {fileID: 5895671552974814301} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6005366455880278080 PrefabInstance: m_ObjectHideFlags: 0 @@ -4924,21 +8126,25 @@ PrefabInstance: propertyPath: m_Name value: Sink objectReference: {fileID: 0} + - target: {fileID: 2592771000051030090, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalScale.x - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalScale.y - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalScale.z - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalPosition.x - value: -3.04 + value: -17.25 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalPosition.y @@ -4946,7 +8152,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalPosition.z - value: 5.98 + value: -5.32 objectReference: {fileID: 0} - target: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} propertyPath: m_LocalRotation.w @@ -4986,6 +8192,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 8723746495979426143, guid: cf7dc63a4a59ed8469132f5f08896e77, type: 3} m_PrefabInstance: {fileID: 6263828908763440281} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6581766585052698185 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5806978480304762257} + m_Modifications: + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: BarTable01 (2) + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.x + value: -8.915 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.z + value: 10.851 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} +--- !u!4 &2669598217517900337 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + m_PrefabInstance: {fileID: 6581766585052698185} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6594491959083110697 PrefabInstance: m_ObjectHideFlags: 0 @@ -4996,27 +8264,27 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalScale.x - value: 3 + value: 3.1314 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalScale.y - value: 3 + value: 3.1314 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalScale.z - value: 3 + value: 3.1314 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalPosition.x - value: -0.61 + value: -4.747 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.027 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalPosition.z - value: 8.07 + value: -0.411 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} propertyPath: m_LocalRotation.w @@ -5050,6 +8318,22 @@ PrefabInstance: propertyPath: m_Name value: Board objectReference: {fileID: 0} + - target: {fileID: 6077686033771388879, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} + propertyPath: m_Color.a + value: 0.53333336 + objectReference: {fileID: 0} + - target: {fileID: 6077686033771388879, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6077686033771388879, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6077686033771388879, guid: 1764a535fa3a6ad429a1962e099c5546, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5132,19 +8416,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -1.2300003 + value: 0.459 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5152,7 +8436,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -5.9 + value: -4.323 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.w @@ -5196,79 +8480,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 6710588257829302041} m_PrefabAsset: {fileID: 0} ---- !u!1001 &6719915304933239705 +--- !u!1001 &7029344006648184126 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 7219412584754126181} + m_TransformParent: {fileID: 5806978480304762257} m_Modifications: - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalScale.x - value: 1 + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: BarTable01 (1) objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalPosition.x - value: -9.67 + value: -9.783 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -13.495887 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 10.865 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6075426784951483330, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - propertyPath: m_Name - value: Barrel - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 56f291167a33ba3439141926db46c4a6, type: 3} ---- !u!4 &6051159417414277454 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} +--- !u!4 &2294108577146112326 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 56f291167a33ba3439141926db46c4a6, type: 3} - m_PrefabInstance: {fileID: 6719915304933239705} + m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + m_PrefabInstance: {fileID: 7029344006648184126} m_PrefabAsset: {fileID: 0} --- !u!1001 &7034712271388384592 PrefabInstance: @@ -5280,19 +8552,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -4.61 + value: -5.8260016 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5300,7 +8572,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -5.9 + value: -4.381 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.w @@ -5344,6 +8616,88 @@ Transform: m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} m_PrefabInstance: {fileID: 7034712271388384592} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7153741269608065863 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5806978480304762257} + m_Modifications: + - target: {fileID: 249691834857601388, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_Name + value: BarTable02 (1) + objectReference: {fileID: 0} + - target: {fileID: 502682313064510292, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 502682313064510292, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 502682313064510292, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalPosition.x + value: -13.390999 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalPosition.y + value: -13.5126 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalPosition.z + value: 12.535991 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} +--- !u!4 &4241127396383300414 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + m_PrefabInstance: {fileID: 7153741269608065863} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7160706292292424845 PrefabInstance: m_ObjectHideFlags: 0 @@ -5441,19 +8795,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -1.23 + value: 0.41899967 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5461,7 +8815,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -8.14 + value: -6.266 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.w @@ -5567,6 +8921,158 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 3f301faac738d7743b5242be145dedd4, type: 3} m_PrefabInstance: {fileID: 7231278846165836100} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7251413442114627145 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug (5) + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: 0.30281872 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.30281872 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.30281872 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: -3.6127863 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: -4.7481427 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 2.978109 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} +--- !u!4 &3659724498606878420 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + m_PrefabInstance: {fileID: 7251413442114627145} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7334668314689431639 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1582116343231843844} + m_Modifications: + - target: {fileID: 203741387490724426, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.128 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.x + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.y + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalScale.z + value: 0.79659 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.x + value: 2.83 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalPosition.z + value: -0.657 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5897095096647521783, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + propertyPath: m_Name + value: CustomerTable3 (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} +--- !u!4 &7995278076708631733 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} + m_PrefabInstance: {fileID: 7334668314689431639} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7345797135935478074 PrefabInstance: m_ObjectHideFlags: 0 @@ -5645,72 +9151,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 785cea62243883549bddb71405b44456, type: 3} m_PrefabInstance: {fileID: 7345797135935478074} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7427594706559604728 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 842254293393057955} - m_Modifications: - - target: {fileID: 3229364190588727142, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_Name - value: 99EXXXX - objectReference: {fileID: 0} - - target: {fileID: 3229364190588727142, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalPosition.x - value: -1.86 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalPosition.y - value: -13.76 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalPosition.z - value: 11.72 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} ---- !u!4 &1238131302938882443 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8519306175793604211, guid: 4b02ff46d73dbc14abe6eec2dd37ff3f, type: 3} - m_PrefabInstance: {fileID: 7427594706559604728} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7492888499889056789 PrefabInstance: m_ObjectHideFlags: 0 @@ -5773,6 +9213,142 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: c4421d320cae91143b529ff1324bc6c7, type: 3} m_PrefabInstance: {fileID: 7492888499889056789} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7558827210384554403 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5806978480304762257} + m_Modifications: + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: BarTable01 (3) + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.x + value: -8.06 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.z + value: 10.845 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} +--- !u!4 &1638511973844291035 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + m_PrefabInstance: {fileID: 7558827210384554403} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7609231622338814879 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3665631389410855864} + m_Modifications: + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalScale.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.x + value: -6.330999 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalPosition.z + value: 14.152 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9079599260925932303, guid: 80d491129e76216469e1484503d636e4, type: 3} + propertyPath: m_Name + value: BigBarrel (4) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 80d491129e76216469e1484503d636e4, type: 3} +--- !u!4 &5581080337168947589 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2660098128634706458, guid: 80d491129e76216469e1484503d636e4, type: 3} + m_PrefabInstance: {fileID: 7609231622338814879} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7652595564994784361 PrefabInstance: m_ObjectHideFlags: 0 @@ -5925,6 +9501,138 @@ Transform: m_CorrespondingSourceObject: {fileID: 7686860294138350331, guid: c625f910e02ef344c8b7071d43ed0e8c, type: 3} m_PrefabInstance: {fileID: 8124482328605545903} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8222108409924576969 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5806978480304762257} + m_Modifications: + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: BarTable01 (4) + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.x + value: -7.194 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.y + value: -13.495887 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.z + value: 10.843 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} +--- !u!4 &883194467903853233 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + m_PrefabInstance: {fileID: 8222108409924576969} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8302987225568116693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5806978480304762257} + m_Modifications: + - target: {fileID: 249691834857601388, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_Name + value: BarTable02 (2) + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalPosition.x + value: -13.390999 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalPosition.y + value: -13.5126 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalPosition.z + value: 11.50699 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} +--- !u!4 &3073304110347784108 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6457232975130062969, guid: 2aeb08954cc461441a6481a7e54664bb, type: 3} + m_PrefabInstance: {fileID: 8302987225568116693} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8416804165228621391 PrefabInstance: m_ObjectHideFlags: 0 @@ -5935,19 +9643,19 @@ PrefabInstance: m_Modifications: - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.x - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalScale.z - value: 1 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.x - value: -2.95 + value: -4.3050003 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.y @@ -5955,7 +9663,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalPosition.z - value: -7.14 + value: -5.3250003 objectReference: {fileID: 0} - target: {fileID: 809828747251277026, guid: 8d99c5b5242b8da41ba9b1410a70cd1d, type: 3} propertyPath: m_LocalRotation.w @@ -6279,6 +9987,80 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 785cea62243883549bddb71405b44456, type: 3} m_PrefabInstance: {fileID: 8952402252677842790} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9050786560278694354 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5604696651888245994} + m_Modifications: + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: -2.1647863 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: -4.418142 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 6.553108 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} +--- !u!4 &3166343339917656399 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + m_PrefabInstance: {fileID: 9050786560278694354} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9161375769952416007 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab b/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab deleted file mode 100644 index 39dcf85cc..000000000 --- a/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab +++ /dev/null @@ -1,107 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8683294020589671588 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalScale.x - value: 0.47511 - objectReference: {fileID: 0} - - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalScale.y - value: 0.10264 - objectReference: {fileID: 0} - - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalPosition.y - value: 0.3 - objectReference: {fileID: 0} - - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalPosition.z - value: 0.05 - objectReference: {fileID: 0} - - target: {fileID: 528369701346911359, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1061695247072719575, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2152858845316769879, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b57f93005908a754bb842b7dbcaddedd, type: 3} - - target: {fileID: 5899354841691025914, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b57f93005908a754bb842b7dbcaddedd, type: 3} - - target: {fileID: 6075426784951483330, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} - propertyPath: m_Name - value: 99EXXXX - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 987a207f03b91fc49aaa62221cf11900, type: 3} diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab index d5f852946..f961fdb4d 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable3.prefab @@ -425,7 +425,7 @@ PrefabInstance: - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2496c7db5d6099e468caebc7bd780dbb, type: 3} + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -489,7 +489,7 @@ PrefabInstance: - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2496c7db5d6099e468caebc7bd780dbb, type: 3} + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_WasSpriteAssigned value: 1 @@ -537,6 +537,7 @@ MonoBehaviour: k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} k__BackingField: 1 k__BackingField: 1.2 + IsOpened: 0 _tableSeats: - k__BackingField: 0 k__BackingField: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab new file mode 100644 index 000000000..bfbe87f7c --- /dev/null +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab @@ -0,0 +1,193 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7208898558036350106 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7358052634285927493} + m_Layer: 8 + m_Name: Center + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7358052634285927493 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7208898558036350106} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 809828747251277026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7343451337687172630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1180174675498993111, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2106642157007834423, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 0.18181819 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 0.18181819 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 0.18181819 + objectReference: {fileID: 0} + - target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_AnchoredPosition.y + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2cf8faf4514a14547b8f056727e0a0f2, type: 3} + - target: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Name + value: Liquid + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2cf8faf4514a14547b8f056727e0a0f2, type: 3} + - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 7358052634285927493} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1535180298174803447} + m_SourcePrefab: {fileID: 100100000, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} +--- !u!4 &809828747251277026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7986070582027999988, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5897095096647521783 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1535180298174803447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5897095096647521783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2568fe8d4d702ed4698ed46b9c2ad25a, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: {fileID: 7358052634285927493} + k__BackingField: {fileID: 6077686033771388879} + k__BackingField: {fileID: 8975593228546502023} + k__BackingField: {fileID: 8793236136028073839} + k__BackingField: {fileID: 2100000, guid: 9db92b3ac1f276e42ae7d7bcfbbca549, type: 2} + k__BackingField: 1 + k__BackingField: 0.5 + IsOpened: 0 +--- !u!212 &6077686033771388879 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 3580758810857167321, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!224 &8793236136028073839 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} +--- !u!223 &8975593228546502023 stripped +Canvas: + m_CorrespondingSourceObject: {fileID: 1830317875510668177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} + m_PrefabInstance: {fileID: 7343451337687172630} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab.meta b/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab.meta rename to Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta index f79916de5..cdf1ec00a 100644 --- a/Assets/05.Prefabs/Props/Furniture/99EXXXX.prefab.meta +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Liquid.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b02ff46d73dbc14abe6eec2dd37ff3f +guid: 7cb398d57f4c7ff468b50dbf1d226ca5 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Mini.meta b/Assets/05.Prefabs/Props/Mini.meta new file mode 100644 index 000000000..4cb97a4c9 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6509728fd6517b1429d165aea4882a6b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/BarTable01.prefab b/Assets/05.Prefabs/Props/Mini/BarTable01.prefab new file mode 100644 index 000000000..686dfc8d7 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/BarTable01.prefab @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1193251972430982796 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + - target: {fileID: 3580758810857167321, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Name + value: BarTable01 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9e508ffd6f8853c4c8b20b63ad90622d, type: 3} + - target: {fileID: 9047629830516719732, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b97349d9df2c9eb4abdca5b7559b2260, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/BarTable01.prefab.meta b/Assets/05.Prefabs/Props/Mini/BarTable01.prefab.meta new file mode 100644 index 000000000..195df581a --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/BarTable01.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7601c5b68d6bab142b581e0a63d4743c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/BarTable02.prefab b/Assets/05.Prefabs/Props/Mini/BarTable02.prefab new file mode 100644 index 000000000..eeeb6a75d --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/BarTable02.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2866474732463670273 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2395388827384788821, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 36d530736d9579c418ddafc987341443, type: 3} + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: BarTable02 + objectReference: {fileID: 0} + - target: {fileID: 7854536393926979320, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 36d530736d9579c418ddafc987341443, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/BarTable02.prefab.meta b/Assets/05.Prefabs/Props/Mini/BarTable02.prefab.meta new file mode 100644 index 000000000..8604bf66c --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/BarTable02.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2aeb08954cc461441a6481a7e54664bb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/Barrel.prefab b/Assets/05.Prefabs/Props/Mini/Barrel.prefab new file mode 100644 index 000000000..16c0ed92c --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/Barrel.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8250971885031797383 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 652625962474261424, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3} + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: Barrel + objectReference: {fileID: 0} + - target: {fileID: 4985587680422744605, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9f7d82fbc664fbb4d98842fc46db319d, type: 3} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/Barrel.prefab.meta b/Assets/05.Prefabs/Props/Mini/Barrel.prefab.meta new file mode 100644 index 000000000..c8d391bab --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/Barrel.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 80d491129e76216469e1484503d636e4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/Column 1.prefab b/Assets/05.Prefabs/Props/Mini/Column 1.prefab new file mode 100644 index 000000000..a9597c5e1 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/Column 1.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3546911982502979613 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 652625962474261424, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f4c17f53385195f4e98fdf1f0da515d3, type: 3} + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: Column 1 + objectReference: {fileID: 0} + - target: {fileID: 4985587680422744605, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f4c17f53385195f4e98fdf1f0da515d3, type: 3} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/Column 1.prefab.meta b/Assets/05.Prefabs/Props/Mini/Column 1.prefab.meta new file mode 100644 index 000000000..a2c582259 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/Column 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b23ca5f12ec57c34aa306900e3450fe1 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/Column.prefab b/Assets/05.Prefabs/Props/Mini/Column.prefab new file mode 100644 index 000000000..fb744c150 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/Column.prefab @@ -0,0 +1,75 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &2044797857068986449 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 652625962474261424, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 06a2c6aed62612e41ad12d29e64f669e, type: 3} + - target: {fileID: 652625962474261424, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: Column + objectReference: {fileID: 0} + - target: {fileID: 4985587680422744605, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 06a2c6aed62612e41ad12d29e64f669e, type: 3} + - target: {fileID: 4985587680422744605, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/Column.prefab.meta b/Assets/05.Prefabs/Props/Mini/Column.prefab.meta new file mode 100644 index 000000000..bd524c8f9 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/Column.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dfa7ae42d29c44044a8bca8e68c9db21 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/NPCTable.prefab b/Assets/05.Prefabs/Props/Mini/NPCTable.prefab new file mode 100644 index 000000000..8b4b8f910 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/NPCTable.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &8805598650455662079 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 652625962474261424, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + - target: {fileID: 900825868516819336, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Name + value: NPCTable + objectReference: {fileID: 0} + - target: {fileID: 4985587680422744605, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6227288689240557725, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1496e34f13636804a82b6e1c438a74e2, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/NPCTable.prefab.meta b/Assets/05.Prefabs/Props/Mini/NPCTable.prefab.meta new file mode 100644 index 000000000..0637833e4 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/NPCTable.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 094fc2c5e04bd7f4cafd9d08a9c5e15d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/TrashCan.prefab b/Assets/05.Prefabs/Props/Mini/TrashCan.prefab new file mode 100644 index 000000000..608c0412b --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/TrashCan.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4355904791066675117 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2395388827384788821, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3efc550bddc68a345b5400a832fb9a6a, type: 3} + - target: {fileID: 2643849317649087853, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Name + value: TrashCan + objectReference: {fileID: 0} + - target: {fileID: 7854536393926979320, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 3efc550bddc68a345b5400a832fb9a6a, type: 3} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9104995012213585016, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7601c5b68d6bab142b581e0a63d4743c, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/TrashCan.prefab.meta b/Assets/05.Prefabs/Props/Mini/TrashCan.prefab.meta new file mode 100644 index 000000000..49ad3f0a2 --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/TrashCan.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b51ba0e08743f4947898c76771fa87e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Props/Mini/WoodenBeerMug.prefab b/Assets/05.Prefabs/Props/Mini/WoodenBeerMug.prefab new file mode 100644 index 000000000..36f3a947a --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/WoodenBeerMug.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1460291065197099848 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1784444314929232576, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_Name + value: WoodenBeerMug + objectReference: {fileID: 0} + - target: {fileID: 2111459413474029816, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4767122796570620885, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5869214406492465493, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: cda1d961a563b6143a024170ed6f0f44, type: 3} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b51ba0e08743f4947898c76771fa87e2, type: 3} diff --git a/Assets/05.Prefabs/Props/Mini/WoodenBeerMug.prefab.meta b/Assets/05.Prefabs/Props/Mini/WoodenBeerMug.prefab.meta new file mode 100644 index 000000000..f70394abf --- /dev/null +++ b/Assets/05.Prefabs/Props/Mini/WoodenBeerMug.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1496e34f13636804a82b6e1c438a74e2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/Tycoons/GarnishSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/GarnishSlotUi.prefab new file mode 100644 index 000000000..a374c57ea --- /dev/null +++ b/Assets/05.Prefabs/Uis/Tycoons/GarnishSlotUi.prefab @@ -0,0 +1,717 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1268009844864649886 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1052343526279135741} + - component: {fileID: 5171059195189016428} + - component: {fileID: 1325640231676880476} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1052343526279135741 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268009844864649886} + 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: 6797177110631514817} + - {fileID: 6863518221733553098} + m_Father: {fileID: 951536233033161353} + 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: -10} + m_SizeDelta: {x: -50, y: -50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &5171059195189016428 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268009844864649886} + m_CullTransparentMesh: 1 +--- !u!114 &1325640231676880476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268009844864649886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 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: dca6f3667624f48c3854ed640667233d, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.75 + m_FillClockwise: 0 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4096152250021928420 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6797177110631514817} + - component: {fileID: 5268857531540855992} + - component: {fileID: 2193117477692280895} + m_Layer: 5 + m_Name: FillBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6797177110631514817 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096152250021928420} + 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: 1052343526279135741} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5268857531540855992 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096152250021928420} + m_CullTransparentMesh: 1 +--- !u!114 &2193117477692280895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4096152250021928420} + 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: 0.19607843} + 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: dca6f3667624f48c3854ed640667233d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4591983256759759334 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 951536233033161353} + - component: {fileID: 8578504528708574381} + - component: {fileID: 2888391198623738212} + - component: {fileID: 8505710238214063229} + - component: {fileID: 8805757369534729607} + m_Layer: 5 + m_Name: GarnishSlotUi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &951536233033161353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591983256759759334} + 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: 1052343526279135741} + - {fileID: 4467300184883090593} + - {fileID: 2279725123146950703} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8578504528708574381 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591983256759759334} + m_CullTransparentMesh: 1 +--- !u!114 &2888391198623738212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591983256759759334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5254902, g: 0.3529412, b: 0.25490198, 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: 05f0f8e989806654ab3f111f0a9081a0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8505710238214063229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591983256759759334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2888391198623738212} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &8805757369534729607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4591983256759759334} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4db4e95fa40f3f4cb7f3be76c9f3457, type: 3} + m_Name: + m_EditorClassIdentifier: + _button: {fileID: 8505710238214063229} + _fill: {fileID: 1325640231676880476} + _image: {fileID: 3839866525170966225} + _name: {fileID: 6762671232451140065} +--- !u!1 &5539091650491980861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6863518221733553098} + - component: {fileID: 8199118602222042397} + - component: {fileID: 6037623178657664202} + m_Layer: 5 + m_Name: FillMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6863518221733553098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5539091650491980861} + 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: 1547245573255683487} + m_Father: {fileID: 1052343526279135741} + 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: -20} + m_SizeDelta: {x: -40, y: -40} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8199118602222042397 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5539091650491980861} + m_CullTransparentMesh: 1 +--- !u!114 &6037623178657664202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5539091650491980861} + 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: dca6f3667624f48c3854ed640667233d, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5832682775208929410 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4467300184883090593} + - component: {fileID: 3314932796147742378} + - component: {fileID: 6762671232451140065} + m_Layer: 5 + m_Name: Amount + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4467300184883090593 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5832682775208929410} + 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: 951536233033161353} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -120} + m_SizeDelta: {x: 240, y: 60} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3314932796147742378 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5832682775208929410} + m_CullTransparentMesh: 1 +--- !u!114 &6762671232451140065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5832682775208929410} + 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: 100% + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, 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: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 36 + 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!1 &7640741734497850217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1547245573255683487} + - component: {fileID: 1651674441861431496} + - component: {fileID: 3839866525170966225} + m_Layer: 5 + m_Name: LiquidImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1547245573255683487 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7640741734497850217} + 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: 6863518221733553098} + 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: -10} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1651674441861431496 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7640741734497850217} + m_CullTransparentMesh: 1 +--- !u!114 &3839866525170966225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7640741734497850217} + 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: ddde5976023f9be4e83dc3d867c2dc30, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8766622058487790889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2279725123146950703} + - component: {fileID: 8452472984123830544} + - component: {fileID: 6504072107714458664} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2279725123146950703 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766622058487790889} + 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: 951536233033161353} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: -20, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &8452472984123830544 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766622058487790889} + m_CullTransparentMesh: 1 +--- !u!114 &6504072107714458664 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766622058487790889} + 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: "\uC5BC\uC74C \uC2AC\uB77C\uC784 \uC870\uAC01" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, 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: 20.3 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 12 + m_fontSizeMax: 24 + 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} diff --git a/Assets/05.Prefabs/Uis/Tycoons/GarnishSlotUi.prefab.meta b/Assets/05.Prefabs/Uis/Tycoons/GarnishSlotUi.prefab.meta new file mode 100644 index 000000000..7258c025f --- /dev/null +++ b/Assets/05.Prefabs/Uis/Tycoons/GarnishSlotUi.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9fa4784d5b350fa46a4a9af81bba7fc7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab similarity index 99% rename from Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab rename to Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab index 613b1a9c8..7a151a33d 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab @@ -89,7 +89,7 @@ GameObject: - component: {fileID: 3050633509931874182} - component: {fileID: 282528693430034096} m_Layer: 5 - m_Name: DrinkRecipeSlotUi + m_Name: LiquidRecipeSlotUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab.meta b/Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Uis/Tycoons/DrinkRecipeSlotUi.prefab.meta rename to Assets/05.Prefabs/Uis/Tycoons/LiquidRecipeSlotUi.prefab.meta diff --git a/Assets/05.Prefabs/Uis/Tycoons/DrinkIngredientSlotUi.prefab b/Assets/05.Prefabs/Uis/Tycoons/LiquidSlotUi.prefab similarity index 64% rename from Assets/05.Prefabs/Uis/Tycoons/DrinkIngredientSlotUi.prefab rename to Assets/05.Prefabs/Uis/Tycoons/LiquidSlotUi.prefab index 21fec2ae5..e299bcd04 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/DrinkIngredientSlotUi.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/LiquidSlotUi.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2061157754719405327 RectTransform: m_ObjectHideFlags: 0 @@ -147,10 +147,10 @@ GameObject: - component: {fileID: 3591675408625319010} - component: {fileID: 8191011795703834529} - component: {fileID: 7012204021464368899} - - component: {fileID: 3225355617982558926} + - component: {fileID: 1579569081057140782} - component: {fileID: 8019154252991896507} m_Layer: 5 - m_Name: DrinkIngredientSlotUi + m_Name: LiquidSlotUi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -199,15 +199,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.48235294} + m_Color: {r: 0.44705886, g: 0.121568635, b: 0.003921569, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 05f0f8e989806654ab3f111f0a9081a0, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -216,7 +216,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3225355617982558926 +--- !u!114 &1579569081057140782 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -272,10 +272,85 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4db4e95fa40f3f4cb7f3be76c9f3457, type: 3} m_Name: m_EditorClassIdentifier: - _button: {fileID: 3225355617982558926} - _image: {fileID: 7812366238446595861} - _amount: {fileID: 7573605139369236078} + _button: {fileID: 1579569081057140782} + _image: {fileID: 7048314058805912249} + _fill: {fileID: 7812366238446595861} _name: {fileID: 7573605139369236078} +--- !u!1 &4992330748918390070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241615000640783258} + - component: {fileID: 3929660431007968605} + - component: {fileID: 7048314058805912249} + m_Layer: 5 + m_Name: LiquidImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7241615000640783258 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4992330748918390070} + 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: 5492166217554772022} + 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: -20} + m_SizeDelta: {x: -40, y: -40} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3929660431007968605 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4992330748918390070} + m_CullTransparentMesh: 1 +--- !u!114 &7048314058805912249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4992330748918390070} + 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: d2a16eca65977be4e9926f930953c831, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5679961045511757371 GameObject: m_ObjectHideFlags: 0 @@ -308,10 +383,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 3591675408625319010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -180} - m_SizeDelta: {x: 240, y: 60} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: -20, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &4972998227257955351 CanvasRenderer: @@ -341,7 +416,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC6A9\uC554 \uB9E5\uC8FC" + m_text: "\uB2EC\uBE5B \uC0D8\uBB3C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2} @@ -368,12 +443,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 + m_fontSize: 24 m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 12 - m_fontSizeMax: 36 + m_fontSizeMax: 24 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 @@ -412,6 +487,82 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6961339931371382699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5492166217554772022} + - component: {fileID: 4740213993773000558} + - component: {fileID: 3952076590340583205} + m_Layer: 5 + m_Name: FillMask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5492166217554772022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6961339931371382699} + 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: 7241615000640783258} + m_Father: {fileID: 1640367631470655499} + 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: -20} + m_SizeDelta: {x: -40, y: -40} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4740213993773000558 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6961339931371382699} + m_CullTransparentMesh: 1 +--- !u!114 &3952076590340583205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6961339931371382699} + 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: -2413806693520163455, guid: e074a9b4b276847b0b578d2c96d2c1db, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8269679239817146016 GameObject: m_ObjectHideFlags: 0 @@ -424,7 +575,7 @@ GameObject: - component: {fileID: 1918449643841995284} - component: {fileID: 7812366238446595861} m_Layer: 5 - m_Name: Image + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -441,13 +592,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1262323363163563987} + - {fileID: 5492166217554772022} m_Father: {fileID: 3591675408625319010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: -10} - m_SizeDelta: {x: 180, y: 180} + m_SizeDelta: {x: -50, y: -50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1918449643841995284 CanvasRenderer: @@ -470,14 +623,89 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, 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: 2cf8faf4514a14547b8f056727e0a0f2, type: 3} + m_Sprite: {fileID: -2413806693520163455, guid: e074a9b4b276847b0b578d2c96d2c1db, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0.75 + m_FillClockwise: 0 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8987180682441382207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1262323363163563987} + - component: {fileID: 2197900747290526683} + - component: {fileID: 1838126071896120816} + m_Layer: 5 + m_Name: FillBackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1262323363163563987 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8987180682441382207} + 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: 1640367631470655499} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2197900747290526683 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8987180682441382207} + m_CullTransparentMesh: 1 +--- !u!114 &1838126071896120816 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8987180682441382207} + 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: 0.19607843} + 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: -2413806693520163455, guid: e074a9b4b276847b0b578d2c96d2c1db, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/05.Prefabs/Uis/Tycoons/DrinkIngredientSlotUi.prefab.meta b/Assets/05.Prefabs/Uis/Tycoons/LiquidSlotUi.prefab.meta similarity index 100% rename from Assets/05.Prefabs/Uis/Tycoons/DrinkIngredientSlotUi.prefab.meta rename to Assets/05.Prefabs/Uis/Tycoons/LiquidSlotUi.prefab.meta diff --git a/Assets/09.Shaders/GradientSlider.shadergraph b/Assets/09.Shaders/GradientSlider.shadergraph new file mode 100644 index 000000000..87a12eb38 --- /dev/null +++ b/Assets/09.Shaders/GradientSlider.shadergraph @@ -0,0 +1,945 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "125e252b280d4043a3e232ad66365ff2", + "m_Properties": [ + { + "m_Id": "a128696d045141149cfb3bf816b54d80" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "b24d1c02f74d48e5a6cb3e41a064f0fa" + } + ], + "m_Nodes": [ + { + "m_Id": "40a37cf1d98f49d2a7766d6a9c7a304b" + }, + { + "m_Id": "0211643180e94c54bcd79ec77dc452ea" + }, + { + "m_Id": "482587c66b08454d8c0cf94bb2a533ec" + }, + { + "m_Id": "a5d899d55d4c42c2bee93c46b469c0a0" + }, + { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + { + "m_Id": "aae61fd383a145759ae1fa10631fabba" + }, + { + "m_Id": "5e0d5368f6144fa3a05f2b5e989e25ba" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "40a37cf1d98f49d2a7766d6a9c7a304b" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5e0d5368f6144fa3a05f2b5e989e25ba" + }, + "m_SlotId": 1 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a5d899d55d4c42c2bee93c46b469c0a0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1fe4e18012224bd086abad48cef570a5" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "aae61fd383a145759ae1fa10631fabba" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5e0d5368f6144fa3a05f2b5e989e25ba" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "40a37cf1d98f49d2a7766d6a9c7a304b" + }, + { + "m_Id": "0211643180e94c54bcd79ec77dc452ea" + }, + { + "m_Id": "482587c66b08454d8c0cf94bb2a533ec" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "72dd91f1183d498f819167fdf65ada12" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "0211643180e94c54bcd79ec77dc452ea", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "38602216b85349ffa57dfa5856f2bf92" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "15ca3e2a6ecd4dc78b089a004c8dd832", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.SampleGradient", + "m_ObjectId": "1fe4e18012224bd086abad48cef570a5", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Gradient", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -642.9998168945313, + "y": 199.99996948242188, + "width": 207.99993896484376, + "height": 302.0 + } + }, + "m_Slots": [ + { + "m_Id": "6fbe934ec4cb457d95fa2916f5121f30" + }, + { + "m_Id": "9b5d385653b04fa7bd2b3810f55e8013" + }, + { + "m_Id": "2e071c1ec2c647f997309f104913f763" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "254af246b3ae42258ec1d4d0e0049d97", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "2e071c1ec2c647f997309f104913f763", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "38602216b85349ffa57dfa5856f2bf92", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "40a37cf1d98f49d2a7766d6a9c7a304b", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "15ca3e2a6ecd4dc78b089a004c8dd832" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "482587c66b08454d8c0cf94bb2a533ec", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "71bcf66d2c7a4dee9f08bc89a9774672" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5679351844564412ae5af9334f89321f", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "5e0d5368f6144fa3a05f2b5e989e25ba", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1009.9998779296875, + "y": 302.9999694824219, + "width": 120.00006103515625, + "height": 148.99996948242188 + } + }, + "m_Slots": [ + { + "m_Id": "5679351844564412ae5af9334f89321f" + }, + { + "m_Id": "e037e7d258e34400b685169a0a598aa7" + }, + { + "m_Id": "254af246b3ae42258ec1d4d0e0049d97" + }, + { + "m_Id": "8c75f434bf6e4081990d03377c07f669" + }, + { + "m_Id": "70120b5270a3424b91d2fc6dac508a2b" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientInputMaterialSlot", + "m_ObjectId": "6fbe934ec4cb457d95fa2916f5121f30", + "m_Id": 0, + "m_DisplayName": "Gradient", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Gradient", + "m_StageCapability": 3, + "m_Value": { + "serializedVersion": "2", + "key0": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key1": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key2": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key3": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key4": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key5": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key6": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key7": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "ctime0": 0, + "ctime1": 65535, + "ctime2": 0, + "ctime3": 0, + "ctime4": 0, + "ctime5": 0, + "ctime6": 0, + "ctime7": 0, + "atime0": 0, + "atime1": 65535, + "atime2": 0, + "atime3": 0, + "atime4": 0, + "atime5": 0, + "atime6": 0, + "atime7": 0, + "m_Mode": 0, + "m_ColorSpace": -1, + "m_NumColorKeys": 2, + "m_NumAlphaKeys": 2 + }, + "m_DefaultValue": { + "serializedVersion": "2", + "key0": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key1": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "key2": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key3": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key4": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key5": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key6": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key7": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "ctime0": 0, + "ctime1": 65535, + "ctime2": 0, + "ctime3": 0, + "ctime4": 0, + "ctime5": 0, + "ctime6": 0, + "ctime7": 0, + "atime0": 0, + "atime1": 65535, + "atime2": 0, + "atime3": 0, + "atime4": 0, + "atime5": 0, + "atime6": 0, + "atime7": 0, + "m_Mode": 0, + "m_ColorSpace": -1, + "m_NumColorKeys": 2, + "m_NumAlphaKeys": 2 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "70120b5270a3424b91d2fc6dac508a2b", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "71bcf66d2c7a4dee9f08bc89a9774672", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "72dd91f1183d498f819167fdf65ada12", + "m_Datas": [ + { + "m_Id": "e43fc642d054436484b7fc14464630de" + } + ], + "m_ActiveSubTarget": { + "m_Id": "c0126ad9f7e344cd93a205ece9acb55b" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8c75f434bf6e4081990d03377c07f669", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "9b5d385653b04fa7bd2b3810f55e8013", + "m_Id": 1, + "m_DisplayName": "Time", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Time", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientShaderProperty", + "m_ObjectId": "a128696d045141149cfb3bf816b54d80", + "m_Guid": { + "m_GuidSerialized": "c67d0ed6-ff75-47f5-9414-be832a06c9e4" + }, + "m_Name": "Gradient", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Gradient", + "m_DefaultReferenceName": "_Gradient", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": false, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "serializedVersion": "2", + "key0": { + "r": 0.0, + "g": 0.0, + "b": 1.0, + "a": 1.0 + }, + "key1": { + "r": 0.0, + "g": 0.03921568766236305, + "b": 1.0, + "a": 1.0 + }, + "key2": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 0.0 + }, + "key3": { + "r": 1.0, + "g": 0.03921568766236305, + "b": 0.0, + "a": 0.0 + }, + "key4": { + "r": 1.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key5": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key6": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "key7": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "ctime0": 0, + "ctime1": 29491, + "ctime2": 32768, + "ctime3": 36044, + "ctime4": 65535, + "ctime5": 0, + "ctime6": 0, + "ctime7": 0, + "atime0": 0, + "atime1": 65535, + "atime2": 0, + "atime3": 0, + "atime4": 0, + "atime5": 0, + "atime6": 0, + "atime7": 0, + "m_Mode": 0, + "m_ColorSpace": 1, + "m_NumColorKeys": 5, + "m_NumAlphaKeys": 2 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "a5d899d55d4c42c2bee93c46b469c0a0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -800.9998779296875, + "y": 183.0, + "width": 113.0, + "height": 33.99998474121094 + } + }, + "m_Slots": [ + { + "m_Id": "fac570dcada74bb99f8f84df7704cf04" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "a128696d045141149cfb3bf816b54d80" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVNode", + "m_ObjectId": "aae61fd383a145759ae1fa10631fabba", + "m_Group": { + "m_Id": "" + }, + "m_Name": "UV", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1250.9998779296875, + "y": 271.9999694824219, + "width": 208.0001220703125, + "height": 313.0000305175781 + } + }, + "m_Slots": [ + { + "m_Id": "d0bf0b18495841e3b036937f9ecea82f" + } + ], + "synonyms": [ + "texcoords", + "coords", + "coordinates" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_OutputChannel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "b24d1c02f74d48e5a6cb3e41a064f0fa", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "a128696d045141149cfb3bf816b54d80" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalCanvasSubTarget", + "m_ObjectId": "c0126ad9f7e344cd93a205ece9acb55b" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d0bf0b18495841e3b036937f9ecea82f", + "m_Id": 0, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e037e7d258e34400b685169a0a598aa7", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.Rendering.Canvas.ShaderGraph.CanvasData", + "m_ObjectId": "e43fc642d054436484b7fc14464630de", + "m_Version": 0, + "m_AlphaClip": false, + "m_DisableTint": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GradientMaterialSlot", + "m_ObjectId": "fac570dcada74bb99f8f84df7704cf04", + "m_Id": 0, + "m_DisplayName": "Gradient", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3 +} + diff --git a/Assets/09.Shaders/GradientSlider.shadergraph.meta b/Assets/09.Shaders/GradientSlider.shadergraph.meta new file mode 100644 index 000000000..a42aa5249 --- /dev/null +++ b/Assets/09.Shaders/GradientSlider.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: ae82fd6780cf2e54b850202306896be6 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/09.Shaders/Liquid3.shadergraph b/Assets/09.Shaders/Liquid3.shadergraph index 19ed30ae3..4f5c80b4b 100644 --- a/Assets/09.Shaders/Liquid3.shadergraph +++ b/Assets/09.Shaders/Liquid3.shadergraph @@ -317,6 +317,15 @@ }, { "m_Id": "a80f5045148b4e6a8db99957f45731f7" + }, + { + "m_Id": "e7fffce0a08b4ec78b79ee64bdcdabdf" + }, + { + "m_Id": "52a0bdd9ee2e49ceb75a4097f56b7843" + }, + { + "m_Id": "cae791b474054116adbf3b632705d906" } ], "m_GroupDatas": [], @@ -616,6 +625,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "52a0bdd9ee2e49ceb75a4097f56b7843" + }, + "m_SlotId": 7 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e7fffce0a08b4ec78b79ee64bdcdabdf" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1078,6 +1101,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "a652d57b83d6427eb2c2bc24b5264c96" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "e7fffce0a08b4ec78b79ee64bdcdabdf" + }, + "m_SlotId": 0 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1316,6 +1353,20 @@ "m_SlotId": 0 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "cae791b474054116adbf3b632705d906" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "52a0bdd9ee2e49ceb75a4097f56b7843" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -1942,6 +1993,31 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "081f3a3aa6264afdbc201061d61ff86a", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -2149,7 +2225,7 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "{\"texture\":{\"fileID\":2800000,\"guid\":\"d39d76f18f907014a9979953fb5d43a0\",\"type\":3}}", "m_Guid": "" }, "isMainTexture": false, @@ -3210,6 +3286,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "20ffc2f956644ffd8173568cb44ca956", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -4381,6 +4505,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "44a879844bae4c9eb84cc2956c7185f1", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5170,6 +5309,66 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "52a0bdd9ee2e49ceb75a4097f56b7843", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 549.0, + "y": 2130.0, + "width": 208.0, + "height": 435.0 + } + }, + "m_Slots": [ + { + "m_Id": "081f3a3aa6264afdbc201061d61ff86a" + }, + { + "m_Id": "a4ed840cbd2943c78faadd075e119795" + }, + { + "m_Id": "44a879844bae4c9eb84cc2956c7185f1" + }, + { + "m_Id": "e7be06b6c6a1408bbd0bf7fa9b6ef1d4" + }, + { + "m_Id": "639e8b195fac40a8a577e5ed1e32112d" + }, + { + "m_Id": "ce9cf4efa18d471cb6a6a143f7664095" + }, + { + "m_Id": "e3ec8dd8d588473dae836188d8fcdd2d" + }, + { + "m_Id": "9a4494d59d0a4b9483d81ca8422a9911" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -5769,6 +5968,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "639e8b195fac40a8a577e5ed1e32112d", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", @@ -6497,6 +6711,54 @@ "m_SerializedDescriptor": "SurfaceDescription.Alpha" } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "7892c41bfe694810a46313787cb1aa2d", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", @@ -7637,6 +7899,19 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "9a4494d59d0a4b9483d81ca8422a9911", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -8137,6 +8412,21 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a4ed840cbd2943c78faadd075e119795", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -9091,6 +9381,19 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "bb61f0ae44d846a1ac5462de4c423f5c", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -9831,6 +10134,42 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "cae791b474054116adbf3b632705d906", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 549.0, + "y": 2075.0, + "width": 127.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "bb61f0ae44d846a1ac5462de4c423f5c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "0a1a4ed5edd441b2a25633a208f068e0" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.TimeNode", @@ -10015,6 +10354,24 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "ce9cf4efa18d471cb6a6a143f7664095", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -11199,6 +11556,28 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "e3ec8dd8d588473dae836188d8fcdd2d", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", @@ -11358,6 +11737,64 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "e7be06b6c6a1408bbd0bf7fa9b6ef1d4", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "e7fffce0a08b4ec78b79ee64bdcdabdf", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 786.9999389648438, + "y": 1737.0, + "width": 207.99993896484376, + "height": 301.9998779296875 + } + }, + "m_Slots": [ + { + "m_Id": "fa82698c49b54b23a5ec48fadbf8e0ed" + }, + { + "m_Id": "20ffc2f956644ffd8173568cb44ca956" + }, + { + "m_Id": "7892c41bfe694810a46313787cb1aa2d" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", @@ -12356,6 +12793,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "fa82698c49b54b23a5ec48fadbf8e0ed", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", diff --git a/Assets/Resources/Excel/CocktailDataTable.xlsx b/Assets/Resources/Excel/CocktailDataTable.xlsx index 0d041ebf9..064ed2363 100644 Binary files a/Assets/Resources/Excel/CocktailDataTable.xlsx and b/Assets/Resources/Excel/CocktailDataTable.xlsx differ diff --git a/Assets/Resources/Excel/DrinkDataTable.xlsx b/Assets/Resources/Excel/DrinkDataTable.xlsx deleted file mode 100644 index cea5f85d8..000000000 Binary files a/Assets/Resources/Excel/DrinkDataTable.xlsx and /dev/null differ diff --git a/Assets/Resources/Excel/ItemDataTable.xlsx b/Assets/Resources/Excel/ItemDataTable.xlsx index 0a3d69a49..423a50d82 100644 Binary files a/Assets/Resources/Excel/ItemDataTable.xlsx and b/Assets/Resources/Excel/ItemDataTable.xlsx differ diff --git a/Assets/Resources/Excel/LiquidDataTable.xlsx b/Assets/Resources/Excel/LiquidDataTable.xlsx new file mode 100644 index 000000000..b11135563 Binary files /dev/null and b/Assets/Resources/Excel/LiquidDataTable.xlsx differ diff --git a/Assets/Resources/Excel/DrinkDataTable.xlsx.meta b/Assets/Resources/Excel/LiquidDataTable.xlsx.meta similarity index 74% rename from Assets/Resources/Excel/DrinkDataTable.xlsx.meta rename to Assets/Resources/Excel/LiquidDataTable.xlsx.meta index 7ea42c564..4e9002c28 100644 --- a/Assets/Resources/Excel/DrinkDataTable.xlsx.meta +++ b/Assets/Resources/Excel/LiquidDataTable.xlsx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bb71d8850cf0ec8408b3837078726c75 +guid: 90524f05a5186434c9ec511cde133a5c DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/JSON/CocktailDataTable.json b/Assets/Resources/JSON/CocktailDataTable.json index e23958d32..f8bb3d7db 100644 --- a/Assets/Resources/JSON/CocktailDataTable.json +++ b/Assets/Resources/JSON/CocktailDataTable.json @@ -1,152 +1,242 @@ [ { - "Idx": "Cocktail300", - "Name": "달빛 샘물", + "Idx": "Cocktail000", + "Name": "쓰레기", "RatioRange": 0, - "IngredientIdx1": "Drink100", - "IngredientRatio1": 100, + "IngredientIdx1": "", + "IngredientAmount1": 0, "IngredientIdx2": "", - "IngredientRatio2": 0, + "IngredientAmount2": 0, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail301", - "Name": "망령 맥주", + "Idx": "Cocktail001", + "Name": "칵테일A", "RatioRange": 0, - "IngredientIdx1": "Drink101", - "IngredientRatio1": 100, + "IngredientIdx1": "LiquidA", + "IngredientAmount1": 400, "IngredientIdx2": "", - "IngredientRatio2": 0, + "IngredientAmount2": 0, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail302", - "Name": "검은 수염", + "Idx": "Cocktail002", + "Name": "칵테일B", "RatioRange": 0, - "IngredientIdx1": "Drink102", - "IngredientRatio1": 100, + "IngredientIdx1": "LiquidB", + "IngredientAmount1": 400, "IngredientIdx2": "", - "IngredientRatio2": 0, + "IngredientAmount2": 0, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail303", - "Name": "용암 맥주", + "Idx": "Cocktail003", + "Name": "칵테일C", "RatioRange": 0, - "IngredientIdx1": "Drink103", - "IngredientRatio1": 100, + "IngredientIdx1": "LiquidC", + "IngredientAmount1": 400, "IngredientIdx2": "", - "IngredientRatio2": 0, + "IngredientAmount2": 0, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail304", - "Name": "죽음의 이슬", + "Idx": "Cocktail004", + "Name": "칵테일D", "RatioRange": 0, - "IngredientIdx1": "Drink104", - "IngredientRatio1": 100, + "IngredientIdx1": "LiquidD", + "IngredientAmount1": 400, "IngredientIdx2": "", - "IngredientRatio2": 0, + "IngredientAmount2": 0, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail305", - "Name": "얼음", + "Idx": "Cocktail005", + "Name": "칵테일E", "RatioRange": 0, - "IngredientIdx1": "Ice200", - "IngredientRatio1": 100, + "IngredientIdx1": "LiquidE", + "IngredientAmount1": 400, "IngredientIdx2": "", - "IngredientRatio2": 0, + "IngredientAmount2": 0, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail306", - "Name": "얼어붙은 망령", + "Idx": "Cocktail006", + "Name": "칵테일AC", + "RatioRange": 5, + "IngredientIdx1": "LiquidA", + "IngredientAmount1": 200, + "IngredientIdx2": "LiquidC", + "IngredientAmount2": 200, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail007", + "Name": "칵테일BD", + "RatioRange": 5, + "IngredientIdx1": "LiquidB", + "IngredientAmount1": 200, + "IngredientIdx2": "LiquidD", + "IngredientAmount2": 200, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail008", + "Name": "칵테일CD", + "RatioRange": 5, + "IngredientIdx1": "LiquidC", + "IngredientAmount1": 200, + "IngredientIdx2": "LiquidD", + "IngredientAmount2": 200, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail009", + "Name": "칵테일ABE", "RatioRange": 10, - "IngredientIdx1": "Drink101", - "IngredientRatio1": 80, - "IngredientIdx2": "Ice200", - "IngredientRatio2": 20, - "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientIdx1": "LiquidA", + "IngredientAmount1": 100, + "IngredientIdx2": "LiquidB", + "IngredientAmount2": 100, + "IngredientIdx3": "LiquidE", + "IngredientAmount3": 200, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail307", - "Name": "슬라임 풀", - "RatioRange": 25, - "IngredientIdx1": "Drink100", - "IngredientRatio1": 50, - "IngredientIdx2": "Ice200", - "IngredientRatio2": 50, - "IngredientIdx3": "", - "IngredientRatio3": 0, - "IngredientIdx4": "", - "IngredientRatio4": 0, - "IngredientIdx5": "", - "IngredientRatio5": 0 - }, - { - "Idx": "Cocktail308", - "Name": "불탄 수염", + "Idx": "Cocktail010", + "Name": "칵테일CDE", "RatioRange": 10, - "IngredientIdx1": "Drink102", - "IngredientRatio1": 20, - "IngredientIdx2": "Drink103", - "IngredientRatio2": 80, - "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientIdx1": "LiquidC", + "IngredientAmount1": 100, + "IngredientIdx2": "LiquidD", + "IngredientAmount2": 100, + "IngredientIdx3": "LiquidE", + "IngredientAmount3": 200, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 }, { - "Idx": "Cocktail309", - "Name": "라바 고스트", - "RatioRange": 15, - "IngredientIdx1": "Drink101", - "IngredientRatio1": 50, - "IngredientIdx2": "Drink103", - "IngredientRatio2": 50, + "Idx": "Cocktail011", + "Name": "칵테일B1", + "RatioRange": 10, + "IngredientIdx1": "LiquidB", + "IngredientAmount1": 320, + "IngredientIdx2": "Garnish1", + "IngredientAmount2": 80, "IngredientIdx3": "", - "IngredientRatio3": 0, + "IngredientAmount3": 0, "IngredientIdx4": "", - "IngredientRatio4": 0, + "IngredientAmount4": 0, "IngredientIdx5": "", - "IngredientRatio5": 0 + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail012", + "Name": "칵테일D1", + "RatioRange": 10, + "IngredientIdx1": "LiquidD", + "IngredientAmount1": 320, + "IngredientIdx2": "Garnish1", + "IngredientAmount2": 80, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail013", + "Name": "칵테일A2", + "RatioRange": 5, + "IngredientIdx1": "LiquidA", + "IngredientAmount1": 360, + "IngredientIdx2": "Garnish2", + "IngredientAmount2": 40, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail014", + "Name": "칵테일C2", + "RatioRange": 5, + "IngredientIdx1": "LiquidC", + "IngredientAmount1": 360, + "IngredientIdx2": "Garnish2", + "IngredientAmount2": 40, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 + }, + { + "Idx": "Cocktail015", + "Name": "칵테일E2", + "RatioRange": 5, + "IngredientIdx1": "LiquidE", + "IngredientAmount1": 360, + "IngredientIdx2": "Garnish2", + "IngredientAmount2": 40, + "IngredientIdx3": "", + "IngredientAmount3": 0, + "IngredientIdx4": "", + "IngredientAmount4": 0, + "IngredientIdx5": "", + "IngredientAmount5": 0 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/DrinkDataTable.json b/Assets/Resources/JSON/DrinkDataTable.json deleted file mode 100644 index 53a4def9f..000000000 --- a/Assets/Resources/JSON/DrinkDataTable.json +++ /dev/null @@ -1,104 +0,0 @@ -[ - { - "Idx": "Drink100", - "Name": "달빛 샘물", - "Category": 1, - "Amount": 99999, - "AlcoholVolume": 0, - "CoolWarm": 10, - "BitterSweet": 0, - "Scent": 0, - "IngredientIdx1": 0, - "IngredientQuantity1": 0, - "IngredientIdx2": 0, - "IngredientQuantity2": 0, - "IngredientIdx3": 0, - "IngredientQuantity3": 0, - "Price": 100 - }, - { - "Idx": "Drink101", - "Name": "망령 맥주", - "Category": 1, - "Amount": 2000, - "AlcoholVolume": 7, - "CoolWarm": -20, - "BitterSweet": -10, - "Scent": 0, - "IngredientIdx1": "Item00", - "IngredientQuantity1": 2, - "IngredientIdx2": 0, - "IngredientQuantity2": 0, - "IngredientIdx3": 0, - "IngredientQuantity3": 0, - "Price": 100 - }, - { - "Idx": "Drink102", - "Name": "검은 수염 럼", - "Category": 1, - "Amount": 1200, - "AlcoholVolume": 20, - "CoolWarm": -30, - "BitterSweet": -15, - "Scent": 0, - "IngredientIdx1": "Item01", - "IngredientQuantity1": 3, - "IngredientIdx2": "Item00", - "IngredientQuantity2": 1, - "IngredientIdx3": 0, - "IngredientQuantity3": 0, - "Price": 100 - }, - { - "Idx": "Drink103", - "Name": "용암 맥주", - "Category": 1, - "Amount": 2800, - "AlcoholVolume": 6, - "CoolWarm": 20, - "BitterSweet": 10, - "Scent": 0, - "IngredientIdx1": "Item02", - "IngredientQuantity1": 1, - "IngredientIdx2": "Item03", - "IngredientQuantity2": 3, - "IngredientIdx3": 0, - "IngredientQuantity3": 0, - "Price": 100 - }, - { - "Idx": "Drink104", - "Name": "죽음의 이슬", - "Category": 1, - "Amount": 800, - "AlcoholVolume": 30, - "CoolWarm": -25, - "BitterSweet": 20, - "Scent": 0, - "IngredientIdx1": "Item04", - "IngredientQuantity1": 2, - "IngredientIdx2": 0, - "IngredientQuantity2": 0, - "IngredientIdx3": 0, - "IngredientQuantity3": 0, - "Price": 100 - }, - { - "Idx": "Ice200", - "Name": "얼음 슬라임의 조각", - "Category": 2, - "Amount": 1000, - "AlcoholVolume": 0, - "CoolWarm": -20, - "BitterSweet": 0, - "Scent": 0, - "IngredientIdx1": "Item05", - "IngredientQuantity1": 2, - "IngredientIdx2": 0, - "IngredientQuantity2": 0, - "IngredientIdx3": 0, - "IngredientQuantity3": 0, - "Price": 100 - } -] \ No newline at end of file diff --git a/Assets/Resources/JSON/ItemDataTable.json b/Assets/Resources/JSON/ItemDataTable.json index 7621b4321..5305aa8c1 100644 --- a/Assets/Resources/JSON/ItemDataTable.json +++ b/Assets/Resources/JSON/ItemDataTable.json @@ -540,7 +540,7 @@ "Desciption": "" }, { - "Idx": "Item00", + "Idx": "Ingredient00", "Name": "저주 받은 보리", "Type": 1, "IngredientType": 0, @@ -550,7 +550,7 @@ "Desciption": "보리밭의 악령에서 드롭" }, { - "Idx": "Item01", + "Idx": "Ingredient01", "Name": "심연의 해초", "Type": 1, "IngredientType": 0, @@ -560,7 +560,7 @@ "Desciption": "" }, { - "Idx": "Item02", + "Idx": "Ingredient02", "Name": "도깨비 불", "Type": 1, "IngredientType": 0, @@ -570,7 +570,7 @@ "Desciption": "" }, { - "Idx": "Item03", + "Idx": "Ingredient03", "Name": "용암 보리", "Type": 1, "IngredientType": 0, @@ -580,7 +580,7 @@ "Desciption": "" }, { - "Idx": "Item04", + "Idx": "Ingredient04", "Name": "영혼의 안개", "Type": 1, "IngredientType": 0, @@ -590,7 +590,7 @@ "Desciption": "" }, { - "Idx": "Item05", + "Idx": "Ingredient05", "Name": "얼음 슬라임의 영혼", "Type": 1, "IngredientType": 0, diff --git a/Assets/Resources/JSON/LiquidDataTable.json b/Assets/Resources/JSON/LiquidDataTable.json new file mode 100644 index 000000000..36a689e8b --- /dev/null +++ b/Assets/Resources/JSON/LiquidDataTable.json @@ -0,0 +1,37 @@ +[ + { + "Idx": "LiquidA", + "Name": "술 원액A", + "Amount": 99999 + }, + { + "Idx": "LiquidB", + "Name": "술 원액B", + "Amount": 2000 + }, + { + "Idx": "LiquidC", + "Name": "술 원액C", + "Amount": 2000 + }, + { + "Idx": "LiquidD", + "Name": "술 원액D", + "Amount": 2000 + }, + { + "Idx": "LiquidE", + "Name": "술 원액E", + "Amount": 2000 + }, + { + "Idx": "Garnish1", + "Name": "가나쉬1", + "Amount": 2000 + }, + { + "Idx": "Garnish2", + "Name": "가나쉬2", + "Amount": 2000 + } +] \ No newline at end of file diff --git a/Assets/Resources/JSON/DrinkDataTable.json.meta b/Assets/Resources/JSON/LiquidDataTable.json.meta similarity index 75% rename from Assets/Resources/JSON/DrinkDataTable.json.meta rename to Assets/Resources/JSON/LiquidDataTable.json.meta index ed4c3879c..51275e7cd 100644 --- a/Assets/Resources/JSON/DrinkDataTable.json.meta +++ b/Assets/Resources/JSON/LiquidDataTable.json.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e796a69cf0dc39742a3dd3aa1dc0168a +guid: d48fde71a853cc14885b421e95dd13d5 TextScriptImporter: externalObjects: {} userData: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d370eb355..2c6c115a2 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -27,7 +27,7 @@ TagManager: - ClickGround - DamageableProps - Liquid - - + - Test - - -