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
c4ba2ee9
Commit
c4ba2ee9
authored
Feb 13, 2019
by
astatham
Browse files
Added boing to Trapeze and -5 seconds of time when hit trampoline
parent
69382462
Changes
4
Hide whitespace changes
Inline
Side-by-side
RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
View file @
c4ba2ee9
<Properties
StartupConfiguration=
"{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"
>
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp
PreferredExecutionTarget=
"Unity.Editor"
/>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Pi
eScripts/
Pie
.cs"
>
<MonoDevelop.Ide.Workbench
ActiveDocument=
"Assets/Scripts/
Daytim
eScripts/
CharacterSpeech/SimonSpeech
.cs"
>
<Files>
<File
FileName=
"Assets/Scripts/MimeScripts/SpawnKeys.cs"
Line=
"123"
Column=
"93"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/TriggerManager.cs"
Line=
"143"
Column=
"32"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/MimeMime.cs"
Line=
"63"
Column=
"84"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SongSelect.cs"
Line=
"75"
Column=
"1
3
"
/>
<File
FileName=
"Assets/Scripts/MimeScripts/SongSelect.cs"
Line=
"75"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/PieScripts/Pie.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/FollowPlayerx.cs"
Line=
"49"
Column=
"40"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezeController.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/TrapezeScripts/TrapezeTutorial.cs"
Line=
"1"
Column=
"1"
/>
<File
FileName=
"Assets/Scripts/DaytimeScripts/CharacterSpeech/SimonSpeech.cs"
Line=
"1"
Column=
"1"
/>
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace
ActiveConfiguration=
"Debug"
/>
...
...
RingMaster/RingMaster/Assets/Scenes/Trapeze.unity
View file @
c4ba2ee9
...
...
@@ -2068,6 +2068,8 @@ GameObject:
-
component
:
{
fileID
:
2023603711
}
-
component
:
{
fileID
:
2023603710
}
-
component
:
{
fileID
:
2023603709
}
-
component
:
{
fileID
:
2023603712
}
-
component
:
{
fileID
:
2023603713
}
m_Layer
:
0
m_Name
:
Trampoline
m_TagString
:
Untagged
...
...
@@ -2127,6 +2129,126 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
7
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!61
&2023603712
BoxCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2023603708
}
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.6
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
oldSize
:
{
x
:
0
,
y
:
0
}
newSize
:
{
x
:
0
,
y
:
0
}
adaptiveTilingThreshold
:
0
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
3
,
y
:
0.1
}
m_EdgeRadius
:
0
---
!u!82
&2023603713
AudioSource
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2023603708
}
m_Enabled
:
1
serializedVersion
:
4
OutputAudioMixerGroup
:
{
fileID
:
0
}
m_audioClip
:
{
fileID
:
8300000
,
guid
:
3ae896e9e52674372bec157939579d91
,
type
:
3
}
m_PlayOnAwake
:
0
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
&2061639490
GameObject
:
m_ObjectHideFlags
:
0
...
...
RingMaster/RingMaster/Assets/Scenes/TrapezeTutorial.unity
View file @
c4ba2ee9
...
...
@@ -3334,6 +3334,7 @@ GameObject:
-
component
:
{
fileID
:
2023603710
}
-
component
:
{
fileID
:
2023603709
}
-
component
:
{
fileID
:
2023603712
}
-
component
:
{
fileID
:
2023603713
}
m_Layer
:
0
m_Name
:
Trampoline
m_TagString
:
Untagged
...
...
@@ -3488,6 +3489,31 @@ AudioSource:
m_PreInfinity
:
2
m_PostInfinity
:
2
m_RotationOrder
:
4
---
!u!61
&2023603713
BoxCollider2D
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInternal
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
2023603708
}
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.58
}
m_SpriteTilingProperty
:
border
:
{
x
:
0
,
y
:
0
,
z
:
0
,
w
:
0
}
pivot
:
{
x
:
0
,
y
:
0
}
oldSize
:
{
x
:
0
,
y
:
0
}
newSize
:
{
x
:
0
,
y
:
0
}
adaptiveTilingThreshold
:
0
drawMode
:
0
adaptiveTiling
:
0
m_AutoTiling
:
0
serializedVersion
:
2
m_Size
:
{
x
:
3
,
y
:
0.1
}
m_EdgeRadius
:
0
---
!u!1
&2061639490
GameObject
:
m_ObjectHideFlags
:
0
...
...
RingMaster/RingMaster/Assets/Scripts/TrapezeScripts/FollowPlayerx.cs
View file @
c4ba2ee9
...
...
@@ -42,4 +42,13 @@ public class FollowPlayerx : MonoBehaviour {
//player.GetComponent<Rigidbody2D>().angularVelocity = 0;
print
(
"Tramp"
);
}
private
void
OnTriggerEnter2D
(
Collider2D
collision
)
{
gameObject
.
GetComponent
<
AudioSource
>().
Play
();
if
(!
FindObjectOfType
<
TrapezeTutorial
>())
{
TrapezeController
.
AddTime
(-
5f
);
}
}
}
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