From e2d2010c42bd79a7c6e9eaaacca028abf9388a77 Mon Sep 17 00:00:00 2001 From: cemt1363 Date: Sun, 7 Jun 2026 02:13:36 +0200 Subject: [PATCH] =?UTF-8?q?fixed=20everyth=C4=B1ng=20no=20crashes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Game/Assets/Scenes/1_Start scene.unity | 6 + Game/Assets/Scenes/3_Fall splash scene.unity | 143 ------------------- Game/Assets/Scripts/StartScene.cs.meta | 2 - 3 files changed, 6 insertions(+), 145 deletions(-) delete mode 100644 Game/Assets/Scripts/StartScene.cs.meta diff --git a/Game/Assets/Scenes/1_Start scene.unity b/Game/Assets/Scenes/1_Start scene.unity index a6a9cf1..7c9201f 100644 --- a/Game/Assets/Scenes/1_Start scene.unity +++ b/Game/Assets/Scenes/1_Start scene.unity @@ -119,6 +119,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +<<<<<<< HEAD --- !u!1 &330371564 GameObject: m_ObjectHideFlags: 0 @@ -354,6 +355,8 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +======= +>>>>>>> parent of 8849a17 (soundeffects) --- !u!1 &1410446868 GameObject: m_ObjectHideFlags: 0 @@ -565,6 +568,9 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1410446871} +<<<<<<< HEAD - {fileID: 995945558} - {fileID: 330371566} - {fileID: 2033681219} +======= +>>>>>>> parent of 8849a17 (soundeffects) diff --git a/Game/Assets/Scenes/3_Fall splash scene.unity b/Game/Assets/Scenes/3_Fall splash scene.unity index 2013fb1..5a7e8bb 100644 --- a/Game/Assets/Scenes/3_Fall splash scene.unity +++ b/Game/Assets/Scenes/3_Fall splash scene.unity @@ -211,151 +211,8 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1616685617 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1616685620} - - component: {fileID: 1616685619} - - component: {fileID: 1616685618} - m_Layer: 0 - m_Name: Audio - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1616685618 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616685617} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cf4b348d575825e429b880cfe70f135e, type: 3} - m_Name: - m_EditorClassIdentifier: '::' ---- !u!82 &1616685619 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616685617} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: a2bc0335c81b4244397158d9fcb5f586, type: 3} - m_PlayOnAwake: 1 - m_Volume: 1 - m_Pitch: 1 - Loop: 0 - 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: 1 - 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 &1616685620 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1616685617} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -19.86103, y: 2.85599, z: 0} - 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!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 713676164} - - {fileID: 1616685620} diff --git a/Game/Assets/Scripts/StartScene.cs.meta b/Game/Assets/Scripts/StartScene.cs.meta deleted file mode 100644 index 3991d39..0000000 --- a/Game/Assets/Scripts/StartScene.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 95ce96b9c2b516844a78e1102b390f54 \ No newline at end of file