Trying to fix bug

IlanOu · Dec 7, 2023 · af763d0 · af763d0
1 parent fe1414d
commit af763d0
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 11 deletions.
diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity
@@ -248,10 +248,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

diff --git a/Assets/Scenes/Introduction.unity b/Assets/Scenes/Introduction.unity
@@ -413,10 +413,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1920, y: 1080}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
@@ -1482,8 +1482,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1920, y: 1080}
+  m_AnchoredPosition: {x: -0.0060036, y: 0}
+  m_SizeDelta: {x: 1933.8, y: 1080}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1564931688
 MonoBehaviour:
@@ -1558,7 +1558,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -0.00012207, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1595579350
 MonoBehaviour:

diff --git a/Assets/Scripts/Interfaces/ChangeMenu.cs b/Assets/Scripts/Interfaces/ChangeMenu.cs
@@ -10,6 +10,7 @@ public class ChangeMenu : MonoBehaviour
     public GameObject introMenu;
     public GameObject waitingMenu;
     public GameObject selectionMenu;
+    public GameObject background;
 
     [Header("Objects")]
     public GameObject objectTextWaitingForPlayer;
@@ -81,7 +82,7 @@ IEnumerator ChangeState()
     void HandleIntroState()
     {
         // Logique pour l'état Intro
-        ChangeImage(introMenu);
+        ChangeImage(introMenu, false);
     }
 
     void HandleWaitingState(bool leftPlayerPresent, bool rightPlayerPresent)
@@ -105,7 +106,7 @@ void HandleSelectionState(bool leftPlayerPresence, bool rightPlayerPresent)
         ChangeImage(selectionMenu);
     }
 
-    void ChangeImage(GameObject objectToActivate)
+    void ChangeImage(GameObject objectToActivate, bool backgroundToDeactivate = true)
     {
         List<GameObject> objectsToDeactivate = new List<GameObject> { introMenu, waitingMenu, selectionMenu };
 
@@ -115,5 +116,7 @@ void ChangeImage(GameObject objectToActivate)
         }
 
         objectToActivate.SetActive(true);
+
+        background.SetActive(backgroundToDeactivate);
     }
 }
diff --git a/Assets/Scripts/Interfaces/ImageLoader.cs b/Assets/Scripts/Interfaces/ImageLoader.cs
@@ -6,7 +6,7 @@
 public class ImageLoader : MonoBehaviour
 {
     public Image photo;
-    private string pathBegin = "Assets/StreamingAssets/photos/";
+    private string pathBegin = "StreamingAssets/photos/";
 
     void Start()
     {

diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json
@@ -0,0 +1,17 @@
+{
+  "MonoBehaviour": {
+    "Version": 4,
+    "EnableBurstCompilation": true,
+    "EnableOptimisations": true,
+    "EnableSafetyChecks": false,
+    "EnableDebugInAllBuilds": false,
+    "DebugDataKind": 1,
+    "EnableArmv9SecurityFeatures": false,
+    "CpuMinTargetX32": 0,
+    "CpuMaxTargetX32": 0,
+    "CpuMinTargetX64": 0,
+    "CpuMaxTargetX64": 0,
+    "CpuTargetsX64": 72,
+    "OptimizeFor": 0
+  }
+}
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -93,7 +93,7 @@ PlayerSettings:
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
   useFlipModelSwapchain: 1
-  resizableWindow: 0
+  resizableWindow: 1
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
   gpuSkinning: 0

diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset
@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 53
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shaderVariantLimit: 128
+  customInterpolatorErrorThreshold: 32
+  customInterpolatorWarningThreshold: 16
diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset
@@ -9,6 +9,7 @@ UnityConnectSettings:
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
   m_ConfigUrl: https://config.uca.cloud.unity3d.com
+  m_DashboardUrl: https://dashboard.unity3d.com
   m_TestInitMode: 0
   CrashReportingSettings:
     m_EventUrl: https://perf-events.cloud.unity3d.com
@@ -22,6 +23,7 @@ UnityConnectSettings:
     m_Enabled: 0
     m_TestMode: 0
     m_InitializeOnStartup: 1
+    m_PackageRequiringCoreStatsPresent: 0
   UnityAdsSettings:
     m_Enabled: 0
     m_InitializeOnStartup: 1