Commit 5dc70727 authored by Marcel Bieg's avatar Marcel Bieg

fix für sachen

parent f33da9f0
......@@ -292,7 +292,7 @@ MonoBehaviour:
toxicSprite: {fileID: 0}
player: {fileID: 5180667629328793573}
fireBackgroundObject: {fileID: 1460399941}
electricBackgroundObject: {fileID: 0}
electricBackgroundObject: {fileID: 8608179789912019053}
--- !u!1 &8608179789912019053
GameObject:
m_ObjectHideFlags: 0
......
......@@ -122,3 +122,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
player: {fileID: 0}
pauseMenu: {fileID: 0}
deathClip: {fileID: 7400000, guid: 152e6b6036649f245a4b8bc0e8fc58ca, type: 2}
......@@ -2211,11 +2211,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3599216479277522380, guid: 2725af8035a08437bb044bb4f50e0e9a,
type: 3}
propertyPath: orthographic size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3599216479277522378, guid: 2725af8035a08437bb044bb4f50e0e9a,
type: 3}
propertyPath: player
......@@ -2231,6 +2226,11 @@ PrefabInstance:
propertyPath: mapSizeY
value: 29
objectReference: {fileID: 0}
- target: {fileID: 3599216479277522380, guid: 2725af8035a08437bb044bb4f50e0e9a,
type: 3}
propertyPath: orthographic size
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2725af8035a08437bb044bb4f50e0e9a, type: 3}
--- !u!1001 &870447775
......@@ -2318,6 +2318,12 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 870447775}
m_PrefabAsset: {fileID: 0}
--- !u!1 &943994894 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8608179789912019053, guid: f0f39a88bbab58f41b69c80542e442cd,
type: 3}
m_PrefabInstance: {fileID: 1947123784}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &964315427
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -17345,237 +17351,237 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723994410144964, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995423992389, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589817860853, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800723995548233995, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589518466896, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347011010953, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588837168309, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834347155172039, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656588973735344, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.characterCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.spaceCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.wordCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.lineCount
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7199834348159061768, guid: ee2a31c10517e42889fc2f428c7d4f54,
- target: {fileID: 5040656589910747901, guid: ee2a31c10517e42889fc2f428c7d4f54,
type: 3}
propertyPath: m_textInfo.pageCount
value: 0
......@@ -18606,6 +18612,10 @@ PrefabInstance:
propertyPath: wallMap
value:
objectReference: {fileID: 2067454340}
- target: {fileID: 1220400015, guid: f0f39a88bbab58f41b69c80542e442cd, type: 3}
propertyPath: electricBackgroundObject
value:
objectReference: {fileID: 943994894}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f0f39a88bbab58f41b69c80542e442cd, type: 3}
--- !u!1 &1947123785 stripped
......@@ -6,7 +6,6 @@ public class ToxicAreaBehaviour : MonoBehaviour
{
public GameObject player;
public GameObject pauseMenu;
public Animator AnimDeath;
public AnimationClip deathClip;
public static bool isDead;
......@@ -31,7 +30,7 @@ public class ToxicAreaBehaviour : MonoBehaviour
public IEnumerator DeathEffect()
{
isDead = true;
AnimDeath.SetTrigger("Death");
player.GetComponent<Animator>().SetTrigger("Death");
yield return new WaitForSeconds(deathClip.length);;
player.SetActive(false);
yield return new WaitForSeconds(0.5f);
......
fileFormatVersion: 2
guid: 463ba267aa2a4e24f9d1125f77677ea1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
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