Commit adfdd6d3 authored by Domm29's avatar Domm29

kleinkram

parent 09dd9b15
......@@ -157,7 +157,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467034929}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -289,7 +289,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467034929}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -560,7 +560,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467034929}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -692,7 +692,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467034929}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......@@ -1052,12 +1052,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467034929}
m_RootOrder: 6
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 140}
m_SizeDelta: {x: 368.2, y: 96}
m_SizeDelta: {x: 409.2, y: 187.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1429304041
MonoBehaviour:
......@@ -1079,7 +1079,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: a882eb030a82cea46bf1b03396c80c65, type: 3}
m_Sprite: {fileID: 21300000, guid: 0be1cf6c1aa98384da60cdf8a711ade9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
......@@ -1205,12 +1205,12 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1375445807}
- {fileID: 1429304040}
- {fileID: 415816971}
- {fileID: 191938905}
- {fileID: 407276318}
- {fileID: 123865567}
- {fileID: 2047248187}
- {fileID: 1429304040}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1348,7 +1348,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1467034929}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
......
......@@ -44,5 +44,6 @@ public class MushroomGrowth : MonoBehaviour
break;
}
}
}
......@@ -60,7 +60,7 @@ public class UI_Health : MonoBehaviour
IEnumerator WaitForDeath()
{
yield return new WaitForSeconds(1.5f);
yield return new WaitForSeconds(3f);
if (gameOverScreen != null)
{
gameOverScreen.ShowNow();
......
......@@ -38,7 +38,7 @@ public class UI_SceneManager : MonoBehaviour
}
void Start()
{
if (sp.GetScene() != SceneManager.GetActiveScene().buildIndex)
if (sp.GetScene() != SceneManager.GetActiveScene().buildIndex && SceneManager.GetActiveScene().buildIndex != 0 )
{
if (sp.targetsporn)
{
......@@ -62,11 +62,14 @@ public class UI_SceneManager : MonoBehaviour
{
if (!sp.loadGame)
{
sp.SetLife(3);
sp.SetScene(1);
sp.SetNumber(savepointo.gameObject.GetComponent<Resporn>().respornNo);
sp.SetPosition(savepointo.gameObject.GetComponent<Resporn>().GetPosition());
sp.pilzZustand = 0;
if (sp.GetNumber() == 1)
{
sp.SetLife(3);
sp.SetScene(1);
sp.SetNumber(savepointo.gameObject.GetComponent<Resporn>().respornNo);
sp.SetPosition(savepointo.gameObject.GetComponent<Resporn>().GetPosition());
sp.pilzZustand = 0;
}
}
}
......
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