Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Wintersemester 2018-2019
Unity
Suck It
Commits
ed9c1211
Commit
ed9c1211
authored
Mar 29, 2019
by
Christopher Benes
Browse files
lemme pull
parent
af0d1865
Changes
3
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Scenes/MainLevel.unity
View file @
ed9c1211
...
...
@@ -4139,7 +4139,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x:
2
, y:
2
}
m_Size: {x:
5
, y:
4
}
m_EdgeRadius: 0
--- !u!50 &209653169
Rigidbody2D:
...
...
@@ -10799,15 +10799,20 @@ PrefabInstance:
propertyPath: m_TagString
value: Interactive
objectReference: {fileID: 0}
- target: {fileID: 6240296448730384320, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.x
value: 141.
3
value: 141.
22
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.y
value: 92.
59
value: 92.
72
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
...
...
@@ -10869,6 +10874,26 @@ PrefabInstance:
propertyPath: force
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6184296985288555399, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 3590286897431027205, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3590286897431027205, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Size.x
value: 6
objectReference: {fileID: 0}
- target: {fileID: 3590286897431027205, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Size.y
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a0c6081106659114387502f3e4d51362, type: 3}
--- !u!4 &554033098 stripped
...
...
@@ -15471,7 +15496,7 @@ Camera:
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits:
24375
m_Bits:
57143
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
...
...
@@ -29915,7 +29940,7 @@ PrefabInstance:
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
propertyPath: m_GroundedOffset.y
value:
-0.5
value:
0
objectReference: {fileID: 0}
- target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
type: 3}
...
...
@@ -31290,6 +31315,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Interactive
objectReference: {fileID: 0}
- target: {fileID: 6240296448730384320, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.x
...
...
@@ -37613,6 +37643,11 @@ PrefabInstance:
propertyPath: m_TagString
value: Interactive
objectReference: {fileID: 0}
- target: {fileID: 6240296448730384320, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_Layer
value: 15
objectReference: {fileID: 0}
- target: {fileID: 7732554449417407852, guid: a0c6081106659114387502f3e4d51362,
type: 3}
propertyPath: m_LocalPosition.x
Assets/_Game/Scripts/Level Hazards/SliderObject.cs
View file @
ed9c1211
...
...
@@ -12,7 +12,7 @@ namespace _Game.Scripts.Level_Hazards
_rigidbody2D
=
this
.
GetComponentInParent
<
Rigidbody2D
>();
}
private
void
On
Collision
Enter2D
(
Colli
sion
2D
other
)
private
void
On
Trigger
Enter2D
(
Colli
der
2D
other
)
{
if
(
other
.
gameObject
.
layer
==
LayerMask
.
NameToLayer
(
"Player"
)
||
other
.
gameObject
.
layer
==
LayerMask
.
NameToLayer
(
"Enemy"
)
||
other
.
gameObject
.
CompareTag
(
"Fire"
))
...
...
@@ -22,7 +22,7 @@ namespace _Game.Scripts.Level_Hazards
}
}
private
void
On
Collision
Exit2D
(
Colli
sion
2D
other
)
private
void
On
Trigger
Exit2D
(
Colli
der
2D
other
)
{
if
(
other
.
gameObject
.
layer
==
LayerMask
.
NameToLayer
(
"Player"
)
||
other
.
gameObject
.
layer
==
LayerMask
.
NameToLayer
(
"Enemy"
)
||
other
.
gameObject
.
CompareTag
(
"Fire"
))
...
...
ProjectSettings/TagManager.asset
View file @
ed9c1211
...
...
@@ -30,7 +30,7 @@ TagManager:
-
ElementalAttacks
-
BackgroundTileMap
-
Enemy
-
-
MovableObject
-
-
-
...
...
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