Skip to content
GitLab
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
07e7cadc
Commit
07e7cadc
authored
Mar 30, 2019
by
mthiele2
Browse files
Debug-entfernt
parent
78a2e214
Changes
5
Hide whitespace changes
Inline
Side-by-side
Assets/_Game/Prefabs/Enemies/Erd-Gegner.prefab
View file @
07e7cadc
...
...
@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1377908510
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0
,
w
:
1
}
m_LocalPosition
:
{
x
:
0.
63
,
y
:
-
0.
08
,
z
:
0
}
m_LocalPosition
:
{
x
:
0.
54
,
y
:
0.
1
,
z
:
0
}
m_LocalScale
:
{
x
:
0.3846154
,
y
:
0.3846154
,
z
:
0.3846154
}
m_Children
:
[]
m_Father
:
{
fileID
:
4738352637052488
}
...
...
@@ -87,7 +87,7 @@ GameObject:
-
component
:
{
fileID
:
1329814112
}
m_Layer
:
14
m_Name
:
Erd-Gegner
m_TagString
:
E
nemy
m_TagString
:
E
arth
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -101,7 +101,7 @@ Transform:
m_GameObject
:
{
fileID
:
1634356314439590
}
m_LocalRotation
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
1
}
m_LocalPosition
:
{
x
:
-823.3
,
y
:
-198.56
,
z
:
0
}
m_LocalScale
:
{
x
:
2.
6
,
y
:
2.
6
,
z
:
2.
6
}
m_LocalScale
:
{
x
:
2.
4
,
y
:
2.
4
,
z
:
2.
4
}
m_Children
:
-
{
fileID
:
5151316259711694663
}
-
{
fileID
:
1377908511
}
...
...
@@ -241,7 +241,7 @@ MonoBehaviour:
weight
:
2
isPerformingAction
:
0
speed
:
5
distance
:
1.
5
distance
:
1.
8
groundDetection
:
{
fileID
:
1377908511
}
---
!u!1
&7480494801806484534
GameObject
:
...
...
Assets/_Game/Prefabs/Enemies/Wind-Gegner.prefab
View file @
07e7cadc
...
...
@@ -20,7 +20,7 @@ GameObject:
-
component
:
{
fileID
:
4724602922512031261
}
m_Layer
:
14
m_Name
:
Wind-Gegner
m_TagString
:
Enemy
m_TagString
:
Air
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
Assets/_Game/Prefabs/Level_Elements/Burnable_Thing.prefab
View file @
07e7cadc
...
...
@@ -13,7 +13,7 @@ GameObject:
-
component
:
{
fileID
:
448694265548740070
}
-
component
:
{
fileID
:
7669234691109163246
}
-
component
:
{
fileID
:
8811905775964263056
}
m_Layer
:
0
m_Layer
:
9
m_Name
:
Burnable_Thing
m_TagString
:
DestroyableByFire
m_Icon
:
{
fileID
:
0
}
...
...
@@ -99,7 +99,7 @@ BoxCollider2D:
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0.5
,
y
:
0.5
}
oldSize
:
{
x
:
8
,
y
:
8
}
oldSize
:
{
x
:
1
,
y
:
1
}
newSize
:
{
x
:
1
,
y
:
1
}
adaptiveTilingThreshold
:
0.5
drawMode
:
0
...
...
Assets/_Game/Scripts/Enemy AI/Generell/isHittingWall.cs
View file @
07e7cadc
...
...
@@ -6,10 +6,20 @@ public class isHittingWall : MonoBehaviour
{
private
void
OnTriggerEnter2D
(
Collider2D
collision
)
{
if
(
collision
.
gameObject
.
layer
!=
LayerMask
.
NameToLayer
(
"Ground"
))
Debug
.
Log
(
collision
.
gameObject
.
layer
+
"stuff"
+
LayerMask
.
NameToLayer
(
"Ground"
));
if
(!(
collision
.
gameObject
.
layer
==
LayerMask
.
NameToLayer
(
"Ground"
)
||
collision
.
gameObject
.
layer
==
LayerMask
.
NameToLayer
(
"Enemy"
)))
{
return
;
}
this
.
GetComponentInParent
<
AI_WaterAttack
>().
turn
();
}
//private void OnCollisionEnter2D(Collision2D collision)
//{
// if (collision.gameObject.layer == 9 || collision.gameObject.layer == LayerMask.NameToLayer("Enemy"))
// {
// Debug.Log("penis");
// this.GetComponentInParent<AI_WaterAttack>().turn();
// }
//}
}
Assets/_Game/Scripts/Enemy AI/Water/AI_WaterAttack.cs
View file @
07e7cadc
...
...
@@ -30,7 +30,6 @@ public class AI_WaterAttack : WeightedAction
RaycastHit2D
groundInfo
=
Physics2D
.
Raycast
(
groundDetection
.
position
,
Vector3
.
down
,
distance
,
1
<<
LayerMask
.
NameToLayer
(
"Ground"
));
Debug
.
Log
(
groundInfo
.
collider
);
if
(
groundInfo
.
collider
==
false
)
{
turn
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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