diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index 9ff0fdef8..766575d66 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -120264,13 +120264,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 168896972} serializedVersion: 2 - m_LocalRotation: {x: 0.2080406, y: 0.000000029802319, z: -0, w: 0.9781202} - m_LocalPosition: {x: -0.0000004768374, y: 15, z: -19.999998} + m_LocalRotation: {x: 0.14710693, y: 0.69163543, z: -0.14710695, w: 0.69163543} + m_LocalPosition: {x: -19.999996, y: 10.74, z: 0.0000023841858} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 263106988} - m_Father: {fileID: 476261175} + m_Father: {fileID: 649179607} m_LocalEulerAnglesHint: {x: 24.015, y: 0, z: 0.03} --- !u!114 &168896974 MonoBehaviour: @@ -224729,11 +224729,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 304932851} - - component: {fileID: 304932854} - component: {fileID: 304932853} - - component: {fileID: 304932852} m_Layer: 13 - m_Name: Character + m_Name: InShipPlayer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -224747,14 +224745,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 304932850} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.16, y: 2.853, z: -2.07} - m_LocalScale: {x: 0.4, y: 0.4, z: 0.4} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.15999998, y: 2.626, z: -2.07} + m_LocalScale: {x: 0.40000007, y: 0.4, z: 0.40000007} m_ConstrainProportionsScale: 1 - m_Children: [] + m_Children: + - {fileID: 1370792208} m_Father: {fileID: 476261175} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &304932852 +--- !u!136 &304932853 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -224776,57 +224775,7 @@ CapsuleCollider: m_Radius: 0.5 m_Height: 2 m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &304932853 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 304932850} - 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 &304932854 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 304932850} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} + m_Center: {x: 0, y: 1, z: 0} --- !u!1 &304946396 GameObject: m_ObjectHideFlags: 0 @@ -230616,113 +230565,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &314097976 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 314097977} - - component: {fileID: 314097980} - - component: {fileID: 314097979} - - component: {fileID: 314097978} - m_Layer: 0 - m_Name: VisualLook - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &314097977 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314097976} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1828981125} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &314097978 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314097976} - 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: 2 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &314097979 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314097976} - 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 &314097980 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 314097976} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &314315632 GameObject: m_ObjectHideFlags: 0 @@ -348094,10 +347936,7 @@ Transform: - {fileID: 1260016380} - {fileID: 622062898} - {fileID: 631284636} - - {fileID: 168896973} - - {fileID: 519038851} - {fileID: 304932851} - - {fileID: 817556450} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!65 &476261176 @@ -381164,13 +381003,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519038850} serializedVersion: 2 - m_LocalRotation: {x: 0.30631077, y: -0.6373176, z: 0.3063107, w: 0.6373177} - m_LocalPosition: {x: 19.84, y: 27.853, z: -2.0700016} + m_LocalRotation: {x: 0.43318883, y: 0.00000008940697, z: -0.000000044703484, w: 0.90130323} + m_LocalPosition: {x: -2.0700035, y: 23.593, z: -19.840002} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1385621422} - m_Father: {fileID: 476261175} + m_Father: {fileID: 649179607} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &519038852 MonoBehaviour: @@ -476771,6 +476610,41 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 649157373} m_Mesh: {fileID: 4300460, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &649179606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 649179607} + m_Layer: 0 + m_Name: CineCamers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &649179607 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 649179606} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -37.3, y: 2.68, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 168896973} + - {fileID: 519038851} + - {fileID: 817556450} + - {fileID: 1036440296} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &649194912 GameObject: m_ObjectHideFlags: 0 @@ -568189,7 +568063,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.14710693, y: 0.6916355, z: -0.14710693, w: 0.69163543} + m_LocalRotation: {x: 0.14710693, y: 0.69163543, z: -0.14710695, w: 0.69163543} m_LocalPosition: {x: -57.299995, y: 13.42, z: 0.0000023841858} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -600395,15 +600269,15 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 817556449} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} - m_LocalPosition: {x: 2.9895594, y: 60.570004, z: -0.25007224} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.25007248, y: 56.31, z: -2.9895597} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1266809189} - {fileID: 1625123129} - {fileID: 308513091} - m_Father: {fileID: 476261175} + m_Father: {fileID: 649179607} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &817556451 MonoBehaviour: @@ -758046,14 +757920,14 @@ Transform: m_GameObject: {fileID: 1036440295} serializedVersion: 2 m_LocalRotation: {x: 0.10037751, y: 0.699946, z: -0.10037751, w: 0.699946} - m_LocalPosition: {x: -37.3, y: 2.68, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1299379571} - {fileID: 1208059832} - {fileID: 719550483} - m_Father: {fileID: 0} + m_Father: {fileID: 649179607} m_LocalEulerAnglesHint: {x: 16.322, y: 90, z: 0} --- !u!114 &1036440297 MonoBehaviour: @@ -921168,7 +921042,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1055635915} - - {fileID: 1828981125} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1248203897 @@ -1013900,6 +1013773,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1370789143} m_Mesh: {fileID: 4301002, guid: 02ded044b8e0963439276550f50be6f9, type: 3} +--- !u!1 &1370792207 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + m_PrefabInstance: {fileID: 1619855241} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1370792208 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + m_PrefabInstance: {fileID: 1619855241} + m_PrefabAsset: {fileID: 0} +--- !u!1183024399 &1370792210 +LookAtConstraint: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1370792207} + m_Enabled: 1 + serializedVersion: 2 + m_Weight: 1 + m_RotationAtRest: {x: 0, y: 0, z: 0} + m_RotationOffset: {x: 0, y: 0, z: 0} + m_Roll: 0 + m_WorldUpObject: {fileID: 0} + m_UseUpObject: 0 + m_Active: 1 + m_IsLocked: 1 + m_Sources: + - sourceTransform: {fileID: 776161958} + weight: 1 --- !u!1 &1370972090 GameObject: m_ObjectHideFlags: 0 @@ -1135541,7 +1135446,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _persistent: 0 - player: {fileID: 0} + shipPlayer: {fileID: 0} boats: [] slowSpeed: 0.1 --- !u!4 &1540310984 @@ -1158692,6 +1158597,78 @@ MonoBehaviour: BackgroundTexture: {fileID: 0} IsBackgroundRecursive: 0 IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 776161953} + Ordinal: 9 + Priority: 0 + IconType: 290000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 649179606} + Ordinal: 10 + Priority: 0 + IconType: 341000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 168896972} + Ordinal: 11 + Priority: 0 + IconType: 341000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 519038850} + Ordinal: 12 + Priority: 0 + IconType: 341000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 817556449} + Ordinal: 13 + Priority: 0 + IconType: 341000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 + - Type: 0 + Name: + GameObject: {fileID: 1036440295} + Ordinal: 14 + Priority: 0 + IconType: 341000 + IconTexture: {fileID: 0} + IsIconRecursive: 0 + BackgroundType: 0 + BackgroundTexture: {fileID: 0} + IsBackgroundRecursive: 0 + IsHidden: 0 --- !u!4 &1574668128 Transform: m_ObjectHideFlags: 0 @@ -1191712,6 +1191689,148 @@ SkinnedMeshRenderer: m_Center: {x: -3.084474, y: -0.16242947, z: 0.0013718605} m_Extent: {x: 1.6378536, y: 0.013213575, z: 0.91397595} m_DirtyAABB: 0 +--- !u!1001 &1619855241 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 304932851} + m_Modifications: + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalScale.z + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.004259542 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.0013270916 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.9547264 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.29745203 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 895707786071648807, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + propertyPath: m_Name + value: Viking + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4681418249284042988, guid: 5d3f02c24a243a044bbddafc1652ee67, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1370792210} + m_SourcePrefab: {fileID: 100100000, guid: 5d3f02c24a243a044bbddafc1652ee67, type: 3} --- !u!1 &1619867958 GameObject: m_ObjectHideFlags: 0 @@ -1195550,8 +1195669,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1625123128} serializedVersion: 2 - m_LocalRotation: {x: 0.6753436, y: 0.03074276, z: -0.028196778, w: 0.7363227} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.6753435, y: 0.030742027, z: -0.028196106, w: 0.7363227} + m_LocalPosition: {x: 0, y: 0, z: 0.00000047683716} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1344567,38 +1344686,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1828426795} m_Mesh: {fileID: 4300936, guid: 02ded044b8e0963439276550f50be6f9, type: 3} ---- !u!1 &1828981124 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1828981125} - m_Layer: 13 - m_Name: InShipPlayer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1828981125 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1828981124} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 314097977} - m_Father: {fileID: 1248116869} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1828982574 GameObject: m_ObjectHideFlags: 0 @@ -1569870,8 +1569957,8 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 776161958} + - {fileID: 649179607} - {fileID: 1341654437} - - {fileID: 1036440296} - {fileID: 1861343896} - {fileID: 734248431} - {fileID: 641420500} diff --git a/BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs b/BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs index 096dbd709..f5e503545 100644 --- a/BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs @@ -58,7 +58,7 @@ namespace BlueWaterProject private void Init() { - character = transform.Find("Character").gameObject; + character = transform.Find("InShipPlayer").gameObject; rb = GetComponent(); GetComponentsInChildren(Canons); diff --git a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta new file mode 100644 index 000000000..5febfcde5 --- /dev/null +++ b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53f2bca3c5c2c4544bad31c50361eaa5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta index cdb770faa..ceaa2ca78 100644 --- a/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta +++ b/BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4ff1f29eab234cf4490d9bb383892c44 +guid: 8c6adcf8630b347898c538ece9f01333 DefaultImporter: externalObjects: {} userData: