Commit 147f7e37 authored by mmaluschnig's avatar mmaluschnig
Browse files

differenciated good/bad/perfect explosions in mime mime

parent fbbdef32
<Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/PieScripts/throwManager.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/MimeScripts/TriggerManager.cs">
<Files>
<File FileName="Assets/Scripts/PieScripts/PieTutorial.cs" Line="25" Column="1" />
<File FileName="Assets/Scripts/PieScripts/throwManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/MimeScripts/SpawnKeys.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/MimeScripts/TriggerManager.cs" Line="143" Column="32" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
......
......@@ -43,7 +43,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1783430355985828
GameObject:
m_ObjectHideFlags: 0
......@@ -60,7 +60,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1933345221963994
GameObject:
m_ObjectHideFlags: 0
......@@ -14117,9 +14117,9 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: -1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
......
......@@ -27,7 +27,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!1 &1298412414263232
GameObject:
m_ObjectHideFlags: 0
......@@ -4894,8 +4894,8 @@ ParticleSystem:
startSpeed:
serializedVersion: 2
minMaxState: 3
scalar: 4
minScalar: 1
scalar: 2
minScalar: 0.5
maxCurve:
serializedVersion: 2
m_Curve:
......
......@@ -9600,7 +9600,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 0.3
scalar: 0.6
minScalar: 1
maxCurve:
serializedVersion: 2
......@@ -14003,9 +14003,9 @@ ParticleSystemRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: -1
m_RenderMode: 0
m_SortMode: 0
m_MinParticleSize: 0
......
......@@ -168,8 +168,7 @@ public class TriggerManager : MonoBehaviour
void checkAllColliders(GameObject currentKey)
{
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);
semiBadHit();
} else if (perfectCollider.OverlapPoint(currentKey.transform.position))
{
......@@ -185,8 +184,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);
semiBadHit();
}
}
......@@ -248,6 +246,14 @@ public class TriggerManager : MonoBehaviour
Destroy(currentKey);
AudioSource.PlayClipAtPoint(badNoise, transform.position);
musicSpawner.volume = 0.1f;
musicSpawner.volume = 0.3f;
}
public void semiBadHit(){
print("That was so horrible im just gonna pretend it didnt happen");
Instantiate(badHit, (Vector2)badCollider.transform.position + badCollider.offset, Quaternion.identity);
AudioSource.PlayClipAtPoint(badNoise, transform.position);
musicSpawner.volume = 0.3f;
}
}
\ No newline at end of file
Markdown is supported
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