Timer eingebaut, Inventory Script überarbeitet, InventoryScript dank Hr. Neuhaus durch Speicherfunktion erweiter, GameOver und GameOverlay ready and working
This commit is contained in:
PBA3H24ASE committed
1 parent
57f6aa02c8
commit
a7aac28d92
5 files changed
+759
-60
No files matched your search
+601
-20
@@ -153,7 +153,7 @@ RectTransform:
|
||||
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: 323, y: 224}
|
||||
m_AnchoredPosition: {x: 219, y: -177}
|
||||
m_SizeDelta: {x: 268.7455, y: 241.3384}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &121854192
|
||||
@@ -288,6 +288,7 @@ RectTransform:
|
||||
- {fileID: 121854191}
|
||||
- {fileID: 1649312371}
|
||||
- {fileID: 1720859578}
|
||||
- {fileID: 1998796460}
|
||||
m_Father: {fileID: 517957359}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
@@ -308,7 +309,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0, b: 0, a: 0.13725491}
|
||||
m_Color: {r: 1, g: 0, b: 0, a: 0.59607846}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@@ -399,8 +400,8 @@ MonoBehaviour:
|
||||
m_fontMaterials: []
|
||||
m_fontColor32:
|
||||
serializedVersion: 2
|
||||
rgba: 4281479730
|
||||
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
rgba: 4294967295
|
||||
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_enableVertexGradient: 0
|
||||
m_colorMode: 3
|
||||
m_fontColorGradient:
|
||||
@@ -417,8 +418,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 24
|
||||
m_fontSizeBase: 24
|
||||
m_fontSize: 40
|
||||
m_fontSizeBase: 40
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -482,7 +483,7 @@ GameObject:
|
||||
- component: {fileID: 517957357}
|
||||
- component: {fileID: 517957356}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_Name: CanvasDeathScreen
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -571,6 +572,262 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1 &1010133835
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1010133839}
|
||||
- component: {fileID: 1010133838}
|
||||
- component: {fileID: 1010133837}
|
||||
- component: {fileID: 1010133836}
|
||||
m_Layer: 5
|
||||
m_Name: CanvasGameOverlay
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1010133836
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1010133835}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &1010133837
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1010133835}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &1010133838
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1010133835}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &1010133839
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1010133835}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1588632992}
|
||||
- {fileID: 1367110565}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1001 &1367110564
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1010133839}
|
||||
m_Modifications:
|
||||
- target: {fileID: 356179062784817821, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: HUBHealth
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2982112833242550702, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: eefd57e8b57cd814ebc86925f3a4a109, type: 3}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 165.565
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 48.9888
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 308
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 1000
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_ConstrainProportionsScale
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4380711172102757789, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ButtonHealth
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 2006687874}
|
||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
value: GetHit
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||
value: ChangeHealth, Assembly-CSharp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7160822827701049137, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TextHealth
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
--- !u!224 &1367110565 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
m_PrefabInstance: {fileID: 1367110564}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1367110566 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5299365935632096705, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
m_PrefabInstance: {fileID: 1367110564}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
|
||||
--- !u!1 &1471272247
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -698,6 +955,159 @@ MonoBehaviour:
|
||||
m_ShadowLayerMask: 1
|
||||
m_RenderingLayers: 1
|
||||
m_ShadowRenderingLayers: 1
|
||||
--- !u!1001 &1588632991
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1010133839}
|
||||
m_Modifications:
|
||||
- target: {fileID: 356179062784817821, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: HUBEnergy
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2982112833242550702, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: ed8ef41e0593c444f89985400bb18768, type: 3}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 165.565
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 48.9888
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: -296
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 1000
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_ConstrainProportionsScale
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4380711172102757789, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ButtonEnergy
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
|
||||
value:
|
||||
objectReference: {fileID: 2006687873}
|
||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
|
||||
value: LoseEnergy
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5735876779332155667, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
|
||||
value: HandleEnergy, Assembly-CSharp
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7160822827701049137, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: TextEnergy
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
--- !u!224 &1588632992 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
m_PrefabInstance: {fileID: 1588632991}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1588632993 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5299365935632096705, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
|
||||
m_PrefabInstance: {fileID: 1588632991}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI
|
||||
--- !u!1 &1640410202
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -811,7 +1221,7 @@ RectTransform:
|
||||
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: 79}
|
||||
m_AnchoredPosition: {x: 0, y: 210}
|
||||
m_SizeDelta: {x: 773.4789, y: 402.2059}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1649312372
|
||||
@@ -836,8 +1246,8 @@ MonoBehaviour:
|
||||
m_Calls: []
|
||||
m_text: YOU JOINED THEM
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
||||
m_fontAsset: {fileID: 11400000, guid: 0d20768fe751f1147a443fd153425caa, type: 2}
|
||||
m_sharedMaterial: {fileID: -524333686992057447, guid: 0d20768fe751f1147a443fd153425caa, type: 2}
|
||||
m_fontSharedMaterials: []
|
||||
m_fontMaterial: {fileID: 0}
|
||||
m_fontMaterials: []
|
||||
@@ -861,8 +1271,8 @@ MonoBehaviour:
|
||||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 36
|
||||
m_fontSizeBase: 36
|
||||
m_fontSize: 65
|
||||
m_fontSizeBase: 65
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
@@ -975,7 +1385,7 @@ MonoBehaviour:
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_PressedColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
@@ -995,7 +1405,19 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 1720859580}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 2006687876}
|
||||
m_TargetAssemblyTypeName: GameOver, Assembly-CSharp
|
||||
m_MethodName: GiveNewChance
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!114 &1720859580
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1009,7 +1431,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
@@ -1171,6 +1593,143 @@ MonoBehaviour:
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
m_Version: 2
|
||||
--- !u!1 &1998796459
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1998796460}
|
||||
- component: {fileID: 1998796462}
|
||||
- component: {fileID: 1998796461}
|
||||
m_Layer: 5
|
||||
m_Name: TextInfoText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1998796460
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1998796459}
|
||||
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: 180048208}
|
||||
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: -21}
|
||||
m_SizeDelta: {x: 200, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1998796461
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1998796459}
|
||||
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: This is Text This is Text This is Text This is Text This is Text This is
|
||||
Text
|
||||
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: 40
|
||||
m_fontSizeBase: 40
|
||||
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: -150.63669, y: 0, z: -177.04352, w: -20.691895}
|
||||
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 &1998796462
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1998796459}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &2006687871
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1183,6 +1742,7 @@ GameObject:
|
||||
- component: {fileID: 2006687874}
|
||||
- component: {fileID: 2006687873}
|
||||
- component: {fileID: 2006687872}
|
||||
- component: {fileID: 2006687876}
|
||||
m_Layer: 0
|
||||
m_Name: ScriptPile
|
||||
m_TagString: Untagged
|
||||
@@ -1204,7 +1764,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::InventoryScript
|
||||
energy: 0
|
||||
health: 0
|
||||
gems: 0
|
||||
gems: 100
|
||||
--- !u!114 &2006687873
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1219,8 +1779,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::HandleEnergy
|
||||
standardEnergy: 10
|
||||
addEnergyValue: 2
|
||||
energyHUD: {fileID: 0}
|
||||
scriptPile: {fileID: 0}
|
||||
energyHUD: {fileID: 1588632993}
|
||||
scriptPile: {fileID: 2006687871}
|
||||
--- !u!114 &2006687874
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1233,8 +1793,8 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 8336b8f8234487443af56cbe19330e6e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::ChangeHealth
|
||||
panel: {fileID: 0}
|
||||
healthHUD: {fileID: 0}
|
||||
panel: {fileID: 2006687871}
|
||||
healthHUD: {fileID: 1367110566}
|
||||
standardHealth: 3
|
||||
--- !u!4 &2006687875
|
||||
Transform:
|
||||
@@ -1251,6 +1811,26 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2006687876
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2006687871}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1765a05fbe2c3cd408dca42fafe71d5d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::GameOver
|
||||
deathPanel: {fileID: 517957355}
|
||||
timer: 0
|
||||
deathTime: {fileID: 121854192}
|
||||
infoText: {fileID: 1998796461}
|
||||
recentDeath: 0
|
||||
etwas: 0
|
||||
zeit: 0
|
||||
scriptPile: {fileID: 2006687871}
|
||||
--- !u!1660057539 &9223372036854775807
|
||||
SceneRoots:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1260,3 +1840,4 @@ SceneRoots:
|
||||
- {fileID: 1640410205}
|
||||
- {fileID: 517957359}
|
||||
- {fileID: 2006687875}
|
||||
- {fileID: 1010133839}
|
||||
@@ -11,9 +11,15 @@ public class GameOver : MonoBehaviour
|
||||
|
||||
[SerializeField] GameObject deathPanel;
|
||||
private float duration = 4f;
|
||||
[SerializeField] float timer;
|
||||
[SerializeField] public float timer;
|
||||
[SerializeField] TMP_Text deathTime;
|
||||
[SerializeField] bool recentDeath;
|
||||
[SerializeField] TMP_Text infoText;
|
||||
[SerializeField] public bool recentDeath;
|
||||
|
||||
bool timerOn = false;
|
||||
|
||||
public float etwas;
|
||||
public float zeit;
|
||||
|
||||
[Header("ScriptPile")]
|
||||
|
||||
@@ -33,39 +39,53 @@ public class GameOver : MonoBehaviour
|
||||
|
||||
void Start()
|
||||
{
|
||||
recentDeath = false; //Eigentlicher Wert
|
||||
deathPanel.SetActive(false);
|
||||
recentDeath = true;
|
||||
timer = 10;
|
||||
|
||||
recentDeath = true; //ZUM TESTEN
|
||||
timer = 0;
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
recentDeath = true;
|
||||
if (recentDeath)
|
||||
{
|
||||
deathTime.text = Convert.ToInt32(timer -= Time.deltaTime).ToString();
|
||||
|
||||
if(timer >= 0)
|
||||
{
|
||||
StopBothering();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
StopBothering();
|
||||
ShowDeathScreen();
|
||||
CheckDeathTime();
|
||||
timerOn = true;
|
||||
}
|
||||
}
|
||||
|
||||
public void ShowDeathScreen()
|
||||
{
|
||||
deathPanel.SetActive(true);
|
||||
infoText.text = "Try again?";
|
||||
infoText.text = inventory.Gems.ToString(); //ZUM DEBUGGEN
|
||||
|
||||
//OPTION INS MAINMENUE ZURÜCKZUKEHREN
|
||||
}
|
||||
|
||||
public void GiveNewChance()
|
||||
{
|
||||
if (inventory.Gems > 100)
|
||||
{
|
||||
NewChance();
|
||||
inventory.Gems -= 100;
|
||||
}
|
||||
|
||||
else //EINBAUEN, DASS MAN DORT GEMS KAUFEN KANN
|
||||
{
|
||||
infoText.text = "You don´t have enough gems to do that.";
|
||||
}
|
||||
}
|
||||
|
||||
public void StopBothering()
|
||||
{
|
||||
recentDeath = false;
|
||||
Time.timeScale = 1; //UNSICHER OB LAden VON SCENE DEN WERT AUTO. AUF 1 SETZT
|
||||
SceneManager.LoadSceneAsync(0);
|
||||
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");
|
||||
//SceneManager.LoadSceneAsync(0); //MUSS AM ENDE WIEDER EINGEBAUT WERDEN
|
||||
}
|
||||
|
||||
|
||||
@@ -73,10 +93,33 @@ public class GameOver : MonoBehaviour
|
||||
{
|
||||
inventory.Health = healthScript.standardHealth;
|
||||
|
||||
if (battery.standardEnergy <= (inventory.Energy + battery.addEnergyValue))
|
||||
if (battery.standardEnergy >= (inventory.Energy + battery.addEnergyValue))
|
||||
{
|
||||
inventory.Energy += battery.addEnergyValue;
|
||||
}
|
||||
|
||||
//Logik: bei Retry, soll der Player nochmal neue Energie bekommen
|
||||
|
||||
}
|
||||
|
||||
public void CheckDeathTime()
|
||||
{
|
||||
if(timerOn == true)
|
||||
{
|
||||
timer = 10;
|
||||
zeit -= Time.deltaTime;
|
||||
|
||||
deathTime.text = Convert.ToInt32(zeit + timer).ToString();
|
||||
|
||||
if (zeit >= timer)
|
||||
{
|
||||
recentDeath = false;
|
||||
StopBothering();
|
||||
|
||||
timerOn = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
@@ -25,31 +25,38 @@ public class ChangeHealth : MonoBehaviour
|
||||
void Start()
|
||||
{
|
||||
inventory.Health = standardHealth;
|
||||
healthHUD.text = inventory.Health.ToString();
|
||||
|
||||
Debug.Log(inventory.Health);
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
healthHUD.text = inventory.Health.ToString();
|
||||
|
||||
if (inventory.Health <= 0)
|
||||
{
|
||||
Die();
|
||||
}
|
||||
}
|
||||
|
||||
public void GetHit()
|
||||
public void GetHit() //MUSS NOCH MIT ENEMIES VERKNÜPFT WERDEN
|
||||
{
|
||||
inventory.Health -= 1; //MAGIC NUMBER BITTE BEACHTEN
|
||||
if (inventory.Health > 0)
|
||||
{
|
||||
inventory.Health -= 1; //MAGIC NUMBER BITTE BEACHTEN
|
||||
}
|
||||
|
||||
Debug.Log("Ouch, you bastard.");
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void Die()
|
||||
{
|
||||
Time.timeScale = 0;
|
||||
|
||||
//Time.timeScale = 0; //Wieder umlegen
|
||||
end.recentDeath = true;
|
||||
end.ShowDeathScreen();
|
||||
Debug.Log("rest in pizza");
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -30,17 +30,23 @@ public class HandleEnergy : MonoBehaviour
|
||||
void Start()
|
||||
{
|
||||
inventory.Energy = standardEnergy;
|
||||
energyHUD.text = inventory.Energy.ToString();
|
||||
Debug.Log(inventory.Energy);
|
||||
}
|
||||
|
||||
|
||||
void Update()
|
||||
{
|
||||
|
||||
energyHUD.text = inventory.Energy.ToString();
|
||||
}
|
||||
|
||||
public void LoseEnergy()
|
||||
{
|
||||
if (inventory.Energy > 0)
|
||||
inventory.Energy -= 1; //MAGIC NUMBER BEACHTEN ERSTMAL AUSPROBIEREN
|
||||
else
|
||||
{
|
||||
Debug.Log("Alle alle.");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1,9 +1,31 @@
|
||||
using System.IO;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
public class InventoryData
|
||||
{
|
||||
// energy
|
||||
public int energy;
|
||||
|
||||
//Health
|
||||
public int health;
|
||||
|
||||
//Gems
|
||||
public int gems;
|
||||
|
||||
public InventoryData(int energy, int health, int gems)
|
||||
{
|
||||
this.energy = energy;
|
||||
this.health = health;
|
||||
this.gems = gems;
|
||||
}
|
||||
}
|
||||
|
||||
public class InventoryScript : MonoBehaviour
|
||||
{
|
||||
|
||||
string filename = "inventoryData.txt";
|
||||
string path;
|
||||
InventoryData inventoryData;
|
||||
|
||||
[Header("Variables")]
|
||||
//Energy
|
||||
@@ -16,25 +38,65 @@ public class InventoryScript : MonoBehaviour
|
||||
[SerializeField] int gems;
|
||||
|
||||
|
||||
public InventoryScript(int energy, int health, int gems)
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
this.energy = energy;
|
||||
this.health = health;
|
||||
this.gems = gems;
|
||||
path = Path.Combine(Application.persistentDataPath, filename);
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
Debug.Log("erzeuge leeres File");
|
||||
File.WriteAllText(path, "");
|
||||
}
|
||||
}
|
||||
private void Start()
|
||||
{
|
||||
ReadInventoryData();
|
||||
}
|
||||
|
||||
public int Energy { get => energy; set => energy = value; }
|
||||
public int Health { get => health; set => health = value; }
|
||||
public int Gems { get => gems; set => gems = value; }
|
||||
|
||||
|
||||
void Start()
|
||||
public int Energy
|
||||
{
|
||||
|
||||
get { return energy; }
|
||||
set { energy = value; ValChanged(); }
|
||||
}
|
||||
|
||||
void Update()
|
||||
public int Health
|
||||
{
|
||||
|
||||
get { return health; }
|
||||
set { health = value; ValChanged(); }
|
||||
}
|
||||
public int Gems
|
||||
{
|
||||
get { return gems; }
|
||||
set { gems = value; ValChanged(); }
|
||||
}
|
||||
|
||||
// Achtung, ValChanged wird NICHT aufgerufen, wenn man die Werte im Inspector verändert,
|
||||
// weil das nur die Felder, nicht die Properties setzt.
|
||||
// Ändert man aber per Script die Property, wird ValChanged aufgerufen und sofort die Werte ins File gespeichert.
|
||||
// Solche Werte sollte man dann auch nicht in jedem Frame ändern, sondern nur, wenn der Spieler klickt.
|
||||
private void ValChanged()
|
||||
{
|
||||
Debug.Log("ValChanged");
|
||||
SaveInventoryData();
|
||||
}
|
||||
private void ReadInventoryData()
|
||||
{
|
||||
string datastring = File.ReadAllText(path);
|
||||
if (datastring == "")
|
||||
{
|
||||
Debug.Log("File ist noch leer, bitte erst etwas schreiben");
|
||||
return;
|
||||
}
|
||||
inventoryData = JsonUtility.FromJson<InventoryData>(datastring);
|
||||
energy = inventoryData.energy;
|
||||
health = inventoryData.health;
|
||||
gems = inventoryData.gems;
|
||||
}
|
||||
private void SaveInventoryData()
|
||||
{
|
||||
inventoryData = new InventoryData(energy, health, gems); // erstellt ein neues Objekt InventoryData aus den Werten dieses Scripts
|
||||
string datastring = JsonUtility.ToJson(inventoryData); // macht einen JSON String aus diesem Objekt (dafür brauchen wir es auch nur)
|
||||
File.WriteAllText(path, datastring);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user