diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index d473e7f70..d8e5c2149 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -130,151 +130,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 241393316} m_PrefabAsset: {fileID: 0} ---- !u!1 &214845523 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 214845524} - - component: {fileID: 214845525} - m_Layer: 0 - m_Name: GameObject (3) - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &214845524 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214845523} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5, y: 0, z: 0.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1225567543} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &214845525 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 214845523} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 1225567544} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 0.5 ---- !u!1 &227505832 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 227505833} - - component: {fileID: 227505836} - - component: {fileID: 227505835} - - component: {fileID: 227505834} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &227505833 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227505832} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 897152332} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &227505834 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227505832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 10.1, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 ---- !u!114 &227505835 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227505832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0.5 - m_VerticalDamping: 0.5 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &227505836 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 227505832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &241393316 PrefabInstance: m_ObjectHideFlags: 0 @@ -762,7 +617,7 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c8c901c119dd09f4d9976a4d49bbd8f9, type: 3} ---- !u!1 &595518295 +--- !u!1 &503805554 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -770,48 +625,208 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 595518296} - - component: {fileID: 595518297} + - component: {fileID: 503805558} + - component: {fileID: 503805557} + - component: {fileID: 503805556} + - component: {fileID: 503805555} m_Layer: 0 - m_Name: GameObject (1) + m_Name: Cube (1) m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} + m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &595518296 +--- !u!65 &503805555 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503805554} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &503805556 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503805554} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &503805557 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 503805554} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &503805558 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595518295} + m_GameObject: {fileID: 503805554} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5, y: 0.2, z: 1.5} + m_LocalPosition: {x: 17.54, y: 0.64, z: 10.33} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 242252084844004957} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &595518297 -MonoBehaviour: +--- !u!1 &546777058 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 595518295} + serializedVersion: 6 + m_Component: + - component: {fileID: 546777062} + - component: {fileID: 546777061} + - component: {fileID: 546777060} + - component: {fileID: 546777059} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &546777059 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546777058} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 242252084844255478} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 10 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &546777060 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546777058} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &546777061 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546777058} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &546777062 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546777058} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 16.03, y: 0.64, z: -2.76} + m_LocalScale: {x: 1, y: 1, z: 5.0621} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &608298000 GameObject: m_ObjectHideFlags: 0 @@ -988,7 +1003,7 @@ Camera: height: 1 near clip plane: 0.3 far clip plane: 1000 - field of view: 60.000004 + field of view: 50 orthographic: 0 orthographic size: 5 m_Depth: -1 @@ -1014,8 +1029,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.2722223, y: 0.65260637, z: -0.27222228, w: 0.6526063} - m_LocalPosition: {x: -9.999999, y: 10.1, z: 0.0000011920929} + m_LocalRotation: {x: 0.18875057, y: 0.6814494, z: -0.18875054, w: 0.6814494} + m_LocalPosition: {x: -9.999999, y: 5.42, z: 0.0000011920929} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1105,245 +1120,101 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2031530112} m_PrefabAsset: {fileID: 0} ---- !u!1 &840095402 +--- !u!1 &1040971781 GameObject: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 840095406} - - component: {fileID: 840095405} - - component: {fileID: 840095404} - - component: {fileID: 840095403} - - component: {fileID: 840095407} - m_Layer: 4 - m_Name: Water Object_Stylized - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &840095403 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840095402} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 52480f6baf9b7b0428c75481cb3d5a6d, type: 3} - m_Name: - m_EditorClassIdentifier: - material: {fileID: 2100000, guid: 9e73dc93ef929ba46ae79f13b165b3dc, type: 2} - meshFilter: {fileID: 840095405} - meshRenderer: {fileID: 840095404} ---- !u!23 &840095404 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840095402} - m_Enabled: 1 - m_CastShadows: 0 - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 9e73dc93ef929ba46ae79f13b165b3dc, 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 &840095405 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840095402} - m_Mesh: {fileID: -8670151273213183110, guid: 1e01d80fdc2155d4692276500db33fc9, type: 3} ---- !u!4 &840095406 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840095402} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 53.13422, y: -0.4, z: 97.5045} - m_LocalScale: {x: 10, y: 10, z: 10} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &840095407 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 840095402} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1f6878d8c33f6d147918f802eec4ddbf, type: 3} - m_Name: - m_EditorClassIdentifier: - waterMat: {fileID: 2100000, guid: 9e73dc93ef929ba46ae79f13b165b3dc, type: 2} - waterLevelSource: 0 - waterPlane: {fileID: 840095404} - waterLevel: -0.4 - dynamicMaterial: 0 ---- !u!1 &897152331 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 897152332} - - component: {fileID: 897152333} + - component: {fileID: 1040971782} + - component: {fileID: 1040971785} + - component: {fileID: 1040971784} + - component: {fileID: 1040971783} m_Layer: 0 - m_Name: Virtual Camera + m_Name: cm m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &897152332 +--- !u!4 &1040971782 Transform: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 897152331} + m_GameObject: {fileID: 1040971781} serializedVersion: 2 - m_LocalRotation: {x: 0.3849805, y: 0.000000029802322, z: 0.000000014901161, w: 0.92292476} - m_LocalPosition: {x: -0.0000002384187, y: 10.1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 227505833} - m_Father: {fileID: 242252084844004957} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &897152333 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 897152331} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 242252084844004957} - m_Follow: {fileID: 242252084844004957} - m_Lens: - FieldOfView: 60.000004 - OrthographicSize: 5 - NearClipPlane: 0.3 - FarClipPlane: 1000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - FocusDistance: 10 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 227505833} ---- !u!1 &1034588240 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1034588241} - - component: {fileID: 1034588242} - m_Layer: 0 - m_Name: GameObject (2) - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1034588241 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034588240} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5, y: 0, z: -0.5} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1225567543} + m_Father: {fileID: 1437521087} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1034588242 +--- !u!114 &1040971783 MonoBehaviour: - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034588240} + m_GameObject: {fileID: 1040971781} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} + m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 6, z: -10} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 0 + m_RollDamping: 0 + m_AngularDamping: 0 +--- !u!114 &1040971784 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040971781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 + m_ScreenX: 0.5 + m_ScreenY: 0.5 + m_DeadZoneWidth: 0 + m_DeadZoneHeight: 0 + m_SoftZoneWidth: 0.8 + m_SoftZoneHeight: 0.8 + m_BiasX: 0 + m_BiasY: 0 + m_CenterOnActivate: 1 +--- !u!114 &1040971785 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1040971781} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: - rigidBody: {fileID: 1225567544} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 0.5 --- !u!114 &1052583427 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8113378936488292401, guid: 19e7a279b411e8a4aa8396dbda0558e2, @@ -1356,56 +1227,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe50eb2ce75bcc748ab14fe464853cfd, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1075979656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1075979657} - - component: {fileID: 1075979658} - m_Layer: 0 - m_Name: GameObject (2) - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1075979657 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075979656} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5, y: 0.2, z: -2.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 242252084844004957} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1075979658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1075979656} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 242252084844255478} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 10 --- !u!1001 &1081941391 PrefabInstance: m_ObjectHideFlags: 0 @@ -1579,7 +1400,9 @@ GameObject: - component: {fileID: 1181634880} - component: {fileID: 1181634878} - component: {fileID: 1181634884} - - component: {fileID: 1181634883} + - component: {fileID: 1181634885} + - component: {fileID: 1181634886} + - component: {fileID: 1181634887} m_Layer: 0 m_Name: SM_Veh_Boat_Rowing_01_Hull (1) m_TagString: Untagged @@ -1676,23 +1499,10 @@ Transform: m_LocalPosition: {x: 0, y: -0.58, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1437521087} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!114 &1181634883 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1181634877} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3} - m_Name: - m_EditorClassIdentifier: - waveGenerator: {fileID: 1560348105} - boatOffset: -0.4 --- !u!65 &1181634884 BoxCollider: m_ObjectHideFlags: 0 @@ -1714,143 +1524,65 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.9821782, y: 1.1576467, z: 5.3873086} m_Center: {x: 0, y: 0.5788233, z: 0} ---- !u!1 &1225567539 -GameObject: +--- !u!114 &1181634885 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1225567543} - - component: {fileID: 1225567542} - - component: {fileID: 1225567541} - - component: {fileID: 1225567540} - - component: {fileID: 1225567544} - m_Layer: 0 - m_Name: TestCube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!65 &1225567540 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1225567539} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 + m_GameObject: {fileID: 1181634877} m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1225567541 -MeshRenderer: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 176cfac66084d4bfb9b4c9f11c4b137f, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 + turnSpeed: 1 +--- !u!114 &1181634886 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1225567539} + m_GameObject: {fileID: 1181634877} 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &1225567542 -MeshFilter: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 0acb404847404484198cbf94e6929af2, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &1181634887 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1225567539} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1225567543 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1225567539} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.315569, y: 0.29, z: -2.8508334} - m_LocalScale: {x: 2, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2026649843} - - {fileID: 1899264901} - - {fileID: 1034588241} - - {fileID: 214845524} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &1225567544 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1225567539} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0.01 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 + m_GameObject: {fileID: 1181634877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3} + m_Name: + m_EditorClassIdentifier: + waveGenerator: {fileID: 1560348105} + boatOffset: -0.4 --- !u!1 &1234264506 GameObject: m_ObjectHideFlags: 0 @@ -1905,7 +1637,7 @@ GameObject: m_Component: - component: {fileID: 1341654437} - component: {fileID: 1341654436} - - component: {fileID: 1341654435} + - component: {fileID: 1341654438} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -1913,26 +1645,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1341654435 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1341654434} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &1341654436 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1963,6 +1675,47 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1341654438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1341654434} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 --- !u!1001 &1369204175 PrefabInstance: m_ObjectHideFlags: 0 @@ -2041,6 +1794,78 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 02e365f50f0bd7747a4b9eb64b6f4e6c, type: 3} +--- !u!1 &1437521086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437521087} + - component: {fileID: 1437521088} + m_Layer: 0 + m_Name: Virtual Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1437521087 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437521086} + serializedVersion: 2 + m_LocalRotation: {x: 0.2669336, y: -0, z: 0.000000014901159, w: 0.96371496} + m_LocalPosition: {x: -0.0000002384187, y: 6, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1040971782} + m_Father: {fileID: 1181634882} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1437521088 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437521086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 1181634882} + m_Follow: {fileID: 1181634882} + m_Lens: + FieldOfView: 50 + OrthographicSize: 5 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 1040971782} --- !u!1 &1469028826 GameObject: m_ObjectHideFlags: 0 @@ -7123,153 +6948,6 @@ Transform: - {fileID: 9160692602282674359} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1549546633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1549546636} - - component: {fileID: 1549546634} - - component: {fileID: 1549546637} - - component: {fileID: 1549546638} - m_Layer: 0 - m_Name: Water Object_Crest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1549546634 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549546633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: eb53c12498f48724b925c6750aaaa631, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1549546636 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549546633} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 619.69946, y: -1, z: 292.20862} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1549546637 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549546633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dde37eff0f7685f41902f400d1de0c6c, type: 3} - m_Name: - m_EditorClassIdentifier: - _version: 0 - _globalWindSpeed: 11.1 - _viewpoint: {fileID: 0} - _camera: {fileID: 0} - _teleportThreshold: 10 - _timeProvider: {fileID: 0} - _primaryLight: {fileID: 1861343895} - _searchForPrimaryLightOnStartup: 1 - _material: {fileID: 2100000, guid: 9def92ac79181fe41b238e91663f0fad, type: 2} - _waterTilePrefab: {fileID: 0} - _layerName: - _layer: 4 - _gravityMultiplier: 1 - _waterBodyCulling: 1 - _minScale: 8 - _maxScale: 256 - _dropDetailHeightBasedOnWaves: 0.2 - _lodDataResolution: 384 - _geometryDownSampleFactor: 2 - _lodCount: 7 - _extentsSizeMultiplier: 100 - _renderingLayerMask: 255 - _simSettingsAnimatedWaves: {fileID: 0} - _createSeaFloorDepthData: 1 - _simSettingsSeaFloorDepth: {fileID: 0} - _createFoamSim: 1 - _simSettingsFoam: {fileID: 0} - _createDynamicWaveSim: 0 - _simSettingsDynamicWaves: {fileID: 0} - _createFlowSim: 0 - _simSettingsFlow: {fileID: 0} - _createShadowData: 0 - _simSettingsShadow: {fileID: 0} - _createClipSurfaceData: 0 - _simSettingsClipSurface: {fileID: 0} - _defaultClippingState: 0 - _createAlbedoData: 0 - _settingsAlbedo: {fileID: 0} - _surfaceSelfIntersectionFixMode: 2 - _underwaterCullLimit: 0.001 - _verifyOpaqueAndDepthTexturesEnabled: 1 - _showOceanProxyPlane: 0 - _editModeFPS: 30 - _followSceneCamera: 1 - _heightQueries: 1 - _debug: - _attachDebugGUI: 0 - _showOceanTileGameObjects: 0 - _disableFollowViewpoint: 0 - _destroyResourcesInOnDisable: 0 - _forceBatchMode: 0 - _forceNoGPU: 0 ---- !u!114 &1549546638 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1549546633} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7a57126133720c243a7af00a156c9ee8, type: 3} - m_Name: - m_EditorClassIdentifier: - _spectrum: {fileID: 0} - _spectrumFixedAtRuntime: 1 - _waveDirectionHeadingAngle: 0 - _overrideGlobalWindSpeed: 0 - _windSpeed: 20 - _respectShallowWaterAttenuation: 1 - _weight: 1 - _blendMode: 0 - _queue: 0 - _resolution: 128 - _overrideSplineSettings: 0 - _radius: 50 - _subdivisions: 1 - _featherWaveStart: 0.1 - _version: 0 - _windTurbulence: 0.145 - _maxVerticalDisplacement: 10 - _maxHorizontalDisplacement: 15 - _enableBakedCollision: 0 - _timeResolution: 4 - _smallestWavelengthRequired: 2 - _timeLoopLength: 32 - _debug: - _drawBounds: 0 - _drawSlicesInEditor: 0 --- !u!1001 &1555303302 PrefabInstance: m_ObjectHideFlags: 0 @@ -7374,8 +7052,6 @@ GameObject: - component: {fileID: 1560348101} - component: {fileID: 1560348100} - component: {fileID: 1560348099} - - component: {fileID: 1560348103} - - component: {fileID: 1560348102} - component: {fileID: 1560348105} m_Layer: 4 m_Name: Water Object @@ -7444,39 +7120,11 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 10, y: 1, z: 10} + m_LocalScale: {x: 5, y: 1, z: 5} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1560348102 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1560348097} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e030824537d64505a8560a4d8d344587, type: 3} - m_Name: - m_EditorClassIdentifier: - amplitude: 1 - length: 2 - speed: 1 - offset: 0 ---- !u!114 &1560348103 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1560348097} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 58d3123bba1e4be4813c40e9f26a7702, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!114 &1560348105 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7490,7 +7138,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: waveLength: 2 - amplitude: 0.1 + amplitude: 0.5 speed: 1 direction: {x: 1, y: 0} --- !u!1001 &1646060060 @@ -7571,56 +7219,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 19e7a279b411e8a4aa8396dbda0558e2, type: 3} ---- !u!1 &1689714492 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1689714493} - - component: {fileID: 1689714494} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1689714493 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1689714492} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5, y: 0.2, z: 1.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 242252084844004957} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1689714494 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1689714492} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 242252084844255478} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 10 --- !u!114 &1728819388 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 5797603629361181971, guid: 02e365f50f0bd7747a4b9eb64b6f4e6c, @@ -7751,156 +7349,6 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 ---- !u!1 &1899264900 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1899264901} - - component: {fileID: 1899264902} - m_Layer: 0 - m_Name: GameObject (1) - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1899264901 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1899264900} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5, y: 0, z: -0.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1225567543} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1899264902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1899264900} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 1225567544} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 0.5 ---- !u!1 &1957343710 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1957343711} - - component: {fileID: 1957343712} - m_Layer: 0 - m_Name: GameObject (3) - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1957343711 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1957343710} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.5, y: 0.2, z: -2.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 242252084844004957} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1957343712 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1957343710} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 242252084844255478} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 10 ---- !u!1 &2026649842 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2026649843} - - component: {fileID: 2026649844} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 8418204508859773708, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2026649843 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2026649842} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.5, y: 0, z: 0.5} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1225567543} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2026649844 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2026649842} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca68bc2df97bc4c43a817e4a07ea1814, type: 3} - m_Name: - m_EditorClassIdentifier: - rigidBody: {fileID: 1225567544} - depthBeforeSubmerged: 1 - displacementAmount: 3 - floaterCount: 4 - waterDrag: 0.99 - waterAngularDrag: 0.5 --- !u!1001 &2031530112 PrefabInstance: m_ObjectHideFlags: 0 @@ -8024,6 +7472,111 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c7d7cec49ffdaf24ca922735dac9c4f0, type: 3} +--- !u!1 &2102660101 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2102660105} + - component: {fileID: 2102660104} + - component: {fileID: 2102660103} + - component: {fileID: 2102660102} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &2102660102 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2102660101} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2102660103 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2102660101} + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2102660104 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2102660101} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2102660105 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2102660101} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.64, z: 10.89} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2105062287 GameObject: m_ObjectHideFlags: 0 @@ -8127,144 +7680,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!33 &242252084841062447 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 242252084844255477} - m_Mesh: {fileID: 4300000, guid: 9e2ca1b3a4930a0478e9a1785b96f2dd, type: 3} ---- !u!23 &242252084842083485 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 242252084844255477} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5e1235b2e417983469723d36f05de88d, 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: 0 - 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!4 &242252084844004957 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 242252084844255477} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1689714493} - - {fileID: 595518296} - - {fileID: 1075979657} - - {fileID: 1957343711} - - {fileID: 897152332} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} ---- !u!1 &242252084844255477 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 242252084844004957} - - component: {fileID: 242252084841062447} - - component: {fileID: 242252084842083485} - - component: {fileID: 242252084844255479} - - component: {fileID: 242252084844255478} - m_Layer: 0 - m_Name: SM_Veh_Boat_Rowing_01_Hull - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!54 &242252084844255478 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 242252084844255477} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0.01 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!65 &242252084844255479 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 242252084844255477} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 1.9821777, y: 1.1576467, z: 5.387307} - m_Center: {x: 0, y: 0.5788233, z: 0} --- !u!114 &748616344565672306 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12910,9 +12325,8 @@ SceneRoots: - {fileID: 2105062291} - {fileID: 392096320} - {fileID: 1341654437} - - {fileID: 840095406} - - {fileID: 1549546636} - {fileID: 1560348101} - - {fileID: 242252084844004957} - - {fileID: 1225567543} - {fileID: 1181634882} + - {fileID: 2102660105} + - {fileID: 503805558} + - {fileID: 546777062} diff --git a/BlueWater/Assets/02.Scritps.meta b/BlueWater/Assets/02.Scripts.meta similarity index 100% rename from BlueWater/Assets/02.Scritps.meta rename to BlueWater/Assets/02.Scripts.meta diff --git a/BlueWater/Assets/02.Scritps/BlueWater.cs b/BlueWater/Assets/02.Scripts/BlueWater.cs similarity index 99% rename from BlueWater/Assets/02.Scritps/BlueWater.cs rename to BlueWater/Assets/02.Scripts/BlueWater.cs index b9053eec1..05599fb6d 100644 --- a/BlueWater/Assets/02.Scritps/BlueWater.cs +++ b/BlueWater/Assets/02.Scripts/BlueWater.cs @@ -39,7 +39,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable ], ""bindings"": [ { - ""name"": ""2D Vector"", + ""name"": ""WASD"", ""id"": ""4dc5b54c-0e59-461e-a12d-470900925a36"", ""path"": ""2DVector"", ""interactions"": """", diff --git a/BlueWater/Assets/02.Scritps/BlueWater.cs.meta b/BlueWater/Assets/02.Scripts/BlueWater.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scritps/BlueWater.cs.meta rename to BlueWater/Assets/02.Scripts/BlueWater.cs.meta diff --git a/BlueWater/Assets/02.Scritps/BlueWater.inputactions b/BlueWater/Assets/02.Scripts/BlueWater.inputactions similarity index 98% rename from BlueWater/Assets/02.Scritps/BlueWater.inputactions rename to BlueWater/Assets/02.Scripts/BlueWater.inputactions index 31241127a..34b2bb14d 100644 --- a/BlueWater/Assets/02.Scritps/BlueWater.inputactions +++ b/BlueWater/Assets/02.Scripts/BlueWater.inputactions @@ -17,7 +17,7 @@ ], "bindings": [ { - "name": "2D Vector", + "name": "WASD", "id": "4dc5b54c-0e59-461e-a12d-470900925a36", "path": "2DVector", "interactions": "", diff --git a/BlueWater/Assets/02.Scritps/BlueWater.inputactions.meta b/BlueWater/Assets/02.Scripts/BlueWater.inputactions.meta similarity index 100% rename from BlueWater/Assets/02.Scritps/BlueWater.inputactions.meta rename to BlueWater/Assets/02.Scripts/BlueWater.inputactions.meta diff --git a/BlueWater/Assets/02.Scritps/WaterAndShip.meta b/BlueWater/Assets/02.Scripts/WaterAndShip.meta similarity index 100% rename from BlueWater/Assets/02.Scritps/WaterAndShip.meta rename to BlueWater/Assets/02.Scripts/WaterAndShip.meta diff --git a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave.meta b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave.meta similarity index 100% rename from BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave.meta rename to BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave.meta diff --git a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/Floater.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs similarity index 96% rename from BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/Floater.cs rename to BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs index 5c0d481d2..ee3629de1 100644 --- a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/Floater.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs @@ -8,12 +8,12 @@ public class Floater : MonoBehaviour public float boatOffset = 0.0f; // new variable private Rigidbody rb; - void Start() + private void Start() { rb = GetComponent(); } - void Update() + public void Update() { float waveNumber = 2.0f * Mathf.PI / waveGenerator.waveLength; float phaseConstant = waveGenerator.speed * waveNumber; @@ -34,4 +34,4 @@ public class Floater : MonoBehaviour Quaternion targetRotation = Quaternion.FromToRotation(transform.up, normal) * transform.rotation; rb.MoveRotation(Quaternion.Slerp(transform.rotation, targetRotation, Time.deltaTime * waveGenerator.speed)); } -} +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/Floater.cs.meta b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/Floater.cs.meta rename to BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs.meta diff --git a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/GerstnerWave.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs similarity index 97% rename from BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/GerstnerWave.cs rename to BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs index ed6d46959..47fe716a0 100644 --- a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/GerstnerWave.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs @@ -9,7 +9,7 @@ public class GerstnerWave : MonoBehaviour public float speed = 1f; public Vector2 direction = new Vector2(1.0f, 0.0f); - void Update() + public void Update() { Mesh mesh = GetComponent().mesh; Vector3[] vertices = mesh.vertices; diff --git a/BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/GerstnerWave.cs.meta b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs.meta similarity index 100% rename from BlueWater/Assets/02.Scritps/WaterAndShip/Gerstner wave/GerstnerWave.cs.meta rename to BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/GerstnerWave.cs.meta diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs new file mode 100644 index 000000000..a967bddb5 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs @@ -0,0 +1,36 @@ +using UnityEngine; +using UnityEngine.InputSystem; + +namespace _02.Scripts.WaterAndShip +{ + public class Player : MonoBehaviour + { + public float speed = 10f; + public float turnSpeed = 10f; + private Rigidbody rb; + private Vector2 movementInput; + + void Awake() + { + rb = GetComponent(); + } + + public void OnMove(InputValue value) + { + movementInput = value.Get(); + } + + void FixedUpdate() + { + Vector3 movement = new Vector3(movementInput.x, 0.0f, movementInput.y); + + // Move the boat + rb.AddForce(movement * speed * Time.fixedDeltaTime, ForceMode.VelocityChange); + + // Rotate the boat + float turn = movementInput.x; + Quaternion turnRotation = Quaternion.Euler(0f, turn * turnSpeed, 0f); + rb.MoveRotation(rb.rotation * turnRotation); + } + } +} diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs.meta b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs.meta new file mode 100644 index 000000000..58a3049fd --- /dev/null +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 176cfac66084d4bfb9b4c9f11c4b137f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/ProjectSettings/ProjectSettings.asset b/BlueWater/ProjectSettings/ProjectSettings.asset index 4fb27b112..3ccd054f3 100644 --- a/BlueWater/ProjectSettings/ProjectSettings.asset +++ b/BlueWater/ProjectSettings/ProjectSettings.asset @@ -819,7 +819,8 @@ PlayerSettings: tvOS: UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} - scriptingBackend: {} + scriptingBackend: + Standalone: 1 il2cppCompilerConfiguration: {} il2cppCodeGeneration: {} managedStrippingLevel: @@ -920,7 +921,7 @@ PlayerSettings: embeddedLinuxEnableGamepadInput: 1 hmiLogStartupTiming: 0 hmiCpuConfiguration: - apiCompatibilityLevel: 6 + apiCompatibilityLevel: 3 activeInputHandler: 2 windowsGamepadBackendHint: 0 cloudProjectId: