diff --git a/Assets/01.Scenes/03.Sail.meta b/Assets/01.Scenes/03.Sail.meta new file mode 100644 index 000000000..1f0e3fdfb --- /dev/null +++ b/Assets/01.Scenes/03.Sail.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f826239377de7dd4898e24658212a24c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01.Scenes/03.Sail.unity b/Assets/01.Scenes/03.Sail.unity index 8d7d1a90e..501596cb8 100644 --- a/Assets/01.Scenes/03.Sail.unity +++ b/Assets/01.Scenes/03.Sail.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 1 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 2100000, guid: b2ed5fd2ea8a455448f752571034b0d2, type: 2} + m_SkyboxMaterial: {fileID: 2100000, guid: 3d48ebb64507a6e43bba7a5ef43f06ec, type: 2} m_HaloStrength: 0.69 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -93,7 +93,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingDataAsset: {fileID: 112000000, guid: 2d183ccdbf5a7ae4388b9e0b9f6ebcf2, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -1848,8 +1848,8 @@ MonoBehaviour: obj: {fileID: 299608776} speed: 30 force_add: 0.005 - SmokeL: {fileID: 751988502} - SmokeR: {fileID: 1493920140} + SmokeL: {fileID: 751988505} + SmokeR: {fileID: 1493920143} --- !u!1001 &104393447 PrefabInstance: m_ObjectHideFlags: 0 @@ -3359,13 +3359,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 175395209} serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0.2216868, y: 0.00015328174, z: -0.0006742293, w: 0.9751177} m_LocalPosition: {x: 79.73, y: -6.55, z: 7.08} m_LocalScale: {x: 0.24869, y: 0.15133035, z: -0.0986777} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 456696131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 25.616, y: 0, z: -0.079} --- !u!212 &175395211 SpriteRenderer: m_ObjectHideFlags: 0 @@ -3748,6 +3748,127 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 182671153} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &190067142 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 190067145} + - component: {fileID: 190067144} + - component: {fileID: 190067143} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &190067143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190067142} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!108 &190067144 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190067142} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &190067145 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190067142} + serializedVersion: 2 + m_LocalRotation: {x: 0.3711695, y: 0.2672877, z: 0.11246619, w: 0.88212353} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 36.492, y: 43.663, z: 29.579} --- !u!1001 &207813138 PrefabInstance: m_ObjectHideFlags: 0 @@ -3836,15 +3957,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f4a1c8b3f07cfd24bba537629409a8ba, type: 3} propertyPath: m_LocalPosition.x - value: 53.1 + value: 68.68 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f4a1c8b3f07cfd24bba537629409a8ba, type: 3} propertyPath: m_LocalPosition.y - value: -6 + value: -4.5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f4a1c8b3f07cfd24bba537629409a8ba, type: 3} propertyPath: m_LocalPosition.z - value: 48.683067 + value: 40.85 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: f4a1c8b3f07cfd24bba537629409a8ba, type: 3} propertyPath: m_LocalRotation.w @@ -5750,7 +5871,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9f84839f14c17af4486f87abf512b02b, type: 3} propertyPath: m_LocalPosition.y - value: 0.08 + value: 0.15 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 9f84839f14c17af4486f87abf512b02b, type: 3} propertyPath: m_LocalPosition.z @@ -13481,6 +13602,71 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 626ff85c3f4426948a7e4c996dafe50a, type: 3} m_PrefabInstance: {fileID: 690535386} m_PrefabAsset: {fileID: 0} +--- !u!1 &692571164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692571166} + - component: {fileID: 692571165} + m_Layer: 0 + m_Name: Test + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!215 &692571165 +ReflectionProbe: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692571164} + m_Enabled: 1 + serializedVersion: 2 + m_Type: 0 + m_Mode: 0 + m_RefreshMode: 1 + m_TimeSlicingMode: 0 + m_Resolution: 1024 + m_UpdateFrequency: 0 + m_BoxSize: {x: 100, y: 100, z: 100} + m_BoxOffset: {x: 0, y: 0, z: 0} + m_NearClip: 0.3 + m_FarClip: 1000 + m_ShadowDistance: 1000 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_IntensityMultiplier: 1 + m_BlendDistance: 1 + m_HDR: 1 + m_BoxProjection: 0 + m_RenderDynamicObjects: 0 + m_UseOcclusionCulling: 1 + m_Importance: 1 + m_CustomBakedTexture: {fileID: 0} +--- !u!4 &692571166 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692571164} + 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: 943285318} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &692873316 GameObject: m_ObjectHideFlags: 0 @@ -14814,7 +15000,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &751988503 Transform: m_ObjectHideFlags: 0 @@ -14823,13 +15009,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 751988502} serializedVersion: 2 - m_LocalRotation: {x: -0.122787856, y: -0.6963643, z: -0.122787856, w: 0.6963643} - m_LocalPosition: {x: 0, y: 0.02000001, z: 1.55} - m_LocalScale: {x: 0.5000002, y: 0.49999997, z: 0.5000002} + m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.51} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 299608775} - m_LocalEulerAnglesHint: {x: -20, y: -90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!199 &751988504 ParticleSystemRenderer: serializedVersion: 6 @@ -14874,7 +15060,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_RenderMode: 4 m_MeshDistribution: 0 m_SortMode: 2 @@ -21601,99 +21787,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 860157549} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &864444949 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 864444952} - - component: {fileID: 864444951} - - component: {fileID: 864444950} - m_Layer: 0 - m_Name: Terrain - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 2147483647 - m_IsActive: 1 ---- !u!154 &864444950 -TerrainCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 864444949} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_TerrainData: {fileID: 15600000, guid: 28b2c3d227482154c9df296825da7540, type: 2} - m_EnableTreeColliders: 1 ---- !u!218 &864444951 -Terrain: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 864444949} - m_Enabled: 1 - serializedVersion: 6 - m_TerrainData: {fileID: 15600000, guid: 28b2c3d227482154c9df296825da7540, type: 2} - m_TreeDistance: 5000 - m_TreeBillboardDistance: 50 - m_TreeCrossFadeLength: 5 - m_TreeMaximumFullLODCount: 50 - m_DetailObjectDistance: 80 - m_DetailObjectDensity: 1 - m_HeightmapPixelError: 5 - m_SplatMapDistance: 1000 - m_HeightmapMinimumLODSimplification: 0 - m_HeightmapMaximumLOD: 0 - m_ShadowCastingMode: 2 - m_DrawHeightmap: 1 - m_DrawInstanced: 0 - m_DrawTreesAndFoliage: 1 - m_StaticShadowCaster: 0 - m_IgnoreQualitySettings: 0 - m_ReflectionProbeUsage: 0 - m_MaterialTemplate: {fileID: 2100000, guid: 3094077e3543222499063951e40d9905, type: 2} - m_BakeLightProbesForTrees: 1 - m_PreserveTreePrototypeLayers: 0 - m_DeringLightProbesForTrees: 1 - m_ReceiveGI: 1 - m_ScaleInLightmap: 0.0256 - m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} - m_GroupingID: 0 - m_RenderingLayerMask: 1 - m_AllowAutoConnect: 1 - m_EnableHeightmapRayTracing: 1 - m_EnableTreesAndDetailsRayTracing: 0 - m_TreeMotionVectorModeOverride: 3 ---- !u!4 &864444952 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 864444949} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -500, y: -20, z: -500} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &875465592 GameObject: m_ObjectHideFlags: 0 @@ -22674,7 +22767,8 @@ Transform: m_LocalPosition: {x: 0, y: 7, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 692571166} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 103.505005, y: 0, z: 0} --- !u!114 &943285319 @@ -33265,7 +33359,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1493920141 Transform: m_ObjectHideFlags: 0 @@ -33274,13 +33368,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1493920140} serializedVersion: 2 - m_LocalRotation: {x: -0.122787856, y: 0.6963643, z: 0.122787856, w: 0.6963643} - m_LocalPosition: {x: 0, y: 0.02000001, z: 1.55} - m_LocalScale: {x: 0.5000002, y: 0.49999997, z: 0.5000002} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 3.5099998} + m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 299608775} - m_LocalEulerAnglesHint: {x: -20, y: 90, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!199 &1493920142 ParticleSystemRenderer: serializedVersion: 6 @@ -33325,7 +33419,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_RenderMode: 4 m_MeshDistribution: 0 m_SortMode: 2 @@ -44819,27 +44913,27 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalScale.x - value: -254.88681 + value: -333.74878 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalScale.y - value: -244.00745 + value: -319.50333 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalScale.z - value: -229.04999 + value: -299.91806 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalPosition.x - value: -66.8 + value: -62.46 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalPosition.y - value: 2.7 + value: 3.53 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalPosition.z - value: 50.4 + value: 52.19 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d22951cb4645a8a4e8bbf16317f0b74c, type: 3} propertyPath: m_LocalRotation.w @@ -51873,7 +51967,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_RenderMode: 2 m_MeshDistribution: 0 m_SortMode: 0 @@ -59010,7 +59104,7 @@ SceneRoots: - {fileID: 726620385} - {fileID: 1098585720} - {fileID: 456696131} - - {fileID: 864444952} - {fileID: 1896203544} - {fileID: 1138792921} - {fileID: 844496662} + - {fileID: 190067145} diff --git a/Assets/01.Scenes/03.Sail/LightingData.asset b/Assets/01.Scenes/03.Sail/LightingData.asset new file mode 100644 index 000000000..536426b9b Binary files /dev/null and b/Assets/01.Scenes/03.Sail/LightingData.asset differ diff --git a/Assets/01.Scenes/03.Sail/LightingData.asset.meta b/Assets/01.Scenes/03.Sail/LightingData.asset.meta new file mode 100644 index 000000000..9cf1f67de --- /dev/null +++ b/Assets/01.Scenes/03.Sail/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2d183ccdbf5a7ae4388b9e0b9f6ebcf2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01.Scenes/03.Sail/ReflectionProbe-0.exr b/Assets/01.Scenes/03.Sail/ReflectionProbe-0.exr new file mode 100644 index 000000000..68c0e123a Binary files /dev/null and b/Assets/01.Scenes/03.Sail/ReflectionProbe-0.exr differ diff --git a/Assets/01.Scenes/03.Sail/ReflectionProbe-0.exr.meta b/Assets/01.Scenes/03.Sail/ReflectionProbe-0.exr.meta new file mode 100644 index 000000000..2c8d586c8 --- /dev/null +++ b/Assets/01.Scenes/03.Sail/ReflectionProbe-0.exr.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: db25ab9c904b7374eaee0f5a1d617ba0 +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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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: 4 + 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: 4 + buildTarget: iOS + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01.Scenes/03.Sail/ReflectionProbe-1.exr b/Assets/01.Scenes/03.Sail/ReflectionProbe-1.exr new file mode 100644 index 000000000..cf503a818 Binary files /dev/null and b/Assets/01.Scenes/03.Sail/ReflectionProbe-1.exr differ diff --git a/Assets/01.Scenes/03.Sail/ReflectionProbe-1.exr.meta b/Assets/01.Scenes/03.Sail/ReflectionProbe-1.exr.meta new file mode 100644 index 000000000..76bcfc585 --- /dev/null +++ b/Assets/01.Scenes/03.Sail/ReflectionProbe-1.exr.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: f6badb44acf20db4f84f84323aa2e8a4 +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: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + 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: 4 + 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: 4 + buildTarget: iOS + 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: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/01.Scenes/99.LMG/New Material.mat b/Assets/01.Scenes/99.LMG/New Material.mat index bbc81e14c..de5d9303c 100644 --- a/Assets/01.Scenes/99.LMG/New Material.mat +++ b/Assets/01.Scenes/99.LMG/New Material.mat @@ -114,12 +114,12 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 0 + - _Metallic: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 1 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs b/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs index 2ad8ac6cb..e96bff22e 100644 --- a/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs +++ b/Assets/02.Scripts/BlueWater/Sail/ShipMove.cs @@ -15,9 +15,9 @@ namespace BlueWater public float force_add = 0.002f; [SerializeField] - private GameObject SmokeL; + private ParticleSystem SmokeL; [SerializeField] - private GameObject SmokeR; + private ParticleSystem SmokeR; void Update() @@ -33,8 +33,8 @@ namespace BlueWater if (Input.GetKey(KeyCode.UpArrow)|| Input.GetKey(KeyCode.W)) { - SmokeL.gameObject.SetActive(true); - SmokeR.gameObject.SetActive(true); + SmokeL.Play(); + SmokeR.Play(); force += force_add; if (force >= 1.0f) force = 1.0f; } @@ -53,8 +53,8 @@ namespace BlueWater // transform.Translate(0, 0, speed * time); } else - { SmokeL.gameObject.SetActive(false); - SmokeR.gameObject.SetActive(false); + { SmokeL.Stop(); + SmokeR.Stop(); if (force < 0.0f)force += force_add/2.0f; else if(force > 0.0f)force -= force_add/2.0f; } diff --git a/Assets/StylizedWater2/_Demo/DemoAssets/Materials/StylizedWater2_Demo.mat b/Assets/StylizedWater2/_Demo/DemoAssets/Materials/StylizedWater2_Demo.mat index 4f8ea8050..d23ef3d50 100644 --- a/Assets/StylizedWater2/_Demo/DemoAssets/Materials/StylizedWater2_Demo.mat +++ b/Assets/StylizedWater2/_Demo/DemoAssets/Materials/StylizedWater2_Demo.mat @@ -8,8 +8,9 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: StylizedWater2_Demo - m_Shader: {fileID: -6465566751694194690, guid: d7b0192b9bf19c949900035fa781fdc4, - type: 3} + m_Shader: {fileID: -6465566751694194690, guid: d7b0192b9bf19c949900035fa781fdc4, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _ADVANCED_SHADING - _CAUSTICS @@ -34,6 +35,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -307,6 +309,7 @@ Material: - _WaveDirection: {r: -1, g: -1, b: -1, a: -1} - _WaveFadeDistance: {r: 25, g: 286.97916, b: 0, a: 0} m_BuildTextureStacks: [] + m_AllowLocking: 1 --- !u!114 &6498140463000427223 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/Assets/Toon Water URP/Curved Toon Water Material 1.mat b/Assets/Toon Water URP/Curved Toon Water Material 1.mat index dbacbc93e..f01c31077 100644 --- a/Assets/Toon Water URP/Curved Toon Water Material 1.mat +++ b/Assets/Toon Water URP/Curved Toon Water Material 1.mat @@ -87,17 +87,17 @@ Material: m_Ints: [] m_Floats: - Boolean_2918AA79: 0 - - Vector1_20DB7652: 0.158 - - Vector1_301E02E2: 240 - - Vector1_31894ABB: 0.005 + - Vector1_20DB7652: 0.636 + - Vector1_301E02E2: 202 + - Vector1_31894ABB: 0.0124 - Vector1_3632ABA2: 0 - Vector1_45F25267: 12.89 - Vector1_738B39CF: 0 - - Vector1_854A7D8C: 0.51 - - Vector1_9C73072A: 0.88 + - Vector1_854A7D8C: 1 + - Vector1_9C73072A: 0.45 - Vector1_A524D234: 0 - - Vector1_B9CC1720: 0.03 - - Vector1_E71BB35E: 1.02 + - Vector1_B9CC1720: 0 + - Vector1_E71BB35E: 0.99 - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 @@ -128,8 +128,8 @@ Material: - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 0 - - _Wave_Height: 0.2 - - _Wave_Speed: 0.29 + - _Wave_Height: 0.3 + - _Wave_Speed: 0.05 - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: diff --git a/Assets/Toon Water URP/Curved Toon Water Shader.shadergraph b/Assets/Toon Water URP/Curved Toon Water Shader.shadergraph index 1f46c5b35..40836cd7a 100644 --- a/Assets/Toon Water URP/Curved Toon Water Shader.shadergraph +++ b/Assets/Toon Water URP/Curved Toon Water Shader.shadergraph @@ -2952,7 +2952,7 @@ "hlslDeclarationOverride": 0, "m_Hidden": false, "m_Value": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "isMainTexture": false, @@ -3252,8 +3252,8 @@ "m_ObjectId": "06e054090df1402ea51e9bded04cbb6d", "m_Title": "Fresnel", "m_Position": { - "x": -42.00000762939453, - "y": -979.0001220703125 + "x": -41.9998779296875, + "y": -978.9999389648438 } } @@ -4508,8 +4508,8 @@ "m_ObjectId": "1bbff5234f2c4b92832f844222e0362f", "m_Title": "Calculate UVs", "m_Position": { - "x": -3501.999755859375, - "y": 264.0 + "x": -3502.0, + "y": 262.0 } } @@ -6010,7 +6010,7 @@ "m_StageCapability": 3, "m_BareResource": false, "m_Texture": { - "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_SerializedTexture": "", "m_Guid": "" }, "m_DefaultType": 0 @@ -9172,6 +9172,7 @@ "m_SourceType": 0, "m_FunctionName": "DirLight", "m_FunctionSource": "268205336744f064d922e191ec6947d0", + "m_FunctionSourceUsePragmas": true, "m_FunctionBody": "Enter function body here..." } @@ -11541,8 +11542,8 @@ "m_ObjectId": "87e14a641c1d4bc6b7f82422c382e1f0", "m_Title": "Planar Reflection", "m_Position": { - "x": 10.0, - "y": 10.0 + "x": -1388.0, + "y": -1991.0 } } @@ -12013,8 +12014,8 @@ "m_ObjectId": "8f5b78c2c6884f4a9ce7b9c4bcc3d37b", "m_Title": "Other Lights Specular", "m_Position": { - "x": 10.0, - "y": 10.0 + "x": -764.0, + "y": 2251.999755859375 } } @@ -13066,7 +13067,7 @@ "m_Title": "Calculate Foam", "m_Position": { "x": -2895.0, - "y": 834.0 + "y": 998.9998779296875 } } @@ -14594,7 +14595,7 @@ "m_Hidden": false, "m_ShaderOutputName": "Smoothness", "m_StageCapability": 2, - "m_Value": 0.0, + "m_Value": 1.0, "m_DefaultValue": 0.5, "m_Labels": [] } @@ -15565,8 +15566,8 @@ "m_ObjectId": "ca0af7d94af04602a2328fb3cda13141", "m_Title": "Calculate Foam UVs", "m_Position": { - "x": -3524.000244140625, - "y": 1663.0001220703125 + "x": -3524.0, + "y": 1660.9998779296875 } } @@ -16786,7 +16787,7 @@ "m_Title": "Generate Normals", "m_Position": { "x": -2487.0, - "y": -15.000019073486329 + "y": 347.9999694824219 } } @@ -17208,6 +17209,7 @@ "m_SourceType": 0, "m_FunctionName": "OtherLights", "m_FunctionSource": "f01c1c57da365e5428a918b893fe3ff7", + "m_FunctionSourceUsePragmas": true, "m_FunctionBody": "Enter function body here..." } @@ -17519,8 +17521,8 @@ "m_ObjectId": "eb30c1030929435f80c1f702bdf64863", "m_Title": "Refraction", "m_Position": { - "x": -1213.0001220703125, - "y": 178.0 + "x": -1357.0, + "y": 151.99998474121095 } } @@ -17957,8 +17959,8 @@ "m_ObjectId": "f2277552366946468919c6cd85bba5a7", "m_Title": "Calculate Water Color Based On Depth", "m_Position": { - "x": -1907.0, - "y": -589.0000610351563 + "x": -1758.0, + "y": -512.0 } } @@ -18285,8 +18287,8 @@ "m_ObjectId": "f73efc0d442d4fea93b236459693b1b6", "m_Title": "Directional Light Specular", "m_Position": { - "x": -1391.9998779296875, - "y": 1207.0 + "x": -1391.999755859375, + "y": 1207.9998779296875 } } diff --git a/Assets/Universal Render Pipeline Asset.asset b/Assets/Universal Render Pipeline Asset.asset index 5e69ef14c..c30f2fc92 100644 --- a/Assets/Universal Render Pipeline Asset.asset +++ b/Assets/Universal Render Pipeline Asset.asset @@ -51,7 +51,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierLow: 256 m_AdditionalLightsShadowResolutionTierMedium: 512 m_AdditionalLightsShadowResolutionTierHigh: 1024 - m_ReflectionProbeBlending: 0 + m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 0 m_ShadowDistance: 150 m_ShadowCascadeCount: 4 diff --git a/ProjectSettings/Packages/com.unity.polybrush/Settings.json b/ProjectSettings/Packages/com.unity.polybrush/Settings.json index 3c7b4c18b..d563e2040 100644 --- a/ProjectSettings/Packages/com.unity.polybrush/Settings.json +++ b/ProjectSettings/Packages/com.unity.polybrush/Settings.json @@ -1,5 +1,41 @@ { "m_Dictionary": { - "m_DictionaryValues": [] + "m_DictionaryValues": [ + { + "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "Brush.VertexBillboardSize", + "value": "{\"m_Value\":2.0}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "Brush.HideWireframe", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "Mesh.RebuildNormals", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "Mesh.RebuildColliders", + "value": "{\"m_Value\":true}" + }, + { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "Mesh.UseAdditionalVertexStream", + "value": "{\"m_Value\":false}" + }, + { + "type": "UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "Brush.BrushColor", + "value": "{\"m_Value\":{\"r\":0.0,\"g\":0.800000011920929,\"b\":1.0,\"a\":1.0}}" + }, + { + "type": "UnityEngine.Gradient, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "Brush.BrushColorGradient", + "value": "{\"m_Value\":{\"serializedVersion\":\"2\",\"key0\":{\"r\":0.22699999809265138,\"g\":1.0,\"b\":0.22699999809265138,\"a\":1.0},\"key1\":{\"r\":1.0,\"g\":1.0,\"b\":1.0,\"a\":0.2587999999523163},\"key2\":{\"r\":0.0,\"g\":0.0,\"b\":0.0,\"a\":0.0},\"key3\":{\"r\":0.0,\"g\":0.0,\"b\":0.0,\"a\":0.0},\"key4\":{\"r\":0.0,\"g\":0.0,\"b\":0.0,\"a\":0.0},\"key5\":{\"r\":0.0,\"g\":0.0,\"b\":0.0,\"a\":0.0},\"key6\":{\"r\":0.0,\"g\":0.0,\"b\":0.0,\"a\":0.0},\"key7\":{\"r\":0.0,\"g\":0.0,\"b\":0.0,\"a\":0.0},\"ctime0\":0,\"ctime1\":65535,\"ctime2\":0,\"ctime3\":0,\"ctime4\":0,\"ctime5\":0,\"ctime6\":0,\"ctime7\":0,\"atime0\":0,\"atime1\":65535,\"atime2\":0,\"atime3\":0,\"atime4\":0,\"atime5\":0,\"atime6\":0,\"atime7\":0,\"m_Mode\":0,\"m_ColorSpace\":-1,\"m_NumColorKeys\":2,\"m_NumAlphaKeys\":2}}" + } + ] } } \ No newline at end of file diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 598db6ae7..2a9a320c8 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,7 +4,7 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 0 + m_CurrentQuality: 5 m_QualitySettings: - serializedVersion: 4 name: Very Low