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
9f1bc44d
Commit
9f1bc44d
authored
Feb 12, 2019
by
astatham
Browse files
Added splat sound when pie lands, background music for Pie Throwing and Daytime
parent
c835c8f8
Changes
6
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
9f1bc44d
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Mim
eScripts/
SongSelect
.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Pi
eScripts/
Pie
.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/MimeScripts/SpawnKeys.cs"
Line=
"
2
1"
Column=
"3
0
"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SpawnKeys.cs"
Line=
"1
23
"
Column=
"
9
3"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/TriggerManager.cs"
Line=
"143"
Column=
"32"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/MimeMime.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SongSelect.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/MimeMime.cs"
Line=
"63"
Column=
"84"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SongSelect.cs"
Line=
"75"
Column=
"13"
/>
<File
FileName=
"Assets/Scripts/PieScripts/Pie.cs"
Line=
"1"
Column=
"1"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/Assets/Prefabs/PieThrowing Prefabs/PieSplat.prefab
View file @
9f1bc44d
...
...
@@ -20,6 +20,7 @@ GameObject:
m_Component
:
-
component
:
{
fileID
:
4382537808531230
}
-
component
:
{
fileID
:
114065949033577690
}
-
component
:
{
fileID
:
82964150405124478
}
m_Layer
:
0
m_Name
:
PieSplat
m_TagString
:
Untagged
...
...
@@ -71,6 +72,101 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!82
&82964150405124478
AudioSource
:
m_ObjectHideFlags
:
1
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
100100000
}
m_GameObject
:
{
fileID
:
1100451465125852
}
m_Enabled
:
1
serializedVersion
:
4
OutputAudioMixerGroup
:
{
fileID
:
0
}
m_audioClip
:
{
fileID
:
8300000
,
guid
:
96d1777c5f90f450a86d38f5660a03db
,
type
:
3
}
m_PlayOnAwake
:
1
m_Volume
:
1
m_Pitch
:
1
Loop
:
0
Mute
:
0
Spatialize
:
0
SpatializePostEffects
:
0
Priority
:
128
DopplerLevel
:
1
MinDistance
:
1
MaxDistance
:
500
Pan2D
:
0
rolloffMode
:
0
BypassEffects
:
0
BypassListenerEffects
:
0
BypassReverbZones
:
0
rolloffCustomCurve
:
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.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
panLevelCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
spreadCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
reverbZoneMixCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
1
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
---
!u!114
&114065949033577690
MonoBehaviour
:
m_ObjectHideFlags
:
1
...
...
RingMaster/RingMaster/Assets/Scenes/Daytime.unity
View file @
9f1bc44d
...
...
@@ -1431,8 +1431,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
songs:
- {fileID: 8300000, guid: 6492c1c2b65dd475ebbe25ebcae4f780, type: 3}
- {fileID: 8300000, guid: 1e5816223313147d088f56ac191b233a, type: 3}
- {fileID: 8300000, guid: 6887ce842f38d4373b8ba3da6e8ab372, type: 3}
- {fileID: 8300000, guid: 8de4a48d78f24413aac65b705536e8c4, type: 3}
- {fileID: 8300000, guid: 7e8e03d6dcd5044d4a785e8118065729, type: 3}
- {fileID: 8300000, guid: 1633a428e3e91484d9e5eb8f5f74c2d5, type: 3}
- {fileID: 8300000, guid: c23e323e20393461da14a477bbec4416, type: 3}
- {fileID: 8300000, guid: f2c29f0f4250648cfb8287c40b371420, type: 3}
- {fileID: 8300000, guid: 3c6820f98355346d0a98f50c20dc8199, type: 3}
- {fileID: 8300000, guid: 85f547ede6afa4ed0bbeb5c8e10b3145, type: 3}
- {fileID: 8300000, guid: b8ddbf933d41f4d9cbe36f344cebe703, type: 3}
- {fileID: 8300000, guid: c11baa07b486e48558001a41b16f5002, type: 3}
- {fileID: 8300000, guid: c63b74098d5494d048736a099c6b28ab, type: 3}
- {fileID: 8300000, guid: b45e87f3e97ca4d82b2331861ab0ef7f, type: 3}
--- !u!114 &277655077 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 114787342697137634, guid: 2c7917ac87eca42679b31ab33e2eec29,
...
...
RingMaster/RingMaster/Assets/Scenes/MimeMime.unity
View file @
9f1bc44d
...
...
@@ -3592,7 +3592,7 @@ Prefab:
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
1602431506710890
,
guid
:
a6dd0ddad611645efbc5ef92c67041a7
,
type
:
2
}
propertyPath
:
m_IsActive
value
:
0
value
:
1
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
a6dd0ddad611645efbc5ef92c67041a7
,
type
:
2
}
...
...
RingMaster/RingMaster/Assets/Scenes/PieThrowing.unity
View file @
9f1bc44d
...
...
@@ -792,6 +792,7 @@ GameObject:
m_Component
:
-
component
:
{
fileID
:
510235120
}
-
component
:
{
fileID
:
510235119
}
-
component
:
{
fileID
:
510235121
}
m_Layer
:
0
m_Name
:
PieMaster
m_TagString
:
Untagged
...
...
@@ -828,6 +829,101 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
1
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!82
&510235121
AudioSource
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
510235118
}
m_Enabled
:
1
serializedVersion
:
4
OutputAudioMixerGroup
:
{
fileID
:
0
}
m_audioClip
:
{
fileID
:
8300000
,
guid
:
289d382b3061449ed9d1c4925bcd7231
,
type
:
3
}
m_PlayOnAwake
:
1
m_Volume
:
1
m_Pitch
:
1
Loop
:
0
Mute
:
0
Spatialize
:
0
SpatializePostEffects
:
0
Priority
:
128
DopplerLevel
:
1
MinDistance
:
1
MaxDistance
:
500
Pan2D
:
0
rolloffMode
:
0
BypassEffects
:
0
BypassListenerEffects
:
0
BypassReverbZones
:
0
rolloffCustomCurve
:
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.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
panLevelCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
spreadCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
reverbZoneMixCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
1
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
---
!u!1001
&551958898
Prefab
:
m_ObjectHideFlags
:
0
...
...
RingMaster/RingMaster/Assets/Scenes/PieThrowingTutorial.unity
View file @
9f1bc44d
...
...
@@ -927,6 +927,7 @@ GameObject:
-
component
:
{
fileID
:
510235120
}
-
component
:
{
fileID
:
510235119
}
-
component
:
{
fileID
:
510235121
}
-
component
:
{
fileID
:
510235122
}
m_Layer
:
0
m_Name
:
PieMaster
m_TagString
:
Untagged
...
...
@@ -982,6 +983,101 @@ MonoBehaviour:
button
:
{
fileID
:
257364250
}
powerPointer
:
{
fileID
:
1627361073
}
powerBar
:
{
fileID
:
2133793784
}
---
!u!82
&510235122
AudioSource
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
510235118
}
m_Enabled
:
1
serializedVersion
:
4
OutputAudioMixerGroup
:
{
fileID
:
0
}
m_audioClip
:
{
fileID
:
8300000
,
guid
:
289d382b3061449ed9d1c4925bcd7231
,
type
:
3
}
m_PlayOnAwake
:
1
m_Volume
:
1
m_Pitch
:
1
Loop
:
0
Mute
:
0
Spatialize
:
0
SpatializePostEffects
:
0
Priority
:
128
DopplerLevel
:
1
MinDistance
:
1
MaxDistance
:
500
Pan2D
:
0
rolloffMode
:
0
BypassEffects
:
0
BypassListenerEffects
:
0
BypassReverbZones
:
0
rolloffCustomCurve
:
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.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
panLevelCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
spreadCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
0
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
reverbZoneMixCustomCurve
:
serializedVersion
:
2
m_Curve
:
-
serializedVersion
:
3
time
:
0
value
:
1
inSlope
:
0
outSlope
:
0
tangentMode
:
0
weightedMode
:
0
inWeight
:
0.33333334
outWeight
:
0.33333334
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
---
!u!1
&598049472
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -2202,6 +2298,7 @@ MonoBehaviour:
AngleBorder
:
{
fileID
:
53951142
}
piePrefab
:
{
fileID
:
1202179348292156
,
guid
:
39accd453c2c645ab81f09dc448b32c6
,
type
:
2
}
pieSpawn
:
{
fileID
:
1163067307
}
hand
:
{
fileID
:
0
}
---
!u!114
&1407271056
MonoBehaviour
:
m_ObjectHideFlags
:
0
...
...
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