Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
Suck It
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GameDevWeek
W
Wintersemester 2018-2019
Unity
Suck It
Commits
f2576c7d
Commit
f2576c7d
authored
Mar 29, 2019
by
Isa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PausenMenü fix
parent
d53ec134
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
208 additions
and
24070 deletions
+208
-24070
Assets/_Game/Graphics/Sprite/SavePoint.meta
Assets/_Game/Graphics/Sprite/SavePoint.meta
+2
-1
Assets/_Game/Prefabs/HUD.prefab
Assets/_Game/Prefabs/HUD.prefab
+3
-18
Assets/_Game/Prefabs/PauseMenu.prefab
Assets/_Game/Prefabs/PauseMenu.prefab
+75
-0
Assets/_Game/Scenes/MainLevel-Isa.unity
Assets/_Game/Scenes/MainLevel-Isa.unity
+0
-24047
Assets/_Game/Scenes/MainLevel_Isa.unity
Assets/_Game/Scenes/MainLevel_Isa.unity
+128
-4
No files found.
Assets/_Game/
Scenes/MainLevel-Isa.unity
.meta
→
Assets/_Game/
Graphics/Sprite/SavePoint
.meta
View file @
f2576c7d
fileFormatVersion: 2
guid: 6688e298301342a4f988b19370ed74ac
guid: bc43ac6a6d9af5e44b800027e40c1e84
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
...
...
Assets/_Game/Prefabs/HUD.prefab
View file @
f2576c7d
...
...
@@ -1736,7 +1736,7 @@ RectTransform:
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
-
224.22716
,
y
:
93.781555
}
m_AnchoredPosition
:
{
x
:
-
66.1
,
y
:
93.781555
}
m_SizeDelta
:
{
x
:
450
,
y
:
350
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&8231279422017153594
...
...
@@ -2208,7 +2208,7 @@ GameObject:
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
m_IsActive
:
0
---
!u!4
&6614416692707838556
Transform
:
m_ObjectHideFlags
:
0
...
...
@@ -2497,7 +2497,7 @@ MonoBehaviour:
m_HorizontalOverflow
:
0
m_VerticalOverflow
:
0
m_LineSpacing
:
1
m_Text
:
Safepoint
1
m_Text
:
Safepoint
2
---
!u!1
&8200656083975303732
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -2903,21 +2903,6 @@ PrefabInstance:
propertyPath
:
m_Pivot.y
value
:
0.5
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2362585431789937784
,
guid
:
35f9d08058ae666458aadeaeab77cf00
,
type
:
3
}
propertyPath
:
m_LocalScale.x
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2362585431789937784
,
guid
:
35f9d08058ae666458aadeaeab77cf00
,
type
:
3
}
propertyPath
:
m_LocalScale.y
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2362585431789937784
,
guid
:
35f9d08058ae666458aadeaeab77cf00
,
type
:
3
}
propertyPath
:
m_LocalScale.z
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
35f9d08058ae666458aadeaeab77cf00
,
type
:
3
}
---
!u!224
&2362585431382610845
stripped
...
...
Assets/_Game/Prefabs/PauseMenu.prefab
View file @
f2576c7d
...
...
@@ -31,6 +31,7 @@ Transform:
-
{
fileID
:
2362585432235520307
}
-
{
fileID
:
2362585431233343510
}
-
{
fileID
:
2362585432379109695
}
-
{
fileID
:
6065714407732024795
}
m_Father
:
{
fileID
:
2362585431789937784
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
...
...
@@ -1621,3 +1622,77 @@ MonoBehaviour:
m_VerticalOverflow
:
0
m_LineSpacing
:
1
m_Text
:
Letzten Speicherpunkt laden
---
!u!1
&4139903514428706715
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
6065714407732024795
}
-
component
:
{
fileID
:
7143202358448262554
}
-
component
:
{
fileID
:
7486693496261950971
}
m_Layer
:
0
m_Name
:
Image
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!224
&6065714407732024795
RectTransform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4139903514428706715
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
[]
m_Father
:
{
fileID
:
2362585430913481191
}
m_RootOrder
:
4
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
m_AnchorMin
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchorMax
:
{
x
:
0.5
,
y
:
0.5
}
m_AnchoredPosition
:
{
x
:
0
,
y
:
0
}
m_SizeDelta
:
{
x
:
100
,
y
:
100
}
m_Pivot
:
{
x
:
0.5
,
y
:
0.5
}
---
!u!222
&7143202358448262554
CanvasRenderer
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4139903514428706715
}
m_CullTransparentMesh
:
0
---
!u!114
&7486693496261950971
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
4139903514428706715
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
-765806418
,
guid
:
f70555f144d8491a825f0804e09c671c
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
m_Material
:
{
fileID
:
0
}
m_Color
:
{
r
:
1
,
g
:
1
,
b
:
1
,
a
:
1
}
m_RaycastTarget
:
1
m_OnCullStateChanged
:
m_PersistentCalls
:
m_Calls
:
[]
m_TypeName
:
UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite
:
{
fileID
:
0
}
m_Type
:
0
m_PreserveAspect
:
0
m_FillCenter
:
1
m_FillMethod
:
4
m_FillAmount
:
1
m_FillClockwise
:
1
m_FillOrigin
:
0
m_UseSpriteMesh
:
0
Assets/_Game/Scenes/MainLevel-Isa.unity
deleted
100644 → 0
View file @
d53ec134
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/MainLevel_Isa.unity
View file @
f2576c7d
...
...
@@ -769,8 +769,8 @@ SpriteShapeRenderer:
-
{
fileID
:
0
}
-
{
fileID
:
0
}
m_LocalAABB
:
m_Center
:
{
x
:
-73.73873
,
y
:
31.33
5548
,
z
:
-0.007
}
m_Extent
:
{
x
:
41.417297
,
y
:
12.78
098
,
z
:
0.007
}
m_Center
:
{
x
:
-73.73873
,
y
:
31.33
6891
,
z
:
-0.007
}
m_Extent
:
{
x
:
41.417297
,
y
:
12.78
2323
,
z
:
0.007
}
---
!u!4
&438036707
Transform
:
m_ObjectHideFlags
:
0
...
...
@@ -2751,6 +2751,125 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
35f9d08058ae666458aadeaeab77cf00
,
type
:
3
}
---
!u!1001
&1020248502
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
0
}
m_Modifications
:
-
target
:
{
fileID
:
7766137271154010154
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_Name
value
:
HUD (1)
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
22
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_AnchoredPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_AnchoredPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_SizeDelta.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_SizeDelta.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_AnchorMin.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_AnchorMin.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_AnchorMax.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_AnchorMax.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_Pivot.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_Pivot.y
value
:
0
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
---
!u!1
&1025537126
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -3823,8 +3942,8 @@ SpriteShapeRenderer:
-
{
fileID
:
0
}
-
{
fileID
:
0
}
m_LocalAABB
:
m_Center
:
{
x
:
10.545332
,
y
:
11.27174
4
,
z
:
-0.003
}
m_Extent
:
{
x
:
16.665777
,
y
:
15.1803
49
,
z
:
0.003
}
m_Center
:
{
x
:
10.545332
,
y
:
11.27174
5
,
z
:
-0.003
}
m_Extent
:
{
x
:
16.665777
,
y
:
15.1803
5
,
z
:
0.003
}
---
!u!4
&1334142119
Transform
:
m_ObjectHideFlags
:
0
...
...
@@ -5744,6 +5863,11 @@ PrefabInstance:
propertyPath
:
m_Name
value
:
HUD
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
7766137271154010154
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2888112478438871478
,
guid
:
50a0ddec8ac259c46a58a6b5324a759d
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
...
...
Write
Preview
Markdown
is supported
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