Merge branch 'main' into Lune-Blocking

Assets/AddressableAssetsData/Windows/addressables_content_state.bin

-
����
PUnity.Addressables.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
<UnityEditor.AddressableAssets.Build.AddressablesContentState
playerVersion
editorVersioncachedInfosremoteCatalogLoadPath
cachedBundles


6UnityEditor.AddressableAssets.Build.CachedAssetState[]7UnityEditor.AddressableAssets.Build.CachedBundleState[]2021.02.12.17.51.072019.4.18f1		
4UnityEditor.AddressableAssets.Build.CachedAssetState
5UnityEditor.AddressableAssets.Build.CachedBundleState				
-			
	LUnity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null5UnityEditor.AddressableAssets.Build.CachedBundleStatebundleFileIddata
�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/defaultlocalgroup_scenes_all_e03df14a9e8b5885c1d9be1202c83b3e.bundle	
	�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/hats_assets_all_62696b1ad7a0175c52e893303466f9d3.bundle	

-�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/defaultlocalgroup_unitybuiltinshaders_e1984920d865c792729bfa603b50ccc1.bundle	
�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/level00_scenes_all_dfdd9569f38ebdbbffba5510c09d65ed.bundle	
�
https://ceded976-9f8b-45f6-9555-266c5abf1251.client-api.unity3dusercontent.com/client_api/v1/buckets/1257381c-f1d6-4244-9d65-4ee28add3a01/release_by_badge/latest/entry_by_path/content/?path=/level01_scenes_all_abf94ae2a2cbd445407ce6191c32da30.bundle	

�
https://ceded976-9f8b-45f6-9555-266c5abf1251.client-api.unity3dusercontent.com/client_api/v1/buckets/1257381c-f1d6-4244-9d65-4ee28add3a01/release_by_badge/latest/entry_by_path/content/?path=/level02_scenes_all_5cadc2c3c8931e35b0df6d30f02d1c1c.bundle	
�
https://ceded976-9f8b-45f6-9555-266c5abf1251.client-api.unity3dusercontent.com/client_api/v1/buckets/1257381c-f1d6-4244-9d65-4ee28add3a01/release_by_badge/latest/entry_by_path/content/?path=/level03_scenes_all_68700b9b52571d1e7f94a9fbd3e90673.bundle	JUnityEngine.ResourceManagement.ResourceProviders.AssetBundleRequestOptions	m_Hashm_Crc	m_Timeoutm_ChunkedTransferm_RedirectLimitm_RetryCountm_BundleNamem_BundleSizem_UseCrcForCachedBundles


	
 e03df14a9e8b5885c1d9be1202c83b3e�h�X���� a51ca88ae68e8c1a0ef32ed277b33aa8u�

  62696b1ad7a0175c52e893303466f9d3Xz`����! 64f011d74e88f182d7216d359809f055
K

" e1984920d865c792729bfa603b50ccc1��u�����#44ca2663bd9edfc2fbd445508e464f8dc_unitybuiltinshaders:

$ dfdd9569f38ebdbbffba5510c09d65ed�������% 54ff3eacd04bc0a414b28fa9c098ea559�

& abf94ae2a2cbd445407ce6191c32da30p������' 58a4cec6769f25c3fa5664e447db4be6��

( 5cadc2c3c8931e35b0df6d30f02d1c1c�
-Y�����) 559ba29a65f96ca16a67ec5e513da006��

* 68700b9b52571d1e7f94a9fbd3e90673Re������+ fd1daf39a086bc73490bd5b4b2002c56��

+
����
PUnity.Addressables.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
<UnityEditor.AddressableAssets.Build.AddressablesContentState
playerVersion
editorVersioncachedInfosremoteCatalogLoadPath
cachedBundles


6UnityEditor.AddressableAssets.Build.CachedAssetState[]7UnityEditor.AddressableAssets.Build.CachedBundleState[]2021.02.16.18.35.122019.4.18f1		
4UnityEditor.AddressableAssets.Build.CachedAssetState
5UnityEditor.AddressableAssets.Build.CachedBundleState				
+			
	LUnity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null5UnityEditor.AddressableAssets.Build.CachedBundleStatebundleFileIddata
�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/defaultlocalgroup_scenes_all_78fc2bab33da48cefc8f70bb714ce535.bundle	
	�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/hats_assets_all_370aefec225954cbcb1eaa4c194bcb38.bundle	

+�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/defaultlocalgroup_unitybuiltinshaders_e1984920d865c792729bfa603b50ccc1.bundle	
�
{UnityEngine.AddressableAssets.Addressables.RuntimePath}/StandaloneWindows64/level00_scenes_all_46a4d8513475a1645fc7c866054f16c3.bundle	
�
https://ceded976-9f8b-45f6-9555-266c5abf1251.client-api.unity3dusercontent.com/client_api/v1/buckets/1257381c-f1d6-4244-9d65-4ee28add3a01/release_by_badge/latest/entry_by_path/content/?path=/level01_scenes_all_424ccce14646b971cf00ce365cf09ced.bundle	

�
https://ceded976-9f8b-45f6-9555-266c5abf1251.client-api.unity3dusercontent.com/client_api/v1/buckets/1257381c-f1d6-4244-9d65-4ee28add3a01/release_by_badge/latest/entry_by_path/content/?path=/level02_scenes_all_6bf559fe5e5074dfc4560cbe91fd1529.bundle	
�
https://ceded976-9f8b-45f6-9555-266c5abf1251.client-api.unity3dusercontent.com/client_api/v1/buckets/1257381c-f1d6-4244-9d65-4ee28add3a01/release_by_badge/latest/entry_by_path/content/?path=/level03_scenes_all_0fb1ca230c35dd571ceb5be927e15df2.bundle	JUnityEngine.ResourceManagement.ResourceProviders.AssetBundleRequestOptions	m_Hashm_Crc	m_Timeoutm_ChunkedTransferm_RedirectLimitm_RetryCountm_BundleNamem_BundleSizem_UseCrcForCachedBundles


	
 78fc2bab33da48cefc8f70bb714ce535H�Sl���� a51ca88ae68e8c1a0ef32ed277b33aa8�
+0

  370aefec225954cbcb1eaa4c194bcb38�������! ad30d6d581e37cfd25a48413c36d6ba7žz


" e1984920d865c792729bfa603b50ccc1��u�����#44ca2663bd9edfc2fbd445508e464f8dc_unitybuiltinshaders:

$ 46a4d8513475a1645fc7c866054f16c3�4Z[����% 54ff3eacd04bc0a414b28fa9c098ea55aY3


& 424ccce14646b971cf00ce365cf09cedU��
����' 58a4cec6769f25c3fa5664e447db4be6�f�

( 6bf559fe5e5074dfc4560cbe91fd1529#}������) 559ba29a65f96ca16a67ec5e513da006�f�

* 0fb1ca230c35dd571ceb5be927e15df2������+ fd1daf39a086bc73490bd5b4b2002c56�f�


Assets/Scripts/GameManager.cs

 
     public static void LoadNextLevel()
     {
+        //TODO: Show old workflow
+
         Addressables.LoadSceneAsync("LoadingScene", UnityEngine.SceneManagement.LoadSceneMode.Single, true);
     }
 

Assets/Scripts/Loading.cs

 
 public class Loading : MonoBehaviour
 {
+    private bool m_LoadingComplete = false;
+
     [SerializeField]
     private Slider m_LoadingSlider;
 
     {
         // The scene is loaded, show the button and now turn the scene on?
         m_PlayButton.SetActive(true);
+
+        //m_LoadingComplete = true;
     }
 
     public void GoToNextLevel()
 
     private void Update()
     {
-        m_LoadingSlider.value = m_SceneHandle.PercentComplete;
+        // TODO: Comment the range of the percentcomplete
+        //if (!m_LoadingComplete)
+        {
+            m_LoadingSlider.value = m_SceneHandle.PercentComplete;
+        }
+
+    //Make the oncomplete 
 }