GameOver Overlay ist komplett fertig und funktional, später ggf. noch änderungen an info.Text
This commit is contained in:
@@ -148,13 +148,14 @@ RectTransform:
|
|||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children:
|
||||||
|
- {fileID: 670049979}
|
||||||
m_Father: {fileID: 180048208}
|
m_Father: {fileID: 180048208}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 1, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 219, y: -177}
|
m_AnchoredPosition: {x: -318, y: -177}
|
||||||
m_SizeDelta: {x: 268.7455, y: 241.3384}
|
m_SizeDelta: {x: 268.74548, y: 241.33838}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &121854192
|
--- !u!114 &121854192
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -241,7 +242,7 @@ MonoBehaviour:
|
|||||||
m_VertexBufferAutoSizeReduction: 0
|
m_VertexBufferAutoSizeReduction: 0
|
||||||
m_useMaxVisibleDescender: 1
|
m_useMaxVisibleDescender: 1
|
||||||
m_pageToDisplay: 1
|
m_pageToDisplay: 1
|
||||||
m_margin: {x: 0, y: 0, z: -4.936981, w: -0.9782715}
|
m_margin: {x: 71.07947, y: 0, z: 66.2319, w: -0.9782715}
|
||||||
m_isUsingLegacyAnimationComponent: 0
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
m_isVolumetricText: 0
|
m_isVolumetricText: 0
|
||||||
m_hasFontAssetChanged: 0
|
m_hasFontAssetChanged: 0
|
||||||
@@ -289,12 +290,14 @@ RectTransform:
|
|||||||
- {fileID: 1649312371}
|
- {fileID: 1649312371}
|
||||||
- {fileID: 1720859578}
|
- {fileID: 1720859578}
|
||||||
- {fileID: 1998796460}
|
- {fileID: 1998796460}
|
||||||
|
- {fileID: 2095775804}
|
||||||
|
- {fileID: 429287127}
|
||||||
m_Father: {fileID: 517957359}
|
m_Father: {fileID: 517957359}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 107.85425}
|
m_AnchoredPosition: {x: 0, y: 107.85425}
|
||||||
m_SizeDelta: {x: 0, y: -801.452}
|
m_SizeDelta: {x: 1080, y: 1536.548}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &180048209
|
--- !u!114 &180048209
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -366,10 +369,10 @@ RectTransform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1720859578}
|
m_Father: {fileID: 1720859578}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 284, y: 116}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &198231207
|
--- !u!114 &198231207
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -470,6 +473,152 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 198231205}
|
m_GameObject: {fileID: 198231205}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1001 &214614297
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 180048208}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 6642208740740781789, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 429287131}
|
||||||
|
- target: {fileID: 6642208740740781789, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||||
|
value: ReturnHome
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7092835499209656921, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: ButtonHome
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_Pivot.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_Pivot.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_AnchorMax.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_AnchorMin.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.x
|
||||||
|
value: 256
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_SizeDelta.y
|
||||||
|
value: 256
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 266
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
propertyPath: m_ConstrainProportionsScale
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents:
|
||||||
|
- targetCorrespondingSourceObject: {fileID: 7092835499209656921, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
insertIndex: -1
|
||||||
|
addedObject: {fileID: 429287131}
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
--- !u!1 &429287126 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 7092835499209656921, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 214614297}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!224 &429287127 stripped
|
||||||
|
RectTransform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 7155168148166861137, guid: 2a2d6859836c9fc42810462d8ab7fdd6, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 214614297}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &429287131
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 429287126}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: eaff23fd5c8f4ed4ea07e6f39a83522f, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Assembly-CSharp::MenueScript
|
||||||
--- !u!1 &517957355
|
--- !u!1 &517957355
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -572,6 +721,81 @@ RectTransform:
|
|||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
|
--- !u!1 &670049978
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 670049979}
|
||||||
|
- component: {fileID: 670049981}
|
||||||
|
- component: {fileID: 670049980}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: DeathImage
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &670049979
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 670049978}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 121854191}
|
||||||
|
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: 123, y: 0}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &670049980
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 670049978}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: e5da668c6557abb47a17a303cf69943f, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!222 &670049981
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 670049978}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1010133835
|
--- !u!1 &1010133835
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -791,6 +1015,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ButtonHealth
|
value: ButtonHealth
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5500951168615024559, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
value:
|
value:
|
||||||
@@ -1071,6 +1299,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: ButtonEnergy
|
value: ButtonEnergy
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5500951168615024559, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||||
|
propertyPath: m_AnchoredPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||||
value:
|
value:
|
||||||
@@ -1219,10 +1451,10 @@ RectTransform:
|
|||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 180048208}
|
m_Father: {fileID: 180048208}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 210}
|
m_AnchoredPosition: {x: 0, y: -558}
|
||||||
m_SizeDelta: {x: 773.4789, y: 402.2059}
|
m_SizeDelta: {x: 773.4789, y: 402.20593}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &1649312372
|
--- !u!114 &1649312372
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@@ -1323,6 +1555,81 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1649312370}
|
m_GameObject: {fileID: 1649312370}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &1677120789
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1677120790}
|
||||||
|
- component: {fileID: 1677120792}
|
||||||
|
- component: {fileID: 1677120791}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: GemImage
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!224 &1677120790
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1677120789}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 2095775804}
|
||||||
|
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: 122, y: -5}
|
||||||
|
m_SizeDelta: {x: 100, y: 100}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!114 &1677120791
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1677120789}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Sprite: {fileID: 21300000, guid: c9f0cc0739579d541a08ac2c78d3e605, type: 3}
|
||||||
|
m_Type: 0
|
||||||
|
m_PreserveAspect: 0
|
||||||
|
m_FillCenter: 1
|
||||||
|
m_FillMethod: 4
|
||||||
|
m_FillAmount: 1
|
||||||
|
m_FillClockwise: 1
|
||||||
|
m_FillOrigin: 0
|
||||||
|
m_UseSpriteMesh: 0
|
||||||
|
m_PixelsPerUnitMultiplier: 1
|
||||||
|
--- !u!222 &1677120792
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1677120789}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &1720859577
|
--- !u!1 &1720859577
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1764,7 +2071,7 @@ MonoBehaviour:
|
|||||||
m_EditorClassIdentifier: Assembly-CSharp::InventoryScript
|
m_EditorClassIdentifier: Assembly-CSharp::InventoryScript
|
||||||
energy: 0
|
energy: 0
|
||||||
health: 0
|
health: 0
|
||||||
gems: 100
|
gems: 0
|
||||||
--- !u!114 &2006687873
|
--- !u!114 &2006687873
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1793,6 +2100,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 8336b8f8234487443af56cbe19330e6e, type: 3}
|
m_Script: {fileID: 11500000, guid: 8336b8f8234487443af56cbe19330e6e, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::ChangeHealth
|
m_EditorClassIdentifier: Assembly-CSharp::ChangeHealth
|
||||||
|
deathCounter: 0
|
||||||
panel: {fileID: 2006687871}
|
panel: {fileID: 2006687871}
|
||||||
healthHUD: {fileID: 1367110566}
|
healthHUD: {fileID: 1367110566}
|
||||||
standardHealth: 3
|
standardHealth: 3
|
||||||
@@ -1823,14 +2131,153 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 1765a05fbe2c3cd408dca42fafe71d5d, type: 3}
|
m_Script: {fileID: 11500000, guid: 1765a05fbe2c3cd408dca42fafe71d5d, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier: Assembly-CSharp::GameOver
|
m_EditorClassIdentifier: Assembly-CSharp::GameOver
|
||||||
deathPanel: {fileID: 517957355}
|
deathPanel: {fileID: 180048207}
|
||||||
timer: 0
|
timer: 0
|
||||||
deathTime: {fileID: 121854192}
|
deathTime: {fileID: 121854192}
|
||||||
infoText: {fileID: 1998796461}
|
infoText: {fileID: 1998796461}
|
||||||
recentDeath: 0
|
costText: {fileID: 2095775802}
|
||||||
|
cost: 0
|
||||||
|
timerOn: 0
|
||||||
etwas: 0
|
etwas: 0
|
||||||
zeit: 0
|
zeit: 0
|
||||||
scriptPile: {fileID: 2006687871}
|
scriptPile: {fileID: 2006687871}
|
||||||
|
--- !u!1 &2095775801
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2095775804}
|
||||||
|
- component: {fileID: 2095775803}
|
||||||
|
- component: {fileID: 2095775802}
|
||||||
|
m_Layer: 5
|
||||||
|
m_Name: CostText
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &2095775802
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2095775801}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_RaycastTarget: 1
|
||||||
|
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
m_Maskable: 1
|
||||||
|
m_OnCullStateChanged:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_text: XXX
|
||||||
|
m_isRightToLeft: 0
|
||||||
|
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||||
|
m_fontSharedMaterials: []
|
||||||
|
m_fontMaterial: {fileID: 0}
|
||||||
|
m_fontMaterials: []
|
||||||
|
m_fontColor32:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_enableVertexGradient: 0
|
||||||
|
m_colorMode: 3
|
||||||
|
m_fontColorGradient:
|
||||||
|
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
topRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
m_fontColorGradientPreset: {fileID: 0}
|
||||||
|
m_spriteAsset: {fileID: 0}
|
||||||
|
m_tintAllSprites: 0
|
||||||
|
m_StyleSheet: {fileID: 0}
|
||||||
|
m_TextStyleHashCode: -1183493901
|
||||||
|
m_overrideHtmlColors: 0
|
||||||
|
m_faceColor:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
|
m_fontSize: 80
|
||||||
|
m_fontSizeBase: 80
|
||||||
|
m_fontWeight: 400
|
||||||
|
m_enableAutoSizing: 0
|
||||||
|
m_fontSizeMin: 18
|
||||||
|
m_fontSizeMax: 72
|
||||||
|
m_fontStyle: 0
|
||||||
|
m_HorizontalAlignment: 2
|
||||||
|
m_VerticalAlignment: 512
|
||||||
|
m_textAlignment: 65535
|
||||||
|
m_characterSpacing: 0
|
||||||
|
m_wordSpacing: 0
|
||||||
|
m_lineSpacing: 0
|
||||||
|
m_lineSpacingMax: 0
|
||||||
|
m_paragraphSpacing: 0
|
||||||
|
m_charWidthMaxAdj: 0
|
||||||
|
m_TextWrappingMode: 1
|
||||||
|
m_wordWrappingRatios: 0.4
|
||||||
|
m_overflowMode: 0
|
||||||
|
m_linkedTextComponent: {fileID: 0}
|
||||||
|
parentLinkedComponent: {fileID: 0}
|
||||||
|
m_enableKerning: 0
|
||||||
|
m_ActiveFontFeatures: 6e72656b
|
||||||
|
m_enableExtraPadding: 0
|
||||||
|
checkPaddingRequired: 0
|
||||||
|
m_isRichText: 1
|
||||||
|
m_EmojiFallbackSupport: 1
|
||||||
|
m_parseCtrlCharacters: 1
|
||||||
|
m_isOrthographic: 1
|
||||||
|
m_isCullingEnabled: 0
|
||||||
|
m_horizontalMapping: 0
|
||||||
|
m_verticalMapping: 0
|
||||||
|
m_uvLineOffset: 0
|
||||||
|
m_geometrySortingOrder: 0
|
||||||
|
m_IsTextObjectScaleStatic: 0
|
||||||
|
m_VertexBufferAutoSizeReduction: 0
|
||||||
|
m_useMaxVisibleDescender: 1
|
||||||
|
m_pageToDisplay: 1
|
||||||
|
m_margin: {x: -28.243408, y: -79.892334, z: 29.569061, w: -88.94519}
|
||||||
|
m_isUsingLegacyAnimationComponent: 0
|
||||||
|
m_isVolumetricText: 0
|
||||||
|
m_hasFontAssetChanged: 0
|
||||||
|
m_baseMaterial: {fileID: 0}
|
||||||
|
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
--- !u!222 &2095775803
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2095775801}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!224 &2095775804
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2095775801}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 1677120790}
|
||||||
|
m_Father: {fileID: 180048208}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
|
m_AnchorMax: {x: 0, y: 0.5}
|
||||||
|
m_AnchoredPosition: {x: 192, y: -177}
|
||||||
|
m_SizeDelta: {x: 200, y: 50}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!1660057539 &9223372036854775807
|
--- !u!1660057539 &9223372036854775807
|
||||||
SceneRoots:
|
SceneRoots:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -14,9 +14,11 @@ public class GameOver : MonoBehaviour
|
|||||||
[SerializeField] public float timer;
|
[SerializeField] public float timer;
|
||||||
[SerializeField] TMP_Text deathTime;
|
[SerializeField] TMP_Text deathTime;
|
||||||
[SerializeField] TMP_Text infoText;
|
[SerializeField] TMP_Text infoText;
|
||||||
[SerializeField] public bool recentDeath;
|
[SerializeField] TMP_Text costText;
|
||||||
|
[SerializeField] int cost;
|
||||||
|
//[SerializeField] public bool recentDeath; //discaraded
|
||||||
|
|
||||||
bool timerOn = false;
|
[SerializeField] public bool timerOn;
|
||||||
|
|
||||||
public float etwas;
|
public float etwas;
|
||||||
public float zeit;
|
public float zeit;
|
||||||
@@ -39,39 +41,47 @@ public class GameOver : MonoBehaviour
|
|||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
recentDeath = false; //Eigentlicher Wert
|
timer = 10f;
|
||||||
|
inventory.Gems = 599;
|
||||||
deathPanel.SetActive(false);
|
deathPanel.SetActive(false);
|
||||||
|
|
||||||
recentDeath = true; //ZUM TESTEN
|
|
||||||
timer = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
recentDeath = true;
|
|
||||||
if (recentDeath)
|
|
||||||
{
|
|
||||||
ShowDeathScreen();
|
|
||||||
CheckDeathTime();
|
CheckDeathTime();
|
||||||
timerOn = true;
|
//if (Time.timeScale == 1)
|
||||||
}
|
//{
|
||||||
|
// Debug.Log("The game is running.");
|
||||||
|
//}
|
||||||
|
//else if(Time.timeScale == 0)
|
||||||
|
//{
|
||||||
|
// Debug.Log("The game should be paused now.");
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ShowDeathScreen()
|
public void ShowDeathScreen()
|
||||||
{
|
{
|
||||||
|
//Time.timeScale = 0;
|
||||||
|
timerOn = true;
|
||||||
|
timer = 10f;
|
||||||
deathPanel.SetActive(true);
|
deathPanel.SetActive(true);
|
||||||
infoText.text = "Try again?";
|
infoText.text = "Try again?";
|
||||||
infoText.text = inventory.Gems.ToString(); //ZUM DEBUGGEN
|
costText.text = cost.ToString(); //ZUM DEBUGGEN
|
||||||
|
CheckDeathTime();
|
||||||
|
|
||||||
//OPTION INS MAINMENUE ZURÜCKZUKEHREN
|
//OPTION INS MAINMENUE ZURÜCKZUKEHREN
|
||||||
}
|
}
|
||||||
|
|
||||||
public void GiveNewChance()
|
public void GiveNewChance()
|
||||||
{
|
{
|
||||||
if (inventory.Gems > 100)
|
if (inventory.Gems >= cost)
|
||||||
{
|
{
|
||||||
NewChance();
|
NewChance();
|
||||||
inventory.Gems -= 100;
|
inventory.Gems -= cost;
|
||||||
|
Debug.Log(inventory.Gems);
|
||||||
|
timerOn = false;
|
||||||
|
timer = 10f;
|
||||||
}
|
}
|
||||||
|
|
||||||
else //EINBAUEN, DASS MAN DORT GEMS KAUFEN KANN
|
else //EINBAUEN, DASS MAN DORT GEMS KAUFEN KANN
|
||||||
@@ -82,7 +92,6 @@ public class GameOver : MonoBehaviour
|
|||||||
|
|
||||||
public void StopBothering()
|
public void StopBothering()
|
||||||
{
|
{
|
||||||
recentDeath = false;
|
|
||||||
Time.timeScale = 1; //UNSICHER OB LADEN VON SCENE DEN WERT AUTO. AUF 1 SETZT
|
Time.timeScale = 1; //UNSICHER OB LADEN VON SCENE DEN WERT AUTO. AUF 1 SETZT
|
||||||
Debug.Log("Jetzt würdest du wieder in die MainMenueScene geschmissen werden");
|
Debug.Log("Jetzt würdest du wieder in die MainMenueScene geschmissen werden");
|
||||||
//SceneManager.LoadSceneAsync(0); //MUSS AM ENDE WIEDER EINGEBAUT WERDEN
|
//SceneManager.LoadSceneAsync(0); //MUSS AM ENDE WIEDER EINGEBAUT WERDEN
|
||||||
@@ -98,6 +107,9 @@ public class GameOver : MonoBehaviour
|
|||||||
inventory.Energy += battery.addEnergyValue;
|
inventory.Energy += battery.addEnergyValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
deathPanel.SetActive(false);
|
||||||
|
//Time.timeScale = 1;
|
||||||
|
|
||||||
//Logik: bei Retry, soll der Player nochmal neue Energie bekommen
|
//Logik: bei Retry, soll der Player nochmal neue Energie bekommen
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -106,20 +118,23 @@ public class GameOver : MonoBehaviour
|
|||||||
{
|
{
|
||||||
if(timerOn == true)
|
if(timerOn == true)
|
||||||
{
|
{
|
||||||
timer = 10;
|
timer += zeit - Time.deltaTime;
|
||||||
zeit -= Time.deltaTime;
|
|
||||||
|
|
||||||
deathTime.text = Convert.ToInt32(zeit + timer).ToString();
|
deathTime.text = Convert.ToInt32(timer).ToString();
|
||||||
|
|
||||||
if (zeit >= timer)
|
if (timer <= 0.0f)
|
||||||
{
|
{
|
||||||
recentDeath = false;
|
|
||||||
StopBothering();
|
StopBothering();
|
||||||
|
|
||||||
timerOn = false;
|
timerOn = false;
|
||||||
|
timer = 10f;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void CalculateCost()
|
||||||
|
{
|
||||||
|
cost = healthScript.deathCounter * 100;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ public class ChangeHealth : MonoBehaviour
|
|||||||
{
|
{
|
||||||
[Header("UI and HUD")]
|
[Header("UI and HUD")]
|
||||||
|
|
||||||
|
|
||||||
|
[SerializeField] public int deathCounter;
|
||||||
[SerializeField] GameObject panel;
|
[SerializeField] GameObject panel;
|
||||||
[SerializeField] TMP_Text healthHUD;
|
[SerializeField] TMP_Text healthHUD;
|
||||||
[SerializeField] public int standardHealth = 3;
|
[SerializeField] public int standardHealth = 3;
|
||||||
@@ -24,6 +26,7 @@ public class ChangeHealth : MonoBehaviour
|
|||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
deathCounter = 0;
|
||||||
inventory.Health = standardHealth;
|
inventory.Health = standardHealth;
|
||||||
Debug.Log(inventory.Health);
|
Debug.Log(inventory.Health);
|
||||||
}
|
}
|
||||||
@@ -32,10 +35,7 @@ public class ChangeHealth : MonoBehaviour
|
|||||||
{
|
{
|
||||||
healthHUD.text = inventory.Health.ToString();
|
healthHUD.text = inventory.Health.ToString();
|
||||||
|
|
||||||
if (inventory.Health <= 0)
|
|
||||||
{
|
|
||||||
Die();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void GetHit() //MUSS NOCH MIT ENEMIES VERKNÜPFT WERDEN
|
public void GetHit() //MUSS NOCH MIT ENEMIES VERKNÜPFT WERDEN
|
||||||
@@ -47,15 +47,23 @@ public class ChangeHealth : MonoBehaviour
|
|||||||
|
|
||||||
Debug.Log("Ouch, you bastard.");
|
Debug.Log("Ouch, you bastard.");
|
||||||
|
|
||||||
|
if (inventory.Health <= 0)
|
||||||
|
{
|
||||||
|
Die();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void Die()
|
public void Die()
|
||||||
{
|
{
|
||||||
|
deathCounter++;
|
||||||
|
Debug.Log(deathCounter);
|
||||||
|
end.CalculateCost();
|
||||||
//Time.timeScale = 0; //Wieder umlegen
|
//Time.timeScale = 0; //Wieder umlegen
|
||||||
end.recentDeath = true;
|
|
||||||
end.ShowDeathScreen();
|
end.ShowDeathScreen();
|
||||||
Debug.Log("rest in pizza");
|
Debug.Log("rest in pizza");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ using UnityEngine;
|
|||||||
|
|
||||||
public class InventoryData
|
public class InventoryData
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//vielleicht standardHealth, standardEnergy einbauen
|
||||||
|
|
||||||
|
|
||||||
// energy
|
// energy
|
||||||
public int energy;
|
public int energy;
|
||||||
|
|
||||||
|
|||||||
8
Assets/_Recovery.meta
Normal file
8
Assets/_Recovery.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0ea4e51a4775dbf408a7a04cb3357e4b
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
2290
Assets/_Recovery/0.unity
Normal file
2290
Assets/_Recovery/0.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/_Recovery/0.unity.meta
Normal file
7
Assets/_Recovery/0.unity.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 4ae503c3d28f7dc449a8f5355fbed8d4
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Reference in New Issue
Block a user