From b3a2d8b1e68a205aab671a0b2e4a28272c8beacf Mon Sep 17 00:00:00 2001
From: teddy <teddy.falconnet@etu.univ-lyon1.fr>
Date: Wed, 15 Jan 2025 16:23:03 +0100
Subject: [PATCH] correction merge

---
 .idea/indexLayout.xml               |  8 ++++
 .idea/projectSettingsUpdater.xml    |  7 +++
 .idea/vcs.xml                       |  6 +++
 .idea/workspace.xml                 | 70 +++++++++++++++++++++++++++++
 Assets/Scenes/DeathScreen1VS1.unity | 70 +++++++++++++----------------
 5 files changed, 123 insertions(+), 38 deletions(-)
 create mode 100644 .idea/indexLayout.xml
 create mode 100644 .idea/projectSettingsUpdater.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/indexLayout.xml b/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/projectSettingsUpdater.xml b/.idea/projectSettingsUpdater.xml
new file mode 100644
index 0000000..64af657
--- /dev/null
+++ b/.idea/projectSettingsUpdater.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="singleClickDiffPreview" value="1" />
+    <option name="vcsConfiguration" value="3" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..bbe5819
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="bbce60c9-b020-43bc-ac91-3e747354e409" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/Assets/Scenes/DeathScreen1VS1.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/DeathScreen1VS1.unity" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Assets/Sprites/CameraRenderTexture.renderTexture" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Sprites/CameraRenderTexture.renderTexture" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/DeathScreen1VS1.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/MainMenu.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/Assets/Scenes/MainMenu.unity" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/Users/teddy/OneDrive/Documents/BUT3/SAE/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 8
+}]]></component>
+  <component name="ProjectId" id="2rfdTSaHd8CQV55SaQfRGNTGbwL" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "dev",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="bbce60c9-b020-43bc-ac91-3e747354e409" name="Changes" comment="" />
+      <created>1736954071558</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1736954071558</updated>
+      <workItem from="1736954074577" duration="429000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="UnityProjectDiscoverer">
+    <option name="unityProjectFolder" value="true" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Assets/Scenes/DeathScreen1VS1.unity b/Assets/Scenes/DeathScreen1VS1.unity
index cb3e641..1474aa0 100644
--- a/Assets/Scenes/DeathScreen1VS1.unity
+++ b/Assets/Scenes/DeathScreen1VS1.unity
@@ -662,6 +662,7 @@ GameObject:
   m_Component:
   - component: {fileID: 533191358}
   - component: {fileID: 533191359}
+  - component: {fileID: 533191360}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -696,6 +697,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &533191360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533191355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2278264f81ffe464da1a99450675b475, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
   distanceText: {fileID: 393375357}
   numberCoinsText: {fileID: 403573105}
   joueur1Text: {fileID: 1628274878}
@@ -1608,98 +1621,79 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 3596407935928064896, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 3596407935928064896, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_Controller
       value: 
       objectReference: {fileID: 9100000, guid: 104b61ba2d831c84e9200f18cdf2cd2f, type: 2}
-    - target: {fileID: 6031424829095203416, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6031424829095203416, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: healthBarView
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalScale.x
       value: 104.64
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalScale.y
       value: 129.97945
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalPosition.x
       value: 1991
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalPosition.y
       value: 52
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalPosition.z
       value: -176
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalRotation.w
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalRotation.y
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 180
       objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: laneSystem
       value: 
       objectReference: {fileID: 0}
-    - target: {fileID: 7581911058254726377, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 7581911058254726377, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: m_Name
       value: Player
       objectReference: {fileID: 0}
-    - target: {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50,
-        type: 3}
+    - target: {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
       propertyPath: PlayerHUD
       value: 
       objectReference: {fileID: 0}