From 68c818c4af81a07465716938a5edcd3f4225eaff Mon Sep 17 00:00:00 2001 From: IDMhan Date: Sun, 10 Mar 2024 17:51:09 +0900 Subject: [PATCH] [NAVERWORKS] 1,2,3,4 1. Beer size down 2. Character size down 3. Food now 20count 4. Door On/Off Anime --- BlueWater/Assets/01.Scenes/02.Tycoon.unity | 1364 ++++++++--------- .../02.Tycoon/NavMesh-NavMesh Surface.asset | Bin 12428 -> 10908 bytes .../02.Scripts/Tycoon/KitchenController.cs | 9 +- .../Assets/02.Scripts/Tycoon/TycoonPlayer.cs | 8 +- .../03.Images/Tycoon/Foods/beer_cup.png.meta | 15 +- .../03.Images/Tycoon/Foods/onion.png.meta | 2 +- .../Assets/03.Images/Tycoon/Foods/pa.png.meta | 2 +- .../03.Images/Tycoon/Foods/tomato.png.meta | 2 +- BlueWater/Assets/Restaurant.cs | 6 + BlueWater/Packages/manifest.json | 2 +- BlueWater/Packages/packages-lock.json | 2 +- 11 files changed, 640 insertions(+), 772 deletions(-) diff --git a/BlueWater/Assets/01.Scenes/02.Tycoon.unity b/BlueWater/Assets/01.Scenes/02.Tycoon.unity index 68e88c47b..5e4ac144b 100644 --- a/BlueWater/Assets/01.Scenes/02.Tycoon.unity +++ b/BlueWater/Assets/01.Scenes/02.Tycoon.unity @@ -1607,12 +1607,32 @@ PrefabInstance: propertyPath: conversation value: Guest_Satisfaction_01 objectReference: {fileID: 0} + - target: {fileID: 2179456341190195917, guid: 5e6031a186487438097c5f82f8803b6c, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2211384960430715710, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 05e171f65661a0e4a8b9cd1c2a6f0943, type: 3} + - target: {fileID: 2510051659872630252, guid: 5e6031a186487438097c5f82f8803b6c, + type: 3} + propertyPath: m_LocalScale.x + value: -0.75 + objectReference: {fileID: 0} + - target: {fileID: 2510051659872630252, guid: 5e6031a186487438097c5f82f8803b6c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 2510051659872630252, guid: 5e6031a186487438097c5f82f8803b6c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.75 + objectReference: {fileID: 0} - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: m_LocalScale.x @@ -1631,17 +1651,17 @@ PrefabInstance: - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: m_LocalPosition.x - value: 11.43 + value: 6.72 objectReference: {fileID: 0} - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: m_LocalPosition.y - value: 1.5 + value: 2.03 objectReference: {fileID: 0} - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} propertyPath: m_LocalPosition.z - value: 18.34 + value: -1.39 objectReference: {fileID: 0} - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} @@ -1735,11 +1755,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - insertIndex: 0 - addedObject: {fileID: 625481234} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} --- !u!1001 &12431143 @@ -7290,7 +7306,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &72902251 Transform: m_ObjectHideFlags: 0 @@ -8490,6 +8506,97 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 82829453} m_Mesh: {fileID: 4300000, guid: cddb6f5479c0e29439b6175badfa4191, type: 3} +--- !u!1 &82979399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 82979400} + - component: {fileID: 82979402} + - component: {fileID: 82979401} + m_Layer: 21 + m_Name: Sot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &82979400 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82979399} + serializedVersion: 2 + m_LocalRotation: {x: -0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: -0.4923, y: 0.006, z: 0.015} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1376369094} + m_LocalEulerAnglesHint: {x: -45, y: 0, z: 0} +--- !u!114 &82979401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82979399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + overrideName: "\uC1A5" + overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 55111071} + m_TargetAssemblyTypeName: BlueWaterProject.KitchenController, Assembly-CSharp + m_MethodName: AddIngredient + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!65 &82979402 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 82979399} + 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: 0.2, y: 0.2, z: 0.3} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &83462874 PrefabInstance: m_ObjectHideFlags: 0 @@ -9299,6 +9406,108 @@ Transform: type: 3} m_PrefabInstance: {fileID: 93390975} m_PrefabAsset: {fileID: 0} +--- !u!1 &93597574 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 93597575} + - component: {fileID: 93597578} + - component: {fileID: 93597577} + - component: {fileID: 93597576} + m_Layer: 21 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &93597575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93597574} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.152} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 324578979} + m_Father: {fileID: 1376369094} + 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: 0, y: -0.037} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &93597576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93597574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 2183374463 +--- !u!114 &93597577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93597574} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + 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 &93597578 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 93597574} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 501722145} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 1 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: -1197429611 + m_SortingOrder: 1 + m_TargetDisplay: 0 --- !u!1001 &94943423 PrefabInstance: m_ObjectHideFlags: 0 @@ -10324,8 +10533,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107368052} serializedVersion: 2 - m_LocalRotation: {x: 0.37865573, y: -1e-45, z: 1e-45, w: 0.92553765} - m_LocalPosition: {x: 5.22, y: 12.410001, z: -5.18} + m_LocalRotation: {x: 0.37865573, y: 3e-45, z: -1e-45, w: 0.92553765} + m_LocalPosition: {x: 5.22, y: 12.534, z: -5.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -27550,7 +27759,7 @@ GameObject: - component: {fileID: 295667525} - component: {fileID: 295667524} - component: {fileID: 295667523} - m_Layer: 0 + m_Layer: 21 m_Name: Door_Main m_TagString: Untagged m_Icon: {fileID: 0} @@ -30684,6 +30893,166 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 323892419} m_Mesh: {fileID: 4300000, guid: b627d748c78eff540ac91f8da8a0dfab, type: 3} +--- !u!1001 &324578978 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 93597575} + m_Modifications: + - target: {fileID: 7994320725435224237, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalScale.x + value: 0.002233131 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalScale.y + value: 0.002233131 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalScale.z + value: 0.002233131 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.015 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.031 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320725435224239, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_Name + value: Radial Progress Bar - Filled - Vertical + objectReference: {fileID: 0} + - target: {fileID: 7994320725764835642, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7994320725764835646, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7994320726985764894, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + propertyPath: m_FillAmount + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7994320725435224237, guid: e16713145405c45b4a344ccd7d95ffef, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e16713145405c45b4a344ccd7d95ffef, type: 3} +--- !u!224 &324578979 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7994320725435224238, guid: e16713145405c45b4a344ccd7d95ffef, + type: 3} + m_PrefabInstance: {fileID: 324578978} + m_PrefabAsset: {fileID: 0} --- !u!1001 &325186889 PrefabInstance: m_ObjectHideFlags: 0 @@ -37073,7 +37442,7 @@ Transform: m_GameObject: {fileID: 395321440} serializedVersion: 2 m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956} - m_LocalPosition: {x: 0.3, y: 0.6, z: -0.122} + m_LocalPosition: {x: 0, y: 0.274, z: -0.237} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -39930,7 +40299,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &433516087 Transform: m_ObjectHideFlags: 0 @@ -40275,7 +40644,7 @@ GameObject: - component: {fileID: 437110871} - component: {fileID: 437110870} - component: {fileID: 437110869} - m_Layer: 0 + m_Layer: 21 m_Name: Door_Right m_TagString: Untagged m_Icon: {fileID: 0} @@ -46080,8 +46449,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 501722143} serializedVersion: 2 - m_LocalRotation: {x: 0.37865573, y: -1e-45, z: 1e-45, w: 0.92553765} - m_LocalPosition: {x: 5.22, y: 12.410001, z: -5.18} + m_LocalRotation: {x: 0.37865573, y: 3e-45, z: -1e-45, w: 0.92553765} + m_LocalPosition: {x: 5.22, y: 12.534, z: -5.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -50651,12 +51020,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 547174998} m_PrefabAsset: {fileID: 0} ---- !u!4 &547319626 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - m_PrefabInstance: {fileID: 1554524598} - m_PrefabAsset: {fileID: 0} --- !u!1 &550520989 GameObject: m_ObjectHideFlags: 0 @@ -57475,115 +57838,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 625096735} m_PrefabAsset: {fileID: 0} ---- !u!1 &625481233 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 625481234} - - component: {fileID: 625481236} - - component: {fileID: 625481235} - m_Layer: 17 - m_Name: UnitRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &625481234 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625481233} - serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} - m_LocalPosition: {x: 0, y: 0.517, z: -0.1999995} - m_LocalScale: {x: -1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 832567228} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &625481235 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625481233} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 32dd7d229263e41fe8974724f6cc1d03, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!212 &625481236 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625481233} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 90c4076bfccd1468ea3c37420e19238a, 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: 2126259909 - m_SortingLayer: 1 - m_SortingOrder: 1 - m_Sprite: {fileID: -258422581, guid: 4df68372b963182479eb72273e3b2766, 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!1001 &626388033 PrefabInstance: m_ObjectHideFlags: 0 @@ -57922,7 +58176,8 @@ GameObject: - component: {fileID: 628343054} - component: {fileID: 628343053} - component: {fileID: 628343052} - m_Layer: 0 + - component: {fileID: 628343056} + m_Layer: 21 m_Name: Door_03 m_TagString: Untagged m_Icon: {fileID: 0} @@ -57937,7 +58192,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 628343050} serializedVersion: 2 - m_LocalRotation: {x: -0, y: 0.9998913, z: -0, w: -0.0147471735} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -7.103697, y: 0.49336994, z: 0.1398964} m_LocalScale: {x: 1.0827719, y: 1.0827719, z: 1.0827719} m_ConstrainProportionsScale: 0 @@ -57946,7 +58201,7 @@ Transform: - {fileID: 295667522} - {fileID: 437110868} m_Father: {fileID: 377346305} - m_LocalEulerAnglesHint: {x: 0, y: 181.69, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &628343052 MonoBehaviour: m_ObjectHideFlags: 0 @@ -58020,6 +58275,31 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &628343056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 628343050} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + overrideName: "\uC815\uBB38" + overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: [] --- !u!1 &629535483 GameObject: m_ObjectHideFlags: 0 @@ -60671,6 +60951,7 @@ Transform: - {fileID: 1259577116} - {fileID: 1696230097} - {fileID: 1856919713} + - {fileID: 1376369094} - {fileID: 433516087} - {fileID: 1593489590} - {fileID: 715238202} @@ -61485,8 +61766,8 @@ Transform: m_GameObject: {fileID: 668715964} serializedVersion: 2 m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} - m_LocalPosition: {x: 0.2, y: 0.81, z: 0.51} - m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} + m_LocalPosition: {x: 0, y: 0.335, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 2044885315} @@ -65934,7 +66215,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &715238202 Transform: m_ObjectHideFlags: 0 @@ -71726,12 +72007,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 775983793} m_PrefabAsset: {fileID: 0} ---- !u!4 &777078829 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - m_PrefabInstance: {fileID: 1148314479} - m_PrefabAsset: {fileID: 0} --- !u!1001 &778003012 PrefabInstance: m_ObjectHideFlags: 0 @@ -86405,12 +86680,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 930857427} m_PrefabAsset: {fileID: 0} ---- !u!4 &931363269 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - m_PrefabInstance: {fileID: 1395489338} - m_PrefabAsset: {fileID: 0} --- !u!1 &931700568 GameObject: m_ObjectHideFlags: 0 @@ -88284,12 +88553,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 956810662} m_PrefabAsset: {fileID: 0} ---- !u!4 &956999156 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - m_PrefabInstance: {fileID: 1909578742} - m_PrefabAsset: {fileID: 0} --- !u!1 &957093250 GameObject: m_ObjectHideFlags: 0 @@ -92795,104 +93058,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 997954968} m_PrefabAsset: {fileID: 0} ---- !u!1001 &998280828 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.x - value: 10.221741 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.z - value: 16.66874 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7529533620182262405, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2044885316} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_Name - value: TycconNpc (1) - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} --- !u!1001 &999909277 PrefabInstance: m_ObjectHideFlags: 0 @@ -105432,129 +105597,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1147529703} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1148314479 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.x - value: 19.05 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.z - value: 6.65 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7529533620182262405, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2044885316} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: TakeFoodFromPlayer - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BlueWaterProject.TycoonPlayer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_Name - value: TycconNpc (2) - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} --- !u!1 &1148348436 GameObject: m_ObjectHideFlags: 0 @@ -110698,11 +110740,6 @@ MonoBehaviour: mainDoor: {fileID: 628343051} guestNpc: - {fileID: 832567228} - - {fileID: 1822621713} - - {fileID: 777078829} - - {fileID: 931363269} - - {fileID: 547319626} - - {fileID: 956999156} mainLight: - {fileID: 1342853793} - {fileID: 1011140080} @@ -118840,7 +118877,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1291030681 Transform: m_ObjectHideFlags: 0 @@ -128970,6 +129007,94 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1375370017} m_PrefabAsset: {fileID: 0} +--- !u!1 &1376369093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1376369094} + - component: {fileID: 1376369096} + - component: {fileID: 1376369095} + m_Layer: 21 + m_Name: Cauldron + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1376369094 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376369093} + serializedVersion: 2 + m_LocalRotation: {x: 0.38268343, y: -0, z: -0, w: 0.92387956} + m_LocalPosition: {x: 5.03, y: 3.99, z: 14.42} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 82979400} + - {fileID: 1506519694} + - {fileID: 93597575} + m_Father: {fileID: 656939802} + m_LocalEulerAnglesHint: {x: 45, y: 0, z: 0} +--- !u!23 &1376369095 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376369093} + m_Enabled: 1 + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 61a69205b94c44313a7e54564f315b6f, 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 &1376369096 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1376369093} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1377191636 PrefabInstance: m_ObjectHideFlags: 0 @@ -130095,129 +130220,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1394946449} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1395489338 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.x - value: 19.55 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.z - value: 11.210001 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7529533620182262405, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_hasFontAssetChanged - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2044885316} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: TakeFoodFromPlayer - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BlueWaterProject.TycoonPlayer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_Name - value: TycconNpc (3) - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} --- !u!1001 &1395990065 PrefabInstance: m_ObjectHideFlags: 0 @@ -134730,7 +134732,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1436819826 Transform: m_ObjectHideFlags: 0 @@ -141709,6 +141711,97 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1506515096} m_PrefabAsset: {fileID: 0} +--- !u!1 &1506519693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1506519694} + - component: {fileID: 1506519696} + - component: {fileID: 1506519695} + m_Layer: 21 + m_Name: Cooking + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1506519694 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506519693} + serializedVersion: 2 + m_LocalRotation: {x: -0.38268343, y: 0, z: 0, w: 0.92387956} + m_LocalPosition: {x: -0.002, y: -0.485, z: -0.249} + m_LocalScale: {x: 1.2635, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1376369094} + m_LocalEulerAnglesHint: {x: -45, y: 0, z: 0} +--- !u!114 &1506519695 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506519693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + overrideName: "\uC870\uB9AC\uD558\uAE30" + overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 55111071} + m_TargetAssemblyTypeName: BlueWaterProject.KitchenController, Assembly-CSharp + m_MethodName: Cook + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!65 &1506519696 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1506519693} + 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: 0.6, y: 0.2, z: 0.3} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &1507857262 PrefabInstance: m_ObjectHideFlags: 0 @@ -146001,124 +146094,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1553025744} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1554524598 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.x - value: 19.18 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.z - value: 9.51 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2044885316} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: TakeFoodFromPlayer - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BlueWaterProject.TycoonPlayer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_Name - value: TycconNpc (4) - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} --- !u!1001 &1555495912 PrefabInstance: m_ObjectHideFlags: 0 @@ -149681,7 +149656,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1593489590 Transform: m_ObjectHideFlags: 0 @@ -158979,7 +158954,7 @@ Transform: m_GameObject: {fileID: 1681546792} serializedVersion: 2 m_LocalRotation: {x: 0.6087605, y: -0, z: -0, w: 0.79335415} - m_LocalPosition: {x: 0.234, y: 3.54, z: -0.35} + m_LocalPosition: {x: 0.017, y: 2.59, z: -0.77} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -172713,12 +172688,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1821740493} m_PrefabAsset: {fileID: 0} ---- !u!4 &1822621713 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - m_PrefabInstance: {fileID: 998280828} - m_PrefabAsset: {fileID: 0} --- !u!1 &1822710665 GameObject: m_ObjectHideFlags: 0 @@ -181008,124 +180977,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1909164486} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1909578742 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalScale.z - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.x - value: 16.4 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalPosition.z - value: 9.33 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2861009012256036238, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 2044885316} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: TakeFoodFromPlayer - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: BlueWaterProject.TycoonPlayer, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_Name - value: TycconNpc (5) - objectReference: {fileID: 0} - - target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 5e6031a186487438097c5f82f8803b6c, type: 3} --- !u!1001 &1911275187 PrefabInstance: m_ObjectHideFlags: 0 @@ -192075,7 +191926,7 @@ GameObject: - component: {fileID: 2044885316} m_Layer: 9 m_Name: InShipPlayer - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -192407,7 +192258,7 @@ Transform: m_GameObject: {fileID: 2044885306} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 5.22, y: 1.6, z: 5.82} + m_LocalPosition: {x: 5.22, y: 1.724, z: 5.82} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: @@ -196904,7 +196755,7 @@ GameObject: - component: {fileID: 2113028149} - component: {fileID: 2113028148} - component: {fileID: 2113028147} - m_Layer: 0 + m_Layer: 21 m_Name: Door_Left m_TagString: Untagged m_Icon: {fileID: 0} @@ -213226,11 +213077,6 @@ SceneRoots: - {fileID: 6141662311193982093} - {fileID: 1666419697} - {fileID: 11258713} - - {fileID: 998280828} - - {fileID: 1148314479} - - {fileID: 1395489338} - - {fileID: 1554524598} - - {fileID: 1909578742} - {fileID: 1083387282} - {fileID: 953849053} - {fileID: 1296150106} diff --git a/BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset b/BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset index d62d8536bfb6d607eb1320683aebacb9facc9d63..c075ab8afed98cc619ec7c2efd37ad3db108a989 100644 GIT binary patch literal 10908 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 ingredientsInPot = new Dictionary(); - private Dictionary kingCrabRecipe = new Dictionary + private Dictionary ingredientsInPot = new(); + private Dictionary kingCrabRecipe = new() { { GlobalValue.FoodOnHand.ONION, 1 }, { GlobalValue.FoodOnHand.SCALLION, 1 }, { GlobalValue.FoodOnHand.TOMATO, 1 } }; + + private short maxFood = 20; public void AddIngredient() { @@ -44,7 +46,8 @@ namespace BlueWaterProject player.FoodTransform.gameObject.SetActive(true); player.FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB; cookingProcess.fillAmount = 0; - isFoodInSot = false; + maxFood--; + if (maxFood <= 0) isFoodInSot = false; } } diff --git a/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs b/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs index d0432ddee..d454279c5 100644 --- a/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs @@ -127,7 +127,7 @@ namespace BlueWaterProject { localScale.x = Mathf.Abs(localScale.x); //spriteRenderer.sprite = sideSprite; - FoodTransform.localPosition = new Vector3(-0.30f, 0.6f, -0.15f); + FoodTransform.localPosition = new Vector3(-0.30f, 0.274f, -0.15f); animator.SetBool("IsMoving", true); } // 오른쪽 @@ -135,21 +135,21 @@ namespace BlueWaterProject { localScale.x = -Mathf.Abs(localScale.x); //spriteRenderer.sprite = sideSprite; - FoodTransform.localPosition = new Vector3(0.30f, 0.6f, -0.15f); + FoodTransform.localPosition = new Vector3(0.30f, 0.274f, -0.15f); animator.SetBool("IsMoving", true); } // 뒤로 else if (movement.z > 0) { //spriteRenderer.sprite = backSprite; - FoodTransform.localPosition = new Vector3(0f, 0.6f, 0f); + FoodTransform.localPosition = new Vector3(0f, 0.274f, 0f); animator.SetBool("IsMoving", true); } // 앞으로 else if (movement.z < 0) { //spriteRenderer.sprite = frontSprite; - FoodTransform.localPosition = new Vector3(0f, 0.6f, -0.25f); + FoodTransform.localPosition = new Vector3(0f, 0.274f, -0.25f); animator.SetBool("IsMoving", true); } else diff --git a/BlueWater/Assets/03.Images/Tycoon/Foods/beer_cup.png.meta b/BlueWater/Assets/03.Images/Tycoon/Foods/beer_cup.png.meta index 4269a0122..89315a5f2 100644 --- a/BlueWater/Assets/03.Images/Tycoon/Foods/beer_cup.png.meta +++ b/BlueWater/Assets/03.Images/Tycoon/Foods/beer_cup.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 600 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -82,6 +82,19 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 diff --git a/BlueWater/Assets/03.Images/Tycoon/Foods/onion.png.meta b/BlueWater/Assets/03.Images/Tycoon/Foods/onion.png.meta index 2ca011c19..863a2345b 100644 --- a/BlueWater/Assets/03.Images/Tycoon/Foods/onion.png.meta +++ b/BlueWater/Assets/03.Images/Tycoon/Foods/onion.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/BlueWater/Assets/03.Images/Tycoon/Foods/pa.png.meta b/BlueWater/Assets/03.Images/Tycoon/Foods/pa.png.meta index 3d3c3eda9..64af13347 100644 --- a/BlueWater/Assets/03.Images/Tycoon/Foods/pa.png.meta +++ b/BlueWater/Assets/03.Images/Tycoon/Foods/pa.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/BlueWater/Assets/03.Images/Tycoon/Foods/tomato.png.meta b/BlueWater/Assets/03.Images/Tycoon/Foods/tomato.png.meta index 87d1cb980..9b13eac7f 100644 --- a/BlueWater/Assets/03.Images/Tycoon/Foods/tomato.png.meta +++ b/BlueWater/Assets/03.Images/Tycoon/Foods/tomato.png.meta @@ -48,7 +48,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/BlueWater/Assets/Restaurant.cs b/BlueWater/Assets/Restaurant.cs index 8b067d0bc..e6a7ed08b 100644 --- a/BlueWater/Assets/Restaurant.cs +++ b/BlueWater/Assets/Restaurant.cs @@ -22,6 +22,9 @@ public class Restaurant : MonoBehaviour { light.SetActive(true); } + + var door = mainDoor.GetComponent(); + door._animator.SetBool("Open", true); } else { @@ -32,6 +35,9 @@ public class Restaurant : MonoBehaviour { light.SetActive(false); } + + var door = mainDoor.GetComponent(); + door._animator.SetBool("Open", false); } } } \ No newline at end of file diff --git a/BlueWater/Packages/manifest.json b/BlueWater/Packages/manifest.json index eb67c9047..95c31370e 100644 --- a/BlueWater/Packages/manifest.json +++ b/BlueWater/Packages/manifest.json @@ -12,7 +12,7 @@ "com.unity.collab-proxy": "2.2.0", "com.unity.feature.2d": "2.0.0", "com.unity.feature.worldbuilding": "1.0.1", - "com.unity.ide.rider": "3.0.27", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.inputsystem": "1.7.0", "com.unity.postprocessing": "3.3.0", diff --git a/BlueWater/Packages/packages-lock.json b/BlueWater/Packages/packages-lock.json index b03cac5d7..248601077 100644 --- a/BlueWater/Packages/packages-lock.json +++ b/BlueWater/Packages/packages-lock.json @@ -246,7 +246,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.27", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": {