Merge commit '807aa8c3c6e62c5d033064e3190ae432fb66db03' into feat/molecule/bons

2024-01-18 12:19:30 +01:00
parent 824a8fdbc6 807aa8c3c6
commit a8476f4906
241 changed files with 22113 additions and 1325 deletions
--- a/Assets/Scripts/ChangeScene.cs
+++ b/Assets/Scripts/ChangeScene.cs
@ -7,9 +7,8 @@ using UnityEngine.UI;

 public enum AvailableScenes {
        MainMenu,
-        CompoMenu,
-        PreviewMenu,
-        Fusion,
+        CompositionMenu,
+        QuizzMode,
 }

 public class ChangeScene : MonoBehaviour
@ -20,8 +19,8 @@ public class ChangeScene : MonoBehaviour
    readonly Dictionary<AvailableScenes, String> _scenesNames = new Dictionary<AvailableScenes, String>()
    {
        { AvailableScenes.MainMenu, "MainMenu" },
-        { AvailableScenes.CompoMenu, "CompositionMenu" },
-        { AvailableScenes.Fusion, "Fusion" },
+        { AvailableScenes.CompositionMenu, "CompositionMode" },
+        { AvailableScenes.QuizzMode, "QuizzMode" },
    };
    // Start is called before the first frame update
    void Start()
--- a/Assets/Scripts/ChangeScene.cs.meta
+++ b/Assets/Scripts/ChangeScene.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: cb35a44ae5280ee46bc28b22325565bc
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Config.meta
+++ b/Assets/Scripts/Config.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b341ca4f45021eb40a17a214926ba542
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Config/GlobalConfig.cs.meta
+++ b/Assets/Scripts/Config/GlobalConfig.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 783766876d1f4f840b706ab1526fca6e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/MainMenuLoader.cs.meta
+++ b/Assets/Scripts/MainMenuLoader.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1eba6f5e45170f34fb9ec95c896622ad
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Quizz.meta
+++ b/Assets/Scripts/Quizz.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4040dd72c2608754a9869916970a6596
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Quizz/QuizzManager.cs.meta
+++ b/Assets/Scripts/Quizz/QuizzManager.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4f489ca67a8a06c48b5440e6a6c7039b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scripts/Scripts.asmdef.meta
+++ b/Assets/Scripts/Scripts.asmdef.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d958635d35b092041abdd85770d95d40
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: