diff --git a/BlueWater/Assets/01.Scenes/02.Tycoon.unity b/BlueWater/Assets/01.Scenes/02.Tycoon.unity index 988418d3e..1319786a0 100644 --- a/BlueWater/Assets/01.Scenes/02.Tycoon.unity +++ b/BlueWater/Assets/01.Scenes/02.Tycoon.unity @@ -966,6 +966,91 @@ MonoBehaviour: - {fileID: 1609971082} - {fileID: 1385281201} - {fileID: 503580258} +--- !u!1 &56597200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 56597201} + - component: {fileID: 56597203} + - component: {fileID: 56597202} + m_Layer: 0 + m_Name: boat_01_wheel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &56597201 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56597200} + serializedVersion: 2 + m_LocalRotation: {x: 0.1484949, y: -0, z: -0, w: 0.9889132} + m_LocalPosition: {x: 0, y: 6.685426, z: -2.8368456} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 209906753} + m_LocalEulerAnglesHint: {x: 17.079, y: 0, z: 0} +--- !u!23 &56597202 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56597200} + 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: 5134ad0f4fc645b4a8e99a88724d182a, 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 &56597203 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 56597200} + m_Mesh: {fileID: 6847518756029031712, guid: e174a08d577359c44bd7930fac541c9f, type: 3} --- !u!1 &60567433 GameObject: m_ObjectHideFlags: 0 @@ -1454,7 +1539,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107368052} serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: 1e-45, z: -0, w: 0.92387956} + m_LocalRotation: {x: 0.3826835, y: -0.00000002248122, z: 0.000000009312028, w: 0.92387956} m_LocalPosition: {x: 5.22, y: 11.1380005, z: -4.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3211,6 +3296,153 @@ Transform: m_Children: [] m_Father: {fileID: 1784935559} m_LocalEulerAnglesHint: {x: 90, y: 0, z: -180} +--- !u!1 &209906747 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 209906753} + - component: {fileID: 209906752} + - component: {fileID: 209906751} + - component: {fileID: 209906755} + - component: {fileID: 209906754} + m_Layer: 9 + m_Name: MyShip + m_TagString: ShipPlayer + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &209906751 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209906747} + 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: 5134ad0f4fc645b4a8e99a88724d182a, 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 &209906752 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209906747} + m_Mesh: {fileID: 7248041548669669315, guid: e174a08d577359c44bd7930fac541c9f, type: 3} +--- !u!4 &209906753 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209906747} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.7005195, z: -0, w: 0.7136333} + m_LocalPosition: {x: -12.19, y: -2.88, z: -10.76} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2020594132} + - {fileID: 56597201} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 88.937, z: 0} +--- !u!114 &209906754 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209906747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 274b80ab5b659c646ba9338870d14625, type: 3} + m_Name: + m_EditorClassIdentifier: + overrideName: "\uCD9C\uD56D" + overrideUseMessage: + maxUseDistance: 5 + events: + onSelect: + m_PersistentCalls: + m_Calls: [] + onDeselect: + m_PersistentCalls: + m_Calls: [] + onUse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2044885316} + m_TargetAssemblyTypeName: BlueWaterProject.TycoonPlayer, Assembly-CSharp + m_MethodName: SettingSail + 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 &209906755 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 209906747} + 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: 12.34, y: 15.842085, z: 8.17} + m_Center: {x: -0.00000011761802, y: 7.9210424, z: 1.82792} --- !u!1 &212641461 GameObject: m_ObjectHideFlags: 0 @@ -6351,6 +6583,8 @@ GameObject: - component: {fileID: 501722144} - component: {fileID: 501722147} - component: {fileID: 501722148} + - component: {fileID: 501722150} + - component: {fileID: 501722149} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -6425,7 +6659,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 501722143} serializedVersion: 2 - m_LocalRotation: {x: 0.38268343, y: 1e-45, z: 0, w: 0.92387956} + m_LocalRotation: {x: 0.3826835, y: -0.00000002248122, z: 0.000000009312028, w: 0.92387956} m_LocalPosition: {x: 5.22, y: 11.1380005, z: -4.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6510,6 +6744,32 @@ MonoBehaviour: m_CameraActivatedEvent: m_PersistentCalls: m_Calls: [] +--- !u!114 &501722149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501722143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 34b570195d17c4342bbe738383afd6ae, type: 3} + m_Name: + m_EditorClassIdentifier: + baseCam: {fileID: 107368053} +--- !u!114 &501722150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501722143} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eba32823f7fae4b7886c2fe6ee08123f, type: 3} + m_Name: + m_EditorClassIdentifier: + _persistent: 0 --- !u!1 &503580258 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1678477063493488, guid: 7e5f12ae14890794591cb6e704b39abe, @@ -13776,7 +14036,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0.43452924, z: -0, w: 0.9006578} m_LocalPosition: {x: -9.09, y: 0, z: -2.4} - m_LocalScale: {x: 1.3536491, y: 0.2487, z: 0.37304997} + m_LocalScale: {x: 1.3536491, y: 0.2487, z: 0.5530466} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 826719601} @@ -17283,6 +17543,91 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498426306} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1502066001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1502066002} + - component: {fileID: 1502066004} + - component: {fileID: 1502066003} + m_Layer: 0 + m_Name: boat_01_flag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1502066002 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502066001} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 12.92, z: -0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2020594132} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1502066003 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502066001} + 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: 5134ad0f4fc645b4a8e99a88724d182a, 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 &1502066004 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1502066001} + m_Mesh: {fileID: -3028017588688184324, guid: e174a08d577359c44bd7930fac541c9f, type: 3} --- !u!1 &1523159101 GameObject: m_ObjectHideFlags: 0 @@ -22762,6 +23107,92 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7e5f12ae14890794591cb6e704b39abe, type: 3} +--- !u!1 &2020594131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2020594132} + - component: {fileID: 2020594134} + - component: {fileID: 2020594133} + m_Layer: 0 + m_Name: boat_01_mast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2020594132 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020594131} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3.42, z: -0.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1502066002} + m_Father: {fileID: 209906753} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2020594133 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020594131} + 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: 5134ad0f4fc645b4a8e99a88724d182a, 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 &2020594134 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2020594131} + m_Mesh: {fileID: -1090355519079891785, guid: e174a08d577359c44bd7930fac541c9f, type: 3} --- !u!1 &2034486715 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1678477063493488, guid: 7e5f12ae14890794591cb6e704b39abe, @@ -23344,10 +23775,7 @@ MonoBehaviour: sideSprite: {fileID: 21300000, guid: fa13bcdf7a9c148b3859834bc6efaeb9, type: 3} backSprite: {fileID: 21300000, guid: dba6626ec18b7497a8cdfe6501394253, type: 3} frontSprite: {fileID: 21300000, guid: c21e822c2c1ca418fa2695be70e90ddb, type: 3} - foodTransform: {fileID: 0} - foodOnHand: 0 - foodVisual: {fileID: 0} - kitchenController: {fileID: 0} + myShip: {fileID: 209906753} --- !u!1 &2057823168 GameObject: m_ObjectHideFlags: 0 @@ -37168,6 +37596,7 @@ SceneRoots: - {fileID: 1426193642} - {fileID: 1671439082} - {fileID: 2044885315} + - {fileID: 209906753} - {fileID: 977669111} - {fileID: 1292990768242663165} - {fileID: 4702635561852861618} diff --git a/BlueWater/Assets/02.Scripts/CameraManager.cs b/BlueWater/Assets/02.Scripts/CameraManager.cs index 9b9e9ad63..3721547b3 100644 --- a/BlueWater/Assets/02.Scripts/CameraManager.cs +++ b/BlueWater/Assets/02.Scripts/CameraManager.cs @@ -9,6 +9,7 @@ namespace BlueWaterProject public Camera MainCam { get; set; } public OceanCamera OceanCamera { get; set; } + public TycoonCamera TycoonCamera { get; set; } [Title("InShip Change Offset")] private Vector3 targetOffset; diff --git a/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs b/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs index b054056f8..9f45ece06 100644 --- a/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs +++ b/BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs @@ -28,21 +28,21 @@ namespace BlueWaterProject public void AddIngredient() { var player = GameManager.Inst.TycoonPlayer; - if (player.foodTransform.gameObject.activeSelf) + if (player.FoodTransform.gameObject.activeSelf) { - var ingredient = player.foodOnHand; + var ingredient = player.FoodOnHand; if (!ingredientsInPot.ContainsKey(ingredient)) ingredientsInPot[ingredient] = 0; ingredientsInPot[ingredient]++; - player.foodTransform.gameObject.SetActive(false); - player.foodOnHand = GlobalValue.FoodOnHand.NONE; + player.FoodTransform.gameObject.SetActive(false); + player.FoodOnHand = GlobalValue.FoodOnHand.NONE; } else if (isFoodInSot) { - player.foodVisual.sprite = DataManager.Inst.kingCrabMeat; - player.foodTransform.gameObject.SetActive(true); - player.foodOnHand = GlobalValue.FoodOnHand.KING_CRAB; + player.FoodVisual.sprite = DataManager.Inst.kingCrabMeat; + player.FoodTransform.gameObject.SetActive(true); + player.FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB; cookingProcess.fillAmount = 0; isFoodInSot = false; } @@ -124,37 +124,37 @@ namespace BlueWaterProject public void ScallionBox() { var player = GameManager.Inst.TycoonPlayer; - if (player.foodTransform.gameObject.activeSelf) return; - player.foodVisual.sprite = DataManager.Inst.scallion; - player.foodTransform.gameObject.SetActive(true); - player.foodOnHand = GlobalValue.FoodOnHand.SCALLION; + if (player.FoodTransform.gameObject.activeSelf) return; + player.FoodVisual.sprite = DataManager.Inst.scallion; + player.FoodTransform.gameObject.SetActive(true); + player.FoodOnHand = GlobalValue.FoodOnHand.SCALLION; } public void OnionBox() { var player = GameManager.Inst.TycoonPlayer; - if (player.foodTransform.gameObject.activeSelf) return; - player.foodVisual.sprite = DataManager.Inst.onion; - player.foodTransform.gameObject.SetActive(true); - player.foodOnHand = GlobalValue.FoodOnHand.ONION; + if (player.FoodTransform.gameObject.activeSelf) return; + player.FoodVisual.sprite = DataManager.Inst.onion; + player.FoodTransform.gameObject.SetActive(true); + player.FoodOnHand = GlobalValue.FoodOnHand.ONION; } public void TomatoBox() { var player = GameManager.Inst.TycoonPlayer; - if (player.foodTransform.gameObject.activeSelf) return; - player.foodVisual.sprite = DataManager.Inst.tomato; - player.foodTransform.gameObject.SetActive(true); - player.foodOnHand = GlobalValue.FoodOnHand.TOMATO; + if (player.FoodTransform.gameObject.activeSelf) return; + player.FoodVisual.sprite = DataManager.Inst.tomato; + player.FoodTransform.gameObject.SetActive(true); + player.FoodOnHand = GlobalValue.FoodOnHand.TOMATO; } public void KingCrab() { var player = GameManager.Inst.TycoonPlayer; - if (player.foodTransform.gameObject.activeSelf) return; - player.foodVisual.sprite = DataManager.Inst.kingCrabMeat; - player.foodTransform.gameObject.SetActive(true); - player.foodOnHand = GlobalValue.FoodOnHand.KING_CRAB; + if (player.FoodTransform.gameObject.activeSelf) return; + player.FoodVisual.sprite = DataManager.Inst.kingCrabMeat; + player.FoodTransform.gameObject.SetActive(true); + player.FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB; } } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Tycoon/TycoonCamera.cs b/BlueWater/Assets/02.Scripts/Tycoon/TycoonCamera.cs new file mode 100644 index 000000000..8066a13cb --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Tycoon/TycoonCamera.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using BlueWaterProject; +using Cinemachine; +using UnityEngine; + +public class TycoonCamera : MonoBehaviour +{ + public CinemachineVirtualCamera baseCam; + private CinemachineTransposer baseCamTransposer; + + private void Awake() + { + CameraManager.Inst.TycoonCamera = this; + baseCamTransposer = baseCam.GetComponent(); + } + + public void SetFollow(Transform target) + { + baseCam.Follow = target; + baseCam.LookAt = target; + } + + public void SetVerticalFOV(int value) + { + baseCam.m_Lens.FieldOfView = value; + } +} diff --git a/BlueWater/Assets/02.Scripts/Tycoon/TycoonCamera.cs.meta b/BlueWater/Assets/02.Scripts/Tycoon/TycoonCamera.cs.meta new file mode 100644 index 000000000..7bd124a0a --- /dev/null +++ b/BlueWater/Assets/02.Scripts/Tycoon/TycoonCamera.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 34b570195d17c4342bbe738383afd6ae \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs b/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs index e74fad085..9431ce8f1 100644 --- a/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Tycoon/TycoonPlayer.cs @@ -5,6 +5,7 @@ using PixelCrushers.DialogueSystem; using SoulGames.EasyGridBuilderPro; using UnityEngine; using UnityEngine.InputSystem; +using UnityEngine.SceneManagement; using DialogueSystemTrigger = PixelCrushers.DialogueSystem.Wrappers.DialogueSystemTrigger; // ReSharper disable once CheckNamespace @@ -27,10 +28,10 @@ namespace BlueWaterProject public Sprite sideSprite; public Sprite backSprite; public Sprite frontSprite; - public Transform foodTransform; - public GlobalValue.FoodOnHand foodOnHand; - public SpriteRenderer foodVisual; - public KitchenController kitchenController; + public Transform FoodTransform { get; set; } + [SerializeField] public GlobalValue.FoodOnHand FoodOnHand { get; set; } + [SerializeField] public SpriteRenderer FoodVisual { get; set; } + public Transform myShip; private void Init() { @@ -40,9 +41,9 @@ namespace BlueWaterProject rb = GetComponent(); spriteRenderer = visualLook.GetComponent(); playerInput = GetComponent(); - foodTransform = transform.Find("Food"); - foodOnHand = GlobalValue.FoodOnHand.NONE; - foodVisual = foodTransform.transform.Find("Visual").GetComponent(); + FoodTransform = transform.Find("Food"); + FoodOnHand = GlobalValue.FoodOnHand.NONE; + FoodVisual = FoodTransform.transform.Find("Visual").GetComponent(); proximitySelector = GetComponent(); IsRuning = false; } @@ -126,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.6f, -0.15f); animator.SetBool("IsMoving", true); } // 오른쪽 @@ -134,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.6f, -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.6f, 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.6f, -0.25f); animator.SetBool("IsMoving", true); } else @@ -182,29 +183,29 @@ namespace BlueWaterProject public void TakeKingCrab() { - if (foodTransform.gameObject.activeSelf) return; - foodVisual.sprite = DataManager.Inst.kingCrabMeat; - foodTransform.gameObject.SetActive(true); - foodOnHand = GlobalValue.FoodOnHand.KING_CRAB; + if (FoodTransform.gameObject.activeSelf) return; + FoodVisual.sprite = DataManager.Inst.kingCrabMeat; + FoodTransform.gameObject.SetActive(true); + FoodOnHand = GlobalValue.FoodOnHand.KING_CRAB; } public void TakeBeer() { - if (foodTransform.gameObject.activeSelf) return; - foodVisual.sprite = DataManager.Inst.beer; - foodTransform.gameObject.SetActive(true); - foodOnHand = GlobalValue.FoodOnHand.BEER; + if (FoodTransform.gameObject.activeSelf) return; + FoodVisual.sprite = DataManager.Inst.beer; + FoodTransform.gameObject.SetActive(true); + FoodOnHand = GlobalValue.FoodOnHand.BEER; } public void TakeFoodFromPlayer() { - if (!foodTransform.gameObject.activeSelf) return; + if (!FoodTransform.gameObject.activeSelf) return; if (proximitySelector == null || proximitySelector.CurrentUsable == null) return; var tycoonNpc = proximitySelector.CurrentUsable.gameObject.GetComponent(); if (tycoonNpc != null && tycoonNpc.DoSeat) { - switch (foodOnHand) + switch (FoodOnHand) { case GlobalValue.FoodOnHand.NONE: break; @@ -227,11 +228,37 @@ namespace BlueWaterProject default: throw new ArgumentOutOfRangeException(); } - foodTransform.gameObject.SetActive(false); - foodOnHand = GlobalValue.FoodOnHand.NONE; + FoodTransform.gameObject.SetActive(false); + FoodOnHand = GlobalValue.FoodOnHand.NONE; } } + public void SettingSail() + { + visualLook.gameObject.SetActive(false); + CameraManager.Inst.TycoonCamera.SetVerticalFOV(80); + proximitySelector.enabled = false; + StartCoroutine(ShipMovementAndSceneChange()); + } + + IEnumerator ShipMovementAndSceneChange() + { + float elapsedTime = 0; + var startingPosition = myShip.position; + var endPosition = startingPosition + transform.right * 10; + + var playerPosition = transform.position; + var playerEndPosition = playerPosition + transform.right * 10; + + while (elapsedTime < 3.0f) + { + myShip.position = Vector3.Lerp(startingPosition, endPosition, elapsedTime / 3.0f); + transform.position = Vector3.Lerp(playerPosition, playerEndPosition, elapsedTime / 3.0f); + elapsedTime += Time.deltaTime; + yield return null; + } + SceneManager.LoadScene("02.Ocean"); + } public void StartInteraction(Transform target) { diff --git a/BlueWater/ProjectSettings/EditorBuildSettings.asset b/BlueWater/ProjectSettings/EditorBuildSettings.asset index 6f9880103..b8794ce29 100644 --- a/BlueWater/ProjectSettings/EditorBuildSettings.asset +++ b/BlueWater/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,20 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/01.Scenes/02.Main.unity - guid: a8c5966c283dd40868b53e826b8a1876 + path: Assets/01.Scenes/00.Title.unity + guid: 21ea804226eeb41aeb043add455b4cfe + - enabled: 1 + path: Assets/01.Scenes/01.Lobby.unity + guid: e448d7c68dca14f60a87cab1eb16e1b6 + - enabled: 1 + path: Assets/01.Scenes/02.Tycoon.unity + guid: a9437d08713524c20aa86fc434146cda + - enabled: 1 + path: Assets/01.Scenes/02.Ocean.unity + guid: 942529fbf875349469223442bba93655 + - enabled: 1 + path: Assets/01.Scenes/02.Combat.unity + guid: 677ac36ad44604e7fbfbc0eeaa21cfdf m_configObjects: com.unity.addressableassets: {fileID: 11400000, guid: 52ef95baf252a46f2979b3dff5d5a7fa, type: 2}