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

Merge pull request #49 from CarsonKompon/mr-upbeat-repositioning

Browse source 
Proper Mr. Upbeat Positioning
This commit is contained in:
Jenny Crowe 2022-03-12 18:32:12 -07:00 committed by GitHub
parent 191ad42328 ad151c3d07
commit 5a9cf5507a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Assets/Resources/Games/mrUpbeat.prefab
View file

@ -506,13 +506,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3862020474253857803} m_GameObject: {fileID: 3862020474253857803}
m_LocalRotation: {x: 0, y: -0, z: 0.9848078, w: -0.17364809} m_LocalRotation: {x: 0, y: -0, z: 0.9659259, w: -0.25881898}
m_LocalPosition: {x: 0, y: -2.5, z: 0} m_LocalPosition: {x: 0, y: -2.623, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.05, y: 1.05, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 7248900333300803150} m_Father: {fileID: 7248900333300803150}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 200} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 210}
--- !u!212 &6546086356517948521 --- !u!212 &6546086356517948521
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -702,6 +702,7 @@ MonoBehaviour:
isEligible: 0 isEligible: 0
triggersAutoplay: 1 triggersAutoplay: 1
startBeat: 0 startBeat: 0
beatOffset: 0
--- !u!1 &6060117916978306099 --- !u!1 &6060117916978306099
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1009,6 +1010,7 @@ MonoBehaviour:
bt: {fileID: 5666021292044047195} bt: {fileID: 5666021292044047195}
canGo: 0 canGo: 0
beatCount: 0 beatCount: 0
beatOffset: 0
--- !u!1 &8412912829583803381 --- !u!1 &8412912829583803381
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1116,7 +1118,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8472146464158439961} m_GameObject: {fileID: 8472146464158439961}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.99, z: 0} m_LocalPosition: {x: 0, y: 0.92, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 7864236320873353852} - {fileID: 7864236320873353852}

2
Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs
View file

@ -67,7 +67,7 @@ namespace RhythmHeavenMania.Games
if (canGo) if (canGo)
{ {
var songPos = Conductor.instance.songPositionInBeats - beatOffset; var songPos = Conductor.instance.songPositionInBeats - beatOffset;
metronome.transform.eulerAngles = new Vector3(0, 0, 270 - Mathf.Cos(Mathf.PI * songPos) * 75); metronome.transform.eulerAngles = new Vector3(0, 0, 270 - Mathf.Cos(Mathf.PI * songPos) * 60);
} }
if (Conductor.instance.ReportBeat(ref beat.lastReportedBeat)) if (Conductor.instance.ReportBeat(ref beat.lastReportedBeat))