mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-09 19:25:10 +00:00
Playback visualization + started on timeline in editor
This commit is contained in:
parent
3bfa6bde07
commit
c838c65494
29 changed files with 6788 additions and 358 deletions
8
Assets/Resources/Fonts/roboto.meta
Normal file
8
Assets/Resources/Fonts/roboto.meta
Normal file
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 03421ee710488f44aa2fac5b81c7ea87
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
2741
Assets/Resources/Fonts/roboto/Roboto-Bold SDF.asset
Normal file
2741
Assets/Resources/Fonts/roboto/Roboto-Bold SDF.asset
Normal file
File diff suppressed because one or more lines are too long
8
Assets/Resources/Fonts/roboto/Roboto-Bold SDF.asset.meta
Normal file
8
Assets/Resources/Fonts/roboto/Roboto-Bold SDF.asset.meta
Normal file
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 35949c950a936b744936efd75ae436ea
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Fonts/roboto/Roboto-Bold.ttf
Normal file
BIN
Assets/Resources/Fonts/roboto/Roboto-Bold.ttf
Normal file
Binary file not shown.
21
Assets/Resources/Fonts/roboto/Roboto-Bold.ttf.meta
Normal file
21
Assets/Resources/Fonts/roboto/Roboto-Bold.ttf.meta
Normal file
|
@ -0,0 +1,21 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b1e70176e5ceaf04fa72047d60d99343
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontNames:
|
||||
- Roboto
|
||||
fallbackFontReferences: []
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Fonts/roboto/Roboto-BoldItalic.ttf
Normal file
BIN
Assets/Resources/Fonts/roboto/Roboto-BoldItalic.ttf
Normal file
Binary file not shown.
24
Assets/Resources/Fonts/roboto/Roboto-BoldItalic.ttf.meta
Normal file
24
Assets/Resources/Fonts/roboto/Roboto-BoldItalic.ttf.meta
Normal file
|
@ -0,0 +1,24 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e570112057c258b45a43ae9c4819697d
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontNames:
|
||||
- Roboto
|
||||
fallbackFontReferences:
|
||||
- {fileID: 12800000, guid: b1e70176e5ceaf04fa72047d60d99343, type: 3}
|
||||
- {fileID: 12800000, guid: e393f5a8081612344a8ae85318b1a8dd, type: 3}
|
||||
- {fileID: 12800000, guid: e4a6da46b2ac2064db1e7a0cd232868a, type: 3}
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Fonts/roboto/Roboto-Italic.ttf
Normal file
BIN
Assets/Resources/Fonts/roboto/Roboto-Italic.ttf
Normal file
Binary file not shown.
23
Assets/Resources/Fonts/roboto/Roboto-Italic.ttf.meta
Normal file
23
Assets/Resources/Fonts/roboto/Roboto-Italic.ttf.meta
Normal file
|
@ -0,0 +1,23 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e4a6da46b2ac2064db1e7a0cd232868a
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontNames:
|
||||
- Roboto
|
||||
fallbackFontReferences:
|
||||
- {fileID: 12800000, guid: b1e70176e5ceaf04fa72047d60d99343, type: 3}
|
||||
- {fileID: 12800000, guid: e393f5a8081612344a8ae85318b1a8dd, type: 3}
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Fonts/roboto/Roboto-Medium.ttf
Normal file
BIN
Assets/Resources/Fonts/roboto/Roboto-Medium.ttf
Normal file
Binary file not shown.
22
Assets/Resources/Fonts/roboto/Roboto-Medium.ttf.meta
Normal file
22
Assets/Resources/Fonts/roboto/Roboto-Medium.ttf.meta
Normal file
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e393f5a8081612344a8ae85318b1a8dd
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontNames:
|
||||
- Roboto
|
||||
fallbackFontReferences:
|
||||
- {fileID: 12800000, guid: b1e70176e5ceaf04fa72047d60d99343, type: 3}
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Fonts/roboto/Roboto-MediumItalic.ttf
Normal file
BIN
Assets/Resources/Fonts/roboto/Roboto-MediumItalic.ttf
Normal file
Binary file not shown.
25
Assets/Resources/Fonts/roboto/Roboto-MediumItalic.ttf.meta
Normal file
25
Assets/Resources/Fonts/roboto/Roboto-MediumItalic.ttf.meta
Normal file
|
@ -0,0 +1,25 @@
|
|||
fileFormatVersion: 2
|
||||
guid: a9c6bdeeda43f3241afd31f1ecb755ec
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontNames:
|
||||
- Roboto
|
||||
fallbackFontReferences:
|
||||
- {fileID: 12800000, guid: b1e70176e5ceaf04fa72047d60d99343, type: 3}
|
||||
- {fileID: 12800000, guid: e393f5a8081612344a8ae85318b1a8dd, type: 3}
|
||||
- {fileID: 12800000, guid: e570112057c258b45a43ae9c4819697d, type: 3}
|
||||
- {fileID: 12800000, guid: e4a6da46b2ac2064db1e7a0cd232868a, type: 3}
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
2737
Assets/Resources/Fonts/roboto/Roboto-Regular.asset
Normal file
2737
Assets/Resources/Fonts/roboto/Roboto-Regular.asset
Normal file
File diff suppressed because one or more lines are too long
8
Assets/Resources/Fonts/roboto/Roboto-Regular.asset.meta
Normal file
8
Assets/Resources/Fonts/roboto/Roboto-Regular.asset.meta
Normal file
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c2df694f599b22b42817910ff570a9df
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 11400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Fonts/roboto/Roboto-Regular.ttf
Normal file
BIN
Assets/Resources/Fonts/roboto/Roboto-Regular.ttf
Normal file
Binary file not shown.
26
Assets/Resources/Fonts/roboto/Roboto-Regular.ttf.meta
Normal file
26
Assets/Resources/Fonts/roboto/Roboto-Regular.ttf.meta
Normal file
|
@ -0,0 +1,26 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ca4c19418a29e874bbc3a87da864316a
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontNames:
|
||||
- Roboto
|
||||
fallbackFontReferences:
|
||||
- {fileID: 12800000, guid: b1e70176e5ceaf04fa72047d60d99343, type: 3}
|
||||
- {fileID: 12800000, guid: e393f5a8081612344a8ae85318b1a8dd, type: 3}
|
||||
- {fileID: 12800000, guid: e570112057c258b45a43ae9c4819697d, type: 3}
|
||||
- {fileID: 12800000, guid: e4a6da46b2ac2064db1e7a0cd232868a, type: 3}
|
||||
- {fileID: 12800000, guid: a9c6bdeeda43f3241afd31f1ecb755ec, type: 3}
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Resources/Sprites/GeneralPurpose/Triangle.png
Normal file
BIN
Assets/Resources/Sprites/GeneralPurpose/Triangle.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.5 KiB |
96
Assets/Resources/Sprites/GeneralPurpose/Triangle.png.meta
Normal file
96
Assets/Resources/Sprites/GeneralPurpose/Triangle.png.meta
Normal file
|
@ -0,0 +1,96 @@
|
|||
fileFormatVersion: 2
|
||||
guid: e3b85a6fda50d2343a8dfb2fc70c2b32
|
||||
TextureImporter:
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
serializedVersion: 11
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
vTOnly: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 1
|
||||
aniso: 1
|
||||
mipBias: 0
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
flipbookRows: 1
|
||||
flipbookColumns: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
ignorePngGamma: 0
|
||||
applyGammaDecoding: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 3
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load diff
|
@ -10,44 +10,40 @@ namespace RhythmHeavenMania
|
|||
// [RequireComponent(typeof(AudioSource))]
|
||||
public class Conductor : MonoBehaviour
|
||||
{
|
||||
//Song beats per minute
|
||||
//This is determined by the song you're trying to sync up to
|
||||
// Song beats per minute
|
||||
// This is determined by the song you're trying to sync up to
|
||||
public float songBpm;
|
||||
|
||||
//The number of seconds for each song beat
|
||||
// The number of seconds for each song beat
|
||||
public float secPerBeat;
|
||||
|
||||
//Current song position, in seconds
|
||||
// Current song position, in seconds
|
||||
public float songPosition;
|
||||
|
||||
//Current song position, in beats
|
||||
// Current song position, in beats
|
||||
public float songPositionInBeats;
|
||||
|
||||
//How many seconds have passed since the song started
|
||||
public float dspSongTime;
|
||||
// How many seconds have passed since the song started
|
||||
public float startTime;
|
||||
|
||||
//an AudioSource attached to this GameObject that will play the music.
|
||||
private float pauseTime;
|
||||
|
||||
// Current time of the song
|
||||
private float time;
|
||||
|
||||
// an AudioSource attached to this GameObject that will play the music.
|
||||
public AudioSource musicSource;
|
||||
|
||||
//The offset to the first beat of the song in seconds
|
||||
// The offset to the first beat of the song in seconds
|
||||
public float firstBeatOffset;
|
||||
|
||||
//the number of beats in each loop
|
||||
public float beatsPerLoop;
|
||||
|
||||
//the total number of loops completed since the looping clip first started
|
||||
public int completedLoops = 0;
|
||||
|
||||
//The current position of the song within the loop in beats.
|
||||
public float loopPositionInBeats;
|
||||
|
||||
//The current relative position of the song within the loop measured between 0 and 1.
|
||||
public float loopPositionInAnalog;
|
||||
|
||||
//Conductor instance
|
||||
// Conductor instance
|
||||
public static Conductor instance;
|
||||
|
||||
private AudioDspTimeKeeper timeKeeper;
|
||||
public bool isPlaying;
|
||||
public bool isPaused;
|
||||
|
||||
// private AudioDspTimeKeeper timeKeeper;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
|
@ -56,25 +52,42 @@ namespace RhythmHeavenMania
|
|||
|
||||
void Start()
|
||||
{
|
||||
//Load the AudioSource attached to the Conductor GameObject
|
||||
musicSource = GetComponent<AudioSource>();
|
||||
|
||||
timeKeeper = GetComponent<AudioDspTimeKeeper>();
|
||||
|
||||
//Calculate the number of seconds in each beat
|
||||
secPerBeat = 60f / songBpm;
|
||||
|
||||
//Record the time when the music starts
|
||||
// dspSongTime = (float)musicSource.time;
|
||||
|
||||
//Start the music
|
||||
// musicSource.Play();
|
||||
}
|
||||
|
||||
public void Play(float startBeat)
|
||||
public void Play()
|
||||
{
|
||||
timeKeeper.Play();
|
||||
SetTime(startBeat);
|
||||
float lastTime = pauseTime - startTime;
|
||||
|
||||
startTime = Time.time;
|
||||
|
||||
time = startTime + lastTime;
|
||||
|
||||
isPlaying = true;
|
||||
isPaused = false;
|
||||
|
||||
musicSource.PlayScheduled(startTime);
|
||||
}
|
||||
|
||||
public void Pause()
|
||||
{
|
||||
pauseTime = time;
|
||||
|
||||
isPlaying = false;
|
||||
isPaused = true;
|
||||
|
||||
musicSource.Pause();
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
{
|
||||
time = 0;
|
||||
isPlaying = false;
|
||||
isPaused = false;
|
||||
|
||||
musicSource.Stop();
|
||||
}
|
||||
|
||||
public void SetTime(float startBeat)
|
||||
|
@ -86,22 +99,14 @@ namespace RhythmHeavenMania
|
|||
|
||||
public void Update()
|
||||
{
|
||||
if (!musicSource.isPlaying) return;
|
||||
if (isPlaying)
|
||||
{
|
||||
time += Time.deltaTime * musicSource.pitch;
|
||||
|
||||
//determine how many seconds since the song started
|
||||
// songPosition = (float)(timeKeeper.dspTime - dspSongTime - firstBeatOffset);
|
||||
songPosition = (float)timeKeeper.GetCurrentTimeInSong();
|
||||
songPosition = time - startTime - firstBeatOffset;
|
||||
|
||||
//determine how many beats since the song started
|
||||
songPositionInBeats = songPosition / secPerBeat;
|
||||
|
||||
|
||||
//calculate the loop position
|
||||
if (songPositionInBeats >= (completedLoops + 1) * beatsPerLoop)
|
||||
completedLoops++;
|
||||
loopPositionInBeats = songPositionInBeats - completedLoops * beatsPerLoop;
|
||||
|
||||
loopPositionInAnalog = loopPositionInBeats / beatsPerLoop;
|
||||
songPositionInBeats = songPosition / secPerBeat;
|
||||
}
|
||||
}
|
||||
|
||||
public float GetLoopPositionFromBeat(float startBeat, float length)
|
||||
|
@ -123,6 +128,7 @@ namespace RhythmHeavenMania
|
|||
|
||||
public float SongLengthInBeats()
|
||||
{
|
||||
if (!musicSource.clip) return 0;
|
||||
return musicSource.clip.length / secPerBeat;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -83,14 +83,14 @@ namespace RhythmHeavenMania
|
|||
private IEnumerator Begin()
|
||||
{
|
||||
yield return new WaitForSeconds(startOffset);
|
||||
Conductor.instance.Play(startBeat);
|
||||
// Conductor.instance.Play(startBeat);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (Beatmap.entities.Count < 1)
|
||||
return;
|
||||
if (!Conductor.instance.musicSource.isPlaying)
|
||||
if (!Conductor.instance.isPlaying)
|
||||
return;
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.A))
|
||||
|
|
|
@ -19,12 +19,12 @@ namespace RhythmHeavenMania.Games.Spaceball
|
|||
|
||||
private void Update()
|
||||
{
|
||||
if (Conductor.instance.musicSource.isPlaying && !isShowing)
|
||||
if (Conductor.instance.isPlaying && !isShowing)
|
||||
{
|
||||
anim.Play("AlienSwing", 0, Conductor.instance.loopPositionInAnalog * 2);
|
||||
// anim.Play("AlienSwing", 0, Conductor.instance.loopPositionInAnalog * 2);
|
||||
anim.speed = 0;
|
||||
}
|
||||
else if (!Conductor.instance.musicSource.isPlaying)
|
||||
else if (!Conductor.instance.isPlaying)
|
||||
{
|
||||
anim.Play("AlienIdle", 0, 0);
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ namespace RhythmHeavenMania
|
|||
Conductor.name = "Conductor";
|
||||
Conductor.AddComponent<AudioSource>().clip = music;
|
||||
Conductor.AddComponent<Conductor>();
|
||||
Conductor.AddComponent<AudioDspTimeKeeper>();
|
||||
// Conductor.AddComponent<AudioDspTimeKeeper>();
|
||||
|
||||
if (editor)
|
||||
{
|
||||
|
|
56
Assets/Scripts/LevelEditor/BeatGrid.cs
Normal file
56
Assets/Scripts/LevelEditor/BeatGrid.cs
Normal file
|
@ -0,0 +1,56 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
using TMPro;
|
||||
|
||||
namespace RhythmHeavenMania.Editor
|
||||
{
|
||||
public class BeatGrid : MonoBehaviour
|
||||
{
|
||||
private RectTransform rectTransform;
|
||||
|
||||
public float snap;
|
||||
public float count;
|
||||
|
||||
private float lastPosX;
|
||||
|
||||
private List<GameObject> Lines = new List<GameObject>();
|
||||
|
||||
private void Start()
|
||||
{
|
||||
rectTransform = GetComponent<RectTransform>();
|
||||
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
GameObject line = Instantiate(transform.GetChild(0).gameObject, transform);
|
||||
line.transform.localPosition = new Vector3(i, line.transform.localPosition.y);
|
||||
line.SetActive(true);
|
||||
|
||||
Lines.Add(line);
|
||||
}
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
var pos = new Vector2(Mathf.RoundToInt(Mathf.Abs(transform.parent.localPosition.x) / 100) - 1, transform.localPosition.y);
|
||||
transform.localPosition = pos;
|
||||
|
||||
if (pos.x != lastPosX)
|
||||
UpdateGridNum();
|
||||
|
||||
lastPosX = transform.localPosition.x;
|
||||
}
|
||||
|
||||
private void UpdateGridNum()
|
||||
{
|
||||
for (int i = 0; i < Lines.Count; i++)
|
||||
{
|
||||
var line = Lines[i];
|
||||
float newNum = transform.localPosition.x + i;
|
||||
line.transform.GetChild(0).GetComponent<TMP_Text>().text = newNum.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
11
Assets/Scripts/LevelEditor/BeatGrid.cs.meta
Normal file
11
Assets/Scripts/LevelEditor/BeatGrid.cs.meta
Normal file
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9c7a9db66b8fb65479a81158697db051
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -18,7 +18,10 @@ namespace RhythmHeavenMania.Editor
|
|||
private float lastBeatPos = 0;
|
||||
|
||||
[Header("Timeline Components")]
|
||||
[SerializeField] private Slider TimelineSlider;
|
||||
[SerializeField] private RectTransform TimelineSlider;
|
||||
[SerializeField] private RectTransform TimelineContent;
|
||||
[SerializeField] private RectTransform TimelineSongPosLineRef;
|
||||
private RectTransform TimelineSongPosLine;
|
||||
|
||||
#region Initializers
|
||||
|
||||
|
@ -33,7 +36,7 @@ namespace RhythmHeavenMania.Editor
|
|||
SongBeat.text = $"Beat {string.Format("{0:0.000}", Conductor.instance.songPositionInBeats)}";
|
||||
SongPos.text = FormatTime(Conductor.instance.songPosition);
|
||||
|
||||
isPlaying = Conductor.instance.musicSource.isPlaying;
|
||||
isPlaying = Conductor.instance.isPlaying;
|
||||
|
||||
if (Input.GetKeyDown(KeyCode.Space))
|
||||
{
|
||||
|
@ -54,11 +57,10 @@ namespace RhythmHeavenMania.Editor
|
|||
|
||||
private void SliderControl()
|
||||
{
|
||||
TimelineSlider.maxValue = Conductor.instance.SongLengthInBeats();
|
||||
|
||||
if (isPlaying)
|
||||
if (TimelineSongPosLine != null)
|
||||
{
|
||||
TimelineSlider.value = Conductor.instance.songPositionInBeats;
|
||||
TimelineSongPosLine.transform.localPosition = new Vector3(Conductor.instance.songPositionInBeats, TimelineSlider.transform.localPosition.y);
|
||||
TimelineSongPosLine.transform.localScale = new Vector3(1f / TimelineContent.transform.localScale.x, TimelineSlider.transform.localScale.y, 1);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -67,14 +69,14 @@ namespace RhythmHeavenMania.Editor
|
|||
{
|
||||
if (fromStart)
|
||||
{
|
||||
if (isPlaying && Conductor.instance.musicSource.clip)
|
||||
if (isPlaying)
|
||||
Play(true);
|
||||
else
|
||||
Stop();
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!isPlaying && Conductor.instance.musicSource.clip)
|
||||
if (!isPlaying)
|
||||
{
|
||||
Play(false);
|
||||
}
|
||||
|
@ -88,22 +90,30 @@ namespace RhythmHeavenMania.Editor
|
|||
public void Play(bool fromStart)
|
||||
{
|
||||
if (fromStart) Stop();
|
||||
// isPaused = false;
|
||||
Conductor.instance.musicSource.Play();
|
||||
|
||||
if (!Conductor.instance.isPaused)
|
||||
{
|
||||
TimelineSongPosLine = Instantiate(TimelineSongPosLineRef, TimelineSongPosLineRef.parent).GetComponent<RectTransform>();
|
||||
TimelineSongPosLine.gameObject.SetActive(true);
|
||||
}
|
||||
|
||||
Conductor.instance.Play();
|
||||
}
|
||||
|
||||
public void Pause()
|
||||
{
|
||||
// isPaused = true;
|
||||
Conductor.instance.musicSource.Pause();
|
||||
Conductor.instance.Pause();
|
||||
}
|
||||
|
||||
public void Stop()
|
||||
{
|
||||
// isPaused = true;
|
||||
// timelineSlider.value = 0;
|
||||
Conductor.instance.musicSource.time = 0;
|
||||
Conductor.instance.musicSource.Stop();
|
||||
|
||||
Destroy(TimelineSongPosLine.gameObject);
|
||||
|
||||
Conductor.instance.Stop();
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
|
@ -8,8 +8,6 @@ namespace RhythmHeavenMania.Tests
|
|||
{
|
||||
private void Update()
|
||||
{
|
||||
this.gameObject.transform.rotation = Quaternion.Euler(0, 0, Mathf.Lerp(0, 360, Conductor.instance.loopPositionInAnalog));
|
||||
print(Conductor.instance.loopPositionInAnalog);
|
||||
}
|
||||
}
|
||||
}
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue