From ff7c0b86ce178e6c2f0e1c4c97e875680f970839 Mon Sep 17 00:00:00 2001
From: GIMENEZ TANGUY <tanguy.gimenez@etu.unistra.fr>
Date: Mon, 29 Mar 2021 12:01:49 +0200
Subject: [PATCH] retrait de fichiers qui font tout merder
---
Assets/Scenes/Niveau1.unity | 115 +++-----------------------
UserSettings/EditorUserSettings.asset | 36 --------
2 files changed, 10 insertions(+), 141 deletions(-)
delete mode 100644 UserSettings/EditorUserSettings.asset
diff --git a/Assets/Scenes/Niveau1.unity b/Assets/Scenes/Niveau1.unity
index f40afec..a8ac7ec 100644
--- a/Assets/Scenes/Niveau1.unity
+++ b/Assets/Scenes/Niveau1.unity
@@ -3250,7 +3250,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &286967853
PrefabInstance:
@@ -14728,7 +14728,7 @@ RectTransform:
m_Children:
- {fileID: 878493812}
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@@ -15400,10 +15400,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ propertyPath: period
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: natureBar
value:
objectReference: {fileID: 1100208387}
+ - target: {fileID: -6286016664533736427, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
+ propertyPath: TimeDamage
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 1206561506436264874, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
propertyPath: m_Size.y
value: 1.0000005
@@ -15462,72 +15470,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a53c5cae22cca3445bbb7e30f12f7110, type: 3}
---- !u!1 &1464490954
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1464490957}
- - component: {fileID: 1464490956}
- - component: {fileID: 1464490955}
- m_Layer: 0
- m_Name: EventSystem (1)
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!114 &1464490955
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1464490954}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalAxis: Horizontal
- m_VerticalAxis: Vertical
- m_SubmitButton: Submit
- m_CancelButton: Cancel
- m_InputActionsPerSecond: 10
- m_RepeatDelay: 0.5
- m_ForceModuleActive: 0
---- !u!114 &1464490956
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1464490954}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_FirstSelected: {fileID: 0}
- m_sendNavigationEvents: 1
- m_DragThreshold: 10
---- !u!4 &1464490957
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1464490954}
- 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_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 6
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1511605078 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
@@ -16010,11 +15952,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 480113695441922077, guid: 9cdcd3ac7314fd649bf366c8fd2a4460, type: 3}
m_PrefabInstance: {fileID: 1255072614}
m_PrefabAsset: {fileID: 0}
---- !u!1 &1986186788 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 1705879581494847332, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
- m_PrefabInstance: {fileID: 1097604857}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &2003690271
PrefabInstance:
m_ObjectHideFlags: 0
@@ -16077,38 +16014,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
m_PrefabInstance: {fileID: 2003690271}
m_PrefabAsset: {fileID: 0}
---- !u!1 &2023540884 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 512403696824737883, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
- m_PrefabInstance: {fileID: 1097604857}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &2023540886 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 1778026432316727230, guid: 2e4037a1db4798249a09bbff07baad2e, type: 3}
- m_PrefabInstance: {fileID: 1097604857}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2023540884}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!114 &2023540888
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2023540884}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 96efccd7704b37949a51739ed18bbd7d, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- dialogBox: {fileID: 1986186788}
- dialogText: {fileID: 2023540886}
- dialog: 0
- dialogActive: 1
--- !u!4 &2053511971 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1090639359825973590, guid: 51dbdb89c7a51fc4bbfc6bb932ef5042, type: 3}
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
deleted file mode 100644
index 60977e1..0000000
--- a/UserSettings/EditorUserSettings.asset
+++ /dev/null
@@ -1,36 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!162 &1
-EditorUserSettings:
- m_ObjectHideFlags: 0
- serializedVersion: 4
- m_ConfigSettings:
- RecentlyUsedScenePath-0:
- value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
- flags: 0
- RecentlyUsedScenePath-1:
- value: 22424703114646680e0b0227036c71190012193f6c7a68252320092a
- flags: 0
- RecentlyUsedScenePath-2:
- value: 22424703114646680e0b0227036c72151802563f22213229
- flags: 0
- RecentlyUsedScenePath-3:
- value: 22424703114646680e0b0227036c71190012193f7e66333e243d04
- flags: 0
- RecentlyUsedScenePath-4:
- value: 22424703114646680e0b0227036c71190012193f7d66333e243d04
- flags: 0
- vcSharedLogLevel:
- value: 0d5e400f0650
- flags: 0
- m_VCAutomaticAdd: 1
- m_VCDebugCom: 0
- m_VCDebugCmd: 0
- m_VCDebugOut: 0
- m_SemanticMergeMode: 2
- m_VCShowFailedCheckout: 1
- m_VCOverwriteFailedCheckoutAssets: 1
- m_VCProjectOverlayIcons: 1
- m_VCHierarchyOverlayIcons: 1
- m_VCOtherOverlayIcons: 1
- m_VCAllowAsyncUpdate: 1
--
GitLab