PBA3H24ASE/ConvenientHorror
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Umänderungen, Packages installiert

Browse Source
This commit is contained in:
Xilver Lavender Steinmeier
2026-03-17 11:32:06 +01:00
parent 0660162c86
commit 5647695bb0
93 changed files with 6937 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
Assets/Scripts/Enemy/FieScript.cs
View File

@@ -67,16 +67,32 @@ public class FieScript : MonoBehaviour
//StateOne();
StartStuff();
}
float stickAround = 0;
void Update()
{
if(fieKill == true)
{
stickAround += Time.deltaTime;
if (stickAround >= 2f)
{
Fiefetti.transform.position = SPBack.transform.position;
stickAround = 0f;
fieKill = false;
}
}
}
public void HitPlayer()
{
healthScript.GetHit();
audio.PlaySFX(audio.fieHit);
silv.silvKill = false;
hai.haiKill = false;
fieKill = true;
}
public void StartStuff()
@@ -157,7 +173,6 @@ public class FieScript : MonoBehaviour
{
float elapsed3 = 0;
float stickAround = 0f;
if (spawnLeft && doorSwitch.isOpen == true)
{
@@ -165,17 +180,6 @@ public class FieScript : MonoBehaviour
Debug.Log("Fiefetti: Hab dich!");
//reingehen
HitPlayer();
//StateOne();
silv.silvKill = false;
hai.haiKill = false;
fieKill = true;
stickAround += Time.deltaTime;
if (stickAround >= 2f)
{
Fiefetti.transform.position = SPBack.transform.position;
stickAround = 0f;
}
}
else if (!spawnLeft && doorSwitch2.isOpen == true)
@@ -184,17 +188,6 @@ public class FieScript : MonoBehaviour
Debug.Log("Fiefetti: Hab dich!");
//reingehen
HitPlayer();
//StateOne();
silv.silvKill = false;
hai.haiKill = false;
fieKill = true;
stickAround += Time.deltaTime;
if (stickAround >= 2f)
{
Fiefetti.transform.position = SPBack.transform.position;
stickAround = 0f;
}
}
else
@@ -220,83 +213,4 @@ public class FieScript : MonoBehaviour
StartCoroutine(WanderAround());
}
/*
public void StateOne()
{
button.SetActive(false);
Fiefetti.transform.position = SPBack.transform.position;
//Hauptposition
Debug.Log("Fiefetti: Bin hinten");
int random = Random.Range(1, 3);
if (random == 1) //1 bedeutet immer left
{
spawn1 = true;
}
else
{
spawn2 = true;
}
Debug.Log("random = " + random);
//StartCoroutine(WanderClose());
}*/
/*
public void StateTwo()
{
if (spawn1 == true) //1 bedeutet immer left
{
Fiefetti.transform.position = SPLeft.transform.position;
}
else
{
Fiefetti.transform.position = SPRight.transform.position;
}
StartCoroutine(WanderAround());
//einen von zwei Punkten aussuchen
Debug.Log("Fiefetti: Komme näher");
//StateThree();
}*/
/*
public void StateThree()
{
if (doorSwitch.isOpen == true)
{
Fiefetti.transform.position = SPDeath.transform.position;
Debug.Log("Fiefetti: Hab dich!");
//reingehen
HitPlayer();
//StateOne();
fieKill = true;
}
else if (doorSwitch2.isOpen == true)
{
Fiefetti.transform.position = SPDeath.transform.position;
Debug.Log("Fiefetti: Hab dich!");
//reingehen
HitPlayer();
//StateOne();
fieKill = true;
}
else
{
//AudioSpielen
fieKill = false;
Debug.Log("Fiefetti: Och menno");
}
StartCoroutine(WanderAround());
spawn1 = false;
spawn2 = false;
//StateOne();
}*/
}

20
Assets/Scripts/Enemy/HaiScript.cs
View File

@@ -67,15 +67,32 @@ public class HaiScript : MonoBehaviour
StartStuff();
}
float stickAround = 0;
void Update()
{
if (haiKill == true)
{
stickAround += Time.deltaTime;
if (stickAround >= 2f)
{
Hai.transform.position = SPBack.transform.position;
stickAround = 0f;
haiKill = false;
}
}
}
public void HitPlayer()
{
healthScript.GetHit();
audio.PlaySFX(audio.haiHit);
fie.fieKill = false;
silv.silvKill = false;
haiKill = true;
}
public void StartStuff()
@@ -161,9 +178,6 @@ public class HaiScript : MonoBehaviour
//reingehen
HitPlayer();
fie.fieKill = false;
silv.silvKill = false;
haiKill = true;
stickAround += Time.deltaTime;
if (stickAround >= 2f)

8
Assets/Scripts/Enemy/LevelBehavior.cs
View File

@@ -64,7 +64,7 @@ public class LevelBehavior : MonoBehaviour
if (sceneName == "Day2")
{
Debug.Log("Es ist Tag 2");
curScene = 5;
curScene = 3;
fie.stateTime = 5;
silv.stateTime = 10;
hai.stateTime = 25;
@@ -112,16 +112,18 @@ public class LevelBehavior : MonoBehaviour
public void SwitchScene()
{
curScene++;
Debug.Log("Ich will jetzt in Scene " + curScene++ + " wechseln.");
gameOngoing = false;
gameWon = false;
if (curScene < 5)
if (curScene < 4)
{
Debug.Log("Ist noch nicht Tag 3");
SceneManager.LoadSceneAsync(curScene++);
SceneManager.LoadSceneAsync(curScene);
}
else
{

22
Assets/Scripts/Enemy/SilvScript.cs
View File

@@ -1,4 +1,5 @@
using System.Collections;
using NUnit.Framework;
using UnityEngine;
public class SilvScript : MonoBehaviour
@@ -66,15 +67,32 @@ public class SilvScript : MonoBehaviour
StartStuff();
}
float stickAround = 0;
void Update()
{
if (silvKill == true)
{
stickAround += Time.deltaTime;
if (stickAround >= 2f)
{
Silv.transform.position = SPBack.transform.position;
stickAround = 0f;
silvKill = false;
}
}
}
public void HitPlayer()
{
healthScript.GetHit();
audio.PlaySFX(audio.silvHit);
fie.fieKill = false;
hai.haiKill = false;
silvKill = true;
}
public void StartStuff()
@@ -182,10 +200,6 @@ public class SilvScript : MonoBehaviour
HitPlayer();
//StateOne();
fie.fieKill = false;
hai.haiKill = false;
silvKill = true;
stickAround += Time.deltaTime;
if (stickAround >= 2f)
{