Commit 56397634 authored by Isa's avatar Isa
parents be8d96b9 1e4de605
...@@ -26,7 +26,7 @@ Transform: ...@@ -26,7 +26,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1377908510} m_GameObject: {fileID: 1377908510}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} 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_LocalScale: {x: 0.3846154, y: 0.3846154, z: 0.3846154}
m_Children: [] m_Children: []
m_Father: {fileID: 4738352637052488} m_Father: {fileID: 4738352637052488}
...@@ -87,7 +87,7 @@ GameObject: ...@@ -87,7 +87,7 @@ GameObject:
- component: {fileID: 1329814112} - component: {fileID: 1329814112}
m_Layer: 14 m_Layer: 14
m_Name: Erd-Gegner m_Name: Erd-Gegner
m_TagString: Enemy m_TagString: Earth
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
...@@ -101,7 +101,7 @@ Transform: ...@@ -101,7 +101,7 @@ Transform:
m_GameObject: {fileID: 1634356314439590} m_GameObject: {fileID: 1634356314439590}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -823.3, y: -198.56, z: 0} 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: m_Children:
- {fileID: 5151316259711694663} - {fileID: 5151316259711694663}
- {fileID: 1377908511} - {fileID: 1377908511}
...@@ -241,7 +241,7 @@ MonoBehaviour: ...@@ -241,7 +241,7 @@ MonoBehaviour:
weight: 2 weight: 2
isPerformingAction: 0 isPerformingAction: 0
speed: 5 speed: 5
distance: 1.5 distance: 1.8
groundDetection: {fileID: 1377908511} groundDetection: {fileID: 1377908511}
--- !u!1 &7480494801806484534 --- !u!1 &7480494801806484534
GameObject: GameObject:
......
...@@ -20,7 +20,7 @@ GameObject: ...@@ -20,7 +20,7 @@ GameObject:
- component: {fileID: 4724602922512031261} - component: {fileID: 4724602922512031261}
m_Layer: 14 m_Layer: 14
m_Name: Wind-Gegner m_Name: Wind-Gegner
m_TagString: Enemy m_TagString: Air
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
......
...@@ -13,7 +13,7 @@ GameObject: ...@@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 448694265548740070} - component: {fileID: 448694265548740070}
- component: {fileID: 7669234691109163246} - component: {fileID: 7669234691109163246}
- component: {fileID: 8811905775964263056} - component: {fileID: 8811905775964263056}
m_Layer: 0 m_Layer: 9
m_Name: Burnable_Thing m_Name: Burnable_Thing
m_TagString: DestroyableByFire m_TagString: DestroyableByFire
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
...@@ -99,7 +99,7 @@ BoxCollider2D: ...@@ -99,7 +99,7 @@ BoxCollider2D:
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
oldSize: {x: 8, y: 8} oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1} newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5 adaptiveTilingThreshold: 0.5
drawMode: 0 drawMode: 0
......
...@@ -6,10 +6,20 @@ public class isHittingWall : MonoBehaviour ...@@ -6,10 +6,20 @@ public class isHittingWall : MonoBehaviour
{ {
private void OnTriggerEnter2D(Collider2D collision) 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; return;
} }
this.GetComponentInParent<AI_WaterAttack>().turn(); 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();
// }
//}
} }
...@@ -30,7 +30,6 @@ public class AI_WaterAttack : WeightedAction ...@@ -30,7 +30,6 @@ public class AI_WaterAttack : WeightedAction
RaycastHit2D groundInfo = Physics2D.Raycast(groundDetection.position, Vector3.down, distance, 1<<LayerMask.NameToLayer("Ground")); RaycastHit2D groundInfo = Physics2D.Raycast(groundDetection.position, Vector3.down, distance, 1<<LayerMask.NameToLayer("Ground"));
Debug.Log(groundInfo.collider);
if (groundInfo.collider == false) if (groundInfo.collider == false)
{ {
turn(); turn();
......
...@@ -2,6 +2,7 @@ using System.Collections; ...@@ -2,6 +2,7 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.SceneManagement;
using PlayerSpawnPointScript; using PlayerSpawnPointScript;
public class Life : MonoBehaviour { public class Life : MonoBehaviour {
...@@ -37,9 +38,9 @@ public class Life : MonoBehaviour { ...@@ -37,9 +38,9 @@ public class Life : MonoBehaviour {
public void Death(){ public void Death(){
if (gameObject.CompareTag("Player")) if (gameObject.CompareTag("Player"))
{ {
//PlayerSpawnPoint.psp.SetPlayerPosition(); SceneManager.LoadScene("MainLevel");
gameObject.SetActive(false); //gameObject.SetActive(false);
Heal(5); Heal(3);
Debug.Log("Death"); Debug.Log("Death");
return; return;
......
...@@ -36,7 +36,6 @@ namespace SavePointListScript ...@@ -36,7 +36,6 @@ namespace SavePointListScript
int i = 0; int i = 0;
foreach (GameObject var in savePointList) foreach (GameObject var in savePointList)
{ {
Debug.Log(savePointIsActiv[i]);
SavePoint temp = savePointList[i].GetComponent<SavePoint>(); SavePoint temp = savePointList[i].GetComponent<SavePoint>();
temp.SetIsUsed(savePointIsActiv[i]); temp.SetIsUsed(savePointIsActiv[i]);
i++; i++;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment