From 489396d468bd03c0c603da5f9e64d76c5a52235a Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 15:26:03 -0500 Subject: [PATCH 1/7] Removed MuseumArt.cs, made disabling art disable colliders --- MuseumGame/Assets/Scenes/Museum/Museum.unity | 72 +++---------------- MuseumGame/Assets/Scripts/Art.cs | 10 ++- MuseumGame/Assets/Scripts/GameManager.cs | 11 +-- MuseumGame/Assets/Scripts/MuseumArt.cs | 20 ------ MuseumGame/Assets/Scripts/MuseumArt.cs.meta | 11 --- .../UserSettings/EditorUserSettings.asset | 8 --- 6 files changed, 19 insertions(+), 113 deletions(-) delete mode 100644 MuseumGame/Assets/Scripts/MuseumArt.cs delete mode 100644 MuseumGame/Assets/Scripts/MuseumArt.cs.meta diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 380f232..78404c6 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -123,52 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &2613657 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2613659} - - component: {fileID: 2613658} - m_Layer: 0 - m_Name: Artwork - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &2613658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2613657} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ca8106578153b4c4cb86229f1b0c975f, type: 3} - m_Name: - m_EditorClassIdentifier: - artId: 0 - artworkToEnable: {fileID: 1783916102} ---- !u!4 &2613659 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2613657} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 83.236404, y: 2.2672524, z: -32.17468} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1783916103} - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &73552633 GameObject: m_ObjectHideFlags: 0 @@ -17813,11 +17767,11 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2613659} + m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_RootOrder - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalScale.x @@ -17829,15 +17783,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalPosition.x - value: -77.486404 + value: 5.75 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalPosition.y - value: -4.0172524 + value: -1.75 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalPosition.z - value: 33.17468 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_LocalRotation.w @@ -17867,26 +17821,20 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7047329146721016595, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_Name value: Blackburn-Abstract#2 Pixelart objectReference: {fileID: 0} - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} ---- !u!1 &1783916102 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - m_PrefabInstance: {fileID: 1783916101} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1783916103 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - m_PrefabInstance: {fileID: 1783916101} - m_PrefabAsset: {fileID: 0} --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/Art.cs b/MuseumGame/Assets/Scripts/Art.cs index 5d3a6d4..fb6c27a 100644 --- a/MuseumGame/Assets/Scripts/Art.cs +++ b/MuseumGame/Assets/Scripts/Art.cs @@ -5,17 +5,21 @@ using UnityEngine; public class Art : MonoBehaviour { public int index; - + public SpriteRenderer spriteRenderer; + public BoxCollider2D collider; // Start is called before the first frame update void Start() { - + spriteRenderer = GetComponent(); + collider = GetComponent(); } // Update is called once per frame void Update() { - GetComponent().enabled = GameManager.Instance.IsArtActivated(index); + var status = GameManager.Instance.IsArtActivated(index); + spriteRenderer.enabled = status; + collider.enabled = status; } private void OnTriggerEnter2D(Collider2D collision) { diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index dd39454..702b013 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -37,7 +37,6 @@ public class GameManager : MonoBehaviour public GameObject scrollSpace; public GameObject hideGalleryButton; private GameObject[] galleryArt; - public bool[] enabledArt; private GameObject[] galleryDialog; public Sprite[] powerupSprites; @@ -67,7 +66,7 @@ public class GameManager : MonoBehaviour private bool paused = false; - private bool[] artActivated; + public bool[] artActivated; void Awake() { @@ -100,15 +99,9 @@ public class GameManager : MonoBehaviour }*/ sound = GetComponent(); - enabledArt = new bool[art.Length]; //GameManager.Instance.enablePowerup(3); //GameManager.Instance.enablePowerup(3); - artActivated = new bool[art.Length]; - - for (int i = 0; i < art.Length; i++) - { - artActivated[i] = false; - } + artActivated = new bool[art.Length]; //new bool[] always starts off as false } // Update is called once per frame diff --git a/MuseumGame/Assets/Scripts/MuseumArt.cs b/MuseumGame/Assets/Scripts/MuseumArt.cs deleted file mode 100644 index 6458c8b..0000000 --- a/MuseumGame/Assets/Scripts/MuseumArt.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class MuseumArt : MonoBehaviour -{ - public int artId = 0; - public GameObject artworkToEnable; - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - artworkToEnable.SetActive(GameManager.Instance.enabledArt[artId]); - } -} diff --git a/MuseumGame/Assets/Scripts/MuseumArt.cs.meta b/MuseumGame/Assets/Scripts/MuseumArt.cs.meta deleted file mode 100644 index 66af555..0000000 --- a/MuseumGame/Assets/Scripts/MuseumArt.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ca8106578153b4c4cb86229f1b0c975f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 967b1c0..8db7e8b 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -6,35 +6,27 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c6f1103041d072926337e38271427fb value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1132eceb7414e7f133e5a92f31352d1b flags: 0 RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-8: From f0671d1693b40b02c69bfcc06a43ec9ea494b0fc Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 15:38:03 -0500 Subject: [PATCH 2/7] Created Scarecrow museum art prefab for glider powerup, placed in museum --- MuseumGame/Assets/Prefabs/Art.meta | 8 ++ .../Blackburn-Abstract#2 Pixelart.prefab | 0 .../Blackburn-Abstract#2 Pixelart.prefab.meta | 0 .../Assets/Prefabs/Art/Scarecrow.prefab | 125 +++++++++++++++++ .../Assets/Prefabs/Art/Scarecrow.prefab.meta | 7 + MuseumGame/Assets/Prefabs/Powerups.meta | 8 ++ .../Glider Powerup placeholder.prefab | 0 .../Glider Powerup placeholder.prefab.meta | 0 MuseumGame/Assets/Scenes/Museum/Museum.unity | 130 ++++++++---------- MuseumGame/Assets/Scripts/Art.cs | 6 +- .../UserSettings/EditorUserSettings.asset | 16 +-- 11 files changed, 217 insertions(+), 83 deletions(-) create mode 100644 MuseumGame/Assets/Prefabs/Art.meta rename MuseumGame/Assets/Prefabs/{ => Art}/Blackburn-Abstract#2 Pixelart.prefab (100%) rename MuseumGame/Assets/Prefabs/{ => Art}/Blackburn-Abstract#2 Pixelart.prefab.meta (100%) create mode 100644 MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab create mode 100644 MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta create mode 100644 MuseumGame/Assets/Prefabs/Powerups.meta rename MuseumGame/Assets/Prefabs/{ => Powerups}/Glider Powerup placeholder.prefab (100%) rename MuseumGame/Assets/Prefabs/{ => Powerups}/Glider Powerup placeholder.prefab.meta (100%) diff --git a/MuseumGame/Assets/Prefabs/Art.meta b/MuseumGame/Assets/Prefabs/Art.meta new file mode 100644 index 0000000..dad3c74 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Art.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7cd50c9d1f5784dd9bc638427331af27 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Blackburn-Abstract#2 Pixelart.prefab b/MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2 Pixelart.prefab similarity index 100% rename from MuseumGame/Assets/Prefabs/Blackburn-Abstract#2 Pixelart.prefab rename to MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2 Pixelart.prefab diff --git a/MuseumGame/Assets/Prefabs/Blackburn-Abstract#2 Pixelart.prefab.meta b/MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2 Pixelart.prefab.meta similarity index 100% rename from MuseumGame/Assets/Prefabs/Blackburn-Abstract#2 Pixelart.prefab.meta rename to MuseumGame/Assets/Prefabs/Art/Blackburn-Abstract#2 Pixelart.prefab.meta diff --git a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab b/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab new file mode 100644 index 0000000..8493ead --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8843438201003174076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8843438201003174072} + - component: {fileID: 8843438201003174073} + - component: {fileID: 8843438201003174078} + - component: {fileID: 8843438201003174079} + m_Layer: 0 + m_Name: Scarecrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8843438201003174072 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8843438201003174076} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 15.08, y: -1.75, z: 1} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8843438201003174073 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8843438201003174076} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 71938390b65010447bd9357a6450359c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.28, y: 1.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &8843438201003174078 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8843438201003174076} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.28, y: 1.28} + newSize: {x: 1.28, y: 1.28} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.28, y: 1.28} + m_EdgeRadius: 0 +--- !u!114 &8843438201003174079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8843438201003174076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd4d5b992474f984fa6c9f579b861848, type: 3} + m_Name: + m_EditorClassIdentifier: + index: 7 diff --git a/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta b/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta new file mode 100644 index 0000000..e7061b3 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Art/Scarecrow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 74bd19f26d283402f9ba1d330e1c1e96 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Powerups.meta b/MuseumGame/Assets/Prefabs/Powerups.meta new file mode 100644 index 0000000..e710601 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/Powerups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0fa95a8a5ac8f4d12ba27e1a6dfe1b3a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/Glider Powerup placeholder.prefab b/MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab similarity index 100% rename from MuseumGame/Assets/Prefabs/Glider Powerup placeholder.prefab rename to MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab diff --git a/MuseumGame/Assets/Prefabs/Glider Powerup placeholder.prefab.meta b/MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab.meta similarity index 100% rename from MuseumGame/Assets/Prefabs/Glider Powerup placeholder.prefab.meta rename to MuseumGame/Assets/Prefabs/Powerups/Glider Powerup placeholder.prefab.meta diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 78404c6..0d3191c 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -17762,79 +17762,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1001 &1783916101 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalScale.x - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalScale.y - value: 1.5 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalPosition.x - value: 5.75 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalPosition.y - value: -1.75 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalPosition.z - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016594, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016595, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_Name - value: Blackburn-Abstract#2 Pixelart - objectReference: {fileID: 0} - - target: {fileID: 7047329146721016598, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3} --- !u!1 &1935037035 GameObject: m_ObjectHideFlags: 0 @@ -87633,3 +87560,60 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &247571770440168743 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalPosition.x + value: 5.6 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalPosition.y + value: -1.75 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8843438201003174076, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} + propertyPath: m_Name + value: Scarecrow + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} diff --git a/MuseumGame/Assets/Scripts/Art.cs b/MuseumGame/Assets/Scripts/Art.cs index fb6c27a..f710883 100644 --- a/MuseumGame/Assets/Scripts/Art.cs +++ b/MuseumGame/Assets/Scripts/Art.cs @@ -5,13 +5,15 @@ using UnityEngine; public class Art : MonoBehaviour { public int index; - public SpriteRenderer spriteRenderer; - public BoxCollider2D collider; + private SpriteRenderer spriteRenderer; + private BoxCollider2D collider; // Start is called before the first frame update void Start() { spriteRenderer = GetComponent(); collider = GetComponent(); + spriteRenderer.enabled = false; + collider.enabled = false; } // Update is called once per frame diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index 8db7e8b..ddcee3f 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -12,28 +12,28 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650 From b293e8a5045e16590c365508c0c3546c99ba5704 Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 15:42:08 -0500 Subject: [PATCH 3/7] Added true pausing/resuming --- MuseumGame/Assets/Scripts/GameManager.cs | 8 ++++---- MuseumGame/UserSettings/EditorUserSettings.asset | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 2932801..65b7501 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -194,7 +194,7 @@ public class GameManager : MonoBehaviour disableAllPowerups(); player.SetActive(true); LoadLevel(sceneToLoad, positionToLoad); - title.GetComponent().text = "Menu"; + title.GetComponent().text = "Paused"; startButton.transform.Find("Text").GetComponent().text = "Restart"; @@ -284,7 +284,8 @@ public class GameManager : MonoBehaviour healthbar.SetActive(true); powerUps.SetActive(true); artImage.SetActive(false); - dialogBox.SetActive(false); + dialogBox.SetActive(false); + Time.timeScale = 1; } } @@ -315,8 +316,7 @@ public class GameManager : MonoBehaviour healthbar.SetActive(false); powerUps.SetActive(false); HideDialog(); - - + Time.timeScale = 0; } diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index ddcee3f..af632a4 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 vcSharedLogLevel: value: 0d5e400f0650 From 2092ba912a8db8734980589d71e518e648807a06 Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 15:42:08 -0500 Subject: [PATCH 4/7] Added true pausing/resuming --- MuseumGame/Assets/Scenes/MainMenu.unity | 3 ++- MuseumGame/Assets/Scripts/GameManager.cs | 8 ++++---- MuseumGame/UserSettings/EditorUserSettings.asset | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index a5b270f..7371e05 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -3326,7 +3326,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Menu + m_text: Pause m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -4000,6 +4000,7 @@ MonoBehaviour: - {fileID: 8300000, guid: 327636dbdcb895b478ac95086f383d8a, type: 3} - {fileID: 8300000, guid: f14b1787c8db6e448ab9eff57b9db745, type: 3} enemyHealthBar: {fileID: 1545666262} + artActivated: --- !u!4 &1874083438 Transform: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 2932801..65b7501 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -194,7 +194,7 @@ public class GameManager : MonoBehaviour disableAllPowerups(); player.SetActive(true); LoadLevel(sceneToLoad, positionToLoad); - title.GetComponent().text = "Menu"; + title.GetComponent().text = "Paused"; startButton.transform.Find("Text").GetComponent().text = "Restart"; @@ -284,7 +284,8 @@ public class GameManager : MonoBehaviour healthbar.SetActive(true); powerUps.SetActive(true); artImage.SetActive(false); - dialogBox.SetActive(false); + dialogBox.SetActive(false); + Time.timeScale = 1; } } @@ -315,8 +316,7 @@ public class GameManager : MonoBehaviour healthbar.SetActive(false); powerUps.SetActive(false); HideDialog(); - - + Time.timeScale = 0; } diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index ddcee3f..af632a4 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 vcSharedLogLevel: value: 0d5e400f0650 From 881e9c468ec32701729ab895be4c859f803ce38a Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 16:14:59 -0500 Subject: [PATCH 5/7] Fixed buggy jump animation --- .../Assets/Animations/Protagonist Jump Land v1.anim | 4 ++-- MuseumGame/Assets/Animations/Protagonist Jump v1.anim | 2 +- .../Assets/Animations/Protagonist Run Cycle.controller | 8 ++++---- MuseumGame/Assets/Scripts/Glider.cs | 10 ++++++++++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim b/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim index 91349cf..978fdc8 100644 --- a/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Jump Land v1.anim @@ -58,12 +58,12 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.4166667 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/MuseumGame/Assets/Animations/Protagonist Jump v1.anim b/MuseumGame/Assets/Animations/Protagonist Jump v1.anim index 62bf66f..dbb6e72 100644 --- a/MuseumGame/Assets/Animations/Protagonist Jump v1.anim +++ b/MuseumGame/Assets/Animations/Protagonist Jump v1.anim @@ -66,7 +66,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller index c210a1f..2468a02 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller @@ -138,17 +138,17 @@ AnimatorStateTransition: m_Conditions: - m_ConditionMode: 4 m_ConditionEvent: velocityY - m_EventTreshold: 0 + m_EventTreshold: -0.75 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 3480931448333261977} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0.33901125 m_TransitionOffset: 0 - m_ExitTime: 0.25 - m_HasExitTime: 0 + m_ExitTime: 0.47147307 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 diff --git a/MuseumGame/Assets/Scripts/Glider.cs b/MuseumGame/Assets/Scripts/Glider.cs index dcc0f39..461af23 100644 --- a/MuseumGame/Assets/Scripts/Glider.cs +++ b/MuseumGame/Assets/Scripts/Glider.cs @@ -8,6 +8,8 @@ public class Glider : MonoBehaviour [SerializeField] private float m_FallSpeed = 0f; + private Animator animator; + /// /// /// @@ -18,13 +20,21 @@ public class Glider : MonoBehaviour void Awake() { m_Rigidbody2D = GetComponent(); + animator = GetComponent(); } // Update is called once per frame void Update() { if (IsGliding && m_Rigidbody2D.velocity.y < 0f && Mathf.Abs(m_Rigidbody2D.velocity.y) > m_FallSpeed) + { m_Rigidbody2D.velocity = new Vector2(m_Rigidbody2D.velocity.x, Mathf.Sign(m_Rigidbody2D.velocity.y) * m_FallSpeed); + animator.SetBool("isGliding", true); + } + else + { + animator.SetBool("isGliding", false); + } } public void StartGliding() From f190d83f6a626c82414f56861615e3594296ba25 Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 16:28:07 -0500 Subject: [PATCH 6/7] Attached glider animation --- MuseumGame/Assets/Scenes/Museum/Museum.unity | 59 +++++++++++++++++++- MuseumGame/Assets/Scripts/Glider.cs | 7 --- MuseumGame/Assets/Scripts/movement.cs | 9 ++- 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index 0d3191c..b821b31 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -13532,7 +13532,7 @@ Transform: - {fileID: 993848333} - {fileID: 1620187171} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &993848332 GameObject: @@ -13842,6 +13842,63 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1001 &1404422570 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalPosition.x + value: 18.722578 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalPosition.y + value: -2.2699764 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3406909610842081614, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} + propertyPath: m_Name + value: Glider Powerup placeholder + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} --- !u!1 &1620187170 GameObject: m_ObjectHideFlags: 0 diff --git a/MuseumGame/Assets/Scripts/Glider.cs b/MuseumGame/Assets/Scripts/Glider.cs index 461af23..4f5655d 100644 --- a/MuseumGame/Assets/Scripts/Glider.cs +++ b/MuseumGame/Assets/Scripts/Glider.cs @@ -8,7 +8,6 @@ public class Glider : MonoBehaviour [SerializeField] private float m_FallSpeed = 0f; - private Animator animator; /// /// @@ -20,7 +19,6 @@ public class Glider : MonoBehaviour void Awake() { m_Rigidbody2D = GetComponent(); - animator = GetComponent(); } // Update is called once per frame @@ -29,11 +27,6 @@ public class Glider : MonoBehaviour if (IsGliding && m_Rigidbody2D.velocity.y < 0f && Mathf.Abs(m_Rigidbody2D.velocity.y) > m_FallSpeed) { m_Rigidbody2D.velocity = new Vector2(m_Rigidbody2D.velocity.x, Mathf.Sign(m_Rigidbody2D.velocity.y) * m_FallSpeed); - animator.SetBool("isGliding", true); - } - else - { - animator.SetBool("isGliding", false); } } diff --git a/MuseumGame/Assets/Scripts/movement.cs b/MuseumGame/Assets/Scripts/movement.cs index 473b3b9..3eaaa53 100644 --- a/MuseumGame/Assets/Scripts/movement.cs +++ b/MuseumGame/Assets/Scripts/movement.cs @@ -21,6 +21,8 @@ public class movement : MonoBehaviour private int numJumps; private bool isGrounded = true; + private Glider glider; + public AudioClip[] clips; private AudioSource a; @@ -31,18 +33,21 @@ public class movement : MonoBehaviour numJumps = maxJumps; animator = GetComponent(); a = GetComponent(); + glider = GetComponent(); } // Update is called once per frame void Update() - { + { + Debug.Log("glider.IsGliding" + glider.IsGliding); + animator.SetBool("isGliding", glider.IsGliding); if (Input.GetKeyDown("space") && numJumps > 0 && !GameManager.Instance.isPaused()) { rb2d.velocity = new Vector2(rb2d.velocity.x, 0); rb2d.AddForce(new Vector2(0, jumpForce)); isGrounded = false; - numJumps -= 1; + numJumps -= 1; } } From 061100187a90efb7793b0750912b1ccaa0ef3468 Mon Sep 17 00:00:00 2001 From: Ivy Date: Sun, 2 May 2021 16:38:26 -0500 Subject: [PATCH 7/7] Removed extra powerup in museum --- .../Protagonist Run Cycle.controller | 29 +++++++++ MuseumGame/Assets/Scenes/Museum/Museum.unity | 59 +------------------ 2 files changed, 30 insertions(+), 58 deletions(-) diff --git a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller index 2468a02..890de42 100644 --- a/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller +++ b/MuseumGame/Assets/Animations/Protagonist Run Cycle.controller @@ -165,6 +165,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: 2841470946671679569} + - {fileID: 8758556773497162937} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -572,3 +573,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &8758556773497162937 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isGrounded + m_EventTreshold: -0.75 + - m_ConditionMode: 1 + m_ConditionEvent: isGliding + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3480931448333261977} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/MuseumGame/Assets/Scenes/Museum/Museum.unity b/MuseumGame/Assets/Scenes/Museum/Museum.unity index b821b31..a93c31d 100644 --- a/MuseumGame/Assets/Scenes/Museum/Museum.unity +++ b/MuseumGame/Assets/Scenes/Museum/Museum.unity @@ -13842,63 +13842,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1001 &1404422570 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalPosition.x - value: 18.722578 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalPosition.y - value: -2.2699764 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081608, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3406909610842081614, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} - propertyPath: m_Name - value: Glider Powerup placeholder - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 017d2509132c9428fbed8092b26dfaba, type: 3} --- !u!1 &1620187170 GameObject: m_ObjectHideFlags: 0 @@ -87626,7 +87569,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8843438201003174072, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} propertyPath: m_LocalPosition.x