diff --git a/BlueWater/Assets/01.Scenes/02.Ocean.unity b/BlueWater/Assets/01.Scenes/02.Ocean.unity index 968bded96..da0a71b6e 100644 --- a/BlueWater/Assets/01.Scenes/02.Ocean.unity +++ b/BlueWater/Assets/01.Scenes/02.Ocean.unity @@ -301,10 +301,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 44403560} - - targetCorrespondingSourceObject: {fileID: 176149940216585557, guid: 726da43882bc7cf4794b6164bb2acaa5, - type: 3} - insertIndex: -1 - addedObject: {fileID: 44403559} m_SourcePrefab: {fileID: 100100000, guid: 726da43882bc7cf4794b6164bb2acaa5, type: 3} --- !u!4 &44403557 stripped Transform: @@ -318,18 +314,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 44403556} m_PrefabAsset: {fileID: 0} ---- !u!114 &44403559 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 44403558} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!65 &44403560 BoxCollider: m_ObjectHideFlags: 0 @@ -840,6 +824,104 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e03ec6b6ff510d545ace4e5794f6fab9, type: 3} +--- !u!1 &87371382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 87371383} + - component: {fileID: 87371386} + - component: {fileID: 87371385} + - component: {fileID: 87371384} + m_Layer: 9 + m_Name: Rudder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &87371383 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87371382} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.849, z: -5.566} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 244711282} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &87371384 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87371382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ca3428d119d4dc5a018840803e81994, type: 3} + m_Name: + m_EditorClassIdentifier: + material: {fileID: 11400000, guid: bcb559cbb0ee0fe49b3d7a3b54039bdb, type: 2} + density: 0 + mass: 0 + volume: 0 +--- !u!114 &87371385 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87371382} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9118365f988afd4419c64e108a8bbc64, type: 3} + m_Name: + m_EditorClassIdentifier: + finalForceCoefficient: 1 + finalTorqueCoefficient: 1 + defaultWaterHeight: 0 + defaultWaterNormal: {x: 0, y: 1, z: 0} + defaultWaterFlow: {x: 0, y: 0, z: 0} + calculateWaterHeights: 1 + calculateWaterNormals: 0 + calculateWaterFlows: 0 + fluidDensity: 1030 + buoyantForceCoefficient: 1 + slamForceCoefficient: 1 + suctionForceCoefficient: 1 + hydrodynamicForceCoefficient: 1 + velocityDotPower: 1 + skinDragCoefficient: 0.01 + convexifyMesh: 1 + simplifyMesh: 1 + weldColocatedVertices: 1 + targetTriangleCount: 32 + originalMesh: {fileID: 4300000, guid: d9c2d3b5b3491844cb195e03ee9e1524, type: 3} + serializedSimulationMesh: + vertices: + - {x: -0.005495559, y: 0.008224702, z: -0.0014673093} + triangles: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + triangleCount: 0 + vertexCount: 0 + targetRigidbody: {fileID: 975912081} + submergedVolume: 0 +--- !u!33 &87371386 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 87371382} + m_Mesh: {fileID: 4300000, guid: d9c2d3b5b3491844cb195e03ee9e1524, type: 3} --- !u!1 &100546465 GameObject: m_ObjectHideFlags: 0 @@ -874,79 +956,6 @@ Transform: - {fileID: 44403557} m_Father: {fileID: 357776295} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &107190133 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 107190135} - - component: {fileID: 107190134} - m_Layer: 0 - m_Name: DataManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &107190134 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107190133} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 996bb30c01d484013ab3cb98f88b5c03, type: 3} - m_Name: - m_EditorClassIdentifier: - _persistent: 0 - k__BackingField: - fishInfoList: [] - mouseSpot: {fileID: 1347266192824951316, guid: 049de7a77e0534ced92b672937a0f8db, - type: 3} - boat: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3} - assaultCard: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b, - type: 3} - radarTargetUi: {fileID: 1435528194207525114, guid: 68e1bc2a7cb0a4db89fc3777be734250, - type: 3} - vomit: {fileID: 8216347814332420713, guid: 55593ff8cc9154523aa7f5951f2444a5, type: 3} - nukeFire: {fileID: 128572, guid: d8aca1dfdbd0741fca61f68fd3bc8119, type: 3} - grenadeFire: {fileID: 128572, guid: 8d387b0f65dfa4cdc965c4b56216e120, type: 3} - emojiHeart: {fileID: 0} - emojiPuke: {fileID: 0} - emojiAnger: {fileID: 0} - cardType: - - {fileID: 21300000, guid: 550b6170d3e5c4cf885cf56fa1df8f6b, type: 3} - - {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3} - - {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3} - - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} - - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} - - {fileID: 21300000, guid: 550b6170d3e5c4cf885cf56fa1df8f6b, type: 3} - - {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3} - - {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3} - - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} - - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} - cursorTexture: {fileID: 2800000, guid: 3a146044a282641d99ba04c33b8c2bbf, type: 3} - enemyMarker: {fileID: 21300000, guid: c617a5b08493842c3833527a458fd612, type: 3} ---- !u!4 &107190135 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 107190133} - 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: 357776295} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &155713052 GameObject: m_ObjectHideFlags: 0 @@ -1247,6 +1256,8 @@ GameObject: - component: {fileID: 168896974} - component: {fileID: 168896976} - component: {fileID: 168896975} + - component: {fileID: 168896978} + - component: {fileID: 168896977} m_Layer: 0 m_Name: BaseShipCam m_TagString: Untagged @@ -1263,7 +1274,7 @@ Transform: m_GameObject: {fileID: 168896972} serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: -37.3, y: 21.420004, z: -34.641014} + m_LocalPosition: {x: -37.3, y: 26.420006, z: -43.301266} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -1289,7 +1300,7 @@ MonoBehaviour: m_Priority: 1 m_StandbyUpdate: 2 m_LookAt: {fileID: 0} - m_Follow: {fileID: 476261175} + m_Follow: {fileID: 975912082} m_Lens: FieldOfView: 60 OrthographicSize: 30 @@ -1541,6 +1552,101 @@ MonoBehaviour: m_FrequencyGain: 1 m_Duration: 1 m_NoiseOffsets: {x: 0, y: 0, z: 0} +--- !u!114 &168896977 +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: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 1 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 64 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 1 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!20 &168896978 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168896972} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 --- !u!1001 &181621279 PrefabInstance: m_ObjectHideFlags: 0 @@ -1952,6 +2058,38 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &244711281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 244711282} + m_Layer: 9 + m_Name: Rudders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &244711282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 244711281} + 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: 87371383} + m_Father: {fileID: 975912082} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &248177876 GameObject: m_ObjectHideFlags: 0 @@ -2111,7 +2249,7 @@ MonoBehaviour: m_TargetMovementOnly: 1 m_ScreenX: 0.5 m_ScreenY: 0.5 - m_CameraDistance: 40 + m_CameraDistance: 50 m_DeadZoneWidth: 0 m_DeadZoneHeight: 0 m_DeadZoneDepth: 0 @@ -2498,7 +2636,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &280786784 Transform: m_ObjectHideFlags: 0 @@ -3161,7 +3299,6 @@ Transform: - {fileID: 100546466} - {fileID: 1775595014} - {fileID: 541711049} - - {fileID: 107190135} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1001 &392546456 @@ -3621,7 +3758,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &476261171 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3653,7 +3790,17 @@ MonoBehaviour: boostPower: 2 boostMaxTime: 3 boostRecoveryTime: 1.5 - isBoosting: 0 + additionalBoostTime: 1 + boostCooldownTime: 5 + useBoostSpeedLines: 1 + useBoostChangeDistance: 1 + shrinkDistance: 20 + shrinkTime: 1 + distanceReturnTime: 0.2 + useBoostCameraShaking: 1 + shakingForceCoefficient: 0.8 + useBoostVignetteEffect: 1 + vignetteForceCoefficient: 0.4 waterLayer: serializedVersion: 2 m_Bits: 16 @@ -6874,7 +7021,7 @@ PrefabInstance: - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, type: 3} propertyPath: m_LocalPosition.y - value: -25.1 + value: -40 objectReference: {fileID: 0} - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, type: 3} @@ -6946,6 +7093,12 @@ PrefabInstance: propertyPath: boidCount value: 100 objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidPrefab + value: + objectReference: {fileID: 5402562142639805275, guid: c6911733874ec6645aa30548164bb1fb, + type: 3} - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, type: 3} propertyPath: spawnRange @@ -7010,7 +7163,7 @@ GameObject: m_Component: - component: {fileID: 734248431} - component: {fileID: 734248430} - m_Layer: 0 + m_Layer: 6 m_Name: PostProcessingVolume m_TagString: Untagged m_Icon: {fileID: 0} @@ -7033,7 +7186,7 @@ MonoBehaviour: priority: 0 blendDistance: 0 weight: 1 - sharedProfile: {fileID: 11400000, guid: 0b1b99f1a0a424c56980a2490e5787e2, type: 2} + sharedProfile: {fileID: 11400000, guid: 4fe60212ac4271943ba8246d9163790f, type: 2} --- !u!4 &734248431 Transform: m_ObjectHideFlags: 0 @@ -7043,7 +7196,7 @@ Transform: m_GameObject: {fileID: 734248429} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 75.07783, y: 32.1456, z: 53.378704} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7075,7 +7228,7 @@ Transform: m_GameObject: {fileID: 745028225} serializedVersion: 2 m_LocalRotation: {x: 0.51935977, y: 0.15213497, z: -0.094561435, w: 0.8355708} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.0019607544, y: 0, z: -0.0012359619} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -7229,10 +7382,11 @@ GameObject: - component: {fileID: 776161957} - component: {fileID: 776161955} - component: {fileID: 776161954} + - component: {fileID: 776161963} + - component: {fileID: 776161960} - component: {fileID: 776161959} - component: {fileID: 776161961} - component: {fileID: 776161962} - - component: {fileID: 776161960} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -7316,7 +7470,7 @@ Transform: m_GameObject: {fileID: 776161953} serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} - m_LocalPosition: {x: -37.3, y: 21.420004, z: -34.641014} + m_LocalPosition: {x: -37.3, y: 26.420006, z: -43.301266} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7342,7 +7496,7 @@ MonoBehaviour: m_RendererIndex: -1 m_VolumeLayerMask: serializedVersion: 2 - m_Bits: 1 + m_Bits: 64 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 m_RenderPostProcessing: 1 @@ -7427,6 +7581,66 @@ MonoBehaviour: m_EditorClassIdentifier: autoInit: 1 k__BackingField: {fileID: 168896974} +--- !u!114 &776161963 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776161953} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 776161958} + volumeLayer: + serializedVersion: 2 + m_Bits: 64 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] --- !u!1001 &795209795 PrefabInstance: m_ObjectHideFlags: 0 @@ -7946,8 +8160,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 957406933} serializedVersion: 2 - m_LocalRotation: {x: 0.538808, y: 0.14987604, z: -0.098102435, w: 0.8231641} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.53880805, y: 0.14987588, z: -0.09810233, w: 0.8231641} + m_LocalPosition: {x: 0.000015258789, y: 0, z: -0.000015258789} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -8000,6 +8214,483 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 616875524} +--- !u!1001 &969937948 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.x + value: -17.3 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.z + value: 133 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.z + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_Name + value: Boids (3) + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: moveSpd + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidPrefab + value: + objectReference: {fileID: 5402562142639805275, guid: 1294b74a61e4faa49a0fb449956b4fda, + type: 3} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: escapeMode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: spawnRange + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: viewRadius + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField.y + value: 15 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3} +--- !u!1 &975912075 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 975912082} + - component: {fileID: 975912081} + - component: {fileID: 975912080} + - component: {fileID: 975912079} + - component: {fileID: 975912078} + - component: {fileID: 975912077} + - component: {fileID: 975912076} + - component: {fileID: 975912083} + m_Layer: 9 + m_Name: ShipPlayer + m_TagString: ShipPlayer + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &975912076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 176cfac66084d4bfb9b4c9f11c4b137f, type: 3} + m_Name: + m_EditorClassIdentifier: + autoInit: 1 + maxSpeed: 20 + acceleration: 20 + deceleration: 10 + turnSpeed: 90 + k__BackingField: 100 + k__BackingField: 0 + k__BackingField: 500 + cannon: {fileID: 4529632010256582} + cannonCooldown: 1 + chargingSpeed: 1 + isFireMode: 0 + chargingCannon: 0 + isReloading: 0 + chargingGauge: 0 + previousGauge: 0 + boostPower: 2 + boostMaxTime: 3 + boostRecoveryTime: 1.5 + additionalBoostTime: 1 + boostCooldownTime: 5 + useBoostSpeedLines: 1 + useBoostChangeDistance: 1 + shrinkDistance: 20 + shrinkTime: 1 + distanceReturnTime: 0.2 + useBoostCameraShaking: 1 + shakingForceCoefficient: 0.8 + useBoostVignetteEffect: 1 + vignetteForceCoefficient: 0.4 + waterLayer: + serializedVersion: 2 + m_Bits: 16 +--- !u!114 &975912077 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a5473918a168c44fa0294bd4d1399f0, type: 3} + m_Name: + m_EditorClassIdentifier: + conversationEvents: + onConversationStart: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 476261179} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onConversationEnd: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 476261179} + m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine + m_MethodName: set_enabled + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + runOnConversationEndEventsAtEndOfFrame: 0 + onConversationCancelled: + m_PersistentCalls: + m_Calls: [] + onConversationLine: + m_PersistentCalls: + m_Calls: [] + onConversationLineEnd: + m_PersistentCalls: + m_Calls: [] + onConversationLineCancelled: + m_PersistentCalls: + m_Calls: [] + onConversationResponseMenu: + m_PersistentCalls: + m_Calls: [] + onConversationResponseMenuTimeout: + m_PersistentCalls: + m_Calls: [] + onLinkedConversationStart: + m_PersistentCalls: + m_Calls: [] + barkEvents: + onBarkStart: + m_PersistentCalls: + m_Calls: [] + onBarkEnd: + m_PersistentCalls: + m_Calls: [] + onBarkLine: + m_PersistentCalls: + m_Calls: [] + sequenceEvents: + onSequenceStart: + m_PersistentCalls: + m_Calls: [] + onSequenceEnd: + m_PersistentCalls: + m_Calls: [] + questEvents: + onQuestStateChange: + m_PersistentCalls: + m_Calls: [] + onQuestTrackingEnabled: + m_PersistentCalls: + m_Calls: [] + onQuestTrackingDisabled: + m_PersistentCalls: + m_Calls: [] + onUpdateQuestTracker: + m_PersistentCalls: + m_Calls: [] + pauseEvents: + onDialogueSystemPause: + m_PersistentCalls: + m_Calls: [] + onDialogueSystemUnpause: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &975912078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 42f17d3292d455242a47944a59dea99c, type: 3} + m_Name: + m_EditorClassIdentifier: + tagSpecificElements: [] + layerSpecificElements: [] +--- !u!114 &975912079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 963d6358c55a0f44d8de57bee560f184, type: 3} + m_Name: + m_EditorClassIdentifier: + useDefaultGUI: 1 + guiSkin: {fileID: 0} + guiStyleName: label + alignment: 1 + color: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + textStyle: 1 + textStyleColor: {r: 0, g: 0, b: 0, a: 1} + defaultUseMessage: testtest + useKey: 101 + useButton: + enableTouch: 0 + touchArea: + origin: 0 + alignment: 0 + x: + scale: 0 + value: 0 + y: + scale: 0 + value: 0 + width: + scale: 0 + value: 0 + height: + scale: 0 + value: 0 + minPixelWidth: 0 + minPixelHeight: 0 + broadcastToChildren: 1 + actorTransform: {fileID: 0} + onSelectedUsable: + m_PersistentCalls: + m_Calls: [] + onDeselectedUsable: + m_PersistentCalls: + m_Calls: [] + usablesInRange: [] +--- !u!114 &975912080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + 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!54 &975912081 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + serializedVersion: 4 + m_Mass: 111335.125 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: -0.37, 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: 0 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!4 &975912082 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -37.3, y: -1.58, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2652399630204165252} + - {fileID: 1199960034} + - {fileID: 4529632010256581} + - {fileID: 244711282} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &975912083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 975912075} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 818177d2061f4558b66bee63b4cc78f6, type: 3} + m_Name: + m_EditorClassIdentifier: + useDefaultMass: 1 + useMassAffectors: 0 + baseMass: 111335.125 + combinedMass: 10000 + dimensions: {x: 41.628044, y: 18.221802, z: 16.193644} + useDefaultCenterOfMass: 0 + centerOfMass: {x: 0, y: -0.37, z: 0} + combinedCenterOfMass: {x: 0, y: -0.37, z: 0} + useDefaultInertia: 1 + inertiaTensor: {x: 0, y: 0, z: 0} + combinedInertiaTensor: {x: 0, y: 0, z: 0} --- !u!1001 &991171997 PrefabInstance: m_ObjectHideFlags: 0 @@ -9051,6 +9742,38 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1193870196} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1199960033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1199960034} + m_Layer: 0 + m_Name: DirectionIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1199960034 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1199960033} + 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: 1258025968} + m_Father: {fileID: 975912082} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1220444710 PrefabInstance: m_ObjectHideFlags: 0 @@ -9393,10 +10116,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1256859594} - - targetCorrespondingSourceObject: {fileID: 6209097434605892902, guid: a003617243f099842ac3523a93f80e28, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1256859593} m_SourcePrefab: {fileID: 100100000, guid: a003617243f099842ac3523a93f80e28, type: 3} --- !u!4 &1256859591 stripped Transform: @@ -9410,18 +10129,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1256859590} m_PrefabAsset: {fileID: 0} ---- !u!114 &1256859593 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1256859592} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!65 &1256859594 BoxCollider: m_ObjectHideFlags: 0 @@ -9443,6 +10150,92 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 3.95, y: 5.824234, z: 5.53} m_Center: {x: 0.008092642, y: 2.912117, z: -0.0097852945} +--- !u!1 &1258025967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1258025968} + - component: {fileID: 1258025969} + m_Layer: 0 + m_Name: Line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1258025968 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258025967} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 3, z: 8} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1199960034} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1258025969 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1258025967} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: 76cb51117ead0a94ba2c9b11409a3c1b, type: 3} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1284342734 PrefabInstance: m_ObjectHideFlags: 0 @@ -9573,6 +10366,37 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &1286537729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1286537730} + m_Layer: 7 + m_Name: FirePos + m_TagString: Untagged + m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1286537730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1286537729} + serializedVersion: 2 + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: 0, y: 1.012, z: 1.322} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4529632010256581} + m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!4 &1302515238 stripped Transform: m_CorrespondingSourceObject: {fileID: 412716, guid: e1c4cc5b9a7d0d7479734ea4167d417e, @@ -9801,10 +10625,6 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 1332914092} - - targetCorrespondingSourceObject: {fileID: 3388854588669550803, guid: fbe5f9d69cf27974fa4899b0bcf542c8, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1332914091} m_SourcePrefab: {fileID: 100100000, guid: fbe5f9d69cf27974fa4899b0bcf542c8, type: 3} --- !u!4 &1332914089 stripped Transform: @@ -9818,18 +10638,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1332914088} m_PrefabAsset: {fileID: 0} ---- !u!114 &1332914091 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1332914090} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 910f2fd54fe913648b37e911580e8068, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!65 &1332914092 BoxCollider: m_ObjectHideFlags: 0 @@ -10095,8 +10903,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1354317158} serializedVersion: 2 - m_LocalRotation: {x: 0.5577791, y: 0.1475574, z: -0.10155658, w: 0.81042933} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.5577792, y: 0.14755717, z: -0.10155645, w: 0.81042933} + m_LocalPosition: {x: 0.000015258789, y: 0, z: -0.000015258789} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10149,6 +10957,155 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1038660713} +--- !u!1001 &1374397827 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.x + value: -100.5 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.y + value: -40 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.z + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2146763844810315378, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.y + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.z + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_Name + value: Boids (2) + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: moveSpd + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidCount + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidPrefab + value: + objectReference: {fileID: 5402562142639805275, guid: 1294b74a61e4faa49a0fb449956b4fda, + type: 3} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: escapeMode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: spawnRange + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: viewRadius + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField.y + value: 15 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3} --- !u!1 &1388717422 GameObject: m_ObjectHideFlags: 0 @@ -10273,7 +11230,7 @@ Transform: m_GameObject: {fileID: 1389301164} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 26.277973, y: 144.99, z: -21.115704} + m_LocalPosition: {x: 26.27801, y: 144.99, z: -21.115705} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -10675,6 +11632,167 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1446558449} m_PrefabAsset: {fileID: 0} +--- !u!114 &1446558451 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 6935276925009161161, guid: 380b9020d37774c7a9f587a854c1e063, + type: 3} + m_PrefabInstance: {fileID: 1446558449} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &1461379613 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.x + value: -51.1 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.y + value: -30 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.z + value: 79.2 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalScale.z + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 2854089398056668840, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: m_Name + value: Boids (4) + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: moveSpd + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidPrefab + value: + objectReference: {fileID: 5402562142639805275, guid: 6469fb143a712d448acc225487805c37, + type: 3} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: escapeMode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: spawnRange + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: viewRadius + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField.x + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: k__BackingField.y + value: 8 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3} --- !u!1 &1485085414 GameObject: m_ObjectHideFlags: 3 @@ -10700,8 +11818,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1485085414} serializedVersion: 2 - m_LocalRotation: {x: 0.38024554, y: 0.6187311, z: -0.462958, w: 0.50818807} - m_LocalPosition: {x: -0.00090026855, y: 0, z: -0.0045318604} + m_LocalRotation: {x: 0.3802511, y: 0.618725, z: -0.46295345, w: 0.50819546} + m_LocalPosition: {x: -0.0011329651, y: 0, z: -0.0057144165} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -12411,19 +13529,35 @@ MonoBehaviour: _persistent: 0 k__BackingField: fishInfoList: [] - mouseSpot: {fileID: 0} - boat: {fileID: 0} - assaultCard: {fileID: 0} - radarTargetUi: {fileID: 0} - vomit: {fileID: 0} - nukeFire: {fileID: 0} - grenadeFire: {fileID: 0} - emojiHeart: {fileID: 0} - emojiPuke: {fileID: 0} - emojiAnger: {fileID: 0} - cardType: [] - cursorTexture: {fileID: 0} - enemyMarker: {fileID: 0} + mouseSpot: {fileID: 1347266192824951316, guid: 049de7a77e0534ced92b672937a0f8db, + type: 3} + boat: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3} + assaultCard: {fileID: 6030931212828352948, guid: 410908daff8b945d8b8c446cb753408b, + type: 3} + radarTargetUi: {fileID: 1435528194207525114, guid: 68e1bc2a7cb0a4db89fc3777be734250, + type: 3} + vomit: {fileID: 8216347814332420713, guid: 55593ff8cc9154523aa7f5951f2444a5, type: 3} + nukeFire: {fileID: 128572, guid: d8aca1dfdbd0741fca61f68fd3bc8119, type: 3} + grenadeFire: {fileID: 128572, guid: 8d387b0f65dfa4cdc965c4b56216e120, type: 3} + emojiHeart: {fileID: 3523074446096352133, guid: 22a7d5eadf1bb47a8ad592fa363968b7, + type: 3} + emojiPuke: {fileID: 7384045767894681630, guid: e46328608a61c4a48ab35e50c1e0e680, + type: 3} + emojiAnger: {fileID: 2169051243893775671, guid: 793d59d641d644fc687339cf74f6fb6f, + type: 3} + cardType: + - {fileID: 21300000, guid: 550b6170d3e5c4cf885cf56fa1df8f6b, type: 3} + - {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3} + - {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3} + - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} + - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} + - {fileID: 21300000, guid: 550b6170d3e5c4cf885cf56fa1df8f6b, type: 3} + - {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3} + - {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3} + - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} + - {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3} + cursorTexture: {fileID: 2800000, guid: 3a146044a282641d99ba04c33b8c2bbf, type: 3} + enemyMarker: {fileID: 21300000, guid: c617a5b08493842c3833527a458fd612, type: 3} --- !u!1001 &1708098703 PrefabInstance: m_ObjectHideFlags: 0 @@ -15166,6 +16300,61 @@ NavMeshObstacle: m_CarveOnlyStationary: 1 m_Center: {x: -0.09900001, y: 2.229, z: 0.049000002} m_TimeToStationary: 0.5 +--- !u!1 &2014893524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2014893525} + - component: {fileID: 2014893526} + m_Layer: 5 + m_Name: SpeedLines + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2014893525 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014893524} + 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: 2105062291} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2014893526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2014893524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b508e85f957f4d441998fa32fb18b473, type: 3} + m_Name: + m_EditorClassIdentifier: + shader: {fileID: 4800000, guid: 3dafd9b1d17896a448d50c05e43d1f21, type: 3} + texture: {fileID: 2800000, guid: 5460bab505c65b747acf4fd1a32d9da4, type: 3} + color: {r: 1, g: 1, b: 1, a: 0.5764706} + width: 0.4 + length: 0.42 + lengthSpeed: 17 + density: 0.75 --- !u!1001 &2039624346 PrefabInstance: m_ObjectHideFlags: 0 @@ -15479,6 +16668,7 @@ RectTransform: - {fileID: 7415601899565865879} - {fileID: 480975273} - {fileID: 1446558450} + - {fileID: 2014893525} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -15520,7 +16710,8 @@ MonoBehaviour: k__BackingField: 0.5 k__BackingField: 10 processBarOffset: {x: 0, y: 0, z: 0} - k__BackingField: {fileID: 0} + k__BackingField: {fileID: 1446558451} + k__BackingField: {fileID: 2014893524} --- !u!1001 &2114222814 PrefabInstance: m_ObjectHideFlags: 0 @@ -15749,6 +16940,146 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2129584968} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1595413212644777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4143712617986135} + - component: {fileID: 33244318062754475} + - component: {fileID: 23474627402593889} + m_Layer: 0 + m_Name: pirat_cannon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!1 &1644207063785795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4529632010256581} + - component: {fileID: 4529632010256582} + m_Layer: 0 + m_Name: Cannon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &4143712617986135 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595413212644777} + 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: 4529632010256581} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4529632010256581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644207063785795} + serializedVersion: 2 + m_LocalRotation: {x: -0.08715578, y: 0, z: 0, w: 0.9961947} + m_LocalPosition: {x: 0, y: 5.262, z: 3.23} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4143712617986135} + - {fileID: 1286537730} + m_Father: {fileID: 975912082} + m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} +--- !u!114 &4529632010256582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644207063785795} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3} + m_Name: + m_EditorClassIdentifier: + autoInit: 1 + projectileObj: {fileID: 128572, guid: 8d387b0f65dfa4cdc965c4b56216e120, type: 3} + firePos: {fileID: 1286537730} + fireAngle: 0.2 + speed: 75 + height: 30 + randomCatch: {x: 1, y: 4} + cameraShakePower: 2 + cameraShakeDuration: 0.3 +--- !u!23 &23474627402593889 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595413212644777} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 211485be4706e2546b2fa9e5261bede5, 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 &33244318062754475 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595413212644777} + m_Mesh: {fileID: 7614671844300925536, guid: e174a08d577359c44bd7930fac541c9f, type: 3} --- !u!64 &64047883483704471 MeshCollider: m_ObjectHideFlags: 0 @@ -15837,6 +17168,160 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 43255131788321556, guid: 89cd1f768c41d774582ead143be71c37, type: 2} +--- !u!33 &90500573763691088 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7378706743454093667} + m_Mesh: {fileID: 7248041548669669315, guid: e174a08d577359c44bd7930fac541c9f, type: 3} +--- !u!33 &640465280499345089 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5955351832634056709} + m_Mesh: {fileID: -3028017588688184324, guid: e174a08d577359c44bd7930fac541c9f, type: 3} +--- !u!4 &720954570547921147 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5955351832634056709} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 12.92, z: -0.1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3335688658561809456} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &740866800504269180 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170096154301906649} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1170096154301906649 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3335688658561809456} + - component: {fileID: 6723193483601570699} + - component: {fileID: 740866800504269180} + m_Layer: 0 + m_Name: boat_01_mast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2652399630204165252 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7378706743454093667} + 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: 3335688658561809456} + - {fileID: 8403273370487288770} + m_Father: {fileID: 975912082} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &2775456861694869406 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7378706743454093667} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1001 &2821987114204187354 PrefabInstance: m_ObjectHideFlags: 0 @@ -15848,17 +17333,17 @@ PrefabInstance: - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, type: 3} propertyPath: m_LocalPosition.x - value: -13.5 + value: -2.91 objectReference: {fileID: 0} - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, type: 3} propertyPath: m_LocalPosition.y - value: -9.48 + value: -15 objectReference: {fileID: 0} - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 14.3 objectReference: {fileID: 0} - target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47, type: 3} @@ -15920,6 +17405,12 @@ PrefabInstance: propertyPath: m_Name value: Boids objectReference: {fileID: 0} + - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, + type: 3} + propertyPath: boidPrefab + value: + objectReference: {fileID: 5402562142639805275, guid: c6911733874ec6645aa30548164bb1fb, + type: 3} - target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47, type: 3} propertyPath: escapeMode @@ -15977,6 +17468,66 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &3335688658561809456 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170096154301906649} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 3.42, z: -0.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 720954570547921147} + m_Father: {fileID: 2652399630204165252} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &4371778850838647506 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5955351832634056709} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!222 &4668650722486772898 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16015,6 +17566,24 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5955351832634056709 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 720954570547921147} + - component: {fileID: 640465280499345089} + - component: {fileID: 4371778850838647506} + m_Layer: 0 + m_Name: boat_01_flag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!95 &6136937312830644462 Animator: serializedVersion: 7 @@ -16037,6 +17606,133 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!33 &6723193483601570699 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1170096154301906649} + m_Mesh: {fileID: -1090355519079891785, guid: e174a08d577359c44bd7930fac541c9f, type: 3} +--- !u!1 &7378706743454093667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2652399630204165252} + - component: {fileID: 90500573763691088} + - component: {fileID: 2775456861694869406} + - component: {fileID: 7378706743454093670} + - component: {fileID: 7378706743454093669} + - component: {fileID: 7378706743454093668} + m_Layer: 9 + m_Name: VisualLook + m_TagString: ShipPlayer + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &7378706743454093668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7378706743454093667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ca3428d119d4dc5a018840803e81994, type: 3} + m_Name: + m_EditorClassIdentifier: + material: {fileID: 11400000, guid: bcb559cbb0ee0fe49b3d7a3b54039bdb, type: 2} + density: 0 + mass: 111335.125 + volume: 222.67024 +--- !u!114 &7378706743454093669 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7378706743454093667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9118365f988afd4419c64e108a8bbc64, type: 3} + m_Name: + m_EditorClassIdentifier: + finalForceCoefficient: 1 + finalTorqueCoefficient: 1 + defaultWaterHeight: 0 + defaultWaterNormal: {x: 0, y: 1, z: 0} + defaultWaterFlow: {x: 0, y: 0, z: 0} + calculateWaterHeights: 1 + calculateWaterNormals: 0 + calculateWaterFlows: 0 + fluidDensity: 1030 + buoyantForceCoefficient: 9 + slamForceCoefficient: 1 + suctionForceCoefficient: 1 + hydrodynamicForceCoefficient: 1 + velocityDotPower: 1 + skinDragCoefficient: 0.01 + convexifyMesh: 1 + simplifyMesh: 1 + weldColocatedVertices: 1 + targetTriangleCount: 64 + originalMesh: {fileID: 7248041548669669315, guid: e174a08d577359c44bd7930fac541c9f, + type: 3} + serializedSimulationMesh: + vertices: + - {x: -2.4488986, y: 2.4663444, z: -3.7522728} + - {x: 2.4488993, y: 2.4663444, z: -3.7522726} + - {x: -0.0000005007197, y: 6.8083506, z: 6.138805} + - {x: -0.00000047005938, y: 5.9106164, z: 5.7326965} + - {x: -2.6124632, y: 6.1147313, z: 3.9180279} + - {x: 2.6124632, y: 6.1147313, z: 3.918028} + - {x: 3.1003277, y: 4.043529, z: 0.4490372} + - {x: 2.153518, y: 5.1724415, z: 3.918028} + - {x: -2.1535184, y: 5.1724415, z: 3.9180279} + - {x: 2.6124637, y: 4.460825, z: -4.9289637} + - {x: -2.6124628, y: 4.460825, z: -4.9289637} + - {x: 0.00000039364858, y: 3.4484823, z: -5.707463} + - {x: 1.7325904, y: 6.487637, z: -4.530168} + - {x: -0.000000037252903, y: 4.5821696e-22, z: -2.8125157e-15} + - {x: -1.7325897, y: 6.487637, z: -4.530168} + - {x: 0.00000035969623, y: 6.487637, z: -5.2577496} + - {x: -3.1003277, y: 4.043529, z: 0.44903675} + - {x: -1.6823297, y: 1.2968589, z: 1.9576544} + - {x: 1.6823295, y: 1.2968589, z: 1.9576548} + - {x: 0.00000020998584, y: 0.43785053, z: -3.2747762} + triangles: 010000000600000012000000120000000d0000000100000012000000110000000d000000000000000d0000001100000011000000100000000000000002000000050000000c000000120000000600000005000000130000000b00000001000000010000000d00000013000000000000000b00000013000000130000000d000000000000000900000006000000010000000b000000090000000100000005000000060000000900000005000000090000000c000000090000000b0000000f0000000f0000000c00000009000000020000000c0000000f0000000f0000000e000000020000000400000010000000110000000e0000000400000002000000030000001100000012000000100000000a00000000000000000000000a0000000b0000000e0000000a00000004000000040000000a000000100000000f0000000b0000000a0000000a0000000e0000000f000000080000000300000002000000020000000400000008000000030000000800000011000000110000000800000004000000020000000300000007000000070000000500000002000000120000000700000003000000050000000700000012000000 + triangleCount: 0 + vertexCount: 0 + targetRigidbody: {fileID: 975912081} + submergedVolume: 0 +--- !u!64 &7378706743454093670 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7378706743454093667} + 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: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 7248041548669669315, guid: e174a08d577359c44bd7930fac541c9f, type: 3} --- !u!1 &7415601898274685977 GameObject: m_ObjectHideFlags: 0 @@ -16234,7 +17930,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7415601899565865879 RectTransform: m_ObjectHideFlags: 0 @@ -16438,7 +18134,7 @@ RectTransform: m_Father: {fileID: 7415601898274685978} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 5, y: 10} m_Pivot: {x: 0.5, y: 0.5} @@ -16528,7 +18224,7 @@ RectTransform: m_Father: {fileID: 7415601898878557319} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -16570,6 +18266,91 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7415601900150503606} m_CullTransparentMesh: 0 +--- !u!33 &7453780286455553244 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8331140830047541328} + m_Mesh: {fileID: 6847518756029031712, guid: e174a08d577359c44bd7930fac541c9f, type: 3} +--- !u!1 &8331140830047541328 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8403273370487288770} + - component: {fileID: 7453780286455553244} + - component: {fileID: 8919935956366376945} + m_Layer: 0 + m_Name: boat_01_wheel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8403273370487288770 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8331140830047541328} + serializedVersion: 2 + m_LocalRotation: {x: 0.1484949, y: -0, z: -0, w: 0.9889132} + m_LocalPosition: {x: 0, y: 6.685426, z: -2.8368456} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2652399630204165252} + m_LocalEulerAnglesHint: {x: 17.079, y: 0, z: 0} +--- !u!23 &8919935956366376945 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8331140830047541328} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5134ad0f4fc645b4a8e99a88724d182a, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -16584,6 +18365,7 @@ SceneRoots: - {fileID: 1540310984} - {fileID: 2105062291} - {fileID: 1560348101} + - {fileID: 975912082} - {fileID: 476261175} - {fileID: 357776295} - {fileID: 200595900} @@ -16592,3 +18374,6 @@ SceneRoots: - {fileID: 280786784} - {fileID: 2821987114204187354} - {fileID: 718723263} + - {fileID: 1374397827} + - {fileID: 969937948} + - {fileID: 1461379613} diff --git a/BlueWater/Assets/01.Scenes/02.Ocean/OceanPostProcessingVolume.asset b/BlueWater/Assets/01.Scenes/02.Ocean/OceanPostProcessingVolume.asset new file mode 100644 index 000000000..2abea3cc8 --- /dev/null +++ b/BlueWater/Assets/01.Scenes/02.Ocean/OceanPostProcessingVolume.asset @@ -0,0 +1,44 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: OceanPostProcessingVolume + m_EditorClassIdentifier: + components: + - {fileID: 751907871111195936} +--- !u!114 &751907871111195936 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + color: + m_OverrideState: 1 + m_Value: {r: 0.262, g: 0, b: 0, a: 1} + center: + m_OverrideState: 1 + m_Value: {x: 0.5, y: 0.5} + intensity: + m_OverrideState: 1 + m_Value: 0 + smoothness: + m_OverrideState: 1 + m_Value: 1 + rounded: + m_OverrideState: 1 + m_Value: 1 diff --git a/BlueWater/Assets/01.Scenes/02.Ocean/OceanPostProcessingVolume.asset.meta b/BlueWater/Assets/01.Scenes/02.Ocean/OceanPostProcessingVolume.asset.meta new file mode 100644 index 000000000..2ec0fc218 --- /dev/null +++ b/BlueWater/Assets/01.Scenes/02.Ocean/OceanPostProcessingVolume.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4fe60212ac4271943ba8246d9163790f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs b/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs index 6504129f5..cbb6f9010 100644 --- a/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs +++ b/BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs @@ -2,6 +2,7 @@ using System.Collections; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.InputSystem; +using Vignette = UnityEngine.Rendering.Universal.Vignette; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -14,13 +15,15 @@ namespace BlueWaterProject [Title("쉽의 기본 설정")] [Tooltip("최대 스피드")] - [SerializeField] private float maxSpeed = 10f; + [SerializeField] private float maxSpeed = 20f; + [DisableIf("@true")] + [SerializeField]private float defaultMaxSpeed; [Tooltip("가속 수치")] - [SerializeField] private float acceleration = 2f; + [SerializeField] private float acceleration = 20f; [Tooltip("감속 수치")] - [SerializeField] private float deceleration = 2f; + [SerializeField] private float deceleration = 10f; [Tooltip("회전 속도")] - [SerializeField] private float turnSpeed = 10f; + [SerializeField] private float turnSpeed = 90f; [Tooltip("배의 최대 체력")] [field: SerializeField] public float MaxHp { get; private set; } = 100; [Tooltip("배의 현재 체력")] @@ -32,25 +35,59 @@ namespace BlueWaterProject [SerializeField] private Cannon cannon; [SerializeField] private float cannonCooldown = 1f; [SerializeField] private float chargingSpeed = 1f; + + [DisableIf("@true")] [SerializeField] private bool isFireMode; + [DisableIf("@true")] [SerializeField] private bool chargingCannon; + [DisableIf("@true")] [SerializeField] private bool isReloading; + [DisableIf("@true")] [SerializeField] private float chargingGauge; + [DisableIf("@true")] [SerializeField] private float previousGauge; [Title("부스트")] [SerializeField] private float boostPower = 2f; [SerializeField] private float boostMaxTime = 3f; [SerializeField] private float boostRecoveryTime = 1.5f; + + [SerializeField] private float additionalBoostTime = 1f; + [SerializeField] private float boostCooldownTime = 5f; + private float currentAdditionalBoostTime; + private float currentBoostCooldownTime; + + [Space(10)] + [SerializeField] private bool useBoostSpeedLines = true; + [SerializeField] private bool useBoostChangeDistance = true; + + [ShowIf("@useBoostChangeDistance")] + [SerializeField] private float shrinkDistance = 20f; + [ShowIf("@useBoostChangeDistance")] + [SerializeField] private float shrinkTime = 1f; + [ShowIf("@useBoostChangeDistance")] + [SerializeField] private float distanceReturnTime = 0.2f; + + [SerializeField] private bool useBoostCameraShaking = true; + [ShowIf("@useBoostCameraShaking")] + [SerializeField] private float shakingForceCoefficient = 0.8f; + + [SerializeField] private bool useBoostVignetteEffect = true; + [ShowIf("@useBoostVignetteEffect")] + [SerializeField] private float vignetteForceCoefficient = 0.4f; + + [DisableIf("@true")] [SerializeField] private bool isBoosting; + [Title("Extensions Data")] + [SerializeField] private LayerMask waterLayer; + private PlayerInput playerInput; private Rigidbody rb; private GameObject directionIndicator; - - [SerializeField] private LayerMask waterLayer; + private Vector2 movementInput; - + [Button("셋팅 초기화")] private void Init() { @@ -63,7 +100,8 @@ namespace BlueWaterProject directionIndicator.SetActive(false); waterLayer = LayerMask.GetMask("Water"); - + + defaultMaxSpeed = maxSpeed; SetCurrentHp(MaxHp); } @@ -106,12 +144,9 @@ namespace BlueWaterProject private void Start() { - - } - - private void FixedUpdate() - { - + waterLayer = LayerMask.GetMask("Water"); + defaultMaxSpeed = maxSpeed; + SetCurrentHp(MaxHp); } private void Update() @@ -136,7 +171,13 @@ namespace BlueWaterProject if (moveDirection != Vector3.zero) { var targetRotation = Quaternion.LookRotation(moveDirection, Vector3.up); - rb.rotation = Quaternion.Slerp(rb.rotation, targetRotation, turnSpeed * Time.fixedDeltaTime); + var angleToRotate = Quaternion.Angle(rb.rotation, targetRotation); + + var rotationStep = turnSpeed / angleToRotate; + rb.rotation = Quaternion.Slerp(rb.rotation, targetRotation, rotationStep * Time.fixedDeltaTime); + + // var targetRotation = Quaternion.LookRotation(moveDirection, Vector3.up); + // rb.rotation = Quaternion.Slerp(rb.rotation, targetRotation, turnSpeed * Time.fixedDeltaTime); } } @@ -182,15 +223,62 @@ namespace BlueWaterProject { if (isBoosting) { - UiManager.Inst.OceanUi.ShipBoostSlider.value += Time.deltaTime * (1f / boostMaxTime); - if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f) + HandleBoostUsage(); + } + else + { + HandleBoostRecharge(); + } + + if (useBoostVignetteEffect && UiManager.Inst.OceanUi.ShipBoostSlider.value > 0f) + { + VisualFeedbackManager.Inst.SetVignetteIntensity(UiManager.Inst.OceanUi.ShipBoostSlider.value * vignetteForceCoefficient); + } + } + + private void HandleBoostUsage() + { + UiManager.Inst.OceanUi.ShipBoostSlider.value += Time.deltaTime * (1f / boostMaxTime); + if (useBoostCameraShaking) + { + var shakeValue = UiManager.Inst.OceanUi.ShipBoostSlider.value * shakingForceCoefficient; + VisualFeedbackManager.Inst.CameraShake(CameraManager.Inst.OceanCamera.BaseShipCam, shakeValue); + } + if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f && currentAdditionalBoostTime <= 0) + { + currentAdditionalBoostTime = additionalBoostTime; + } + + if (currentAdditionalBoostTime > 0) + { + currentAdditionalBoostTime -= Time.deltaTime; + if (currentAdditionalBoostTime <= 0) { + currentBoostCooldownTime = boostCooldownTime; + maxSpeed *= 0.5f; ShipStopBoost(); } } + } + + private void HandleBoostRecharge() + { + if (currentBoostCooldownTime > 0) + { + currentBoostCooldownTime -= Time.deltaTime; + UiManager.Inst.OceanUi.ShipBoostSlider.value = 1f; + } else { UiManager.Inst.OceanUi.ShipBoostSlider.value -= Time.deltaTime * (1f / boostRecoveryTime); + if (!Mathf.Approximately(defaultMaxSpeed, maxSpeed)) + { + maxSpeed = defaultMaxSpeed; + } + if (currentAdditionalBoostTime > 0f) + { + currentAdditionalBoostTime = 0f; + } } } @@ -306,21 +394,35 @@ namespace BlueWaterProject private void ShipBoost() { - if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f) + if (currentBoostCooldownTime > 0) return; + + isBoosting = true; + if (useBoostSpeedLines) { - isBoosting = false; + UiManager.Inst.OceanUi.SetActiveSpeedLine(true); } - else + if (useBoostChangeDistance) { - isBoosting = true; + CameraManager.Inst.OceanCamera.ChangeDistance(shrinkDistance, shrinkTime); + } + if (useBoostVignetteEffect) + { + VisualFeedbackManager.Inst.ToggleEffect(true); } } private void ShipStopBoost() { - if (!isBoosting) return; - isBoosting = false; + + if (useBoostSpeedLines) + { + UiManager.Inst.OceanUi.SetActiveSpeedLine(false); + } + if (useBoostChangeDistance) + { + CameraManager.Inst.OceanCamera.DefaultDistance(distanceReturnTime); + } } #endregion diff --git a/BlueWater/Assets/02.Scripts/OceanCamera.cs b/BlueWater/Assets/02.Scripts/OceanCamera.cs index 6974518c6..db5024110 100644 --- a/BlueWater/Assets/02.Scripts/OceanCamera.cs +++ b/BlueWater/Assets/02.Scripts/OceanCamera.cs @@ -1,3 +1,4 @@ +using System.Collections; using System.Collections.Generic; using Cinemachine; using Sirenix.OdinInspector; @@ -16,6 +17,10 @@ namespace BlueWaterProject private List cineCamList; private GameObject cineCams; + private CinemachineFramingTransposer framingTransposer; + private Coroutine distanceCoroutine; + + private float defaultDistance; private const int CINE_CAM_NUM = 1; @@ -46,6 +51,8 @@ namespace BlueWaterProject Debug.LogError("BaseShipCam is null error"); return; } + framingTransposer = BaseShipCam.GetCinemachineComponent(); + defaultDistance = framingTransposer.m_CameraDistance; cineCamList = new List(CINE_CAM_NUM) { @@ -61,5 +68,51 @@ namespace BlueWaterProject CameraManager.Inst.MainCam = Camera.main; } + + public void ChangeDistance(float addDistance, float time) + { + if (distanceCoroutine != null) + { + StopCoroutine(distanceCoroutine); + } + distanceCoroutine = StartCoroutine(ChangeDistanceCoroutine(addDistance, time)); + } + + private IEnumerator ChangeDistanceCoroutine(float addDistance, float time) + { + var changeDistance = framingTransposer.m_CameraDistance + addDistance; + var updateTime = 0f; + while (updateTime < time) + { + updateTime += Time.deltaTime; + framingTransposer.m_CameraDistance = Mathf.Lerp(framingTransposer.m_CameraDistance, + changeDistance, updateTime / time); + yield return null; + } + yield return null; + } + + public void DefaultDistance(float time) + { + if (distanceCoroutine != null) + { + StopCoroutine(distanceCoroutine); + } + distanceCoroutine = StartCoroutine(DefaultDistanceCoroutine(time)); + } + + private IEnumerator DefaultDistanceCoroutine(float time) + { + var updateTime = 0f; + while (updateTime < time) + { + updateTime += Time.deltaTime; + framingTransposer.m_CameraDistance = Mathf.Lerp(framingTransposer.m_CameraDistance, + defaultDistance, updateTime / time); + yield return null; + } + framingTransposer.m_CameraDistance = defaultDistance; + yield return null; + } } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/OceanUi.cs b/BlueWater/Assets/02.Scripts/OceanUi.cs index 12aacf219..c9cea9e1b 100644 --- a/BlueWater/Assets/02.Scripts/OceanUi.cs +++ b/BlueWater/Assets/02.Scripts/OceanUi.cs @@ -83,6 +83,8 @@ namespace BlueWaterProject [field: SerializeField] public Slider ShipBoostSlider { get; set; } + [field: SerializeField] public GameObject SpeedLines { get; set; } + private Canvas canvas; [Button("셋팅 초기화")] @@ -104,6 +106,9 @@ namespace BlueWaterProject ShipBoostSlider = canvas.transform.Find("ShipBoostSlider").GetComponent(); ShipBoostSlider.value = 0f; + + SpeedLines = canvas.transform.Find("SpeedLines").gameObject; + SpeedLines.SetActive(false); } private void Awake() @@ -126,5 +131,7 @@ namespace BlueWaterProject ProcessBar.SetPosition(result); } } + + public void SetActiveSpeedLine(bool value) => SpeedLines.SetActive(value); } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Player/Cannon.cs b/BlueWater/Assets/02.Scripts/Player/Cannon.cs index e2fc94589..d0d387418 100644 --- a/BlueWater/Assets/02.Scripts/Player/Cannon.cs +++ b/BlueWater/Assets/02.Scripts/Player/Cannon.cs @@ -1,5 +1,7 @@ using Sirenix.OdinInspector; +using Unity.Mathematics; using UnityEngine; +using Random = UnityEngine.Random; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -12,14 +14,15 @@ namespace BlueWaterProject [Title("캐논 변수")] [SerializeField] private GameObject projectileObj; [SerializeField] private Transform firePos; - [SerializeField] private float fireAngle = 30f; - [SerializeField] private float speed = 20f; - [SerializeField] private float height = 50f; + [Range(0f, 0.5f)] + [SerializeField] private float fireAngle = 0.2f; + [SerializeField] private float speed = 75f; + [SerializeField] private float height = 20f; [SerializeField] private Vector2 randomCatch = new(1, 4); [Title("캐논 발사 카메라 효과")] - [SerializeField] private float cameraShakePower = 0.5f; - [SerializeField] private float cameraShakeDuration = 0.5f; + [SerializeField] private float cameraShakePower = 2f; + [SerializeField] private float cameraShakeDuration = 0.3f; private float cannonRadius; private LayerMask boidsLayer; @@ -45,10 +48,14 @@ namespace BlueWaterProject public void Fire(float chargingGauge) { VisualFeedbackManager.Inst.CameraShake(CameraManager.Inst.OceanCamera.BaseShipCam, cameraShakePower, cameraShakeDuration); - var projectile = Instantiate(projectileObj, firePos.position, firePos.rotation); + var addAngle = chargingGauge * fireAngle; + var firePosRotation = firePos.rotation.eulerAngles; + firePosRotation.x -= addAngle; + var projectile = Instantiate(projectileObj, firePos.position, Quaternion.Euler(firePosRotation)); var particleWeapon = projectile.GetComponent(); particleWeapon.onHitAction.AddListener(HandleCannonHit); - projectile.GetComponent().AddForce(projectile.transform.forward * (chargingGauge * speed)); + //projectile.GetComponent().AddForce(projectile.transform.forward * (chargingGauge * speed)); + projectile.GetComponent().velocity = projectile.transform.forward * speed; } private void HandleCannonHit(RaycastHit hit, float power) diff --git a/BlueWater/Assets/02.Scripts/SpeedLines.cs b/BlueWater/Assets/02.Scripts/SpeedLines.cs new file mode 100644 index 000000000..0aaa8717c --- /dev/null +++ b/BlueWater/Assets/02.Scripts/SpeedLines.cs @@ -0,0 +1,66 @@ +using UnityEngine; + +namespace _02.Scripts +{ + [ExecuteInEditMode] + public class SpeedLines : MonoBehaviour + { + [SerializeField] private Shader shader; + [SerializeField] private Texture texture; + [SerializeField] private Color color = new(1,1,1,0.1f); + + [Range(0,1)] + [SerializeField] private float width = 0.4f; + [Range(0, 1)] + [SerializeField] private float length = 0.42f; + [Range(0, 100)] + [SerializeField] private float lengthSpeed = 17; + [Range(0, 1)] + [SerializeField] private float density = 0.75f; + + private Material material; + + private static readonly int Color = Shader.PropertyToID("_Color"); + private static readonly int Width = Shader.PropertyToID("_Width"); + private static readonly int Length = Shader.PropertyToID("_Length"); + private static readonly int LengthSpeed = Shader.PropertyToID("_LengthSpeed"); + private static readonly int Density = Shader.PropertyToID("_Density"); + private static readonly int Fbm = Shader.PropertyToID("_FBM"); + + private void Awake() + { + if (material) return; + + material = new Material(shader); + material.SetTexture(Fbm, texture); + } + + private void LateUpdate() + { + material.SetColor(Color, color); + material.SetFloat(Width, width); + material.SetFloat(Length, length); + material.SetFloat(LengthSpeed, lengthSpeed); + material.SetFloat(Density, density); + } + + public void OnRenderObject() + { + material.SetPass(0); + GL.PushMatrix(); + GL.LoadOrtho(); + + GL.Begin(GL.QUADS); + GL.TexCoord(new Vector3(0, 0, 0)); + GL.Vertex3(0, 0, 0); + GL.TexCoord(new Vector3(0, 1, 0)); + GL.Vertex3(0, 1, 0); + GL.TexCoord(new Vector3(1, 1, 0)); + GL.Vertex3(1, 1, 0); + GL.TexCoord(new Vector3(1, 0, 0)); + GL.Vertex3(1, 0, 0); + GL.End(); + GL.PopMatrix(); + } + } +} \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/SpeedLines.cs.meta b/BlueWater/Assets/02.Scripts/SpeedLines.cs.meta new file mode 100644 index 000000000..b7a1ace14 --- /dev/null +++ b/BlueWater/Assets/02.Scripts/SpeedLines.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b508e85f957f4d441998fa32fb18b473 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/02.Scripts/VisualFeedbackManager.cs b/BlueWater/Assets/02.Scripts/VisualFeedbackManager.cs index 2fdb62599..f2f8bbe97 100644 --- a/BlueWater/Assets/02.Scripts/VisualFeedbackManager.cs +++ b/BlueWater/Assets/02.Scripts/VisualFeedbackManager.cs @@ -1,15 +1,37 @@ +using System; using System.Collections; -using System.Collections.Generic; using Cinemachine; using MoreMountains.Feedbacks; using MoreMountains.FeedbacksForThirdParty; using UnityEngine; +using UnityEngine.Rendering; +using UnityEngine.Rendering.Universal; +using UnityEngine.SceneManagement; // ReSharper disable once CheckNamespace namespace BlueWaterProject { public class VisualFeedbackManager : Singleton { + private Vignette vignette; + + private void OnEnable() + { + SceneManager.sceneLoaded += OnSceneLoaded; + } + + private void OnDisable() + { + SceneManager.sceneLoaded -= OnSceneLoaded; + } + + private void OnSceneLoaded(Scene scene, LoadSceneMode mode) + { + vignette = null; + + vignette = GetEffect(); + } + #region HitStop /// @@ -49,6 +71,50 @@ namespace BlueWaterProject mmfPlayer.PlayFeedbacks(); } + #region PostProcessing + + public void ToggleEffect(bool value) where T : VolumeComponent + { + var effect = GetEffect(); + if (effect == null) + { + print(typeof(T) + "효과가 없습니다."); + return; + } + effect.active = value; + } + + private T GetEffect() where T : VolumeComponent + { + var postProcessVolume = FindAnyObjectByType(); + if (postProcessVolume == null) + { + print("Volume 컴포넌트를 가진 오브젝트가 없습니다."); + return null; + } + postProcessVolume.profile.TryGet(out T effect); + return effect; + } + + public void SetVignetteIntensity(float intensity) + { + if (vignette == null) + { + vignette = GetEffect(); + } + + if (vignette != null) + { + vignette.intensity.value = intensity; + } + else + { + print("vignette is null."); + } + } + + #endregion + #endregion } } diff --git a/BlueWater/Assets/03.Images/SpeedLines.png b/BlueWater/Assets/03.Images/SpeedLines.png new file mode 100644 index 000000000..dd46b3e39 Binary files /dev/null and b/BlueWater/Assets/03.Images/SpeedLines.png differ diff --git a/BlueWater/Assets/03.Images/SpeedLines.png.meta b/BlueWater/Assets/03.Images/SpeedLines.png.meta new file mode 100644 index 000000000..d7489a6d5 --- /dev/null +++ b/BlueWater/Assets/03.Images/SpeedLines.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 5460bab505c65b747acf4fd1a32d9da4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: 63 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/03.Materials/Boids/FishGraph.mat b/BlueWater/Assets/03.Materials/Boids/SmallFish.mat similarity index 99% rename from BlueWater/Assets/03.Materials/Boids/FishGraph.mat rename to BlueWater/Assets/03.Materials/Boids/SmallFish.mat index 684f4955d..d5456d427 100644 --- a/BlueWater/Assets/03.Materials/Boids/FishGraph.mat +++ b/BlueWater/Assets/03.Materials/Boids/SmallFish.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FishGraph + m_Name: SmallFish m_Shader: {fileID: -6465566751694194690, guid: 7cae0496bda14c04a9d5aa9138f04bda, type: 3} m_Parent: {fileID: 0} diff --git a/BlueWater/Assets/03.Materials/Boids/FishGraph.mat.meta b/BlueWater/Assets/03.Materials/Boids/SmallFish.mat.meta similarity index 100% rename from BlueWater/Assets/03.Materials/Boids/FishGraph.mat.meta rename to BlueWater/Assets/03.Materials/Boids/SmallFish.mat.meta diff --git a/BlueWater/Assets/03.Materials/Boids/Stingray.mat b/BlueWater/Assets/03.Materials/Boids/Stingray.mat new file mode 100644 index 000000000..530f03130 --- /dev/null +++ b/BlueWater/Assets/03.Materials/Boids/Stingray.mat @@ -0,0 +1,166 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Stingray + m_Shader: {fileID: -6465566751694194690, guid: 7cae0496bda14c04a9d5aa9138f04bda, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 1 + m_CustomRenderQueue: 2050 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b22e9f06f1fbc294c9cb94024e1e05ea, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: a6232c946ac038d42b48ca134947b246, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _A: 0.5 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Amplitude: 0.15 + - _AmplitudeX: 0.2 + - _AmplitudeX_1: 0.2 + - _AmplitudeX_2: 0.2 + - _AmplitudeX_3: 0.2 + - _AmplitudeY: 0.2 + - _AmplitudeZ: 1 + - _B: 0.7 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 1 + - _C: 6 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 0 + - _Cutoff: 0.5 + - _D: 0.15 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _E: 0.2 + - _EnvironmentReflections: 1 + - _F: 1 + - _FrequencyX: 1 + - _FrequencyX_1: 1 + - _FrequencyX_2: 1 + - _FrequencyX_3: 1 + - _FrequencyX_4: 1 + - _FrequencyY: 1 + - _FrequencyZ: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _HeadLimit: 0.05 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 50 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Shake: 0.7 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _Speed: 6 + - _SpeedX: 1 + - _SpeedY: 1 + - _SpeedZ: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + - _offsetY: 0.2 + - _offsetZ: 0.5 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] + m_AllowLocking: 1 +--- !u!114 &6506538637606883820 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/BlueWater/Assets/03.Materials/Boids/Fish01.mat.meta b/BlueWater/Assets/03.Materials/Boids/Stingray.mat.meta similarity index 79% rename from BlueWater/Assets/03.Materials/Boids/Fish01.mat.meta rename to BlueWater/Assets/03.Materials/Boids/Stingray.mat.meta index 613203e76..162147068 100644 --- a/BlueWater/Assets/03.Materials/Boids/Fish01.mat.meta +++ b/BlueWater/Assets/03.Materials/Boids/Stingray.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 092a095eda8f69f4cabbac57bae2184f +guid: 5bc1a0d000b996d44b3d22d5c855de79 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/BlueWater/Assets/03.Materials/Boids/Fish01.mat b/BlueWater/Assets/03.Materials/SpeedLines.mat similarity index 80% rename from BlueWater/Assets/03.Materials/Boids/Fish01.mat rename to BlueWater/Assets/03.Materials/SpeedLines.mat index b8b04c71d..f0aafcda6 100644 --- a/BlueWater/Assets/03.Materials/Boids/Fish01.mat +++ b/BlueWater/Assets/03.Materials/SpeedLines.mat @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-7508768530177104492 -MonoBehaviour: - m_ObjectHideFlags: 11 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -20,19 +7,16 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Fish01 - m_Shader: {fileID: 4800000, guid: 8b0bcba1cce78b64f84471735e786188, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 + m_Name: SpeedLines + m_Shader: {fileID: 4800000, guid: 3dafd9b1d17896a448d50c05e43d1f21, type: 3} m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: {} disabledShaderPasses: [] - m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -60,8 +44,12 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FBM: + m_Texture: {fileID: 2800000, guid: 5460bab505c65b747acf4fd1a32d9da4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: b22e9f06f1fbc294c9cb94024e1e05ea, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -95,52 +83,51 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 - - _AlphaToMask: 0 - - _AmplitudeX: 0.05 - - _AmplitudeY: 0.05 - - _AmplitudeZ: 0.1 - _Blend: 0 - - _BlendModePreserveSpecular: 1 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _Density: 0.75 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - - _FrequencyX: 10 - - _FrequencyY: 5 - - _FrequencyZ: 10 - _GlossMapScale: 0 - _Glossiness: 0 - - _GlossinessSource: 0 - _GlossyReflections: 0 - - _HeadLimit: 0 + - _Length: 0.18 + - _LengthSpeed: 17 - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Shininess: 0 - _Smoothness: 0.5 - - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 - - _SpecSource: 0 - _SpecularHighlights: 1 - - _SpeedX: 1 - - _SpeedY: 0 - - _SpeedZ: 1 - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - _Surface: 0 + - _Width: 0.4 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.14901961} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] +--- !u!114 &1250400037891573329 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta b/BlueWater/Assets/03.Materials/SpeedLines.mat.meta similarity index 52% rename from BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta rename to BlueWater/Assets/03.Materials/SpeedLines.mat.meta index 384510c7b..00b616e91 100644 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta +++ b/BlueWater/Assets/03.Materials/SpeedLines.mat.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 3643c0d76ec153646b1203880bfb64ed -DefaultImporter: +guid: ab3b3ee21523dc74f96276f77b248765 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 2100000 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boids.prefab b/BlueWater/Assets/05.Prefabs/Boids/Boids.prefab index 8f10eddaa..71f52c912 100644 --- a/BlueWater/Assets/05.Prefabs/Boids/Boids.prefab +++ b/BlueWater/Assets/05.Prefabs/Boids/Boids.prefab @@ -60,6 +60,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -151,8 +153,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 883eb23bc92adc54eb936343c0d39f0d, type: 3} m_Name: m_EditorClassIdentifier: - boidPrefab: {fileID: 5402562142639805275, guid: 1294b74a61e4faa49a0fb449956b4fda, - type: 3} + boidPrefab: {fileID: 0} boidCount: 5 k__BackingField: {x: 5, y: 10} spawnRange: 10 @@ -229,23 +230,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071068 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3} propertyPath: m_LocalEulerAnglesHint.y diff --git a/BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab b/BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab new file mode 100644 index 000000000..9178ddef4 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab @@ -0,0 +1,690 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &89719588838547572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1081926911637138583} + m_Layer: 0 + m_Name: Bone.005 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1081926911637138583 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 89719588838547572} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071066, y: -0, z: -0, w: 0.70710695} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4764736475117754603} + m_Father: {fileID: 8466372403534620464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &181724147800501524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 706587450242381742} + - component: {fileID: 4441696169791778486} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &706587450242381742 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181724147800501524} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, 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: 8466372403534620464} + - {fileID: 2338995487159450636} + m_Father: {fileID: 4874816205509271808} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!95 &4441696169791778486 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181724147800501524} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 02aa946627bb6514ebd39a183509b80c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &665513925588288320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4874816205509271808} + - component: {fileID: 5402562142639805275} + - component: {fileID: 2102284208022651341} + m_Layer: 16 + m_Name: HammerheadShark + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4874816205509271808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665513925588288320} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 706587450242381742} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5402562142639805275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665513925588288320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: + k__BackingField: "\uB9DD\uCE58\uBA38\uB9AC\uC0C1\uC5B4" + k__BackingField: 0 + k__BackingField: {x: 10, y: 1} + obstacleDistance: 10 + viewAngle: 120 + maxNeighbourCount: 10 + neighbourDistance: 6 + avoidAdditionalSpeed: 10 + boidUnitLayer: + serializedVersion: 2 + m_Bits: 65536 + obstacleLayer: + serializedVersion: 2 + m_Bits: 2097672 +--- !u!65 &2102284208022651341 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665513925588288320} + 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: 0.5, y: 0.9, z: 2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1224069851354487571 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4130325431993033775} + m_Layer: 0 + m_Name: Bone.003 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4130325431993033775 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1224069851354487571} + serializedVersion: 2 + m_LocalRotation: {x: 0.58029294, y: 0.0000002912544, z: 0.00000020752853, w: 0.8144078} + m_LocalPosition: {x: -0, y: 0.0045014177, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1228888969748167953} + m_Father: {fileID: 3015589278919813335} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1491179128806270494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 311293942175100377} + m_Layer: 0 + m_Name: Bone.009 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &311293942175100377 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1491179128806270494} + serializedVersion: 2 + m_LocalRotation: {x: -0.022205787, y: 0.00000009130886, z: 0.0000000020280853, w: 0.9997534} + m_LocalPosition: {x: -3.8593828e-18, y: 0.005654719, z: 3.7252902e-11} + m_LocalScale: {x: 1, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6616873940118994575} + m_Father: {fileID: 674119233981851916} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1629447816847837215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3015589278919813335} + m_Layer: 0 + m_Name: Bone.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3015589278919813335 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1629447816847837215} + serializedVersion: 2 + m_LocalRotation: {x: -0.00000043908824, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.007196454, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4116136231040088850} + - {fileID: 4130325431993033775} + m_Father: {fileID: 6132471241581053020} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2919818931448682926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6616873940118994575} + m_Layer: 0 + m_Name: Bone.009_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6616873940118994575 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2919818931448682926} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.0046762344, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 311293942175100377} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &4456239184811330756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5464096081733746494} + m_Layer: 0 + m_Name: Bone.002_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5464096081733746494 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4456239184811330756} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.0064032823, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4116136231040088850} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5015505286755233464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2338995487159450636} + - component: {fileID: 4841605955695551639} + m_Layer: 0 + m_Name: Circle.001 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2338995487159450636 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5015505286755233464} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071072, y: 0, z: -0, w: 0.7071064} + m_LocalPosition: {x: 0.01114005, y: -0.25603068, z: 0.0916883} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 706587450242381742} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &4841605955695551639 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5015505286755233464} + 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: 3 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: -876546973899608171, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + - {fileID: -6478536213147159724, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + - {fileID: 1572856357441901246, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + - {fileID: -8969354582770894270, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + - {fileID: -8177756790426730598, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + - {fileID: 327487709993020328, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + - {fileID: 327487709993020328, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 8314571269056883277, guid: f8a901b48090655439b6a6b89e0db9b8, type: 3} + m_Bones: + - {fileID: 6132471241581053020} + - {fileID: 3015589278919813335} + - {fileID: 4116136231040088850} + - {fileID: 4130325431993033775} + - {fileID: 1228888969748167953} + - {fileID: 1081926911637138583} + - {fileID: 4764736475117754603} + - {fileID: 3141911211198631894} + - {fileID: 674119233981851916} + - {fileID: 311293942175100377} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 1081926911637138583} + m_AABB: + m_Center: {x: 0.00011140015, y: 0.009651304, z: 0.0017804052} + m_Extent: {x: 0.011133577, y: 0.029777508, z: 0.009141138} + m_DirtyAABB: 0 +--- !u!1 &5181304155913638514 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3141911211198631894} + m_Layer: 0 + m_Name: Bone.007 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3141911211198631894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5181304155913638514} + serializedVersion: 2 + m_LocalRotation: {x: -1.1368684e-13, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.006372605, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 674119233981851916} + m_Father: {fileID: 4764736475117754603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5337450684634617954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1228888969748167953} + m_Layer: 0 + m_Name: Bone.004 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1228888969748167953 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5337450684634617954} + serializedVersion: 2 + m_LocalRotation: {x: -0.67737514, y: -0.0000002140613, z: -0.00000028738788, w: 0.7356378} + m_LocalPosition: {x: 2.842171e-16, y: 0.0031558385, z: 2.9802322e-10} + m_LocalScale: {x: 1, y: 0.99999994, z: 0.9999999} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1291679289868679539} + m_Father: {fileID: 4130325431993033775} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5522665509291400143 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4116136231040088850} + m_Layer: 0 + m_Name: Bone.002 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4116136231040088850 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5522665509291400143} + serializedVersion: 2 + m_LocalRotation: {x: 0.016941855, y: -0, z: -0, w: 0.9998565} + m_LocalPosition: {x: -0, y: 0.0045014177, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5464096081733746494} + m_Father: {fileID: 3015589278919813335} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5877570663298670048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6132471241581053020} + m_Layer: 0 + m_Name: Bone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6132471241581053020 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5877570663298670048} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3015589278919813335} + m_Father: {fileID: 8466372403534620464} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6484094505080155606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 674119233981851916} + m_Layer: 0 + m_Name: Bone.008 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &674119233981851916 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6484094505080155606} + serializedVersion: 2 + m_LocalRotation: {x: 0.022205783, y: -0.00000009130887, z: -0.000000002028085, w: 0.9997534} + m_LocalPosition: {x: -0, y: 0.0068411776, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0.99999994} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 311293942175100377} + m_Father: {fileID: 3141911211198631894} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8061815563207224698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8466372403534620464} + m_Layer: 0 + m_Name: Armature + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8466372403534620464 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8061815563207224698} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalScale: {x: 100, y: 100, z: 100} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6132471241581053020} + - {fileID: 1081926911637138583} + m_Father: {fileID: 706587450242381742} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8785136224010552733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4764736475117754603} + m_Layer: 0 + m_Name: Bone.006 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4764736475117754603 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8785136224010552733} + serializedVersion: 2 + m_LocalRotation: {x: 5.684342e-14, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.0079657575, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3141911211198631894} + m_Father: {fileID: 1081926911637138583} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8785968493756290015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1291679289868679539} + m_Layer: 0 + m_Name: Bone.004_end + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1291679289868679539 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8785968493756290015} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: 0.002429515, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1228888969748167953} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boid.prefab.meta b/BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab.meta similarity index 100% rename from BlueWater/Assets/05.Prefabs/Boids/Boid.prefab.meta rename to BlueWater/Assets/05.Prefabs/Boids/HammerheadShark.prefab.meta diff --git a/BlueWater/Assets/05.Prefabs/Boids/Boid.prefab b/BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab similarity index 97% rename from BlueWater/Assets/05.Prefabs/Boids/Boid.prefab rename to BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab index 08d722462..312f1a87f 100644 --- a/BlueWater/Assets/05.Prefabs/Boids/Boid.prefab +++ b/BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5402562142639805275} - component: {fileID: 2102284208022651341} m_Layer: 16 - m_Name: Boid + m_Name: SmallFish m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -140,6 +140,8 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta b/BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab.meta similarity index 63% rename from BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta rename to BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab.meta index 7c4bab1a1..481f015a8 100644 --- a/BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta +++ b/BlueWater/Assets/05.Prefabs/Boids/SmallFish.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: aba6fa52907672a4da99307e9c925639 -DefaultImporter: +guid: c6911733874ec6645aa30548164bb1fb +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab b/BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab new file mode 100644 index 000000000..1cfb67095 --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab @@ -0,0 +1,169 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &665513925588288320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4874816205509271808} + - component: {fileID: 5402562142639805275} + - component: {fileID: 2102284208022651341} + m_Layer: 16 + m_Name: Stingray + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4874816205509271808 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665513925588288320} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 8545490757316729625} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5402562142639805275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665513925588288320} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b5a4bdb4c510d354687a785c3f642878, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: + k__BackingField: "\uAC00\uC624\uB9AC" + k__BackingField: 0 + k__BackingField: {x: 5, y: 7} + obstacleDistance: 10 + viewAngle: 120 + maxNeighbourCount: 10 + neighbourDistance: 6 + avoidAdditionalSpeed: 10 + boidUnitLayer: + serializedVersion: 2 + m_Bits: 65536 + obstacleLayer: + serializedVersion: 2 + m_Bits: 2097672 +--- !u!65 &2102284208022651341 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665513925588288320} + 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: 0.5, y: 0.9, z: 2} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &9069262553423479203 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8545490757316729625} + - component: {fileID: 4699634871657583804} + - component: {fileID: 7411942358014533750} + m_Layer: 0 + m_Name: VisualLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8545490757316729625 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9069262553423479203} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, 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: 4874816205509271808} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &4699634871657583804 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9069262553423479203} + m_Mesh: {fileID: 4689743604669123803, guid: 15eb5f7b3a3b3e947b3ece8254a9aecf, type: 3} +--- !u!23 &7411942358014533750 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9069262553423479203} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5bc1a0d000b996d44b3d22d5c855de79, 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} diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta b/BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab.meta similarity index 63% rename from BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta rename to BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab.meta index b4ec97874..328021383 100644 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v1.7/NiceVibrations-v-1-7.unitypackage.meta +++ b/BlueWater/Assets/05.Prefabs/Boids/Stingray.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 078b8f13a17171b49892ad10426d5af0 -DefaultImporter: +guid: 6469fb143a712d448acc225487805c37 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/BlueWater/Assets/07.Animation/HammerheadShark.controller b/BlueWater/Assets/07.Animation/HammerheadShark.controller new file mode 100644 index 000000000..dfb1c3db8 --- /dev/null +++ b/BlueWater/Assets/07.Animation/HammerheadShark.controller @@ -0,0 +1,73 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-760363057230818645 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Armature|Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 8349542763059015795, guid: f8a901b48090655439b6a6b89e0db9b8, + type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HammerheadShark + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7792104606909699159} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &7792104606909699159 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -760363057230818645} + m_Position: {x: 340, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -760363057230818645} diff --git a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta b/BlueWater/Assets/07.Animation/HammerheadShark.controller.meta similarity index 52% rename from BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta rename to BlueWater/Assets/07.Animation/HammerheadShark.controller.meta index 508065e3b..6704f4783 100644 --- a/BlueWater/Assets/Feel/FeelDemos/FeelTemplatesDemo.unitypackage.meta +++ b/BlueWater/Assets/07.Animation/HammerheadShark.controller.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f -DefaultImporter: +guid: 02aa946627bb6514ebd39a183509b80c +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/BlueWater/Assets/08.Models/HammerheadShark.fbx b/BlueWater/Assets/08.Models/HammerheadShark.fbx new file mode 100644 index 000000000..e3ad81c47 Binary files /dev/null and b/BlueWater/Assets/08.Models/HammerheadShark.fbx differ diff --git a/BlueWater/Assets/08.Models/HammerheadShark.fbx.meta b/BlueWater/Assets/08.Models/HammerheadShark.fbx.meta new file mode 100644 index 000000000..3ed6cfa56 --- /dev/null +++ b/BlueWater/Assets/08.Models/HammerheadShark.fbx.meta @@ -0,0 +1,484 @@ +fileFormatVersion: 2 +guid: f8a901b48090655439b6a6b89e0db9b8 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Walk + takeName: Walk + internalID: 2667949614841947897 + firstFrame: 0 + lastFrame: 99 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Idle + takeName: Idle + internalID: -3100369314251171874 + firstFrame: 0 + lastFrame: 99 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|beren + takeName: Armature|beren + internalID: 1516604743415707442 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|CameraAction + takeName: Armature|CameraAction + internalID: 4743084820616853705 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|Circle.001Action + takeName: Armature|Circle.001Action + internalID: -3940031873545852154 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|Idle + takeName: Armature|Idle + internalID: -8945691123924629249 + firstFrame: 0 + lastFrame: 99 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Armature|Walk + takeName: Armature|Walk + internalID: 8349542763059015795 + firstFrame: 0 + lastFrame: 99 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Circle.001|beren + takeName: Circle.001|beren + internalID: 8364777089518938443 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Circle.001|CameraAction + takeName: Circle.001|CameraAction + internalID: -3523305384771567622 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Circle.001|Circle.001Action + takeName: Circle.001|Circle.001Action + internalID: 8971653179785726973 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Camera|beren + takeName: Camera|beren + internalID: 139079586489973769 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Camera|CameraAction + takeName: Camera|CameraAction + internalID: 8440248360967096626 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + - serializedVersion: 16 + name: Camera|Circle.001Action + takeName: Camera|Circle.001Action + internalID: -4808961096489221202 + firstFrame: 0 + lastFrame: 0 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/08.Models/STING.TIF b/BlueWater/Assets/08.Models/STING.TIF new file mode 100644 index 000000000..7fcb852af Binary files /dev/null and b/BlueWater/Assets/08.Models/STING.TIF differ diff --git a/BlueWater/Assets/08.Models/STING.TIF.meta b/BlueWater/Assets/08.Models/STING.TIF.meta new file mode 100644 index 000000000..693cf57fb --- /dev/null +++ b/BlueWater/Assets/08.Models/STING.TIF.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: a6232c946ac038d42b48ca134947b246 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/08.Models/Stingray.fbx b/BlueWater/Assets/08.Models/Stingray.fbx new file mode 100644 index 000000000..989291504 Binary files /dev/null and b/BlueWater/Assets/08.Models/Stingray.fbx differ diff --git a/BlueWater/Assets/08.Models/Stingray.fbx.meta b/BlueWater/Assets/08.Models/Stingray.fbx.meta new file mode 100644 index 000000000..30f4b21fc --- /dev/null +++ b/BlueWater/Assets/08.Models/Stingray.fbx.meta @@ -0,0 +1,107 @@ +fileFormatVersion: 2 +guid: 15eb5f7b3a3b3e947b3ece8254a9aecf +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/10.Shaders/SpeedLines.shader b/BlueWater/Assets/10.Shaders/SpeedLines.shader new file mode 100644 index 000000000..efdd77499 --- /dev/null +++ b/BlueWater/Assets/10.Shaders/SpeedLines.shader @@ -0,0 +1,126 @@ +Shader "liuyima/SpeedLines" +{ + Properties + { + _MainTex ("Texture", 2D) = "white" {} + _FBM ("FBM Texture", 2D) = "white" {} + _Color ("_Color",COLOR) = (1,1,1,1) + _Width("_Width",Range(0,1)) = 0.5 + _Length("Length",Range(0,1)) = 0.5 + _LengthSpeed("Length speed",Range(0,100)) = 50 + _Density("Density",Range(0,1)) = 0.5 + } + SubShader + { + + CGINCLUDE + #define PI 3.1415926 + float SignedAngle(float3 from, float3 to) + { + float angle = acos(dot(normalize(from), normalize(to))); + if (cross(to, from).y < 0) + { + return PI * 2 - angle; + } + return angle; + } + //将uv映射到圆环上 + float2 circleUV(float2 uv) + { + float2 nuv; + float3 h = float3(uv.x-0.5, 0, uv.y-0.5); + float3 f = float3(0, 0, 1); + nuv.x = SignedAngle(f, h) / 2 / PI; + nuv.y = length(uv - float2(0.5, 0.5))/0.5; + return nuv; + } + + float random1(float x) + { + return frac(sin(x)*10007.024); + } + float random(float2 st) { + return frac(sin(dot(st.xy, + float2(12.9898, 78.233)))* + 43758.5453123); + } + ENDCG + + //No culling or depth + Cull Off + ZWrite Off + ZTest Always + + Pass + { + Blend SrcAlpha OneMinusSrcAlpha + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + sampler2D _MainTex; + sampler2D _FBM; + float4 _Color; + float _Length; + float _Width; + float _LengthSpeed; + float _Density; + + //采样FBM贴图 + fixed samFBM(float2 st) + { + float2x2 rot = float2x2(cos(0.5), sin(0.5), + -sin(0.5), cos(0.50)); + return tex2D(_FBM,mul(rot, st)).r; + } + + fixed4 frag (v2f i) : SV_Target + { + float2 cuv = circleUV(i.uv); + + cuv.x *= 80; + + fixed index = ceil(cuv.x); + float lineDensity = 1-_Density; + fixed show = smoothstep(lineDensity-0.01,lineDensity+0.01,samFBM(index+ _Time.x*-10)); + //x映射到0-1-0 + fixed x = abs(cuv.x%1-0.5)*2; + //宽度收缩比例 + float shrink =(_Width)* random1(index)+_Width; + //长度减小 + float add = -samFBM(cuv.x+_Time.x*_LengthSpeed)-1+_Length; + + float a = show*(1- smoothstep(0.01,0.01,x-(cuv.y+add)*shrink)); + + fixed4 col = _Color; + + x = abs(i.uv.x-0.5)*2; + col.a *= a*abs(cuv.y-0.2); + return col; + } + ENDCG + } + } +} diff --git a/BlueWater/Assets/10.Shaders/SpeedLines.shader.meta b/BlueWater/Assets/10.Shaders/SpeedLines.shader.meta new file mode 100644 index 000000000..ecd40f1e5 --- /dev/null +++ b/BlueWater/Assets/10.Shaders/SpeedLines.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3dafd9b1d17896a448d50c05e43d1f21 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + preprocessorOverride: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta deleted file mode 100644 index 2ac65e5d2..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v2.0.1/NiceVibrations-v-2-0-1.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f9406a33814af9c47b352e77f079d798 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta b/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta deleted file mode 100644 index 69d7b56dd..000000000 --- a/BlueWater/Assets/Feel/NiceVibrations/OlderVersions/v3.9/NiceVibrations-v-3-9-0.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9aacf6f3043624194bb6f6fe9a580786 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Hand_Painted_Boats/Pirate_Ship_Pack/Materials/big_ship_d.mat b/BlueWater/Assets/Hand_Painted_Boats/Pirate_Ship_Pack/Materials/big_ship_d.mat index 1cf5a55ca..ad933eafd 100644 --- a/BlueWater/Assets/Hand_Painted_Boats/Pirate_Ship_Pack/Materials/big_ship_d.mat +++ b/BlueWater/Assets/Hand_Painted_Boats/Pirate_Ship_Pack/Materials/big_ship_d.mat @@ -101,3 +101,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta b/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta deleted file mode 100644 index 7763d62a1..000000000 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b1d738c46034bc244bd356692577373c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta b/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta deleted file mode 100644 index 80732d4fa..000000000 --- a/BlueWater/Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2d6d5d59d45ce8a4784ba6c47984a23e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta deleted file mode 100644 index 4801b3793..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 560a88da2bbc70140bed167f0ba7fe37 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta deleted file mode 100644 index 77d64a86c..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: fb01be13d6e88ca488dda82150319bfc -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta b/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta deleted file mode 100644 index 05e590027..000000000 --- a/BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 117dcc671050f5247bd8743b91ecaab7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta deleted file mode 100644 index f5aa0671a..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Compass Navigator Pro Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 171c5051d845c4545a6679cdcb9e8290 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta b/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta deleted file mode 100644 index c69333695..000000000 --- a/BlueWater/Assets/Plugins/Pixel Crushers/Common/Third Party Support/Corgi Support.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e381f1e638a8aec4dbd9a7be673b56e2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/UniversalRenderPipelineGlobalSettings 1.asset b/BlueWater/Assets/UniversalRenderPipelineGlobalSettings 1.asset index f7690e905..44d748292 100644 --- a/BlueWater/Assets/UniversalRenderPipelineGlobalSettings 1.asset +++ b/BlueWater/Assets/UniversalRenderPipelineGlobalSettings 1.asset @@ -16,7 +16,8 @@ MonoBehaviour: m_SettingsList: [] m_RuntimeSettings: [] m_AssetVersion: 5 - m_DefaultVolumeProfile: {fileID: 0} + m_DefaultVolumeProfile: {fileID: 11400000, guid: 81c413490ad4e8e46ababe286c6441e8, + type: 2} m_RenderingLayerNames: - Default m_ValidRenderingLayers: 1 diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset index 6fb18b30a..8319c81e7 100644 --- a/BlueWater/ProjectSettings/TagManager.asset +++ b/BlueWater/ProjectSettings/TagManager.asset @@ -29,7 +29,7 @@ TagManager: - Ground - Water - UI - - + - PostProcessing - - - Player