Merge remote-tracking branch 'origin/main' into main

main
Matthew Kalahiki 4 years ago
commit 57b90a35b9

@ -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

@ -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

@ -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
@ -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

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

@ -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

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

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

@ -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

@ -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:
@ -17762,75 +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: 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
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3726d77edb33a453384117a0626cf7b9, type: 3}
--- !u!1 &1935037035
GameObject:
m_ObjectHideFlags: 0
@ -87629,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: 1
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}

@ -5,19 +5,23 @@ using UnityEngine;
public class Art : MonoBehaviour
{
public int index;
private SpriteRenderer spriteRenderer;
private BoxCollider2D collider;
// Start is called before the first frame update
void Start()
{
spriteRenderer = GetComponent<SpriteRenderer>();
collider = GetComponent<BoxCollider2D>();
spriteRenderer.enabled = false;
collider.enabled = false;
}
// Update is called once per frame
void Update()
{
GetComponent<SpriteRenderer>().enabled = GameManager.Instance.IsArtActivated(index);
GetComponent<Collider2D>().enabled = GameManager.Instance.IsArtActivated(index);
var status = GameManager.Instance.IsArtActivated(index);
spriteRenderer.enabled = status;
collider.enabled = status;
}
private void OnTriggerEnter2D(Collider2D collision)
{

@ -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<AudioSource>();
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
@ -206,7 +199,7 @@ public class GameManager : MonoBehaviour
player.SetActive(true);
LoadLevel(sceneToLoad, positionToLoad);
title.GetComponent<TextMeshProUGUI>().text = "Menu";
title.GetComponent<TextMeshProUGUI>().text = "Paused";
startButton.transform.Find("Text").GetComponent<TextMeshProUGUI>().text = "Restart";
@ -296,7 +289,8 @@ public class GameManager : MonoBehaviour
healthbar.SetActive(true);
powerUps.SetActive(true);
artImage.SetActive(false);
dialogBox.SetActive(false);
dialogBox.SetActive(false);
Time.timeScale = 1;
}
}
@ -327,8 +321,7 @@ public class GameManager : MonoBehaviour
healthbar.SetActive(false);
powerUps.SetActive(false);
HideDialog();
Time.timeScale = 0;
}

@ -8,6 +8,7 @@ public class Glider : MonoBehaviour
[SerializeField]
private float m_FallSpeed = 0f;
/// <summary>
///
/// </summary>
@ -24,7 +25,9 @@ public class Glider : MonoBehaviour
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);
}
}
public void StartGliding()

@ -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]);
}
}

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: ca8106578153b4c4cb86229f1b0c975f
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

@ -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<Animator>();
a = GetComponent<AudioSource>();
glider = GetComponent<Glider>();
}
// 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;
}
}

@ -6,28 +6,28 @@ 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: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c72110203102f3b1c2323391a1e36ece57a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb

Loading…
Cancel
Save