From 5ad0e2d2e470acdb34329eef59880530551b847a Mon Sep 17 00:00:00 2001 From: Oscar Date: Wed, 20 Mar 2024 22:53:55 +0300 Subject: [PATCH] Realeasee --- Assets/Prefabs/Characters/Player.prefab | 18 +-- .../Audio/Ambient/ambience_space.mp3 | 3 + .../Audio/Ambient/ambience_space.mp3.meta | 22 +++ Assets/Scenes/NewMenu.unity | 14 +- Assets/Scenes/Procedural.unity | 140 +++++++++++++++++- 5 files changed, 177 insertions(+), 20 deletions(-) create mode 100644 Assets/Resources/Audio/Ambient/ambience_space.mp3 create mode 100644 Assets/Resources/Audio/Ambient/ambience_space.mp3.meta diff --git a/Assets/Prefabs/Characters/Player.prefab b/Assets/Prefabs/Characters/Player.prefab index 0ca78c3..42f2b66 100644 --- a/Assets/Prefabs/Characters/Player.prefab +++ b/Assets/Prefabs/Characters/Player.prefab @@ -848,7 +848,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 2.7738478, y: 1} + m_SensorSize: {x: 2.2008114, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -5029,7 +5029,7 @@ GameObject: - component: {fileID: 7366316443203543475} - component: {fileID: 5891710480012024911} m_Layer: 3 - m_Name: Spot Light + m_Name: flashlight m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5057,24 +5057,24 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7359847720008112186} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 10 m_Type: 0 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 650 - m_Range: 58.8 - m_SpotAngle: 72.45711 - m_InnerSpotAngle: 24.998234 + m_Intensity: 238 + m_Range: 87.4 + m_SpotAngle: 123.36784 + m_InnerSpotAngle: 36.913513 m_CookieSize: 10 m_Shadows: - m_Type: 2 + 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_NearPlane: 0.89 m_CullingMatrixOverride: e00: 1 e01: 0 diff --git a/Assets/Resources/Audio/Ambient/ambience_space.mp3 b/Assets/Resources/Audio/Ambient/ambience_space.mp3 new file mode 100644 index 0000000..f99c04d --- /dev/null +++ b/Assets/Resources/Audio/Ambient/ambience_space.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6de86bc6b7f0e0b3eb09e582d74b84b36db33b31021af9c1df07cac856ccafe4 +size 79685807 diff --git a/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta b/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta new file mode 100644 index 0000000..a75086d --- /dev/null +++ b/Assets/Resources/Audio/Ambient/ambience_space.mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7d9afb8bb2e693e479f5cd31279695e8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/NewMenu.unity b/Assets/Scenes/NewMenu.unity index 1bd7043..15ff53c 100644 --- a/Assets/Scenes/NewMenu.unity +++ b/Assets/Scenes/NewMenu.unity @@ -857,7 +857,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &285134966 RectTransform: m_ObjectHideFlags: 0 @@ -3690,7 +3690,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -5.3, y: 10} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} @@ -5417,7 +5417,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1042902201 RectTransform: m_ObjectHideFlags: 0 @@ -7534,7 +7534,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -5.6, y: 10} m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} @@ -9589,7 +9589,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1810681710 RectTransform: m_ObjectHideFlags: 0 @@ -10553,7 +10553,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -10629,7 +10629,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scenes/Procedural.unity b/Assets/Scenes/Procedural.unity index 5d3aa54..ecc1159 100644 --- a/Assets/Scenes/Procedural.unity +++ b/Assets/Scenes/Procedural.unity @@ -230,15 +230,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} propertyPath: m_LocalPosition.x - value: 7.704004 + value: 3.17 objectReference: {fileID: 0} - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} propertyPath: m_LocalPosition.y - value: 0.915 + value: 5.11 objectReference: {fileID: 0} - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} propertyPath: m_LocalPosition.z - value: 2.6818013 + value: 2.93 objectReference: {fileID: 0} - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} propertyPath: m_LocalRotation.w @@ -268,9 +268,13 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 179883344990739812, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + propertyPath: MaxDistance + value: 8.940208 + objectReference: {fileID: 0} - target: {fileID: 179883344990739812, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} propertyPath: m_PlayOnAwake - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} @@ -673,6 +677,134 @@ Transform: m_CorrespondingSourceObject: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} m_PrefabInstance: {fileID: 1061603554} m_PrefabAsset: {fileID: 0} +--- !u!1 &1495591699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1495591701} + - component: {fileID: 1495591700} + m_Layer: 0 + m_Name: Ambience Audio + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1495591700 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495591699} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 7d9afb8bb2e693e479f5cd31279695e8, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.194 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1495591701 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1495591699} + 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: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1533208684 GameObject: m_ObjectHideFlags: 0