Skip to content

Commit e37b1bc

Browse files
authored
Merge pull request #678 from Nicky-Nice-Games/MP-CampusCircuit-and-Dorm-start
MP campus circuit and dorm start
2 parents 5f30fdf + 42fc8e0 commit e37b1bc

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

GGK/Assets/Scenes/StartScene.unity

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4075,19 +4075,19 @@ PrefabInstance:
40754075
objectReference: {fileID: 796871339}
40764076
- target: {fileID: 7798345223652425840, guid: dab43e081b9aa61499e9578b65b979fc, type: 3}
40774077
propertyPath: m_AnchorMax.y
4078-
value: 1
4078+
value: 0
40794079
objectReference: {fileID: 0}
40804080
- target: {fileID: 7798345223652425840, guid: dab43e081b9aa61499e9578b65b979fc, type: 3}
40814081
propertyPath: m_AnchorMin.y
4082-
value: 1
4082+
value: 0
40834083
objectReference: {fileID: 0}
40844084
- target: {fileID: 7798345223652425840, guid: dab43e081b9aa61499e9578b65b979fc, type: 3}
40854085
propertyPath: m_AnchoredPosition.x
4086-
value: 10
4086+
value: 0
40874087
objectReference: {fileID: 0}
40884088
- target: {fileID: 7798345223652425840, guid: dab43e081b9aa61499e9578b65b979fc, type: 3}
40894089
propertyPath: m_AnchoredPosition.y
4090-
value: 714.0093
4090+
value: 0
40914091
objectReference: {fileID: 0}
40924092
- target: {fileID: 7798839346391779122, guid: dab43e081b9aa61499e9578b65b979fc, type: 3}
40934093
propertyPath: m_LocalPosition.x

GGK/Assets/Scripts/GameManagers/MultiplayerSceneManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ public void ToGameOverScene()
9393
// Specific track load functions
9494
public void ToRITOuterLoop()
9595
{
96-
LoadScene("LD_RITOuterLoop");
96+
LoadScene("LD_RITOuterLoop-Backup");
9797
}
9898
public void ToGolisano()
9999
{
100100
LoadScene("GSP_Golisano");
101101
}
102102
public void ToRITDorm()
103103
{
104-
LoadScene("LD_RITDorm");
104+
LoadScene("GSP_RITDorm");
105105
}
106106
public void ToRITQuarterMile()
107107
{

GGK/Assets/Scripts/GameManagers/PauseHandler.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,16 @@ public void TogglePause(InputAction.CallbackContext context)
7979
{
8080
pausePanel.SetActive(false);
8181

82-
// If host not paused resume game, else wait for host to unpause
83-
if (!isHostPaused)
84-
{
85-
Time.timeScale = 1;
86-
}
82+
// // If host not paused resume game, else wait for host to unpause
83+
// if (!isHostPaused)
84+
// {
85+
// Time.timeScale = 1;
86+
// }
8787
}
8888
else
8989
{
9090
pausePanel.SetActive(true);
91-
Time.timeScale = 0;
91+
// Time.timeScale = 0;
9292
}
9393
}
9494
}

0 commit comments

Comments
 (0)