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

Merge Issues Part1

Browse Source
This commit is contained in:
Xilver Lavender Steinmeier
2026-02-16 16:07:26 +01:00
parent 1e67520418
commit 0b781ccb0f
12 changed files with 2151 additions and 1800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Prefabs/LevelPrefabs.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2624c74ffa77f2b44a96c4bd8ba87bb1
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

1297
Assets/Prefabs/LevelPrefabs/CanvasDeathScreen.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Prefabs/LevelPrefabs/CanvasDeathScreen.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fa266210e2d474849bdac2e570c33b39
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

389
Assets/Prefabs/LevelPrefabs/CanvasGameOverlay.prefab Normal file
View File

@@ -0,0 +1,389 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3173967211387997328
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7176336808082083352}
- component: {fileID: 6311867306789955568}
- component: {fileID: 7678827467048043617}
- component: {fileID: 4461517032610184240}
m_Layer: 5
m_Name: CanvasGameOverlay
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &7176336808082083352
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3173967211387997328}
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: 552592093626726199}
- {fileID: 4002443576580094796}
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!223 &6311867306789955568
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3173967211387997328}
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!114 &7678827467048043617
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3173967211387997328}
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!114 &4461517032610184240
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3173967211387997328}
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!1001 &2177233651044003278
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7176336808082083352}
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: 5500951168615024559, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- 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 &4002443576580094796 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
m_PrefabInstance: {fileID: 2177233651044003278}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3321313287787241909
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7176336808082083352}
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: 5500951168615024559, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- 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 &552592093626726199 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 3007453758135768706, guid: dbae8ae4777574e49b51c64744daedec, type: 3}
m_PrefabInstance: {fileID: 3321313287787241909}
m_PrefabAsset: {fileID: 0}

7
Assets/Prefabs/LevelPrefabs/CanvasGameOverlay.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0a55df83b81e1f445b03f35e7f95a4b0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

109
Assets/Prefabs/LevelPrefabs/ScriptPile.prefab Normal file
View File

@@ -0,0 +1,109 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1837890152555356944
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8898687434007421952}
- component: {fileID: 9067827542775402770}
- component: {fileID: 6575220929813238106}
- component: {fileID: 504996739262194472}
- component: {fileID: 9001336211658314961}
m_Layer: 0
m_Name: ScriptPile
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8898687434007421952
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837890152555356944}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 415.4325, y: 987.0378, z: -21.01996}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &9067827542775402770
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837890152555356944}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8336b8f8234487443af56cbe19330e6e, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ChangeHealth
deathCounter: 0
panel: {fileID: 1837890152555356944}
healthHUD: {fileID: 0}
standardHealth: 3
--- !u!114 &6575220929813238106
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837890152555356944}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a55b227e958a84b4fa0f0b375b48aa87, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::HandleEnergy
standardEnergy: 10
addEnergyValue: 2
energyHUD: {fileID: 0}
scriptPile: {fileID: 1837890152555356944}
--- !u!114 &504996739262194472
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837890152555356944}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5973ed7f2e7a3374d97418dafd88e753, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::InventoryScript
energy: 0
health: 0
gems: 0
--- !u!114 &9001336211658314961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1837890152555356944}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1765a05fbe2c3cd408dca42fafe71d5d, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::GameOver
deathPanel: {fileID: 0}
timer: 0
deathTime: {fileID: 0}
infoText: {fileID: 0}
costText: {fileID: 0}
cost: 0
timerOn: 0
etwas: 0
zeit: 0
scriptPile: {fileID: 1837890152555356944}
fieKill: 0
silvKill: 0
haiKill: 0

7
Assets/Prefabs/LevelPrefabs/ScriptPile.prefab.meta Normal file
View File

@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 43e751c24b5e5df4e8e3e26875b1b165
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
Assets/Scenes/Lilia.unity
View File

@@ -621,10 +621,10 @@ GameObject:
- component: {fileID: 1174591347}
- component: {fileID: 1174591346}
- component: {fileID: 1174591345}
<<<<<<< HEAD
=======
- component: {fileID: 1174591349}
>>>>>>> 05d0638ebe41a5b1fc8b29e6c4cc410bb0d97892
- component: {fileID: 1174591348}
m_Layer: 0
m_Name: Main Camera
@@ -716,8 +716,8 @@ MonoBehaviour:
m_GameObject: {fileID: 1174591344}
m_Enabled: 1
m_EditorHideFlags: 0
<<<<<<< HEAD
=======
m_Script: {fileID: 11500000, guid: 49abaa4b8268a754399fa82119a91c67, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::CameraLook
@@ -733,7 +733,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1174591344}
m_Enabled: 1
m_EditorHideFlags: 0
>>>>>>> 05d0638ebe41a5b1fc8b29e6c4cc410bb0d97892
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
@@ -769,8 +769,7 @@ MonoBehaviour:
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
m_Version: 2
<<<<<<< HEAD
=======
--- !u!1 &1639874320
GameObject:
m_ObjectHideFlags: 0
@@ -2445,7 +2444,7 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
>>>>>>> 05d0638ebe41a5b1fc8b29e6c4cc410bb0d97892
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0

2074
Assets/Scenes/Xilver.unity
View File

File diff suppressed because it is too large Load Diff

33
Assets/Scripts/Life/ChangeHealth.cs
View File

@@ -1,33 +0,0 @@
using UnityEngine;
public class ChangeHealth : MonoBehaviour
{
public int maxHealth;
public int health;
void Start() {
health = maxHealth;
}
public void Hit(int amount) {
health -= amount;
if (health < 0) {
health = 0; // no negatives
Debug.Log("Death");
Die();
}
}
public void Die() {
// Saves current day
Debug.Log("Save the current day");
// Jumpscare
Debug.Log("Jumpscare! Boo!");
// After Jumpscare Delay Overlay appears
// Decline Overlay
Debug.Log("Return to Main Menue");
// Accept
Debug.Log("Get 1 heart back and get 25+ energy back");
}
}

2
Assets/Scripts/Life/ChangeHealth.cs.meta
View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: d2c342d03f196db429843b7001a79f7d

1
Assets/Scripts/Player/ChangeHealth.cs
View File

@@ -51,7 +51,6 @@ public class ChangeHealth : MonoBehaviour
{
Die();
}
}