etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-10 03:35:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #850 from RHeavenStudio/cherry-pick-release_1_patches-800832134d72e72243d4475a4e8ad9226dfec184

Browse source 
Exclude Unpacked Games from Preload
This commit is contained in:
minenice55 2024-04-09 13:27:40 +00:00 committed by GitHub
commit 9f8f5b25a2
2 changed files with 11 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Assets/Scripts/GameManager.cs
View file

@ -1020,7 +1020,7 @@ namespace HeavenStudio
if (canPreload) if (canPreload)
{ {
Minigames.Minigame inf = GetGameInfo(newGame); Minigames.Minigame inf = GetGameInfo(newGame);
if (inf != null) if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded)
{ {
preload.Add(inf); preload.Add(inf);
} }

67
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View file

@ -165,7 +165,6 @@ namespace HeavenStudio.Editor.Track
public TMP_InputField StartingVolumeSpecialVolume; public TMP_InputField StartingVolumeSpecialVolume;
public SpecialTimeline SpecialInfo; public SpecialTimeline SpecialInfo;
private RectTransform TimelineSongPosLine;
[Header("Timeline Playbar")] [Header("Timeline Playbar")]
public Button PlayBTN; public Button PlayBTN;
@ -250,6 +249,7 @@ namespace HeavenStudio.Editor.Track
TimelineSlider.GetChild(2).GetComponent<TMP_Text>().color = EditorTheme.theme.properties.BeatMarkerCol.Hex2RGB(); TimelineSlider.GetChild(2).GetComponent<TMP_Text>().color = EditorTheme.theme.properties.BeatMarkerCol.Hex2RGB();
TimelineSlider.GetChild(3).GetComponent<TMP_Text>().color = EditorTheme.theme.properties.BeatMarkerCol.Hex2RGB(); TimelineSlider.GetChild(3).GetComponent<TMP_Text>().color = EditorTheme.theme.properties.BeatMarkerCol.Hex2RGB();
TimelineSongPosLineRef.GetComponent<Image>().color = EditorTheme.theme.properties.CurrentTimeMarkerCol.Hex2RGB(); TimelineSongPosLineRef.GetComponent<Image>().color = EditorTheme.theme.properties.CurrentTimeMarkerCol.Hex2RGB();
TimelineSongPosLineRef.gameObject.SetActive(false);
PlayBTN.onClick.AddListener(delegate PlayBTN.onClick.AddListener(delegate
{ {
@ -408,55 +408,10 @@ namespace HeavenStudio.Editor.Track
} }
} }
/*
if (MouseInTimeline)
{
var wheel = Input.mouseScrollDelta.y;
if (wheel != 0)
{
var incre = 0.0f;
if (wheel > 0)
{
incre += wheel * (Zoom * 0.25f);
}
else
{
incre += wheel * (Zoom * 0.2f);
}
var v = new Vector3[4];
TimelineScroll.viewport.GetWorldCorners(v);
var viewportPos = Editor.instance.EditorCamera.WorldToScreenPoint(v[0]);
var left = leftSide;
var viewportWidth = TimelineScroll.viewport.rect.width;
var localPointRec = Mathf.Lerp(left, left + (viewportWidth / Zoom),
MathUtils.Normalize(Input.mousePosition.x, viewportPos.x, viewportPos.x + viewportWidth));
var xPixels = (localPointRec * incre);
xPixels *= (Zoom);
TimelineContent.anchoredPosition = new Vector2(
TimelineContent.anchoredPosition.x - xPixels,
TimelineContent.anchoredPosition.y
);
Zoom += incre;
Zoom = Mathf.Clamp(Zoom, 1, 1000);
}
}
*/
MousePos2Beat = relativeMousePos.x / PixelsPerBeat; MousePos2Beat = relativeMousePos.x / PixelsPerBeat;
MousePos2Layer = Mathf.Clamp(Mathf.FloorToInt(-(relativeMousePos.y) / LayerHeight()), 0, LayerCount - 1); MousePos2Layer = Mathf.Clamp(Mathf.FloorToInt(-(relativeMousePos.y) / LayerHeight()), 0, LayerCount - 1);
Conductor cond = Conductor.instance; Conductor cond = Conductor.instance;
// waveform.rectTransform.anchoredPosition = new Vector2(
// -(GameManager.instance.Beatmap.data.offset / (60.0f / GameManager.instance.Beatmap.bpm)),
// waveform.rectTransform.anchoredPosition.y);
// WaveformBTN.transform.GetChild(0).GetComponent<Image>().color = (cond.musicSource.clip != null && waveform.gameObject.activeInHierarchy) ? Color.white : Color.gray;
if (!cond.isPlaying && !cond.isPaused) if (!cond.isPlaying && !cond.isPaused)
{ {
@ -631,9 +586,13 @@ namespace HeavenStudio.Editor.Track
{ {
TimelinePlaybackBeat.text = $"Beat {string.Format("{0:0.000}", PlaybackBeat)}"; TimelinePlaybackBeat.text = $"Beat {string.Format("{0:0.000}", PlaybackBeat)}";
if (TimelineSongPosLine != null && !Conductor.instance.WaitingForDsp) if (TimelineSongPosLineRef != null && !Conductor.instance.WaitingForDsp)
{ {
TimelineSongPosLine.transform.localPosition = new Vector3(Conductor.instance.songPositionInBeats * PixelsPerBeat, TimelineSongPosLine.transform.localPosition.y); if (Conductor.instance.isPlaying && !TimelineSongPosLineRef.gameObject.activeSelf)
{
TimelineSongPosLineRef.gameObject.SetActive(true);
}
TimelineSongPosLineRef.transform.localPosition = new Vector3(Conductor.instance.songPositionInBeats * PixelsPerBeat, TimelineSongPosLineRef.transform.localPosition.y);
} }
} }
@ -677,9 +636,7 @@ namespace HeavenStudio.Editor.Track
GameManager.instance.SafePlay(time, 0, false); GameManager.instance.SafePlay(time, 0, false);
if (!Conductor.instance.isPaused) if (!Conductor.instance.isPaused)
{ {
TimelineSongPosLine = Instantiate(TimelineSongPosLineRef, TimelineSongPosLineRef.parent).GetComponent<RectTransform>(); TimelineSongPosLineRef.transform.localPosition = new Vector3(time * PixelsPerBeat, TimelineSongPosLineRef.transform.localPosition.y);
TimelineSongPosLine.gameObject.SetActive(true);
TimelineSongPosLine.transform.localPosition = new Vector3(time * PixelsPerBeat, TimelineSongPosLine.transform.localPosition.y);
} }
SetTimeButtonColors(false, true, true); SetTimeButtonColors(false, true, true);
@ -687,7 +644,6 @@ namespace HeavenStudio.Editor.Track
public void Pause() public void Pause()
{ {
// isPaused = true;
GameManager.instance.Pause(); GameManager.instance.Pause();
SetTimeButtonColors(true, false, true); SetTimeButtonColors(true, false, true);
@ -695,11 +651,8 @@ namespace HeavenStudio.Editor.Track
public void Stop(float time) public void Stop(float time)
{ {
// isPaused = true; if (TimelineSongPosLineRef != null)
// timelineSlider.value = 0; TimelineSongPosLineRef.gameObject.SetActive(false);
if (TimelineSongPosLine != null)
Destroy(TimelineSongPosLine.gameObject);
GameManager.instance.Stop(time); GameManager.instance.Stop(time);