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
T
to-the-surface
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
GDW-SS-18
to-the-surface
Commits
f1f27864
Commit
f1f27864
authored
Sep 29, 2018
by
Markus Schlösser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated levels 14-16, reworked part of level 16 to be possible
parent
d48222c6
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
3783 additions
and
783 deletions
+3783
-783
Assets/Resources/ChallengerModus.prefab
Assets/Resources/ChallengerModus.prefab
+4
-4
Assets/_Game/Scenes/Levels/Level14.unity
Assets/_Game/Scenes/Levels/Level14.unity
+1141
-28
Assets/_Game/Scenes/Levels/Level15.unity
Assets/_Game/Scenes/Levels/Level15.unity
+602
-3
Assets/_Game/Scenes/Levels/Level16.unity
Assets/_Game/Scenes/Levels/Level16.unity
+2032
-726
Assets/_Game/Scenes/LightTest.meta
Assets/_Game/Scenes/LightTest.meta
+0
-8
Assets/_Game/Scenes/Tilesets/Obstacles.meta
Assets/_Game/Scenes/Tilesets/Obstacles.meta
+0
-8
Assets/_Game/Scripts/CannonController.cs
Assets/_Game/Scripts/CannonController.cs
+0
-2
Assets/_Game/Scripts/PlayerActor.cs
Assets/_Game/Scripts/PlayerActor.cs
+1
-1
ProjectSettings/Physics2DSettings.asset
ProjectSettings/Physics2DSettings.asset
+1
-1
ProjectSettings/ProjectVersion.txt
ProjectSettings/ProjectVersion.txt
+1
-1
ProjectSettings/TagManager.asset
ProjectSettings/TagManager.asset
+1
-1
No files found.
Assets/Resources/ChallengerModus.prefab
View file @
f1f27864
...
...
@@ -22,7 +22,7 @@ GameObject:
-
component
:
{
fileID
:
58064784892578094
}
-
component
:
{
fileID
:
199745163004192738
}
-
component
:
{
fileID
:
198244601809831776
}
m_Layer
:
1
1
m_Layer
:
1
3
m_Name
:
ChallengerModus
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
...
...
@@ -38,7 +38,7 @@ GameObject:
m_Component
:
-
component
:
{
fileID
:
4143147008631634
}
-
component
:
{
fileID
:
114764353408195872
}
m_Layer
:
1
1
m_Layer
:
1
3
m_Name
:
ChallengerModus
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
...
...
@@ -57,7 +57,7 @@ GameObject:
-
component
:
{
fileID
:
23947111915981346
}
-
component
:
{
fileID
:
114417361206357324
}
-
component
:
{
fileID
:
114644862311527322
}
m_Layer
:
0
m_Layer
:
13
m_Name
:
LightSource
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
...
...
@@ -161,7 +161,7 @@ CircleCollider2D:
m_UsedByComposite
:
0
m_Offset
:
{
x
:
0
,
y
:
0
}
serializedVersion
:
2
m_Radius
:
1
m_Radius
:
0.4
---
!u!114
&114417361206357324
MonoBehaviour
:
m_ObjectHideFlags
:
1
...
...
Assets/_Game/Scenes/Levels/Level14.unity
View file @
f1f27864
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/Levels/Level15.unity
View file @
f1f27864
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/Levels/Level16.unity
View file @
f1f27864
This diff is collapsed.
Click to expand it.
Assets/_Game/Scenes/LightTest.meta
deleted
100644 → 0
View file @
d48222c6
fileFormatVersion: 2
guid: 7d76a63dfd317814d9eef925c0df39c7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/Tilesets/Obstacles.meta
deleted
100644 → 0
View file @
d48222c6
fileFormatVersion: 2
guid: 7302d929ac7a2f44180b44e09592ac8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/CannonController.cs
View file @
f1f27864
...
...
@@ -11,8 +11,6 @@ public class CannonController : MonoBehaviour, IResetable {
[
SerializeField
]
private
Animator
animRadHinten
;
[
SerializeField
]
private
bool
ignoreEnviroment
;
private
Coroutine
co
;
private
float
time
;
private
void
Start
()
{
...
...
Assets/_Game/Scripts/PlayerActor.cs
View file @
f1f27864
...
...
@@ -97,7 +97,7 @@ public class PlayerActor : MonoBehaviour, IResetable {
private
void
OnTriggerEnter2D
(
Collider2D
other
)
{
// Collides with Hazard
if
(
other
.
gameObject
.
layer
==
11
)
{
if
(
other
.
gameObject
.
layer
==
11
||
other
.
gameObject
.
layer
==
13
)
{
StartCoroutine
(
Die
());
}
}
...
...
ProjectSettings/Physics2DSettings.asset
View file @
f1f27864
...
...
@@ -52,4 +52,4 @@ Physics2DSettings:
m_ColliderAsleepColor
:
{
r
:
0.5686275
,
g
:
0.95686275
,
b
:
0.54509807
,
a
:
0.36078432
}
m_ColliderContactColor
:
{
r
:
1
,
g
:
0
,
b
:
1
,
a
:
0.6862745
}
m_ColliderAABBColor
:
{
r
:
1
,
g
:
1
,
b
:
0
,
a
:
0.2509804
}
m_LayerCollisionMatrix
:
c8
e0ffffc8e0ffffc8e0ffffffffffffc8e0ffffc8e0ffffffffffffffffffffc8e0ffffc8ecffffc8e2ffffc8faffffc8e8ffffffff
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_LayerCollisionMatrix
:
c8
c0ffffc8c0ffffc8c0ffffffffffffc8c0ffffc8c0ffffffffffffffffffffc8c0ffffc8ecffffc8c2ffffc8daffffc8c8ffffc8c2
ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
ProjectSettings/ProjectVersion.txt
View file @
f1f27864
m_EditorVersion: 2018.2.
9
f1
m_EditorVersion: 2018.2.
10
f1
ProjectSettings/TagManager.asset
View file @
f1f27864
...
...
@@ -20,7 +20,7 @@ TagManager:
-
Interactible
-
Hazard
-
Enviroment
-
-
Challenger
-
-
-
...
...
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