Conjure/32bit_jam_conjure
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Can go from main menu to game and end game

Browse Source
This commit is contained in:
Soulaha Balde 2022-10-27 21:39:34 -04:00
parent 603ef2f51f
commit 1690b969ac
9 changed files with 390 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Assets/Prefabs/Endzone.prefab Normal file
View File

@ -0,0 +1,60 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &650814744680764505
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 650814744680764510}
- component: {fileID: 650814744680764511}
- component: {fileID: 650814744680764504}
m_Layer: 0
m_Name: Endzone
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &650814744680764510
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 650814744680764505}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 12.76, y: 4.66, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &650814744680764511
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 650814744680764505}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 4.14, y: 3.16, z: 7.34}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &650814744680764504
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 650814744680764505}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d64c5c813262f024cad1aee640001c98, type: 3}
m_Name:
m_EditorClassIdentifier:

7
Assets/Prefabs/Endzone.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3d836690c7327d943babcec93a3c1244
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Prefabs/GameController.prefab
View File

@ -44,3 +44,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8b3e93e82b846d740a6f1fa8aa6d17e8, type: 3}
m_Name:
m_EditorClassIdentifier:
startScene: MainMenu
mainScene: Dev
endScene: MainMenu

69
Assets/Scenes/GameLogic.unity
View File

@ -2842,6 +2842,75 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 3.962, y: 0, z: 0}
--- !u!1001 &650814744052599971
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 650814744680764505, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_Name
value: Endzone
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_RootOrder
value: 8
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalPosition.x
value: 12.76
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalPosition.y
value: 4.66
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 650814744680764510, guid: 3d836690c7327d943babcec93a3c1244,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3d836690c7327d943babcec93a3c1244, type: 3}
--- !u!1001 &4515361963710749759
PrefabInstance:
m_ObjectHideFlags: 0

209
Assets/Scenes/MainMenu.unity
View File

@ -237,6 +237,41 @@ PrefabInstance:
propertyPath: m_Name
value: Button-Quit
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1673962320}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: QuitGame
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539591, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_Pivot.x
@ -596,7 +631,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -0.000030517578, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 165.09, y: 133.04}
m_Pivot: {x: 0, y: 0}
--- !u!114 &574174950
@ -803,7 +838,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 1.1481129}
m_SizeDelta: {x: 0, y: 31.97}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &779369317
MonoBehaviour:
@ -825,7 +860,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Made by Conjure ETS members: Souhala, Louis, Guillaume, Jean, Alain, Yann
m_text: 'Made by Conjure ETS members: Soulaha, Louis, Guillaume, Jean, Alain, Yann
and William'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@ -925,6 +960,41 @@ PrefabInstance:
propertyPath: m_Name
value: Button-Options
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1673962320}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: Options
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539591, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_Pivot.x
@ -1073,7 +1143,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -77.453, y: -53.482}
m_AnchoredPosition: {x: -77.453, y: -53.481995}
m_SizeDelta: {x: 154.907, y: 106.963}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1281004662
@ -1255,6 +1325,92 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 5917528464004223745}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1673962319
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalPosition.x
value: -6.887238
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalPosition.y
value: -1.6704996
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalPosition.z
value: -7.8771486
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757684, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757685, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: mainScene
value: GameLogic
objectReference: {fileID: 0}
- target: {fileID: 4515361964050757686, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
propertyPath: m_Name
value: GameController
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 875ca0f8a7a39ce459999ecf74b0fb3b, type: 3}
--- !u!114 &1673962320 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4515361964050757685, guid: 875ca0f8a7a39ce459999ecf74b0fb3b,
type: 3}
m_PrefabInstance: {fileID: 1673962319}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8b3e93e82b846d740a6f1fa8aa6d17e8, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1703051053
GameObject:
m_ObjectHideFlags: 0
@ -1293,7 +1449,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 82.547, y: -53.407}
m_AnchoredPosition: {x: 82.546, y: -53.406006}
m_SizeDelta: {x: -165.09, y: -106.81}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1703051055
@ -1347,12 +1503,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 76
m_Left: 61
m_Right: 5
m_Top: 102
m_Top: 24
m_Bottom: 1
m_ChildAlignment: 8
m_Spacing: -7.98
m_ChildAlignment: 4
m_Spacing: -5.63
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 1
@ -1487,6 +1643,41 @@ PrefabInstance:
propertyPath: m_Name
value: Button-Play
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 1673962320}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: StartGame
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: GameController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 5917528464644539591, guid: 0bdc45a9254ade843b7ba60aaab62301,
type: 3}
propertyPath: m_Pivot.x

12
Assets/Scripts/Endzone.cs Normal file
View File

@ -0,0 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Endzone : MonoBehaviour
{
private void OnTriggerEnter(Collider other) {
if(other.tag.Equals("Player")){
GameController.Instance.EndGame();
}
}
}

11
Assets/Scripts/Endzone.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d64c5c813262f024cad1aee640001c98
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

22
Assets/Scripts/GameController.cs
View File

@ -1,11 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
public class GameController : MonoBehaviour
{
private static GameController instance;
public bool isOver{get; set;} //The game is over
[SerializeField]
private string startScene, mainScene, endScene;
public static GameController Instance{
get{
if(instance is null)Debug.LogError("Game controller is null");
@ -16,6 +18,22 @@ public class GameController : MonoBehaviour
private void Awake() {
instance = this;
DontDestroyOnLoad(this.gameObject);
isOver = false;
}
public void StartGame(){
SceneManager.LoadScene(mainScene);
}
public void EndGame(){
Debug.Log("Game is over");
SceneManager.LoadScene(endScene);
}
public void QuitGame(){
Application.Quit();
}
public void Options(){
Debug.Log("Clicked options");
}
}

10
ProjectSettings/EditorBuildSettings.asset
View File

@ -6,8 +6,14 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/SampleScene.unity
guid: 99c9720ab356a0642a771bea13969a05
path: Assets/Scenes/MainMenu.unity
guid: af63aef6e17277b44ade3df35992db53
- enabled: 1
path: Assets/Scenes/Dev.unity
guid: 739ca6d2c9f3b5b4a8885b94cf11f074
- enabled: 1
path: Assets/Scenes/GameLogic.unity
guid: 6c735b8f44735c84789efdc5bc7c8d2d
m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 83b4255e269437642ad0474a7bdb56b5,
type: 2}