From 599fdbd4dbcd1520edeee8f1ab781605c3b9c764 Mon Sep 17 00:00:00 2001 From: "ethan.perruzza" Date: Mon, 7 Nov 2022 14:56:23 +0100 Subject: [PATCH] =?UTF-8?q?Suppression=20des=20corrections=20que=20j'avais?= =?UTF-8?q?=20oubli=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Coins/Prefabs/Corrected.meta | 8 - Assets/Coins/Prefabs/Corrected/Coin.prefab | 137 ------------------ .../Coins/Prefabs/Corrected/Coin.prefab.meta | 7 - Assets/Coins/Scripts/Correction.meta | 8 - Assets/Coins/Scripts/Correction/GetCoin.cs | 23 --- .../Coins/Scripts/Correction/GetCoin.cs.meta | 11 -- Assets/_Mario/Scripts/Corrected.meta | 8 - Assets/_Mario/Scripts/Corrected/MarioMove.cs | 37 ----- .../Scripts/Corrected/MarioMove.cs.meta | 11 -- .../Scripts/Corrected/MarioMoveWithJumps.cs | 55 ------- .../Corrected/MarioMoveWithJumps.cs.meta | 11 -- 11 files changed, 316 deletions(-) delete mode 100644 Assets/Coins/Prefabs/Corrected.meta delete mode 100644 Assets/Coins/Prefabs/Corrected/Coin.prefab delete mode 100644 Assets/Coins/Prefabs/Corrected/Coin.prefab.meta delete mode 100644 Assets/Coins/Scripts/Correction.meta delete mode 100644 Assets/Coins/Scripts/Correction/GetCoin.cs delete mode 100644 Assets/Coins/Scripts/Correction/GetCoin.cs.meta delete mode 100644 Assets/_Mario/Scripts/Corrected.meta delete mode 100644 Assets/_Mario/Scripts/Corrected/MarioMove.cs delete mode 100644 Assets/_Mario/Scripts/Corrected/MarioMove.cs.meta delete mode 100644 Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs delete mode 100644 Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs.meta diff --git a/Assets/Coins/Prefabs/Corrected.meta b/Assets/Coins/Prefabs/Corrected.meta deleted file mode 100644 index af9709f..0000000 --- a/Assets/Coins/Prefabs/Corrected.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e0b0753e99bca1c4bb4da99b0c44ddd7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Coins/Prefabs/Corrected/Coin.prefab b/Assets/Coins/Prefabs/Corrected/Coin.prefab deleted file mode 100644 index 029e6a1..0000000 --- a/Assets/Coins/Prefabs/Corrected/Coin.prefab +++ /dev/null @@ -1,137 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7732796189764358544 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7732796189764358557} - - component: {fileID: 7732796189764358546} - - component: {fileID: 7732796189764358547} - - component: {fileID: 7732796189764358556} - - component: {fileID: 7732796189764358559} - m_Layer: 0 - m_Name: Coin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7732796189764358557 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7732796189764358544} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.77621, y: -0.29157558, z: 0} - m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7732796189764358546 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7732796189764358544} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 1270404789, guid: 4049848f0bbd6164cb15af51c3c7f30f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!95 &7732796189764358547 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7732796189764358544} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 04b6779865ee93c458d60a79eaaed654, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!58 &7732796189764358556 -CircleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7732796189764358544} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 0.07999999 ---- !u!114 &7732796189764358559 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7732796189764358544} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 81c4fdeefe96a1642a5e6b3d8043029e, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Coins/Prefabs/Corrected/Coin.prefab.meta b/Assets/Coins/Prefabs/Corrected/Coin.prefab.meta deleted file mode 100644 index 2eff661..0000000 --- a/Assets/Coins/Prefabs/Corrected/Coin.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 0ea03f1cbeb9fff4dbc45552a6eee1ee -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Coins/Scripts/Correction.meta b/Assets/Coins/Scripts/Correction.meta deleted file mode 100644 index eac8b16..0000000 --- a/Assets/Coins/Scripts/Correction.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bb90d0391fb3c3241aad9af8149b0b75 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Coins/Scripts/Correction/GetCoin.cs b/Assets/Coins/Scripts/Correction/GetCoin.cs deleted file mode 100644 index b6fc140..0000000 --- a/Assets/Coins/Scripts/Correction/GetCoin.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class GetCoin : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - - private void OnTriggerEnter2D(Collider2D collision) - { - Destroy(gameObject); - } -} \ No newline at end of file diff --git a/Assets/Coins/Scripts/Correction/GetCoin.cs.meta b/Assets/Coins/Scripts/Correction/GetCoin.cs.meta deleted file mode 100644 index 23693df..0000000 --- a/Assets/Coins/Scripts/Correction/GetCoin.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 81c4fdeefe96a1642a5e6b3d8043029e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Mario/Scripts/Corrected.meta b/Assets/_Mario/Scripts/Corrected.meta deleted file mode 100644 index c59c6c4..0000000 --- a/Assets/_Mario/Scripts/Corrected.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d5ddca0b55233764ea34b9cd290266e2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Mario/Scripts/Corrected/MarioMove.cs b/Assets/_Mario/Scripts/Corrected/MarioMove.cs deleted file mode 100644 index 924aded..0000000 --- a/Assets/_Mario/Scripts/Corrected/MarioMove.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MarioMove : MonoBehaviour -{ - //Variable qui nous permettra de faire le lien entre l'animator et notre code sur Mario - public Animator MarioAnimator; - - //Variable qui nous permettra de faire le lien entre le Sprite Renderer et notre code sur Mario - public SpriteRenderer MarioSpriteRenderer; - - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - Vector3 motion = new Vector3(Input.GetAxis("Horizontal"), 0f, 0f); - transform.position = transform.position + motion * Time.deltaTime; - - - MarioAnimator.SetFloat("Speed", Mathf.Abs(motion.x)); - - if (motion.x > 0.1) - { - MarioSpriteRenderer.flipX = true; - } - else if (motion.x < -0.1) - { - MarioSpriteRenderer.flipX = false; - } - } -} diff --git a/Assets/_Mario/Scripts/Corrected/MarioMove.cs.meta b/Assets/_Mario/Scripts/Corrected/MarioMove.cs.meta deleted file mode 100644 index 948277f..0000000 --- a/Assets/_Mario/Scripts/Corrected/MarioMove.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 14b0d26eda869ad4e810c57627b5b6a5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs b/Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs deleted file mode 100644 index 68d130a..0000000 --- a/Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MarioMoveWithJumps : MonoBehaviour -{ - //Variable qui nous permettra de faire le lien entre l'animator et notre code sur Mario - public Animator MarioAnimator; - - //Variable qui nous permettra de faire le lien entre le Sprite Renderer et notre code sur Mario - public SpriteRenderer MarioSpriteRenderer; - - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - //Saut - if (Input.GetKey(KeyCode.Space) && GetComponent().velocity.y == 0) - { - GetComponent().velocity = new Vector2(0f, 3f); - } - - //Animation Saut - if (GetComponent().velocity.y != 0) - { - MarioAnimator.SetBool("IsJumping", true); - } - else - { - MarioAnimator.SetBool("IsJumping", false); - } - - //Avancer - Vector3 motion = new Vector3(Input.GetAxis("Horizontal"), 0f, 0f); - transform.position = transform.position + motion * Time.deltaTime; - - //Animation Avancer - MarioAnimator.SetFloat("Speed", Mathf.Abs(motion.x)); - - //Changement du cote ou regade mario en fct de direction - if (motion.x > 0.1) - { - MarioSpriteRenderer.flipX = true; - } - else if (motion.x < -0.1) - { - MarioSpriteRenderer.flipX = false; - } - } -} diff --git a/Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs.meta b/Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs.meta deleted file mode 100644 index 8a1ff22..0000000 --- a/Assets/_Mario/Scripts/Corrected/MarioMoveWithJumps.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c8434d1ff2b0fb44298dec854af750f4 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: