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 d62d8536b..c075ab8af 100644 Binary files a/BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset and b/BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset differ diff --git a/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs b/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs index 9f45ece06..2ab1b5f34 100644 --- a/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs +++ b/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs @@ -17,13 +17,15 @@ namespace BlueWaterProject private Vector3 sotUpOriginal = new Vector3(4.17999983f, 8.80000019f, 16.5300007f); private Vector3 sotUpClose = new Vector3(4.17999983f, 7.05000019f, 14.7799997f); public GameObject[] sotSteamEff; - private Dictionary 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": {