Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
47ef82cd
Commit
47ef82cd
authored
Jan 29, 2019
by
Mitchie Maluschnig
Browse files
added rudamentary pause menu
parent
5cff3977
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/Assets/Scenes/Daytime.unity
View file @
47ef82cd
This diff is collapsed.
Click to expand it.
RingMaster/RingMaster/Assets/Scenes/MainMenu.unity
0 → 100644
View file @
47ef82cd
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!29
&1
OcclusionCullingSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_OcclusionBakeSettings
:
smallestOccluder
:
5
smallestHole
:
0.25
backfaceThreshold
:
100
m_SceneGUID
:
00000000000000000000000000000000
m_OcclusionCullingData
:
{
fileID
:
0
}
---
!u!104
&2
RenderSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
9
m_Fog
:
0
m_FogColor
:
{
r
:
0.5
,
g
:
0.5
,
b
:
0.5
,
a
:
1
}
m_FogMode
:
3
m_FogDensity
:
0.01
m_LinearFogStart
:
0
m_LinearFogEnd
:
300
m_AmbientSkyColor
:
{
r
:
0.212
,
g
:
0.227
,
b
:
0.259
,
a
:
1
}
m_AmbientEquatorColor
:
{
r
:
0.114
,
g
:
0.125
,
b
:
0.133
,
a
:
1
}
m_AmbientGroundColor
:
{
r
:
0.047
,
g
:
0.043
,
b
:
0.035
,
a
:
1
}
m_AmbientIntensity
:
1
m_AmbientMode
:
3
m_SubtractiveShadowColor
:
{
r
:
0.42
,
g
:
0.478
,
b
:
0.627
,
a
:
1
}
m_SkyboxMaterial
:
{
fileID
:
0
}
m_HaloStrength
:
0.5
m_FlareStrength
:
1
m_FlareFadeSpeed
:
3
m_HaloTexture
:
{
fileID
:
0
}
m_SpotCookie
:
{
fileID
:
10001
,
guid
:
0000000000000000e000000000000000
,
type
:
0
}
m_DefaultReflectionMode
:
0
m_DefaultReflectionResolution
:
128
m_ReflectionBounces
:
1
m_ReflectionIntensity
:
1
m_CustomReflection
:
{
fileID
:
0
}
m_Sun
:
{
fileID
:
0
}
m_IndirectSpecularColor
:
{
r
:
0
,
g
:
0
,
b
:
0
,
a
:
1
}
m_UseRadianceAmbientProbe
:
0
---
!u!157
&3
LightmapSettings
:
m_ObjectHideFlags
:
0
serializedVersion
:
11
m_GIWorkflowMode
:
1
m_GISettings
:
serializedVersion
:
2
m_BounceScale
:
1
m_IndirectOutputScale
:
1
m_AlbedoBoost
:
1
m_TemporalCoherenceThreshold
:
1
m_EnvironmentLightingMode
:
0
m_EnableBakedLightmaps
:
0
m_EnableRealtimeLightmaps
:
0
m_LightmapEditorSettings
:
serializedVersion
:
10
m_Resolution
:
2
m_BakeResolution
:
40
m_AtlasSize
:
1024
m_AO
:
0
m_AOMaxDistance
:
1
m_CompAOExponent
:
1
m_CompAOExponentDirect
:
0
m_Padding
:
2
m_LightmapParameters
:
{
fileID
:
0
}
m_LightmapsBakeMode
:
1
m_TextureCompression
:
1
m_FinalGather
:
0
m_FinalGatherFiltering
:
1
m_FinalGatherRayCount
:
256
m_ReflectionCompression
:
2
m_MixedBakeMode
:
2
m_BakeBackend
:
1
m_PVRSampling
:
1
m_PVRDirectSampleCount
:
32
m_PVRSampleCount
:
500
m_PVRBounces
:
2
m_PVRFilterTypeDirect
:
0
m_PVRFilterTypeIndirect
:
0
m_PVRFilterTypeAO
:
0
m_PVRFilteringMode
:
1
m_PVRCulling
:
1
m_PVRFilteringGaussRadiusDirect
:
1
m_PVRFilteringGaussRadiusIndirect
:
5
m_PVRFilteringGaussRadiusAO
:
2
m_PVRFilteringAtrousPositionSigmaDirect
:
0.5
m_PVRFilteringAtrousPositionSigmaIndirect
:
2
m_PVRFilteringAtrousPositionSigmaAO
:
1
m_ShowResolutionOverlay
:
1
m_LightingDataAsset
:
{
fileID
:
0
}
m_UseShadowmask
:
1
---
!u!196
&4
NavMeshSettings
:
serializedVersion
:
2
m_ObjectHideFlags
:
0
m_BuildSettings
:
serializedVersion
:
2
agentTypeID
:
0
agentRadius
:
0.5
agentHeight
:
2
agentSlope
:
45
agentClimb
:
0.4
ledgeDropHeight
:
0
maxJumpAcrossDistance
:
0
minRegionArea
:
2
manualCellSize
:
0
cellSize
:
0.16666667
manualTileSize
:
0
tileSize
:
256
accuratePlacement
:
0
debug
:
m_Flags
:
0
m_NavMeshData
:
{
fileID
:
0
}
---
!u!1
&1391947992
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1391947995
}
-
component
:
{
fileID
:
1391947994
}
-
component
:
{
fileID
:
1391947993
}
m_Layer
:
0
m_Name
:
Main Camera
m_TagString
:
MainCamera
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!81
&1391947993
AudioListener
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1391947992
}
m_Enabled
:
1
---
!u!20
&1391947994
Camera
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1391947992
}
m_Enabled
:
1
serializedVersion
:
2
m_ClearFlags
:
1
m_BackGroundColor
:
{
r
:
0.19215687
,
g
:
0.3019608
,
b
:
0.4745098
,
a
:
0
}
m_projectionMatrixMode
:
1
m_SensorSize
:
{
x
:
36
,
y
:
24
}
m_LensShift
:
{
x
:
0
,
y
:
0
}
m_FocalLength
:
50
m_NormalizedViewPortRect
:
serializedVersion
:
2
x
:
0
y
:
0
width
:
1
height
:
1
near clip plane
:
0.3
far clip plane
:
1000
field of view
:
60
orthographic
:
1
orthographic size
:
5
m_Depth
:
-1
m_CullingMask
:
serializedVersion
:
2
m_Bits
:
4294967295
m_RenderingPath
:
-1
m_TargetTexture
:
{
fileID
:
0
}
m_TargetDisplay
:
0
m_TargetEye
:
3
m_HDR
:
1
m_AllowMSAA
:
1
m_AllowDynamicResolution
:
0
m_ForceIntoRT
:
0
m_OcclusionCulling
:
1
m_StereoConvergence
:
10
m_StereoSeparation
:
0.022
---
!u!4
&1391947995
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1391947992
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
-10
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
RingMaster/RingMaster/Assets/Scenes/MainMenu.unity.meta
0 → 100644
View file @
47ef82cd
fileFormatVersion: 2
guid: e561de307f1b59f4badd380bbd7f49bf
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/DaytimeManager.cs
View file @
47ef82cd
using
System.Collections
;
using
System.Collections
;
using
System.Collections.Generic
;
using
System.Collections.Generic
;
using
UnityEngine
;
using
UnityEngine
;
using
UnityEngine.UI
;
public
class
DaytimeManager
:
MonoBehaviour
{
public
class
DaytimeManager
:
MonoBehaviour
{
public
static
float
groundLevel
=
-
4
;
public
static
float
groundLevel
=
-
4
;
public
Canvas
pauseMenu
;
private
bool
pauseMenuActive
=
false
;
void
Start
()
{
pauseMenu
.
gameObject
.
SetActive
(
false
);
}
void
Update
()
{
pauseMenuManagemnent
();
}
private
void
pauseMenuManagemnent
()
{
if
(!
pauseMenuActive
)
{
if
(
Input
.
GetKeyDown
(
KeyCode
.
Escape
))
{
setPauseMenu
(
true
);
}
}
else
{
if
(
Input
.
GetKeyDown
(
KeyCode
.
Escape
))
{
setPauseMenu
(
false
);
}
}
}
public
void
setPauseMenu
(
bool
active
)
{
pauseMenu
.
gameObject
.
SetActive
(
active
);
pauseMenuActive
=
active
;
if
(
active
)
{
Time
.
timeScale
=
0
;
}
else
{
Time
.
timeScale
=
1
;
}
}
}
}
RingMaster/RingMaster/Assets/Scripts/MenuScripts/PauseMenu.cs
0 → 100644
View file @
47ef82cd
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
using
UnityEngine.SceneManagement
;
public
class
PauseMenu
:
MonoBehaviour
{
private
DaytimeManager
dayManager
;
void
Start
()
{
dayManager
=
GameObject
.
FindWithTag
(
"Manager"
).
GetComponent
<
DaytimeManager
>();
}
public
void
Continue
()
{
dayManager
.
setPauseMenu
(
false
);
}
public
void
ExitGame
()
{
}
public
void
ExitToMainMenu
()
{
SceneManager
.
LoadScene
(
"MainMenu"
);
}
}
RingMaster/RingMaster/Assets/Scripts/MenuScripts/PauseMenu.cs.meta
0 → 100644
View file @
47ef82cd
fileFormatVersion: 2
guid: 0c60e5bb67d9ed54da20a5195cb78ee0
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
RingMaster/RingMaster/ProjectSettings/EditorBuildSettings.asset
View file @
47ef82cd
...
@@ -8,6 +8,9 @@ EditorBuildSettings:
...
@@ -8,6 +8,9 @@ EditorBuildSettings:
-
enabled
:
0
-
enabled
:
0
path
:
path
:
guid
:
00000000000000000000000000000000
guid
:
00000000000000000000000000000000
-
enabled
:
1
path
:
Assets/Scenes/MainMenu.unity
guid
:
e561de307f1b59f4badd380bbd7f49bf
-
enabled
:
1
-
enabled
:
1
path
:
Assets/Scenes/Daytime.unity
path
:
Assets/Scenes/Daytime.unity
guid
:
46b74f6b350bb4877b8d22c67afdf35c
guid
:
46b74f6b350bb4877b8d22c67afdf35c
...
...
RingMaster/RingMaster/ProjectSettings/TagManager.asset
View file @
47ef82cd
...
@@ -11,6 +11,7 @@ TagManager:
...
@@ -11,6 +11,7 @@ TagManager:
-
DialogueUI
-
DialogueUI
-
Button1
-
Button1
-
CharacterSpeech
-
CharacterSpeech
-
Manager
layers
:
layers
:
-
Default
-
Default
-
TransparentFX
-
TransparentFX
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment