From 9ae93651f1787fd9a30e92b95e8aa6de53bfb3f3 Mon Sep 17 00:00:00 2001 From: louis Date: Thu, 9 Jan 2025 09:47:26 +0100 Subject: [PATCH] Relance partie + fix curve Y --- .../lasers/lasers2.unitypackage_BASE_1684.meta | 7 ------- .../lasers/lasers2.unitypackage_BASE_821.meta | 7 ------- .../lasers/lasers2.unitypackage_LOCAL_1684.meta | 0 .../lasers/lasers2.unitypackage_LOCAL_821.meta | 0 .../lasers/lasers2.unitypackage_REMOTE_1684.meta | 0 .../lasers/lasers2.unitypackage_REMOTE_821.meta | 0 Assets/Scenes/DeathScreen.unity.meta | 2 +- Assets/Scenes/GameScene.unity | 14 +++++++------- 8 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_1684.meta delete mode 100644 Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_821.meta delete mode 100644 Assets/ParticleSystems/lasers/lasers2.unitypackage_LOCAL_1684.meta delete mode 100644 Assets/ParticleSystems/lasers/lasers2.unitypackage_LOCAL_821.meta delete mode 100644 Assets/ParticleSystems/lasers/lasers2.unitypackage_REMOTE_1684.meta delete mode 100644 Assets/ParticleSystems/lasers/lasers2.unitypackage_REMOTE_821.meta diff --git a/Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_1684.meta b/Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_1684.meta deleted file mode 100644 index 90783e3..0000000 --- a/Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_1684.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 74ec3c5b307a41c4eac0e62ddf7311a7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_821.meta b/Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_821.meta deleted file mode 100644 index 90783e3..0000000 --- a/Assets/ParticleSystems/lasers/lasers2.unitypackage_BASE_821.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 74ec3c5b307a41c4eac0e62ddf7311a7 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ParticleSystems/lasers/lasers2.unitypackage_LOCAL_1684.meta b/Assets/ParticleSystems/lasers/lasers2.unitypackage_LOCAL_1684.meta deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/ParticleSystems/lasers/lasers2.unitypackage_LOCAL_821.meta b/Assets/ParticleSystems/lasers/lasers2.unitypackage_LOCAL_821.meta deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/ParticleSystems/lasers/lasers2.unitypackage_REMOTE_1684.meta b/Assets/ParticleSystems/lasers/lasers2.unitypackage_REMOTE_1684.meta deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/ParticleSystems/lasers/lasers2.unitypackage_REMOTE_821.meta b/Assets/ParticleSystems/lasers/lasers2.unitypackage_REMOTE_821.meta deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/Scenes/DeathScreen.unity.meta b/Assets/Scenes/DeathScreen.unity.meta index b1331cf..18ffeb5 100644 --- a/Assets/Scenes/DeathScreen.unity.meta +++ b/Assets/Scenes/DeathScreen.unity.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 <<<<<<<< HEAD:Assets/TextMesh Pro/Examples & Extras/Scenes/27 - Double Pass Shader Example.unity.meta -guid: 3b38a6ba32b869f48812e595baf39746 +guid: 43c23d1fff294aa4b90d180240a2295a ======== guid: 9fc0d4010bbf28b4594072e72b8655ab >>>>>>>> 4c350d16a4b31db0659a0e5146e5626a353b2200:Assets/Scenes/DeathScreen.unity.meta diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index ee37757..7f04f69 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -343,7 +343,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3} m_Name: m_EditorClassIdentifier: - k__BackingField: 0 + k__BackingField: 0.0005 k__BackingField: 0 curveOrigin: {fileID: 1053166410} --- !u!1 &100036927 @@ -1438,8 +1438,8 @@ MonoBehaviour: m_Calls: [] m_text: Back m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1463,7 +1463,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 37.6 + m_fontSize: 35.8 m_fontSizeBase: 41 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -3632,8 +3632,8 @@ MonoBehaviour: m_Calls: [] m_text: SCOREBOARD m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3657,7 +3657,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36.9 + m_fontSize: 27.95 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1