Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
gstuitje
RingMaster
Commits
147f7e37
Commit
147f7e37
authored
Feb 11, 2019
by
mmaluschnig
Browse files
differenciated good/bad/perfect explosions in mime mime
parent
fbbdef32
Changes
5
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
147f7e37
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Pi
eScripts/
throw
Manager.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Mim
eScripts/
Trigger
Manager.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/
Pi
eScripts/
PieTutorial
.cs"
Line=
"
25
"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/
Pi
eScripts/
throw
Manager.cs"
Line=
"1"
Column=
"
1
"
/>
<File
FileName=
"Assets/Scripts/
Mim
eScripts/
SpawnKeys
.cs"
Line=
"
1
"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/
Mim
eScripts/
Trigger
Manager.cs"
Line=
"1
43
"
Column=
"
32
"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/Assets/Prefabs/BadHit.prefab
View file @
147f7e37
...
...
@@ -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
...
...
RingMaster/RingMaster/Assets/Prefabs/GoodHit.prefab
View file @
147f7e37
...
...
@@ -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
:
...
...
RingMaster/RingMaster/Assets/Prefabs/PerfectHit.prefab
View file @
147f7e37
...
...
@@ -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
...
...
RingMaster/RingMaster/Assets/Scripts/MimeScripts/TriggerManager.cs
View file @
147f7e37
...
...
@@ -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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment