Commit 2be3467b authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

gave arrows values and changed some code so that if a player presses a key...

gave arrows values and changed some code so that if a player presses a key with no notes nearby they get the bad animatioon
parent b0efef5d
......@@ -11,6 +11,22 @@ Prefab:
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 1765769401102260}
m_IsPrefabAsset: 1
--- !u!1 &1566792052579516
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4130203676348586}
- component: {fileID: 96584325195385458}
m_Layer: 8
m_Name: Trail
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1765769401102260
GameObject:
m_ObjectHideFlags: 0
......@@ -29,6 +45,19 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4130203676348586
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1566792052579516}
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: 4145066122545122}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4145066122545122
Transform:
m_ObjectHideFlags: 1
......@@ -36,9 +65,10 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1765769401102260}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: -3.994, z: 0}
m_LocalPosition: {x: 5, y: -1.34, z: 0}
m_LocalScale: {x: 3, y: 5, z: 1}
m_Children: []
m_Children:
- {fileID: 4130203676348586}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -65,8 +95,109 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.5, y: 0.02}
m_Size: {x: 0.5, y: 0.001}
m_EdgeRadius: 0
--- !u!96 &96584325195385458
TrailRenderer:
serializedVersion: 2
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1566792052579516}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10301, 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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Time: 0.6
m_Parameters:
serializedVersion: 2
widthMultiplier: 1.2
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0, a: 1}
key1: {r: 1, g: 0.5235849, b: 0.5235849, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 26407
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
generateLightingData: 0
m_MinVertexDistance: 0.1
m_Autodestruct: 0
m_Emitting: 1
--- !u!114 &114693243665785164
MonoBehaviour:
m_ObjectHideFlags: 1
......
......@@ -1293,11 +1293,6 @@ Prefab:
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 61597912326454196, guid: 72656df34da634e679741c24832b3f36,
type: 2}
propertyPath: m_Size.y
value: 0.001
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72656df34da634e679741c24832b3f36, type: 2}
m_IsPrefabAsset: 0
......
......@@ -91,16 +91,21 @@ public class TriggerManager : MonoBehaviour
//first check all keys inside the lowest(largest) collider
//to find the lowest key.
GameObject lowestKey = FindLowestKey(badCollider);
if (lowestKey != null)
{
//check each collider and see if the key is instde it
checkAllColliders(lowestKey);
}
//if (lowestKey != null)
//{
// //check each collider and see if the key is instde it
// checkAllColliders(lowestKey);
//}
checkAllColliders(lowestKey);
}
void checkAllColliders(GameObject currentKey)
{
if (perfectCollider.OverlapPoint(currentKey.transform.position))
if(currentKey == null) {
print("That was so horrible im just gonna pretend it didnt happen");
Instantiate(badHit, (Vector2)badCollider.transform.position + badCollider.offset, Quaternion.identity);
} else if (perfectCollider.OverlapPoint(currentKey.transform.position))
{
print("PERFECT");
perfectRope.GetComponent<SpriteRenderer>().color = Color.green;
......@@ -124,6 +129,7 @@ public class TriggerManager : MonoBehaviour
else
{
print("That was so horrible im just gonna pretend it didnt happen");
Instantiate(badHit, (Vector2)badCollider.transform.position + badCollider.offset, Quaternion.identity);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment