Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pause

This commit is contained in:
kimrdd 2024-02-04 11:39:08 +01:00
parent 7a33995eb3
commit 8417084fe9
8 changed files with 1423 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller
View File

@ -17,7 +17,7 @@ AnimatorStateMachine:
m_Position: {x: 570, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 5718945116413065706}
m_Position: {x: 270, y: 130, z: 0}
m_Position: {x: 330, y: 160, z: 0}
- serializedVersion: 1
m_State: {fileID: -4512082985165587279}
m_Position: {x: 0, y: -20, z: 0}
@ -137,7 +137,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.34782612
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@ -208,11 +208,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.34782612
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -259,11 +259,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -284,11 +284,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.34782612
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -452,7 +452,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@ -503,10 +503,10 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1

36
Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller
View File

@ -17,10 +17,10 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@ -76,11 +76,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -154,11 +154,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.625
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -231,10 +231,10 @@ AnimatorStateMachine:
m_Position: {x: 210, y: -190, z: 0}
- serializedVersion: 1
m_State: {fileID: 3748437463534410733}
m_Position: {x: 350, y: -140, z: 0}
m_Position: {x: 370, y: -150, z: 0}
- serializedVersion: 1
m_State: {fileID: 8304111510876962717}
m_Position: {x: 440, y: -50, z: 0}
m_Position: {x: 510, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 2168268571006691905}
m_Position: {x: 610, y: -170, z: 0}
@ -271,11 +271,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@ -321,10 +321,10 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
@ -445,11 +445,11 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.516129
m_HasExitTime: 1
m_HasFixedDuration: 1
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

146
Assets/Fonts/janitor.regular SDF 1.asset
View File

File diff suppressed because one or more lines are too long

84
Assets/Fonts/janitor.regular SDF.asset
View File

File diff suppressed because one or more lines are too long

1183
Assets/Prefabs/UI/UI.prefab
View File

File diff suppressed because it is too large Load Diff

8
Assets/Resources/IMGS.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e523e52cbff26654f9bb65888aaa76d1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

80
Assets/Scenes/GameScene.unity
View File

@ -1330,81 +1330,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1230350817
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1230350818}
- component: {fileID: 1230350820}
- component: {fileID: 1230350819}
m_Layer: 5
m_Name: PausePanel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &1230350818
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230350817}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.5, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4158834148864819268}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1230350819
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230350817}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1230350820
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1230350817}
m_CullTransparentMesh: 1
--- !u!1001 &1232208432
PrefabInstance:
m_ObjectHideFlags: 0
@ -8787,9 +8712,6 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
insertIndex: -1
addedObject: {fileID: 1230350818}
- targetCorrespondingSourceObject: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
insertIndex: -1
addedObject: {fileID: 1375820097}
@ -8820,7 +8742,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3c20bad5f6ef76d429d398dfba893d40, type: 3}
m_Name:
m_EditorClassIdentifier:
pauseMenuUI: {fileID: 1230350817}
pauseMenuUI: {fileID: 0}
--- !u!1001 &4910321061857220295
PrefabInstance:
m_ObjectHideFlags: 0

10
Assets/Scripts/UI/PauseMenu.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.SceneManagement;
public class PauseMenu : MonoBehaviour
{
public GameObject pauseMenuUI;
@ -62,4 +63,13 @@ public class PauseMenu : MonoBehaviour
// Update the pause state
isPaused = true;
}
public void MainMenu()
{
SceneManager.LoadScene("MainMenu");
}
public void QuitGame()
{
Application.Quit();
}
}