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

Added PauseMenu to main Scene and le nom de Alain

Browse Source
This commit is contained in:
louishorlaville 2022-10-30 23:47:08 -04:00
parent beba661515
commit 3c93a1da68
3 changed files with 229 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
Assets/Scenes/LevelDesign.unity
View File

@ -136,6 +136,8 @@ GameObject:
- component: {fileID: 3217251} - component: {fileID: 3217251}
- component: {fileID: 3217250} - component: {fileID: 3217250}
- component: {fileID: 3217249} - component: {fileID: 3217249}
- component: {fileID: 3217254}
- component: {fileID: 3217253}
m_Layer: 5 m_Layer: 5
m_Name: Canvas m_Name: Canvas
m_TagString: Untagged m_TagString: Untagged
@ -217,6 +219,7 @@ RectTransform:
m_ConstrainProportionsScale: 1 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 1301531513} - {fileID: 1301531513}
- {fileID: 340071046}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 15 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -225,6 +228,31 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0} m_Pivot: {x: 0, y: 0}
--- !u!114 &3217253
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3217248}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 681a55dd3deb2d74d929c98c9e6bfa69, type: 3}
m_Name:
m_EditorClassIdentifier:
pauseMenu: {fileID: 340071043}
--- !u!114 &3217254
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3217248}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 06cd37efca880db4c897922a3b05a3d9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &248300950 --- !u!1 &248300950
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -368,6 +396,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 248300950} m_GameObject: {fileID: 248300950}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &340071043 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2817070760641160522, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
m_PrefabInstance: {fileID: 1493671347}
m_PrefabAsset: {fileID: 0}
--- !u!224 &340071046 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
m_PrefabInstance: {fileID: 1493671347}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &606331405 --- !u!1001 &606331405
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1679,6 +1719,155 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7039573d66660ae4bae794886465b05e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7039573d66660ae4bae794886465b05e, type: 3}
--- !u!1001 &1493671347
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 3217252}
m_Modifications:
- target: {fileID: 2817070760641160522, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_Name
value: PauseMenu
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalPosition.z
value: -14.5
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2817070760641160523, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8432838737154259329, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3217253}
- target: {fileID: 8432838737154259329, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: ClosePauseMenu
objectReference: {fileID: 0}
- target: {fileID: 8432838737522845751, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3217254}
- target: {fileID: 8432838737522845751, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: QuitGame
objectReference: {fileID: 0}
- target: {fileID: 8432838738104765771, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3217254}
- target: {fileID: 8432838738104765771, guid: 03d6a1d3e6c7efe48929be016d25b63b,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: MainMenu
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 03d6a1d3e6c7efe48929be016d25b63b, type: 3}
--- !u!1 &1530935835 --- !u!1 &1530935835
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2985,6 +3174,41 @@ PrefabInstance:
propertyPath: m_Camera propertyPath: m_Camera
value: value:
objectReference: {fileID: 1530935837} objectReference: {fileID: 1530935837}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 3217253}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
objectReference: {fileID: 0}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: PauseMenu
objectReference: {fileID: 0}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: PauseMenuController, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 1772573266731274172, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3}
propertyPath: m_ActionEvents.Array.data[6].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 1772573266731274173, guid: 4dbf735f9da7b9f43b69f1577e4e5763, - target: {fileID: 1772573266731274173, guid: 4dbf735f9da7b9f43b69f1577e4e5763,
type: 3} type: 3}
propertyPath: canvasRect propertyPath: canvasRect

6
Assets/Scenes/MainMenu.unity
View File

@ -6650,12 +6650,12 @@ MonoBehaviour:
- -
Alain - Level Designer Alain Abboud - Level Designer
- -
William Gingras William
- Programmer/Level Designer Gingras - Programmer/Level Designer
- -

2
Assets/Scripts/UIController.cs
View File

@ -13,6 +13,7 @@ public class UIController : MonoBehaviour
} }
public void QuitGame(){ public void QuitGame(){
Time.timeScale = 1;
GameController.Instance.QuitGame(); GameController.Instance.QuitGame();
} }
@ -21,6 +22,7 @@ public class UIController : MonoBehaviour
} }
public void MainMenu(){ public void MainMenu(){
Time.timeScale = 1;
GameController.Instance.MainMenu(); GameController.Instance.MainMenu();
} }
} }