diff --git a/Assets/01.Scenes/03.Sail.unity b/Assets/01.Scenes/03.Sail.unity index 344b61cf2..21b163c6e 100644 --- a/Assets/01.Scenes/03.Sail.unity +++ b/Assets/01.Scenes/03.Sail.unity @@ -5590,24 +5590,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &7052669 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} - m_PrefabInstance: {fileID: 1973184708} - m_PrefabAsset: {fileID: 0} ---- !u!114 &7052671 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7052669} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d7c410f7c12b3274a8403fffcb4f6cfc, type: 3} - m_Name: - m_EditorClassIdentifier: - rotationSpeed: 2 --- !u!1 &9359168 GameObject: m_ObjectHideFlags: 0 @@ -18824,93 +18806,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 174817182} m_CullTransparentMesh: 1 ---- !u!1 &175395209 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 175395210} - - component: {fileID: 175395211} - m_Layer: 0 - m_Name: Cloud (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &175395210 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175395209} - serializedVersion: 2 - 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: 25.616, y: 0, z: -0.079} ---- !u!212 &175395211 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 175395209} - 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_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c0687ff2bb410b4faf43a5f1d343e65, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7baa939ec089abc45a6659475728f138, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &176258534 GameObject: m_ObjectHideFlags: 0 @@ -47280,93 +47175,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 351890c438f7d9e4595b6f0a747a1555, type: 3} m_PrefabInstance: {fileID: 432428141} m_PrefabAsset: {fileID: 0} ---- !u!1 &433890322 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 433890323} - - component: {fileID: 433890324} - m_Layer: 0 - m_Name: Cloud (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &433890323 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 433890322} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 46.3, y: -7.09, z: 13} - 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} ---- !u!212 &433890324 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 433890322} - 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_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c0687ff2bb410b4faf43a5f1d343e65, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7baa939ec089abc45a6659475728f138, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &435381546 GameObject: m_ObjectHideFlags: 0 @@ -49968,12 +49776,6 @@ Transform: - {fileID: 825403612} - {fileID: 619828494} - {fileID: 164455556} - - {fileID: 1995741410} - - {fileID: 175395210} - - {fileID: 1279330207} - - {fileID: 1415678109} - - {fileID: 433890323} - - {fileID: 1406313508} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &456882156 @@ -140386,6 +140188,127 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &1245732265 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.x + value: 0.30173 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.y + value: 0.30173 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.z + value: 0.30173 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalPosition.x + value: 11.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalPosition.y + value: -2.66 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalPosition.z + value: 17.71 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8431689 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.y + value: -0.53764886 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -65.047 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7635826562936255635, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 6f4839854aa599a4c9fd49afa97338a9, type: 2} + - target: {fileID: -7635826562936255635, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: 'm_Materials.Array.data[1]' + value: + objectReference: {fileID: 2100000, guid: 6f4839854aa599a4c9fd49afa97338a9, type: 2} + - target: {fileID: 919132149155446097, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_Name + value: Shark (1) + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.x + value: 0.36310306 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.y + value: 0.36310306 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.z + value: 0.36310306 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalPosition.x + value: -0.01 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalPosition.y + value: 2.22 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalPosition.z + value: 16.12 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9994463 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.x + value: -0.033274077 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0000000027939675 + objectReference: {fileID: 0} + - target: {fileID: 1151388028547126963, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -3.814 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} --- !u!1 &1247330397 GameObject: m_ObjectHideFlags: 0 @@ -147945,93 +147868,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1279136229} m_CullTransparentMesh: 1 ---- !u!1 &1279330206 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1279330207} - - component: {fileID: 1279330208} - m_Layer: 0 - m_Name: Cloud (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1279330207 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1279330206} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 75.8, y: -5.8, z: 11.1} - 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} ---- !u!212 &1279330208 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1279330206} - 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_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c0687ff2bb410b4faf43a5f1d343e65, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7baa939ec089abc45a6659475728f138, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1279446410 GameObject: m_ObjectHideFlags: 0 @@ -160907,93 +160743,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 1061695247072719575, guid: 8644faa1902e38044a5d5e64a2151252, type: 3} m_PrefabInstance: {fileID: 1405718373} m_PrefabAsset: {fileID: 0} ---- !u!1 &1406313507 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1406313508} - - component: {fileID: 1406313509} - m_Layer: 0 - m_Name: Cloud (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1406313508 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406313507} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 104.8, y: -7.09, 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} ---- !u!212 &1406313509 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1406313507} - 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_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c0687ff2bb410b4faf43a5f1d343e65, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7baa939ec089abc45a6659475728f138, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1001 &1406667063 PrefabInstance: m_ObjectHideFlags: 0 @@ -162213,93 +161962,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1415482170} m_CullTransparentMesh: 1 ---- !u!1 &1415678108 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1415678109} - - component: {fileID: 1415678110} - m_Layer: 0 - m_Name: Cloud (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1415678109 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415678108} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 60.86, y: -6.23, 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} ---- !u!212 &1415678110 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1415678108} - 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_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c0687ff2bb410b4faf43a5f1d343e65, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7baa939ec089abc45a6659475728f138, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1415994567 GameObject: m_ObjectHideFlags: 0 @@ -223523,17 +223185,29 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.x + value: 0.30173 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.y + value: 0.30173 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} + propertyPath: m_LocalScale.z + value: 0.30173 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} propertyPath: m_LocalPosition.x - value: 15.443612 + value: 7.74 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} propertyPath: m_LocalPosition.y - value: -3.89 + value: -2.66 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} propertyPath: m_LocalPosition.z - value: 3.5743117 + value: 12.21 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} propertyPath: m_LocalRotation.w @@ -223622,10 +223296,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} - insertIndex: -1 - addedObject: {fileID: 7052671} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e5e42fa078213b544a47c3f972dbb642, type: 3} --- !u!1 &1973524575 GameObject: @@ -225564,93 +225235,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1995741409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1995741410} - - component: {fileID: 1995741411} - m_Layer: 0 - m_Name: Cloud (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1995741410 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995741409} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 90.45, y: -5.79, z: -1.52} - 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} ---- !u!212 &1995741411 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1995741409} - 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_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5c0687ff2bb410b4faf43a5f1d343e65, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7baa939ec089abc45a6659475728f138, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 20.48, y: 20.48} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1998046902 GameObject: m_ObjectHideFlags: 0 @@ -248189,6 +247773,7 @@ SceneRoots: - {fileID: 89219352} - {fileID: 1921625339} - {fileID: 1973184708} + - {fileID: 1245732265} - {fileID: 1098585720} - {fileID: 456696131} - {fileID: 1896203544} diff --git a/Assets/01.Scenes/04.TycoonTest.unity b/Assets/01.Scenes/04.TycoonTest.unity index 9798b6892..cd4d3f168 100644 --- a/Assets/01.Scenes/04.TycoonTest.unity +++ b/Assets/01.Scenes/04.TycoonTest.unity @@ -111281,8 +111281,8 @@ MonoBehaviour: byteData: byteDataArray: Version: 1.7.9 - gizmoViewMode: 2 - showBehaviorDesignerGizmo: 1 + gizmoViewMode: 0 + showBehaviorDesignerGizmo: 0 --- !u!114 &2074437098 MonoBehaviour: m_ObjectHideFlags: 0 @@ -123106,8 +123106,8 @@ MonoBehaviour: byteData: byteDataArray: Version: 1.7.9 - gizmoViewMode: 2 - showBehaviorDesignerGizmo: 1 + gizmoViewMode: 0 + showBehaviorDesignerGizmo: 0 --- !u!224 &5141651638159501066 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/BlueWater/Sail/Curved_Object.cs b/Assets/02.Scripts/BlueWater/Sail/Curved_Object.cs index 2aec5c4e4..0dbd159b8 100644 --- a/Assets/02.Scripts/BlueWater/Sail/Curved_Object.cs +++ b/Assets/02.Scripts/BlueWater/Sail/Curved_Object.cs @@ -26,15 +26,13 @@ public class Curved_Object : MonoBehaviour private float bendingAmount = 0.001f; #endregion - - + #region Fields private float _prevAmount; #endregion - #region MonoBehaviour private void Awake () @@ -74,8 +72,7 @@ public class Curved_Object : MonoBehaviour } #endregion - - + #region Methods private void UpdateBendingAmount () diff --git a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/LowPoly - FirTree.mat b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/LowPoly - FirTree.mat index aac1c2c0d..eaba40f66 100644 --- a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/LowPoly - FirTree.mat +++ b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/LowPoly - FirTree.mat @@ -139,7 +139,7 @@ Material: m_Colors: - _BaseColor: {r: 0.2235294, g: 0.5607843, b: 0.20784312, a: 1} - _BottomColor: {r: 0, g: 0.53676474, b: 0.07033476, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0.22352937, g: 0.5607843, b: 0.2078431, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _TopColor: {r: 0.31417936, g: 0.7205882, b: 0.28081742, a: 1} diff --git a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Day.mat b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Day.mat index d9ac43f8e..1b44059cd 100644 --- a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Day.mat +++ b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Day.mat @@ -86,14 +86,14 @@ Material: - _Advancedd: 1 - _BumpScale: 1 - _CUBEMAPP: 1 - - _CubemapPosition: -0.57 + - _CubemapPosition: -0.6 - _Cubemapp: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - _EnableFog: 1 - _EnableRotation: 1 - - _Exposure: 0.94 + - _Exposure: 1.6 - _Float0: 0 - _FogFill: 0 - _FogHeight: 0.394 diff --git a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Night.mat b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Night.mat index d52510d27..b69e45142 100644 --- a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Night.mat +++ b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Materials/Skybox Cubemap Extended Night.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skybox Cubemap Extended Night m_Shader: {fileID: 4800000, guid: 82881a2d011b0964696411c822cdd00b, type: 3} - m_ShaderKeywords: _ENABLEFOG_ON _ENABLEROTATION_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ENABLEROTATION_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -75,22 +80,24 @@ Material: m_Texture: {fileID: 8900000, guid: 3ce67fee0f260ee47b4d820421fe6ff9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _Advancedd: 1 - _BumpScale: 1 - _CUBEMAPP: 1 - - _CubemapPosition: 0 + - _CubemapPosition: -0.7 - _Cubemapp: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _EnableFog: 1 + - _EnableFog: 0 - _EnableRotation: 1 - - _Exposure: 1 + - _Exposure: 0.9 - _Float0: -0.21 - _FogFill: 0 - _FogHeight: 0.625 - _FogIntensity: 1 + - _FogMessage: 0 - _FogPosition: 0 - _FogSmoothness: 0.5 - _Fogg: 1 @@ -103,7 +110,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 0 + - _Rotation: 99 - _RotationSpeed: 2 - _Rotationn: 1 - _SkyboxExtended: 1 @@ -118,3 +125,5 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Tex_HDR: {r: 1, g: 1, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Night Sky.exr b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Night Sky.exr index 9aa6ed503..7e2e0da74 100644 Binary files a/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Night Sky.exr and b/Assets/BOXOPHOBIC/Skybox Cubemap Extended/Demo/Textures/Polyverse Skies - Night Sky.exr differ