Skip to content

Commit

Permalink
Merge pull request #11 from TheDimin/master
Browse files Browse the repository at this point in the history
Fixed Game not showing credit screen.
  • Loading branch information
TheDimin authored Feb 4, 2020
2 parents 1c13d41 + 6b05680 commit efc63b4
Show file tree
Hide file tree
Showing 172 changed files with 72 additions and 19 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 0
Expand Down Expand Up @@ -135,7 +135,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 1
Expand Down Expand Up @@ -378,12 +378,12 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 1
Is3D: 0
IsOneShot: 0
Parameters:
- {fileID: 1180235827133311218}
- {fileID: 3256152875931058555}
MinDistance: 0
MaxDistance: 0
Length: 0
Expand Down Expand Up @@ -783,12 +783,12 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 1
IsOneShot: 0
Parameters:
- {fileID: -2296545817379340719}
- {fileID: 3726164763651330768}
MinDistance: 10
MaxDistance: 50
Length: 0
Expand Down Expand Up @@ -826,7 +826,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 1
Expand Down Expand Up @@ -1027,7 +1027,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 1
Expand Down Expand Up @@ -1089,7 +1089,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 1
Expand All @@ -1111,7 +1111,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
EditorBanks:
- {fileID: 5515200682484358969}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
EditorEvents:
- {fileID: -2092067170676324614}
- {fileID: 2584042774056773818}
Expand All @@ -1126,10 +1126,10 @@ MonoBehaviour:
- {fileID: -8662738863454941491}
EditorParameters: []
MasterBanks:
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
StringsBanks:
- {fileID: 5515200682484358969}
stringsBankWriteTime: 637161923941937741
stringsBankWriteTime: 637161439700000000
cacheVersion: 3
--- !u!114 &6128095153466758
MonoBehaviour:
Expand Down Expand Up @@ -1240,7 +1240,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 0
Expand Down Expand Up @@ -1350,14 +1350,32 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 1
Parameters: []
MinDistance: 0
MaxDistance: 0
Length: 2610
--- !u!114 &2205418220645752863
MonoBehaviour:
m_ObjectHideFlags: 0
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: c18180ecb35941f4682ae60107b85b7c, type: 3}
m_Name: bank:/Master.bank
m_EditorClassIdentifier:
Path: ../FMODAssets/Desktop/Master.bank
SubDir:
lastModified: 637161439700000000
LoadResult: 0
FileSizes: []
Exists: 1
--- !u!114 &2462030514857960931
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1392,7 +1410,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 0
Expand Down Expand Up @@ -1483,6 +1501,23 @@ MonoBehaviour:
FileSizes: []
Exists: 1
--- !u!114 &3128382976363950061
MonoBehaviour:
m_ObjectHideFlags: 0
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: fecb8ef7f94ca804a8ab72049b86782e, type: 3}
m_Name: parameter:/Music/Room
m_EditorClassIdentifier:
Name: Room
Min: 0
Max: 3
Default: 0
Exists: 1
--- !u!114 &3256152875931058555
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand Down Expand Up @@ -1550,7 +1585,7 @@ MonoBehaviour:
Banks:
- {fileID: -1110317003892815347}
- {fileID: -7812517444862482830}
- {fileID: 3776611594404022893}
- {fileID: 2205418220645752863}
IsStream: 0
Is3D: 0
IsOneShot: 1
Expand Down Expand Up @@ -1598,6 +1633,23 @@ MonoBehaviour:
Max: 1
Default: 0
Exists: 1
--- !u!114 &3726164763651330768
MonoBehaviour:
m_ObjectHideFlags: 0
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: fecb8ef7f94ca804a8ab72049b86782e, type: 3}
m_Name: parameter:/RobotMovement/RobotSpeed
m_EditorClassIdentifier:
Name: RobotSpeed
Min: 0
Max: 1
Default: 0
Exists: 1
--- !u!114 &3776611594404022893
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1891,7 +1943,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Path: ../FMODAssets/Desktop/Master.strings.bank
SubDir:
lastModified: 637161923941937741
lastModified: 637161439700000000
LoadResult: 0
FileSizes:
- Name:
Expand Down
2 changes: 1 addition & 1 deletion GGJ2020_Unity/Assets/SwitchToMainMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class SwitchToMainMenu : MonoBehaviour
void Awake()
{
// Untill all the global state can be sorted out, this is for the best.
Application.Quit();
GetComponent<Button>().onClick.AddListener(() => Application.Quit());
//GetComponent<Button>().onClick.AddListener(() => SceneManager.LoadScene(0));
}
}
2 changes: 1 addition & 1 deletion GGJ2020_Unity/ProjectSettings/EditorBuildSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ EditorBuildSettings:
path: Assets/GGJ2020/Levels/MainMenu/MainMenu.unity
guid: 5cfc64f4031d86441bcd4480d6b4eabf
- enabled: 1
path: Assets/GGJ2020/Levels/A/Environment.unity
path: Assets/GGJ2020/Levels/Environment/Environment.unity
guid: 7f21184685d048c4196e4655e686abb1
- enabled: 1
path: Assets/GGJ2020/Levels/EndScreen/EndScreen.unity
Expand Down
1 change: 1 addition & 0 deletions GGJ2020_Unity/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down

0 comments on commit efc63b4

Please sign in to comment.