diff --git a/BlueWater/Assets/01.Scenes/02.Main.unity b/BlueWater/Assets/01.Scenes/02.Main.unity index e6ae7d161..863e86ee4 100644 --- a/BlueWater/Assets/01.Scenes/02.Main.unity +++ b/BlueWater/Assets/01.Scenes/02.Main.unity @@ -3189,6 +3189,151 @@ Transform: type: 3} m_PrefabInstance: {fileID: 85341471} m_PrefabAsset: {fileID: 0} +--- !u!1 &86707739 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 86707740} + - component: {fileID: 86707744} + - component: {fileID: 86707743} + - component: {fileID: 86707742} + - component: {fileID: 86707741} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &86707740 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 86707739} + 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: 1871370246} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &86707741 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 86707739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + mNoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!114 &86707742 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 86707739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 20, z: -10} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 3 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 1 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.5 + m_DecelTime: 0.5 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 0 +--- !u!114 &86707743 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 86707739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0.36, z: 0.2} + m_LookaheadTime: 0.4 + m_LookaheadSmoothing: 6.3 + 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 &86707744 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 86707739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &91095985 GameObject: m_ObjectHideFlags: 0 @@ -3434,6 +3579,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: adc69be7f5bb17c41a4afb99576d3409, type: 3} +--- !u!1001 &95668302 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 153108, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Warship_01_Hull_Pirate + objectReference: {fileID: 0} + - target: {fileID: 153108, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalPosition.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalPosition.z + value: -73.6 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 456082, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ca514cb9ea5a00b499f879bd90a9aaca, type: 3} --- !u!1001 &95930891 PrefabInstance: m_ObjectHideFlags: 0 @@ -5602,6 +5808,78 @@ Transform: type: 3} m_PrefabInstance: {fileID: 167722304} m_PrefabAsset: {fileID: 0} +--- !u!1 &168896972 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 168896973} + - component: {fileID: 168896974} + m_Layer: 0 + m_Name: DradgeCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &168896973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168896972} + serializedVersion: 2 + m_LocalRotation: {x: 0.19897524, y: 0.000000059604638, z: -0.000000014901159, w: 0.9800045} + m_LocalPosition: {x: -0.0000002384187, y: 10.32, z: -10.000001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 263106988} + m_Father: {fileID: 476261175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &168896974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168896972} + 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: 1 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 476261175} + m_Follow: {fileID: 476261175} + m_Lens: + FieldOfView: 80 + OrthographicSize: 5 + NearClipPlane: 0.1 + 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: 263106988} --- !u!4 &170034677 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, @@ -10566,6 +10844,151 @@ Transform: - {fileID: 1567188422} m_Father: {fileID: 1379785728} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &263106987 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 263106988} + - component: {fileID: 263106992} + - component: {fileID: 263106991} + - component: {fileID: 263106990} + - component: {fileID: 263106989} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &263106988 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263106987} + 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: 168896973} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &263106989 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263106987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2} + m_PivotOffset: {x: 0, y: 0, z: 0} + m_AmplitudeGain: 1 + m_FrequencyGain: 1 + mNoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!114 &263106990 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263106987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} + m_Name: + m_EditorClassIdentifier: + m_BindingMode: 1 + m_FollowOffset: {x: 0, y: 10.32, z: -10} + m_XDamping: 1 + m_YDamping: 1 + m_ZDamping: 1 + m_AngularDampingMode: 0 + m_PitchDamping: 0 + m_YawDamping: 3 + m_RollDamping: 0 + m_AngularDamping: 0 + m_Heading: + m_Definition: 2 + m_VelocityFilterStrength: 4 + m_Bias: 0 + m_RecenterToTargetHeading: + m_enabled: 1 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_XAxis: + Value: 0 + m_SpeedMode: 0 + m_MaxSpeed: 0 + m_AccelTime: 0.5 + m_DecelTime: 0.5 + m_InputAxisName: Mouse X + m_InputAxisValue: 0 + m_InvertInput: 1 + m_MinValue: -180 + m_MaxValue: 180 + m_Wrap: 1 + m_Recentering: + m_enabled: 0 + m_WaitTime: 1 + m_RecenteringTime: 2 + m_LegacyHeadingDefinition: -1 + m_LegacyVelocityFilterStrength: -1 + m_LegacyRadius: 3.4028235e+38 + m_LegacyHeightOffset: 3.4028235e+38 + m_LegacyHeadingBias: 3.4028235e+38 + m_HeadingIsSlave: 0 +--- !u!114 &263106991 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263106987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 6, z: 0.2} + m_LookaheadTime: 0.4 + m_LookaheadSmoothing: 6.3 + 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 &263106992 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 263106987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &265182709 PrefabInstance: m_ObjectHideFlags: 0 @@ -16818,6 +17241,154 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71e2c9f4ac6ef3c448bfa589003b7db4, type: 3} +--- !u!1 &476261169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 476261175} + - component: {fileID: 476261174} + - component: {fileID: 476261173} + - component: {fileID: 476261172} + - component: {fileID: 476261171} + - component: {fileID: 476261170} + m_Layer: 0 + m_Name: Player (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &476261170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 616a7216aa8754444908b58052d4b644, type: 3} + m_Name: + m_EditorClassIdentifier: + boatOffset: -0.4 +--- !u!114 &476261171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 176cfac66084d4bfb9b4c9f11c4b137f, type: 3} + m_Name: + m_EditorClassIdentifier: + maxSpeed: 5 + acceleration: 2 + deceleration: 2 + turnSpeed: 1 +--- !u!114 &476261172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + m_Enabled: 1 + 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!65 &476261173 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + 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.9821782, y: 1.1576467, z: 5.3873086} + m_Center: {x: 0, y: 0.5788233, z: 0} +--- !u!54 &476261174 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0.1 + 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!4 &476261175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 476261169} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: -37.3, y: -1.58, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 550616932} + - {fileID: 1461171524} + - {fileID: 168896973} + - {fileID: 1871370246} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1001 &477690076 PrefabInstance: m_ObjectHideFlags: 0 @@ -18929,6 +19500,70 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} +--- !u!1001 &550616931 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 476261175} + m_Modifications: + - target: {fileID: 152568, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Medium_01_Hull_Pirate_Attachments + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 64784900362701112, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} +--- !u!4 &550616932 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, + type: 3} + m_PrefabInstance: {fileID: 550616931} + m_PrefabAsset: {fileID: 0} --- !u!4 &551258864 stripped Transform: m_CorrespondingSourceObject: {fileID: 4636189598413550, guid: 43e607b75d000744c895dd18e77b4763, @@ -29998,8 +30633,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 776161953} serializedVersion: 2 - m_LocalRotation: {x: 0.14069676, y: 0.6929679, z: -0.14069676, w: 0.6929678} - m_LocalPosition: {x: -47.3, y: 10.32, z: 0.0000011920929} + m_LocalRotation: {x: 0.14069673, y: 0.6929679, z: -0.14069676, w: 0.69296783} + m_LocalPosition: {x: -47.3, y: 8.74, z: 0.0000011920929} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -37400,6 +38035,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 847480715863e18499e62c63dc24d320, type: 3} +--- !u!1001 &951321259 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 126510, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Warship_01_Hull_Attachments + objectReference: {fileID: 0} + - target: {fileID: 126510, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalPosition.x + value: 36.4 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalPosition.z + value: -70.6 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488092, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 00527f6e18debd843a66aba9400c8c45, type: 3} --- !u!1001 &951342952 PrefabInstance: m_ObjectHideFlags: 0 @@ -47531,7 +48227,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!54 &1181634878 Rigidbody: m_ObjectHideFlags: 0 @@ -57731,6 +58427,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b63cc02ab2a559b4cb9944fbe4feea36, type: 3} +--- !u!1001 &1365765434 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 165382, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Warship_01_Hull_Pirate_Attachments + objectReference: {fileID: 0} + - target: {fileID: 165382, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalPosition.x + value: -18 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalPosition.z + value: -50.7 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 465714, guid: 546543ec887821441bb4deff0e363c1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 546543ec887821441bb4deff0e363c1e, type: 3} --- !u!1001 &1368054663 PrefabInstance: m_ObjectHideFlags: 0 @@ -58869,6 +59626,67 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1408905431} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1414992333 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 174854, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Warship_01_Hull_Pirate_Bare + objectReference: {fileID: 0} + - target: {fileID: 174854, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalPosition.z + value: -33.21 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 487694, guid: 831807539d583624fbfff3c147b19906, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 831807539d583624fbfff3c147b19906, type: 3} --- !u!4 &1417266039 stripped Transform: m_CorrespondingSourceObject: {fileID: 4183561035042534, guid: fd8e4250283abcc4483483042e956394, @@ -58940,6 +59758,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 42456a3efe2528c4f8e980b62db4a5df, type: 3} +--- !u!1001 &1417783439 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 132478, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Warship_01_Hull_Bare + objectReference: {fileID: 0} + - target: {fileID: 132478, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalPosition.x + value: 15.7 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalPosition.z + value: -71.9 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 410384, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 00f2a498c7e05f64ca529c8b767d9bbc, type: 3} --- !u!1001 &1419148165 PrefabInstance: m_ObjectHideFlags: 0 @@ -59479,7 +60358,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1437521086} serializedVersion: 2 - m_LocalRotation: {x: 0.19897528, y: 0.00000008940697, z: -0, w: 0.98000455} + m_LocalRotation: {x: 0.19897524, y: 0.000000059604638, z: -0.000000014901159, w: 0.9800045} m_LocalPosition: {x: -0.0000002384187, y: 10.32, z: -10.000001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -60605,12 +61484,152 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1456636864} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1456744122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 152568, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_Name + value: SM_Veh_Boat_Medium_01_Hull_Pirate_Attachments + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalPosition.x + value: -37.5 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalPosition.z + value: -66.4 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 480178, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 08fa080060d162343b94ac13ffbe8f1e, type: 3} --- !u!4 &1457771168 stripped Transform: m_CorrespondingSourceObject: {fileID: 4687491176583728, guid: 7a07403c17a4db144b938f3f3a271b45, type: 3} m_PrefabInstance: {fileID: 387100157} m_PrefabAsset: {fileID: 0} +--- !u!1 &1461171523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1461171524} + - component: {fileID: 1461171526} + - component: {fileID: 1461171525} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1461171524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461171523} + 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: [] + m_Father: {fileID: 476261175} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!23 &1461171525 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461171523} + 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!33 &1461171526 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1461171523} + m_Mesh: {fileID: 4300000, guid: 9e2ca1b3a4930a0478e9a1785b96f2dd, type: 3} --- !u!1001 &1462361221 PrefabInstance: m_ObjectHideFlags: 0 @@ -68157,8 +69176,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e94b9d97c53ad44e28abbecc69e7d339, type: 3} m_Name: m_EditorClassIdentifier: - waveLength: 5 - amplitude: 0.5 + waveLength: 10 + amplitude: 0.1 speed: 1 direction: {x: 1, y: 0} --- !u!114 &1560348106 @@ -78448,6 +79467,78 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 831fcc86213c0c442be644380a4818d3, type: 3} +--- !u!1 &1871370245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1871370246} + - component: {fileID: 1871370247} + m_Layer: 0 + m_Name: AssaultCam + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1871370246 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871370245} + serializedVersion: 2 + m_LocalRotation: {x: 0.5191833, y: -0, z: 0.000000029802322, w: 0.854663} + m_LocalPosition: {x: -0.0000002384187, y: 20, z: -10.000001} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 86707740} + m_Father: {fileID: 476261175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1871370247 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1871370245} + 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: 0 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 476261175} + m_Follow: {fileID: 476261175} + m_Lens: + FieldOfView: 80 + OrthographicSize: 5 + NearClipPlane: 0.1 + 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: 86707740} --- !u!1001 &1872240697 PrefabInstance: m_ObjectHideFlags: 0 @@ -94240,6 +95331,7 @@ SceneRoots: - {fileID: 392096320} - {fileID: 1341654437} - {fileID: 1560348101} + - {fileID: 476261175} - {fileID: 1181634882} - {fileID: 336257752} - {fileID: 202104949} @@ -94251,3 +95343,9 @@ SceneRoots: - {fileID: 1395280334} - {fileID: 1379785728} - {fileID: 107190135} + - {fileID: 1456744122} + - {fileID: 951321259} + - {fileID: 1417783439} + - {fileID: 95668302} + - {fileID: 1365765434} + - {fileID: 1414992333} diff --git a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs index 3d71f49e5..4be83d9c3 100644 --- a/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs +++ b/BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs @@ -15,10 +15,11 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I public void OnPointerDown(PointerEventData eventData) { - originalPosition = transform.position; - originalScale = transform.localScale; + var transform1 = transform; + originalPosition = transform1.position; + originalScale = transform1.localScale; canvasGroup.alpha = 0.5f; - transform.localScale = new Vector3(0.3f, 0.3f, 1f); + transform1.localScale = new Vector3(0.3f, 0.3f, 1f); } public void OnDrag(PointerEventData eventData) @@ -26,7 +27,7 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I transform.position = Input.mousePosition; Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit; - if (Physics.Raycast(ray, out hit) && hit.collider.tag == "Ground") + if (Physics.Raycast(ray, out hit) && hit.collider.CompareTag("Ground")) { // 마우스가 Ground 위에 있을 때 @@ -38,8 +39,9 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I // 지형에 올바르게 드롭되지 않으면 if (!IsDroppedOnTarget()) { - transform.position = originalPosition; - transform.localScale = originalScale; + var transform1 = transform; + transform1.position = originalPosition; + transform1.localScale = originalScale; canvasGroup.alpha = 1; } } @@ -51,7 +53,7 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I if (Physics.Raycast(ray, out hit)) { - if (hit.collider.tag == "Ground") + if (hit.collider.CompareTag("Ground")) { Destroy(gameObject); return true; diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs index 33b408b64..d88508c3f 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Gerstner wave/Floater.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +[RequireComponent(typeof(Rigidbody))] public class Floater : MonoBehaviour { private GerstnerWave waveGenerator; diff --git a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs index 18301ba4f..e240a225b 100644 --- a/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs +++ b/BlueWater/Assets/02.Scripts/WaterAndShip/Player.cs @@ -4,6 +4,8 @@ using UnityEngine.InputSystem; namespace _02.Scripts.WaterAndShip { + [RequireComponent(typeof(Rigidbody))] + [RequireComponent(typeof(PlayerInput))] public class Player : MonoBehaviour { public float maxSpeed = 10f; diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat index af1539d2d..01bb0a9da 100644 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat +++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/MotorBoat/Materials/WAHOLOGO.mat @@ -36,6 +36,7 @@ Material: RenderType: Transparent disabledShaderPasses: - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -132,7 +133,7 @@ Material: - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.454902, g: 0.454902, b: 0.454902, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat index a34e5b3b3..d15a672fa 100644 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat +++ b/BlueWater/Assets/NWH/Dynamic Water Physics 2/Models/Ships/Sailboat/Materials/SailboatChromeMat.mat @@ -117,7 +117,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 0, g: 0.666667, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0.666667, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: []