mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'megaminerjenny:master' into master

Browse source
This commit is contained in:
ev 2023-01-21 21:22:00 -05:00 committed by GitHub
parent 29d4cff7f9 44391050a2
commit 1454520596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Assets/Scenes/Editor.unity
View file

@ -25485,7 +25485,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1589389272} m_TargetGraphic: {fileID: 1589389272}
m_HandleRect: {fileID: 1589389271} m_HandleRect: {fileID: 1589389271}
m_Direction: 2 m_Direction: 2
m_Value: 0 m_Value: 1
m_Size: 1 m_Size: 1
m_NumberOfSteps: 0 m_NumberOfSteps: 0
m_OnValueChanged: m_OnValueChanged:
@ -32510,7 +32510,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 124.46796} m_AnchoredPosition: {x: 0, y: 124.46795}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1} m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1154875944 --- !u!114 &1154875944

10
Assets/Scripts/Games/Tambourine/Tambourine.cs
View file

@ -16,7 +16,7 @@ namespace HeavenStudio.Games.Loaders
new GameAction("beat intervals", "Start Interval") new GameAction("beat intervals", "Start Interval")
{ {
function = delegate {var e = eventCaller.currentEntity; Tambourine.instance.StartInterval(e.beat, e.length); }, function = delegate {var e = eventCaller.currentEntity; Tambourine.instance.StartInterval(e.beat, e.length); },
defaultLength = 4f, defaultLength = 8f,
resizable = true, resizable = true,
priority = 1 priority = 1
}, },
@ -24,13 +24,13 @@ namespace HeavenStudio.Games.Loaders
{ {
function = delegate {var e = eventCaller.currentEntity; Tambourine.instance.MonkeyInput(e.beat, false); }, function = delegate {var e = eventCaller.currentEntity; Tambourine.instance.MonkeyInput(e.beat, false); },
defaultLength = 0.5f, defaultLength = 0.5f,
priority = 2 priority = 1
}, },
new GameAction("hit", "Hit") new GameAction("hit", "Hit")
{ {
function = delegate {var e = eventCaller.currentEntity; Tambourine.instance.MonkeyInput(e.beat, true); }, function = delegate {var e = eventCaller.currentEntity; Tambourine.instance.MonkeyInput(e.beat, true); },
defaultLength = 0.5f, defaultLength = 0.5f,
priority = 2 priority = 1
}, },
new GameAction("pass turn", "Pass Turn") new GameAction("pass turn", "Pass Turn")
{ {
@ -107,7 +107,7 @@ namespace HeavenStudio.Games
[Header("Variables")] [Header("Variables")]
bool intervalStarted; bool intervalStarted;
float intervalStartBeat; float intervalStartBeat;
float beatInterval = 4f; float beatInterval = 8f;
float misses; float misses;
bool frogPresent; bool frogPresent;
@ -181,7 +181,7 @@ namespace HeavenStudio.Games
intervalStarted = true; intervalStarted = true;
BeatAction.New(instance.gameObject, new List<BeatAction.Action>() BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{ {
new BeatAction.Action(beat + beatInterval, delegate { intervalStarted = false; }), new BeatAction.Action(beat + interval, delegate { intervalStarted = false; }),
}); });
} }
} }