From 6737cd17f311e3d6bdd83bab50140e28b27ef2aa Mon Sep 17 00:00:00 2001 From: Ivy Date: Thu, 15 Apr 2021 14:04:29 -0500 Subject: [PATCH] Fixed player health bar crash, disabled compression --- .../Assets/Scenes/DemoLevels/Spawn.unity | 19 ++++++++++++++ MuseumGame/Assets/Scripts/Health.cs | 6 ----- MuseumGame/Packages/manifest.json | 1 + MuseumGame/Packages/packages-lock.json | 26 +++++++++++++++++++ .../ProjectSettings/EditorBuildSettings.asset | 3 +++ .../ProjectSettings/ProjectSettings.asset | 4 +-- .../UserSettings/EditorUserSettings.asset | 6 ++--- 7 files changed, 54 insertions(+), 11 deletions(-) diff --git a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity index 22317f1..0110bfd 100644 --- a/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity +++ b/MuseumGame/Assets/Scenes/DemoLevels/Spawn.unity @@ -1910,6 +1910,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -5793387185563800375, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: healthBar + value: + objectReference: {fileID: 1592270354} + - target: {fileID: -5793387185563800375, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 374150667840124763, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} propertyPath: m_Name value: Player @@ -2948,6 +2956,17 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} m_PrefabInstance: {fileID: 1592270352} m_PrefabAsset: {fileID: 0} +--- !u!114 &1592270354 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3455161703679244629, guid: 9add303577184004ab77878cb3cdcf57, type: 3} + m_PrefabInstance: {fileID: 1592270352} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b9240bd39bca87438df56c58d013245, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1607880943 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/Health.cs b/MuseumGame/Assets/Scripts/Health.cs index 962ca16..8c3b17d 100644 --- a/MuseumGame/Assets/Scripts/Health.cs +++ b/MuseumGame/Assets/Scripts/Health.cs @@ -26,12 +26,6 @@ public class Health : MonoBehaviour // Update is called once per frame void Update() { - if(Input.GetKeyDown(KeyCode.Space)) - { - DamagePlayer(10); - } - - } diff --git a/MuseumGame/Packages/manifest.json b/MuseumGame/Packages/manifest.json index 0bac6f0..6cb3208 100644 --- a/MuseumGame/Packages/manifest.json +++ b/MuseumGame/Packages/manifest.json @@ -13,6 +13,7 @@ "com.unity.test-framework": "1.1.22", "com.unity.textmeshpro": "3.0.1", "com.unity.timeline": "1.4.6", + "com.unity.toolchain.macos-x86_64-linux-x86_64": "0.1.20-preview", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/MuseumGame/Packages/packages-lock.json b/MuseumGame/Packages/packages-lock.json index eb492e2..24b1553 100644 --- a/MuseumGame/Packages/packages-lock.json +++ b/MuseumGame/Packages/packages-lock.json @@ -116,6 +116,22 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.sysroot": { + "version": "0.1.19-preview", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.sysroot.linux-x86_64": { + "version": "0.1.14-preview", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "0.1.18-preview" + }, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.22", "depth": 0, @@ -148,6 +164,16 @@ }, "url": "https://packages.unity.com" }, + "com.unity.toolchain.macos-x86_64-linux-x86_64": { + "version": "0.1.20-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.sysroot": "0.1.19-preview", + "com.unity.sysroot.linux-x86_64": "0.1.14-preview" + }, + "url": "https://packages.unity.com" + }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, diff --git a/MuseumGame/ProjectSettings/EditorBuildSettings.asset b/MuseumGame/ProjectSettings/EditorBuildSettings.asset index 93c6b18..e182267 100644 --- a/MuseumGame/ProjectSettings/EditorBuildSettings.asset +++ b/MuseumGame/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/DemoLevels/Spawn.unity + guid: eaf2cb5b0460c45979b9dbd52915e53e - enabled: 1 path: Assets/Scenes/SampleScene.unity guid: 2cda990e2423bbf4892e6590ba056729 diff --git a/MuseumGame/ProjectSettings/ProjectSettings.asset b/MuseumGame/ProjectSettings/ProjectSettings.asset index a63d338..e5efbf3 100644 --- a/MuseumGame/ProjectSettings/ProjectSettings.asset +++ b/MuseumGame/ProjectSettings/ProjectSettings.asset @@ -534,10 +534,10 @@ PlayerSettings: webGLDebugSymbols: 0 webGLEmscriptenArgs: webGLModulesDirectory: - webGLTemplate: APPLICATION:Default + webGLTemplate: APPLICATION:Minimal webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 - webGLCompressionFormat: 0 + webGLCompressionFormat: 2 webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 152e263..6d6be97 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -27,13 +27,13 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 vcSharedLogLevel: value: 0d5e400f0650