From 65b90c5cd18702d0d6ca167fd264c3b495b2ee33 Mon Sep 17 00:00:00 2001 From: Adrian Ulbrich Date: Sun, 6 Oct 2019 00:49:21 +0200 Subject: Fixed hunger and bladder bars and added starving --- .../Localization/TextMeshPro.unitypackage.meta | 9 - Assets/Scenes/Simulation/SimulationScene.unity | 635 ++++++++++++++++++--- Assets/Scripts/Player/PlayerStats.cs | 5 +- Packages/manifest.json | 2 +- ProjectSettings/ProjectVersion.txt | 4 +- 5 files changed, 566 insertions(+), 89 deletions(-) delete mode 100644 Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta diff --git a/Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta b/Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta deleted file mode 100644 index 1aa50d5..0000000 --- a/Assets/Packages/Lean/Localization/TextMeshPro.unitypackage.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 97adf6fd425a0944ba1d078ec8de247c -timeCreated: 1561020399 -licenseType: Store -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Simulation/SimulationScene.unity b/Assets/Scenes/Simulation/SimulationScene.unity index 34b07d0..c700547 100644 --- a/Assets/Scenes/Simulation/SimulationScene.unity +++ b/Assets/Scenes/Simulation/SimulationScene.unity @@ -213,8 +213,8 @@ RectTransform: m_Children: - {fileID: 617386311} - {fileID: 629937291} - - {fileID: 1187805769} - - {fileID: 1687973897} + - {fileID: 1242797557} + - {fileID: 993553302} - {fileID: 607681916} - {fileID: 1012510673} m_Father: {fileID: 0} @@ -729,6 +729,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 235540187} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &239516825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 950227354} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 239516826} + m_Layer: 0 + m_Name: Build Mode (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &239516826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 950227354} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 239516825} + 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_Children: + - {fileID: 950227355} + m_Father: {fileID: 629937291} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &293571351 GameObject: m_ObjectHideFlags: 0 @@ -890,6 +921,69 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &332380395 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 950227354} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 950227355} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &342636925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 418420990} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 418420991} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &367871519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1687973896} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 367871520} + - component: {fileID: 1687973899} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &367871520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1687973896} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 367871519} + 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_Children: [] + m_Father: {fileID: 993553302} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &418420990 PrefabInstance: m_ObjectHideFlags: 0 @@ -897,6 +991,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 607681916} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: GraphyEnable + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -1017,11 +1116,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1.264822 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: GraphyEnable - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -1084,11 +1178,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &418420991 stripped +--- !u!4 &418420991 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 418420990} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 342636925} + 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_Children: [] + m_Father: {fileID: 2007349019} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &459256038 GameObject: m_ObjectHideFlags: 0 @@ -1391,6 +1494,37 @@ MonoBehaviour: rotateLeftKey: 122 useMouseRotation: 1 mouseRotationKey: 324 +--- !u!1 &592723118 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 806441973} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 592723119} + m_Layer: 0 + m_Name: WatermarkEnable (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &592723119 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 806441973} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 592723118} + 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_Children: + - {fileID: 806441974} + m_Father: {fileID: 607681916} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &607681915 GameObject: m_ObjectHideFlags: 0 @@ -1420,11 +1554,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 806441974} - - {fileID: 2099133824} - - {fileID: 418420991} - - {fileID: 1912335701} - - {fileID: 696920783} + - {fileID: 592723119} + - {fileID: 614249243} + - {fileID: 2007349019} + - {fileID: 1503808085} + - {fileID: 1450628815} m_Father: {fileID: 17926560} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1469,6 +1603,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 607681915} m_CullTransparentMesh: 0 +--- !u!1 &614249242 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 2099133823} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 614249243} + m_Layer: 0 + m_Name: WatermarkDisable (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &614249243 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 2099133823} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614249242} + 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_Children: + - {fileID: 2099133824} + m_Father: {fileID: 607681916} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &617386310 GameObject: m_ObjectHideFlags: 0 @@ -1657,7 +1822,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 950227355} + - {fileID: 239516826} - {fileID: 1571661886} m_Father: {fileID: 17926560} m_RootOrder: 1 @@ -1703,6 +1868,38 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 629937290} m_CullTransparentMesh: 0 +--- !u!1 &646219580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1187805768} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187805769} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &678576856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 696920782} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 696920783} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &696920782 PrefabInstance: m_ObjectHideFlags: 0 @@ -1710,6 +1907,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 607681916} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: CloseSettings + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -1815,11 +2017,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: CloseSettings - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -1877,11 +2074,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &696920783 stripped +--- !u!4 &696920783 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 696920782} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 678576856} + 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_Children: [] + m_Father: {fileID: 1450628815} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &806441973 PrefabInstance: m_ObjectHideFlags: 0 @@ -1889,6 +2095,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 607681916} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: WatermarkEnable + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -1994,11 +2205,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: WatermarkEnable - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -2066,11 +2272,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &806441974 stripped +--- !u!4 &806441974 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 806441973} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1113524052} + 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_Children: [] + m_Father: {fileID: 592723119} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &820064512 GameObject: m_ObjectHideFlags: 0 @@ -2300,6 +2515,22 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 876457154} m_CullTransparentMesh: 0 +--- !u!1 &928845282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 2099133823} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2099133824} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &950227354 PrefabInstance: m_ObjectHideFlags: 0 @@ -2307,6 +2538,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 629937291} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: Build Mode + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -2412,11 +2648,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: Build Mode - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -2461,11 +2692,52 @@ PrefabInstance: type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &950227355 stripped +--- !u!4 &950227355 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 950227354} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 332380395} + 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_Children: [] + m_Father: {fileID: 239516826} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &993553301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1687973896} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 993553302} + m_Layer: 0 + m_Name: Exit (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &993553302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1687973896} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 993553301} + 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_Children: + - {fileID: 1687973897} + - {fileID: 367871520} + m_Father: {fileID: 17926560} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1012510672 GameObject: m_ObjectHideFlags: 0 @@ -2747,6 +3019,22 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0abab5bb77339e4428787a870eb31bd3, type: 3} +--- !u!1 &1113524052 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 806441973} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 806441974} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &1187805768 PrefabInstance: m_ObjectHideFlags: 0 @@ -2754,6 +3042,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 17926560} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: Settings + objectReference: {fileID: 0} + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -2859,16 +3157,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: Settings - objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Icon - value: - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -2958,11 +3246,51 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &1187805769 stripped +--- !u!4 &1187805769 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1187805768} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 646219580} + 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_Children: [] + m_Father: {fileID: 1242797557} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1242797556 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1187805768} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1242797557} + m_Layer: 0 + m_Name: Settings (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1242797557 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 1187805768} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1242797556} + 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_Children: + - {fileID: 1187805769} + m_Father: {fileID: 17926560} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1297664488 GameObject: m_ObjectHideFlags: 0 @@ -3002,6 +3330,53 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4565202065387174607} m_PrefabAsset: {fileID: 0} +--- !u!1 &1426614431 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1912335700} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1912335701} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1450628814 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 696920782} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1450628815} + m_Layer: 0 + m_Name: CloseSettings (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1450628815 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 696920782} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1450628814} + 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_Children: + - {fileID: 696920783} + m_Father: {fileID: 607681916} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1456343330 GameObject: m_ObjectHideFlags: 0 @@ -3161,6 +3536,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1503808084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1912335700} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1503808085} + m_Layer: 0 + m_Name: GraphyDisable (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1503808085 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1912335700} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1503808084} + 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_Children: + - {fileID: 1912335701} + m_Father: {fileID: 607681916} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1541253347 GameObject: m_ObjectHideFlags: 0 @@ -3294,6 +3700,7 @@ MonoBehaviour: Energy: 0 HungerBar: {fileID: 328379222} BladderBar: {fileID: 1867756365} + SimDeadMaterial: {fileID: 0} --- !u!1 &1614087538 GameObject: m_ObjectHideFlags: 0 @@ -3337,6 +3744,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 17926560} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: Exit + objectReference: {fileID: 0} + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Icon + value: + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -3442,16 +3859,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: Exit - objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Icon - value: - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -3513,18 +3920,28 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &1687973897 stripped +--- !u!4 &1687973897 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 1687973896} m_PrefabAsset: {fileID: 0} ---- !u!114 &1687973899 stripped + m_GameObject: {fileID: 2140927135} + 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_Children: [] + m_Father: {fileID: 993553302} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1687973899 MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 2929411588243878699, guid: 83359716712d3c04293cf99088933eb6, type: 3} m_PrefabInstance: {fileID: 1687973896} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 367871519} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: eb5fd4aa07251794aaa5c0194e617eb8, type: 3} @@ -3661,6 +4078,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 607681916} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: GraphyDisable + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -3781,11 +4203,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1.264822 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: GraphyDisable - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -3843,11 +4260,20 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &1912335701 stripped +--- !u!4 &1912335701 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 1912335700} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426614431} + 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_Children: [] + m_Father: {fileID: 1503808085} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1981482350 GameObject: m_ObjectHideFlags: 0 @@ -3921,6 +4347,37 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981482350} m_CullTransparentMesh: 0 +--- !u!1 &2007349018 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 418420990} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2007349019} + m_Layer: 0 + m_Name: GraphyEnable (Missing Prefab) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2007349019 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 418420990} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2007349018} + 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_Children: + - {fileID: 418420991} + m_Father: {fileID: 607681916} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2099133823 PrefabInstance: m_ObjectHideFlags: 0 @@ -3928,6 +4385,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 607681916} m_Modifications: + - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, + type: 3} + propertyPath: m_Name + value: WatermarkDisable + objectReference: {fileID: 0} - target: {fileID: 8754154740269184899, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_LocalPosition.x @@ -4033,11 +4495,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8754154740269184898, guid: 83359716712d3c04293cf99088933eb6, - type: 3} - propertyPath: m_Name - value: WatermarkDisable - objectReference: {fileID: 0} - target: {fileID: 7217120645699259296, guid: 83359716712d3c04293cf99088933eb6, type: 3} propertyPath: m_textInfo.characterCount @@ -4100,11 +4557,36 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 83359716712d3c04293cf99088933eb6, type: 3} ---- !u!4 &2099133824 stripped +--- !u!4 &2099133824 Transform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 2099133823} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 928845282} + 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_Children: [] + m_Father: {fileID: 614249243} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2140927135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 1687973896} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1687973897} + m_Layer: 0 + m_Name: Missing Prefab (Dummy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1001 &4565202065387174607 PrefabInstance: m_ObjectHideFlags: 0 @@ -4192,11 +4674,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: de53ee38202fd514b9db477ea52d36d2, type: 3} m_Name: m_EditorClassIdentifier: - Hunger: 0 - hungerOverTime: 0 - Bladder: 0 - bladderOverTime: 0 - Hygiene: 0 - Energy: 0 - HungerBar: {fileID: 0} - BladderBar: {fileID: 0} + Hunger: 100 + hungerOverTime: 1 + Bladder: 100 + bladderOverTime: 0.5 + Hygiene: 100 + Energy: 100 + HungerBar: {fileID: 328379222} + BladderBar: {fileID: 1867756365} + SimDeadMaterial: {fileID: 2100000, guid: 7b532612d8ed6e31384c4bf5104a84a4, type: 2} diff --git a/Assets/Scripts/Player/PlayerStats.cs b/Assets/Scripts/Player/PlayerStats.cs index ed26d4b..a6020b8 100644 --- a/Assets/Scripts/Player/PlayerStats.cs +++ b/Assets/Scripts/Player/PlayerStats.cs @@ -34,6 +34,8 @@ public class PlayerStats : MonoBehaviour public Slider HungerBar; public Slider BladderBar; + public Material SimDeadMaterial; + private void Start() { HungerBar.maxValue = Hunger; @@ -66,11 +68,12 @@ public class PlayerStats : MonoBehaviour if (Hunger <= 0) { + gameObject.GetComponent().material = SimDeadMaterial; + Debug.Log("You have starved to death!"); Hunger += 100; } - UpdateUI(); } diff --git a/Packages/manifest.json b/Packages/manifest.json index a04d028..f57e01a 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.ext.nunit": "1.0.0", "com.unity.ide.rider": "1.1.1", "com.unity.ide.visualstudio": "1.0.10", - "com.unity.ide.vscode": "1.0.7", + "com.unity.ide.vscode": "1.1.2", "com.unity.multiplayer-hlapi": "1.0.4", "com.unity.purchasing": "2.0.6", "com.unity.test-framework": "1.1.3", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index b7fa3e3..33526af 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.3.0b4 -m_EditorVersionWithRevision: 2019.3.0b4 (3271e9fc5036) +m_EditorVersion: 2019.3.0b6 +m_EditorVersionWithRevision: 2019.3.0b6 (0612c96692fb) -- cgit v1.2.3