Skip to content

Commit

Permalink
BUILD 20240116-1
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielSanLopes committed Jan 17, 2024
1 parent 2fb3eb3 commit a9ddf7d
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Assets/Game/Scenes/TrainScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -5428,7 +5428,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
timerTextAnimator: {fileID: 1559553290}
initialTime: 2
initialTime: 600
penalty: 30
isPaused: 1
--- !u!4 &257905309
Expand Down Expand Up @@ -7644,7 +7644,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Build 20240116-0
m_text: Build 20240116-1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
Expand Down Expand Up @@ -41954,7 +41954,7 @@ Transform:
m_GameObject: {fileID: 1780359269}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -291.24847, y: -0.1201, z: -8.991622}
m_LocalPosition: {x: -292.24, y: -0.12001777, z: -8.991622}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
Expand Down
22 changes: 17 additions & 5 deletions Assets/Game/Scripts/SceneLoader.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System.Collections;
using UnityEngine;
using UnityEngine.SceneManagement;

public class SceneLoader : MonoBehaviour
{
public class SceneLoader : MonoBehaviour {

public static SceneLoader Instance;



public string sceneToLoad = "TrainScene";
AsyncOperation operation;

Expand All @@ -22,12 +22,13 @@ private void Start() {

}

public void LoadScene(){
public void LoadScene() {
//Debug.Log("Di");
SceneManager.LoadScene(sceneToLoad);
}

public void LoadSceneAsync(string scene) {

operation = SceneManager.LoadSceneAsync(scene);
operation.allowSceneActivation = false;

Expand All @@ -41,6 +42,17 @@ public void LoadScene(string scene) {
//Debug.Log("Di");
SceneManager.LoadScene(scene);
}

public IEnumerator LoadSceneAsync(string scene, bool allow) {

operation = SceneManager.LoadSceneAsync(scene);
operation.allowSceneActivation = allow;

yield return null;
//StopCoroutine(nameof(LoadSceneAsync));


}
}


Expand Down
Binary file modified docs/Build/docs.data.unityweb
Binary file not shown.
Binary file modified docs/Build/docs.framework.js.unityweb
Binary file not shown.
Binary file modified docs/Build/docs.wasm.unityweb
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/GUID.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0b599c0cfff04eac95ce8bfc01a3381e
cbc01a9094d54919a97bbab7090c2349
6 changes: 1 addition & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@
<head>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Imobilidade Urbana | Núcleo de Tecnologia do MTST</title>
<title>Unity WebGL Player | Imobilidade Urbana</title>
<link rel="shortcut icon" href="TemplateData/favicon.ico">
<link rel="stylesheet" href="TemplateData/style.css">
<link rel="manifest" href="manifest.webmanifest">

<meta http-equiv='cache-control' content='no-cache'>
<meta http-equiv='expires' content='0'>
<meta http-equiv='pragma' content='no-cache'>
</head>
<body>
<div id="unity-container">
Expand Down

0 comments on commit a9ddf7d

Please sign in to comment.