Title Screen (#454)

* Barebones title screen prefab added

* logo and stuff

* cool

* Added sfx to title screen

* The logo now bops to the beat

* epic reveal

* Fixed something

* put some of the stuff into the main menu

* other logo bop

* Implemented logobop2 and starbop

* added scrolling bg, tweaked positioning and wip splash text for play button

* more menu

* ooops

* Expand implemented

* cool

* Made stars spawn in in the opening

* make UI elements look nicer on different aspect ratios

* add sound while hovering over logo

* add settings menu to title screen

make the title screen properly play after the opening

* swap out title screen hover sound

remove the old config path warning

* every button works, some play mode fixes

* fix issues with beataction/multisound and pausing

* fix dropdown menus not working in certain screens

* fix particles rotating when camera controls are used

* touch style pause menu items only trigger if cursor is over an item

* various changes

make playback (unpausing) more reliable
only apply changes to advanced audio settings on launch
fix title screen visuals
add opening music
continue past opening by pressing a key
update credits

* almost forgot this

* lol

* initial flow mems

* user-taggable fonts in textboxes

* alt materials for kurokane

* assets prep

* plan out judgement screen layout

change sound encodings

* start sequencing judgement

* judgement screen sequence

* full game loop

* fix major issue with pooled sound objects

rebalance ranking audio
fix issues with some effects in play mode

* new graphics

* particles

* make certain uses of the beat never go below 0

fix loop of superb music

* make markers non clamped

lockstep frees rendertextures when unloading

* lockstep creates its own rendertextures

swapped button order on title screen
added null checks to animation helpers
disabled controller auto-search for now

* enable particles on OK rank

* play mode info panel

* let play mode handle its own fade out

* fix that alignment bug in controller settings

* more safety here

* Update PauseMenu.cs

* settable (one-liner) rating screen text

* address minigame loading crashes

* don't do this twice

* wav converter for mp3

* Update Minigames.cs

* don't double-embed the converted audio

* studio dance bugfixing spree

* import redone sprites for studio dance

* update jukebox

prep epilogue screen

* epilogue screen

* studio dance inkling shuffle test

* new studio dance choreo system

* markers upgrade

* fix deleting volume changes and markers

prep category markers

* Update Editor.unity

* new rating / epilogue settings look

* update to use new tooltip system

mark certain editor components as blocking

* finish category system

* dedicated tempo / volume marker dialogs

* swing prep

* open properties dialog if mapper hasn't opened it prior for this chart

fix memory copy bug when making new chart

* fix ctrl + s

* return to title screen button

* make graphy work everywhere

studio dance selector
membillion mems

* make sure riq cache is clear when loading chart

* lol

* fix the stupid

* bring back tempo and volume change scrolling

* new look for panels

* adjust alignment

* round tooltip

* alignment of chart property prefab

* change scale factor of mem

* adjust open captions material

no dotted BG in results commentary (only epilogue)
bugfix for tempo / volume scroll

* format line 2 of judgement a bit better

update font

* oops

* adjust look of judgement score bar

* new rating bar

* judgement size adjustment

* fix timing window scaling with song pitch

* proper clamping in dialogs

better sync conductor to dsptime (experiment)

* disable timeline pitch change when song is paused

enable perfect challenge if no marker is set to do so

* new app icon

* timing window values are actually double now

* improve deferred timekeep even more

* re-generate font atlases

new app icon in credits

* default epilogue images

* more timing window adjustment

* fix timing display when pitched

* use proper terminology here

* new logo on titlescreen

* remove wip from play

update credits

* adjust spacing of play mode panel

* redo button spacing

* can pass title screen with any controller

fix issues with controller auto-search

* button scale fixes

* controller title screen nav

* remove song genre from properties editor

* disable circle cursor when not using touch style

* proper selection graphic

remove refs
re-add heart to the opening

* controller support in opening

---------

Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
Co-authored-by: minenice55 <star.elementa@gmail.com>
Co-authored-by: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
This commit is contained in:
Rapandrasmus
2023-12-26 06:22:51 +01:00
committed by GitHub
parent 8d8c275e66
commit 98835c3936
1314 changed files with 194146 additions and 11622 deletions

View File

@ -125,10 +125,10 @@ namespace HeavenStudio.Editor.Commands
}
if (deletedEntity != null)
{
var marker = SpecialTimeline.instance.specialTimelineObjs[deletedEntity.guid];
SpecialTimelineObj marker = SpecialTimeline.instance.specialTimelineObjs[deletedEventID];
deletedEntityData = deletedEntity.DeepCopy();
deletedEntityData.guid = deletedEntity.guid;
deletedEntityData.guid = deletedEventID;
switch (type)
{
@ -143,7 +143,7 @@ namespace HeavenStudio.Editor.Commands
break;
}
SpecialTimeline.instance.specialTimelineObjs.Remove(deletedEntity.guid);
SpecialTimeline.instance.specialTimelineObjs.Remove(deletedEventID);
GameObject.Destroy(marker.gameObject);
GameManager.instance.SortEventsList();
@ -171,6 +171,8 @@ namespace HeavenStudio.Editor.Commands
break;
}
deletedEntityData = null;
GameManager.instance.SortEventsList();
}
}
}

View File

@ -5,7 +5,7 @@ using HeavenStudio.Editor.Track;
using TMPro;
namespace HeavenStudio.Editor
namespace HeavenStudio.Editor
{
public class Dialog : MonoBehaviour
{
@ -21,7 +21,7 @@ namespace HeavenStudio.Editor
public static void ResetAllDialogs()
{
foreach(var dialog in FindObjectsOfType<Dialog>())
foreach (var dialog in FindObjectsOfType<Dialog>())
{
dialog.ForceState(false);
}

View File

@ -11,6 +11,7 @@ namespace HeavenStudio.Editor
private void LateUpdate()
{
if (Editor.instance == null) return;
for (int i = 0; i < transform.childCount; i++)
{
if (Editor.MouseInRectTransform(transform.GetChild(i).GetComponent<RectTransform>()))

View File

@ -63,8 +63,6 @@ namespace HeavenStudio.Editor
[SerializeField] private Button EditorThemeBTN;
[SerializeField] private Button EditorSettingsBTN;
[SerializeField] private GameObject DebugHolder;
[Header("Dialogs")]
[SerializeField] private Dialog[] Dialogs;
@ -134,6 +132,7 @@ namespace HeavenStudio.Editor
public void ShowQuitPopUp(bool show)
{
_confirmQuitMain.SetActive(show);
SetAuthoritiveMenu(show);
}
public bool ShouldQuit = false;
@ -226,11 +225,6 @@ namespace HeavenStudio.Editor
SaveRemix(false);
}
}
if (Input.GetKeyDown(KeyCode.F12))
{
DebugHolder.gameObject.SetActive(!DebugHolder.activeInHierarchy);
}
}
#endregion
@ -359,19 +353,36 @@ namespace HeavenStudio.Editor
public void SaveRemix(bool saveAs = true)
{
if (saveAs == true)
Debug.Log(GameManager.instance.Beatmap["propertiesmodified"]);
if (!(bool)GameManager.instance.Beatmap["propertiesmodified"])
{
SaveRemixFilePanel();
foreach (var dialog in Dialogs)
{
if (dialog.GetType() == typeof(RemixPropertiesDialog))
{
GlobalGameManager.ShowErrorMessage("Set Remix Properties", "Set remix properties before saving.");
(dialog as RemixPropertiesDialog).SwitchPropertiesDialog();
(dialog as RemixPropertiesDialog).SetSaveOnClose(true, saveAs);
return;
}
}
}
else
{
if (currentRemixPath == string.Empty || currentRemixPath == null)
if (saveAs)
{
SaveRemixFilePanel();
}
else
{
SaveRemixFile(currentRemixPath);
if (currentRemixPath is "" or null)
{
SaveRemixFilePanel();
}
else
{
SaveRemixFile(currentRemixPath);
}
}
}
}
@ -388,6 +399,7 @@ namespace HeavenStudio.Editor
if (path != String.Empty)
{
SaveRemixFile(path);
currentRemixPath = path;
}
});
}
@ -396,7 +408,6 @@ namespace HeavenStudio.Editor
{
try
{
RiqFileHandler.UnlockCache();
RiqFileHandler.WriteRiq(GameManager.instance.Beatmap);
RiqFileHandler.PackRiq(path, true);
Debug.Log("Packed RIQ successfully!");
@ -447,7 +458,6 @@ namespace HeavenStudio.Editor
try
{
RiqFileHandler.UnlockCache();
string tmpDir = RiqFileHandler.ExtractRiq(path);
Debug.Log("Imported RIQ successfully!");
LoadRemix();
@ -519,6 +529,16 @@ namespace HeavenStudio.Editor
return (rectTransform.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Editor.instance.EditorCamera));
}
public void ReturnToTitle()
{
GlobalGameManager.LoadScene("Title");
}
public void SetAuthoritiveMenu(bool state)
{
inAuthorativeMenu = state;
}
public void ToggleDebugCam()
{
var game = GameManager.instance.currentGameO;

View File

@ -0,0 +1,125 @@
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Networking;
using System.Linq;
using System.IO;
using SFB;
using Jukebox;
using TMPro;
using System.Collections;
namespace HeavenStudio.Editor
{
public class ImageChartResourcePrefab : RemixPropertyPrefab
{
[Header("Image Resource")]
[Space(10)]
[SerializeField] Button uploadButton;
[SerializeField] Image imagePreview;
string resourcePath;
string resourceName;
new public void SetProperties(RemixPropertiesDialog diag, string propertyName, object type, string caption)
{
InitProperties(diag, propertyName, caption);
EntityTypes.Resource resource = (EntityTypes.Resource) parameterManager.chart[propertyName];
resourcePath = resource.path;
resourceName = resource.name;
if (resourcePath != null)
{
try
{
string fsPath = RiqFileHandler.GetResourcePath(resourceName, resourcePath);
// fetch the image using UnityWebRequest
parameterManager.StartCoroutine(LoadImage(fsPath));
}
catch (System.IO.DirectoryNotFoundException)
{
Debug.Log("image resource doesn't exist, using blank placeholder");
imagePreview.sprite = null;
}
}
uploadButton.onClick.AddListener(
() =>
{
UploadImage();
}
);
}
private void UploadImage()
{
var extensions = new[]
{
new ExtensionFilter("Image Files", "png", "jpg", "jpeg" ),
};
StandaloneFileBrowser.OpenFilePanelAsync("Open Image", "", extensions, false, (string[] paths) =>
{
var path = Path.Combine(paths);
if (path == string.Empty)
{
return;
}
try
{
// fetch the image using UnityWebRequest
StartCoroutine(UploadImage(path));
}
catch (System.Exception e)
{
Debug.LogError($"Error uploading image: {e.Message}");
GlobalGameManager.ShowErrorMessage("Error Uploading Image", e.Message + "\n\n" + e.StackTrace);
return;
}
});
}
IEnumerator LoadImage(string path)
{
UnityWebRequest www = UnityWebRequestTexture.GetTexture("file://" + path);
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError)
{
Debug.Log(www.error);
imagePreview.sprite = null;
}
else
{
Texture2D texture = DownloadHandlerTexture.GetContent(www);
imagePreview.sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
imagePreview.preserveAspect = true;
}
}
IEnumerator UploadImage(string path)
{
UnityWebRequest www = UnityWebRequestTexture.GetTexture("file://" + path);
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError)
{
Debug.Log(www.error);
imagePreview.sprite = null;
}
else
{
Texture2D texture = DownloadHandlerTexture.GetContent(www);
imagePreview.sprite = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
imagePreview.preserveAspect = true;
RiqFileHandler.AddResource(path, resourceName, resourcePath);
Debug.Log("Uploaded image successfully!");
}
}
private void Update()
{
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1543b6414667350478cffeb9243f308c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -41,17 +41,11 @@ namespace HeavenStudio.Editor
}
);
inputField.onSelect.AddListener(
_ =>
Editor.instance.editingInputField = true
);
inputField.onEndEdit.AddListener(
_ =>
{
slider.value = Convert.ToSingle(inputField.text);
parameterManager.chart[propertyName] = (int) slider.value;
Editor.instance.editingInputField = false;
}
);
break;
@ -72,17 +66,11 @@ namespace HeavenStudio.Editor
}
);
inputField.onSelect.AddListener(
_ =>
Editor.instance.editingInputField = true
);
inputField.onEndEdit.AddListener(
_ =>
{
slider.value = (float) Math.Round(Convert.ToSingle(inputField.text), 4);
parameterManager.chart[propertyName] = slider.value;
Editor.instance.editingInputField = false;
}
);
break;

View File

@ -0,0 +1,341 @@
using System.IO;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.Networking;
using Jukebox;
using TMPro;
using SFB;
namespace HeavenStudio.Editor
{
public class RatingScreenPropertyDialog : RemixPropertyPrefab
{
enum Ranks
{
Ng,
Ok,
Hi
}
[SerializeField] TMP_InputField headerInput;
[SerializeField] TMP_InputField messageInput;
[SerializeField] TMP_InputField epilogueInput;
[SerializeField] Image imagePreview;
[SerializeField] Image rankPreview;
[SerializeField] Sprite catOff;
[SerializeField] Button[] catButtons;
[SerializeField] Sprite[] catSprites;
[SerializeField] Sprite[] rankSprites;
[SerializeField] Sprite epilogueNg, epilogueOk, epilogueHi;
Sprite[] rankImages;
bool initHooks;
int currentEditingCat = -1;
List<int> usedCategories;
RemixPropertiesDialog diag;
Ranks currentEditingRank;
new public void InitProperties(RemixPropertiesDialog diag, string propertyName, string caption)
{
this.diag = diag;
currentEditingRank = Ranks.Ok;
rankImages = new Sprite[3];
diag.StartCoroutine(LoadRankImages());
GetUsedCategories();
if (!initHooks)
{
initHooks = true;
for (int i = 0; i < catButtons.Length; i++)
{
int cat = i;
catButtons[i].onClick.AddListener(() =>
{
SetCatEditing(cat);
});
}
headerInput.onValueChanged.AddListener(
_ =>
{
diag.chart["resultcaption"] = headerInput.text;
}
);
epilogueInput.onValueChanged.AddListener(
_ =>
{
string propSuffix = currentEditingRank switch
{
Ranks.Ng => "ng",
Ranks.Hi => "hi",
_ => "ok",
};
diag.chart["epilogue_" + propSuffix] = epilogueInput.text;
}
);
messageInput.onValueChanged.AddListener(DoMessageInput);
}
UpdateInfo();
SetCatEditing(usedCategories[0]);
}
void UpdateInfo()
{
headerInput.text = (string)diag.chart["resultcaption"];
if (rankImages[(int)currentEditingRank] != null)
{
imagePreview.sprite = rankImages[(int)currentEditingRank];
}
else
{
imagePreview.sprite = currentEditingRank switch
{
Ranks.Ng => epilogueNg,
Ranks.Hi => epilogueHi,
_ => epilogueOk,
};
}
imagePreview.preserveAspect = true;
rankPreview.sprite = rankSprites[(int)currentEditingRank];
string propSuffix = currentEditingRank switch
{
Ranks.Ng => "ng",
Ranks.Hi => "hi",
_ => "ok",
};
epilogueInput.text = (string)diag.chart["epilogue_" + propSuffix];
SetCatEditing(currentEditingCat);
}
void DoMessageInput(string _)
{
string propSuffix = currentEditingRank switch
{
Ranks.Ng => "ng",
Ranks.Hi => "hi",
_ => "ok",
};
if (usedCategories.Count == 1 || currentEditingRank == Ranks.Ok)
{
diag.chart["resultcommon_" + propSuffix] = messageInput.text;
}
else
{
diag.chart["resultcat" + currentEditingCat + "_" + propSuffix] = messageInput.text;
}
}
void SetCatEditing(int cat)
{
string propSuffix = currentEditingRank switch
{
Ranks.Ng => "ng",
Ranks.Hi => "hi",
_ => "ok",
};
cat = Mathf.Clamp(cat, 0, catButtons.Length - 1);
if (usedCategories.Count == 1 || currentEditingRank == Ranks.Ok)
{
currentEditingCat = usedCategories[0];
for (int i = 0; i < catButtons.Length; i++)
{
catButtons[i].gameObject.SetActive(false);
}
messageInput.text = (string)diag.chart["resultcommon_" + propSuffix];
}
else
{
currentEditingCat = cat;
for (int i = 0; i < catButtons.Length; i++)
{
catButtons[i].gameObject.SetActive(usedCategories.Contains(i));
if (i == currentEditingCat)
catButtons[i].GetComponent<Image>().sprite = catSprites[i];
else
catButtons[i].GetComponent<Image>().sprite = catOff;
}
messageInput.text = (string)diag.chart["resultcat" + currentEditingCat + "_" + propSuffix];
}
}
void GetUsedCategories()
{
RiqBeatmap chart = diag.chart;
usedCategories = new();
if (chart.data.beatmapSections.Count == 0)
{
usedCategories.Add(0);
return;
}
foreach (var section in chart.data.beatmapSections)
{
int cat = section["category"];
if (!usedCategories.Contains(cat))
{
usedCategories.Add(cat);
}
}
usedCategories.Sort();
}
public void GoPrevRank()
{
currentEditingRank--;
if (currentEditingRank < 0)
currentEditingRank = Ranks.Hi;
UpdateInfo();
}
public void GoNextRank()
{
currentEditingRank++;
if (currentEditingRank > Ranks.Hi)
currentEditingRank = Ranks.Ng;
UpdateInfo();
}
public void UploadImage()
{
var extensions = new[]
{
new ExtensionFilter("Image Files", "png", "jpg", "jpeg" ),
};
StandaloneFileBrowser.OpenFilePanelAsync("Open Image", "", extensions, false, (string[] paths) =>
{
var path = Path.Combine(paths);
if (path == string.Empty)
{
return;
}
try
{
// fetch the image using UnityWebRequest
string resource = currentEditingRank switch
{
Ranks.Ng => "Ng",
Ranks.Hi => "Hi",
_ => "Ok",
};
StartCoroutine(UploadImage(path, currentEditingRank));
}
catch (System.Exception e)
{
Debug.LogError($"Error uploading image: {e.Message}");
GlobalGameManager.ShowErrorMessage("Error Uploading Image", e.Message + "\n\n" + e.StackTrace);
return;
}
});
}
IEnumerator LoadRankImages()
{
for (Ranks i = 0; i <= Ranks.Hi; i++)
{
string resource = i switch
{
Ranks.Ng => "Ng",
Ranks.Hi => "Hi",
_ => "Ok",
};
string path;
try
{
path = RiqFileHandler.GetResourcePath(resource, "Images/Epilogue/");
}
catch (System.Exception e)
{
Debug.Log($"Error loading image: {e.Message}, using fallback");
rankImages[(int)i] = null;
continue;
}
UnityWebRequest www = UnityWebRequestTexture.GetTexture("file://" + path);
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError)
{
Debug.Log(www.error);
rankImages[(int)i] = null;
}
else
{
Texture2D texture = DownloadHandlerTexture.GetContent(www);
rankImages[(int)i] = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
Debug.Log("Uploaded image successfully!");
}
}
if (rankImages[(int)currentEditingRank] != null)
{
imagePreview.sprite = rankImages[(int)currentEditingRank];
}
else
{
imagePreview.sprite = currentEditingRank switch
{
Ranks.Ng => epilogueNg,
Ranks.Hi => epilogueHi,
_ => epilogueOk,
};
}
imagePreview.preserveAspect = true;
}
IEnumerator UploadImage(string path, Ranks rank)
{
UnityWebRequest www = UnityWebRequestTexture.GetTexture("file://" + path);
yield return www.SendWebRequest();
if (www.result == UnityWebRequest.Result.ConnectionError)
{
Debug.Log(www.error);
rankImages[(int)rank] = null;
imagePreview.sprite = rank switch
{
Ranks.Ng => epilogueNg,
Ranks.Hi => epilogueHi,
_ => epilogueOk,
};
imagePreview.preserveAspect = true;
}
else
{
Texture2D texture = DownloadHandlerTexture.GetContent(www);
rankImages[(int)rank] = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(0.5f, 0.5f));
imagePreview.sprite = rankImages[(int)rank];
imagePreview.preserveAspect = true;
string resource = rank switch
{
Ranks.Ng => "Ng",
Ranks.Hi => "Hi",
_ => "Ok",
};
RiqFileHandler.AddResource(path, resource, "Images/Epilogue/");
Debug.Log("Uploaded image successfully!");
}
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2b9ca0465f11dcf47b3e129ef391c862
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -24,15 +24,10 @@ namespace HeavenStudio.Editor
inputFieldString.text = (string) parameterManager.chart[propertyName];
inputFieldString.onSelect.AddListener(
_ =>
Editor.instance.editingInputField = true
);
inputFieldString.onValueChanged.AddListener(
_ =>
{;
parameterManager.chart[propertyName] = inputFieldString.text;
Editor.instance.editingInputField = false;
}
);
}

View File

@ -2,6 +2,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using HeavenStudio.Editor.Track;
using Jukebox;
using Jukebox.Legacy;
@ -14,6 +15,12 @@ namespace HeavenStudio.Editor
{
[Header("General References")]
[SerializeField] TabsManager tabsManager;
[SerializeField] Sprite returnIcon;
[SerializeField] Color returnColor;
[SerializeField] Sprite saveIcon;
[SerializeField] Color saveColor;
[SerializeField] Image returnButtonImage;
[SerializeField] GameObject onSaveButton;
[Header("Containers")]
[SerializeField] ChartInfoProperties[] containers;
@ -28,14 +35,17 @@ namespace HeavenStudio.Editor
[SerializeField] public GameObject DropdownP;
[SerializeField] public GameObject ColorP;
[SerializeField] public GameObject StringP;
[SerializeField] public GameObject ImageP;
[Header("Layout Prefabs")]
[SerializeField] public GameObject DividerP;
[SerializeField] public GameObject HeaderP;
[SerializeField] public GameObject SubHeaderP;
[SerializeField] public GameObject ResultDialogP;
[NonSerialized] public RiqBeatmap chart;
List<GameObject> tabContents;
bool saveAfterClose = false, saveAs = false;
private void Start() { }
@ -45,6 +55,7 @@ namespace HeavenStudio.Editor
{
Editor.instance.canSelect = true;
Editor.instance.inAuthorativeMenu = false;
Editor.instance.editingInputField = false;
dialog.SetActive(false);
tabsManager.CleanTabs();
@ -55,10 +66,12 @@ namespace HeavenStudio.Editor
ResetAllDialogs();
Editor.instance.canSelect = false;
Editor.instance.inAuthorativeMenu = true;
Editor.instance.editingInputField = true;
dialog.SetActive(true);
chart = GameManager.instance.Beatmap;
chart["propertiesmodified"] = true;
SetSaveOnClose(false);
tabContents = tabsManager.GenerateTabs(tabs);
foreach (var tab in tabContents)
@ -68,6 +81,23 @@ namespace HeavenStudio.Editor
}
}
public void CloseAndSave()
{
if (saveAfterClose)
{
Editor.instance.SaveRemix(saveAs);
}
SwitchPropertiesDialog();
}
public void SetSaveOnClose(bool saveAfterClose, bool saveAs = false)
{
this.saveAfterClose = saveAfterClose;
this.saveAs = saveAs;
onSaveButton.SetActive(saveAfterClose);
}
public void SetupDialog(PropertyTag[] tags, ChartInfoProperties container)
{
chart = GameManager.instance.Beatmap;
@ -93,6 +123,10 @@ namespace HeavenStudio.Editor
{
container.AddSubHeader(this, property.label);
}
else if (property.tag == "resultmessagediag")
{
container.AddResultMessageEditor(this);
}
else
{
Debug.LogWarning("Property Menu generation Warning: Property " + property.tag + " not found, skipping...");

View File

@ -1,6 +1,7 @@
using UnityEngine;
using UnityEngine.UI;
using TMPro;
using Jukebox;
namespace HeavenStudio.Editor
{
@ -10,19 +11,6 @@ namespace HeavenStudio.Editor
[SerializeField] private GameObject propertyHolder;
RemixPropertiesDialog dialog;
[Header("Property Prefabs")]
[SerializeField] private GameObject IntegerP;
[SerializeField] private GameObject FloatP;
[SerializeField] private GameObject BooleanP;
[SerializeField] private GameObject DropdownP;
[SerializeField] private GameObject ColorP;
[SerializeField] private GameObject StringP;
[Header("Layout Prefabs")]
[SerializeField] private GameObject DividerP;
[SerializeField] private GameObject HeaderP;
[SerializeField] private GameObject SubHeaderP;
[Header("Editable Properties")]
[SerializeField] RemixPropertiesDialog.PropertyTag[] tags;
@ -84,6 +72,21 @@ namespace HeavenStudio.Editor
var property = input.GetComponent<StringChartPropertyPrefab>();
property.SetProperties(diag, propertyName, type, caption);
}
else if (objType == typeof(EntityTypes.Resource))
{
switch (((EntityTypes.Resource)type).type)
{
case EntityTypes.Resource.ResourceType.Image:
prefab = diag.ImageP;
input = InitPrefab(prefab, tooltip);
var property = input.GetComponent<ImageChartResourcePrefab>();
property.SetProperties(diag, propertyName, type, caption);
break;
default:
Debug.LogError("Can't make property interface of type: " + type.GetType());
return;
}
}
else
{
Debug.LogError("Can't make property interface of type: " + type.GetType());
@ -107,7 +110,13 @@ namespace HeavenStudio.Editor
var input = InitPrefab(diag.SubHeaderP);
input.GetComponent<RemixPropertyPrefab>().InitProperties(diag, "", text);
}
public void AddResultMessageEditor(RemixPropertiesDialog diag)
{
var input = InitPrefab(diag.ResultDialogP);
input.GetComponent<RatingScreenPropertyDialog>().InitProperties(diag, "", "");
}
private GameObject InitPrefab(GameObject prefab, string tooltip = "")
{
GameObject input = Instantiate(prefab);

View File

@ -11,12 +11,12 @@ namespace HeavenStudio.Editor
public SnapDialog SnapDialog;
public bool isDown;
public override void OnPointerDown(PointerEventData eventData)
{
if (eventData.button == PointerEventData.InputButton.Left)
{
SnapDialog.ChangeCommon(isDown);
}
}
// public override void OnPointerDown(PointerEventData eventData)
// {
// if (eventData.button == PointerEventData.InputButton.Left)
// {
// SnapDialog.ChangeCommon(isDown);
// }
// }
}
}

View File

@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -10,20 +11,51 @@ using TMPro;
public class SectionDialog : Dialog
{
const float MIN_WEIGHT = 0, MAX_WEIGHT = 10;
SectionTimelineObj sectionObj;
[SerializeField] TMP_InputField sectionName;
[SerializeField] Toggle challengeEnable;
[SerializeField] Slider markerWeight;
[SerializeField] TMP_InputField markerWeightManual;
[SerializeField] Sprite catOff;
[SerializeField] Button[] catButtons;
[SerializeField] Sprite[] catSprites;
bool initHooks;
public void SwitchSectionDialog()
{
if(dialog.activeSelf) {
if (dialog.activeSelf)
{
sectionObj = null;
dialog.SetActive(false);
Editor.instance.inAuthorativeMenu = false;
} else {
}
else
{
Editor.instance.inAuthorativeMenu = true;
ResetAllDialogs();
dialog.SetActive(true);
markerWeight.maxValue = MAX_WEIGHT;
markerWeight.minValue = MIN_WEIGHT;
markerWeight.wholeNumbers = true;
if (!initHooks)
{
initHooks = true;
for (int i = 0; i < catButtons.Length; i++)
{
int cat = i;
catButtons[i].onClick.AddListener(() =>
{
if (sectionObj == null) return;
sectionObj.chartEntity["category"] = cat;
UpdateCatButtonState();
});
}
}
}
}
@ -32,21 +64,32 @@ public class SectionDialog : Dialog
this.sectionObj = sectionObj;
sectionName.text = sectionObj.chartEntity["sectionName"];
challengeEnable.isOn = sectionObj.chartEntity["startPerfect"];
markerWeight.value = sectionObj.chartEntity["weight"];
markerWeight.maxValue = MAX_WEIGHT;
markerWeight.minValue = MIN_WEIGHT;
markerWeight.wholeNumbers = true;
UpdateCatButtonState();
}
public void DeleteSection()
{
if(dialog.activeSelf) {
dialog.SetActive(false);
Editor.instance.inAuthorativeMenu = false;
if (sectionObj != null)
{
sectionObj.Remove();
}
if (dialog.activeSelf)
{
SwitchSectionDialog();
}
if (sectionObj == null) return;
sectionObj.DeleteObj();
}
public void ChangeSectionName(string name)
public void ChangeSectionName()
{
if (sectionObj == null) return;
string name = sectionName.text;
if (string.IsNullOrWhiteSpace(name)) name = string.Empty;
sectionObj.chartEntity["sectionName"] = name;
sectionObj.UpdateLabel();
}
@ -56,4 +99,31 @@ public class SectionDialog : Dialog
if (sectionObj == null) return;
sectionObj.chartEntity["startPerfect"] = challengeEnable.isOn;
}
public void SetSectionWeight()
{
if (sectionObj == null) return;
sectionObj.chartEntity["weight"] = markerWeight.value;
markerWeightManual.text = ((float) sectionObj.chartEntity["weight"]).ToString("G");
}
public void SetSectionWeightManual()
{
if (sectionObj == null) return;
sectionObj.chartEntity["weight"] = Mathf.Round((float)Math.Clamp(Convert.ToSingle(markerWeightManual.text), MIN_WEIGHT, MAX_WEIGHT));
markerWeight.value = sectionObj.chartEntity["weight"];
markerWeightManual.text = ((float) sectionObj.chartEntity["weight"]).ToString("G");
}
void UpdateCatButtonState()
{
if (sectionObj == null) return;
for (int i = 0; i < catButtons.Length; i++)
{
if (i == (int) sectionObj.chartEntity["category"])
catButtons[i].GetComponent<Image>().sprite = catSprites[i];
else
catButtons[i].GetComponent<Image>().sprite = catOff;
}
}
}

View File

@ -172,6 +172,8 @@ namespace HeavenStudio.Editor.Track
specialTimelineObjs.Add(tempoTimelineObj.chartEntity.guid, tempoTimelineObj);
Timeline.instance.FitToSong();
if (create)
tempoTimelineObj.OnRightClick();
}
public void AddVolumeChange(bool create, RiqEntity volumeChange_ = null, bool first = false)
@ -200,7 +202,6 @@ namespace HeavenStudio.Editor.Track
{
RiqEntity volumeC = GameManager.instance.Beatmap.AddNewVolumeChange(Timeline.instance.MousePos2BeatSnap, 100f);
volumeTimelineObj.chartEntity = volumeC;
GameManager.instance.Beatmap.VolumeChanges.Add(volumeC);
CommandManager.Instance.AddCommand(new Commands.AddMarker(volumeC, volumeC.guid, HoveringTypes.VolumeChange));
}
else
@ -211,6 +212,8 @@ namespace HeavenStudio.Editor.Track
volumeTimelineObj.SetVisibility(Timeline.instance.timelineState.currentState);
specialTimelineObjs.Add(volumeTimelineObj.chartEntity.guid, volumeTimelineObj);
if (create)
volumeTimelineObj.OnRightClick();
}
public void AddChartSection(bool create, RiqEntity chartSection_ = null)
@ -240,8 +243,11 @@ namespace HeavenStudio.Editor.Track
{
RiqEntity sectionC = GameManager.instance.Beatmap.AddNewSectionMarker(Timeline.instance.MousePos2BeatSnap, "New Section");
sectionC.CreateProperty("startPerfect", false);
sectionC.CreateProperty("weight", 1f);
sectionC.CreateProperty("category", 0);
sectionTimelineObj.chartEntity = sectionC;
GameManager.instance.Beatmap.SectionMarkers.Add(sectionC);
CommandManager.Instance.AddCommand(new Commands.AddMarker(sectionC, sectionC.guid, HoveringTypes.SectionChange));
}
else

View File

@ -0,0 +1,89 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using HeavenStudio;
using HeavenStudio.Editor;
using HeavenStudio.Editor.Track;
using TMPro;
public class TempoDialog : Dialog
{
TempoTimelineObj tempoObj;
[SerializeField] Button deleteButton;
[SerializeField] TMP_InputField tempoInput;
public void SwitchTempoDialog()
{
if (dialog.activeSelf)
{
tempoObj = null;
dialog.SetActive(false);
Editor.instance.inAuthorativeMenu = false;
}
else
{
Editor.instance.inAuthorativeMenu = true;
ResetAllDialogs();
dialog.SetActive(true);
}
}
public void RefreshDialog()
{
if (tempoObj != null)
{
tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F");
}
}
public void SetTempoObj(TempoTimelineObj tempoObj)
{
this.tempoObj = tempoObj;
deleteButton.gameObject.SetActive(!tempoObj.first);
tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F");
}
public void DeleteTempo()
{
if (tempoObj != null)
{
tempoObj.Remove();
}
if (dialog.activeSelf)
{
SwitchTempoDialog();
}
}
public void SetTempo()
{
if (tempoObj != null)
{
float tempo = float.Parse(tempoInput.text);
tempoObj.SetTempo(tempo);
tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F");
}
}
public void DoubleTempo()
{
if (tempoObj != null)
{
tempoObj.SetTempo(tempoObj.chartEntity["tempo"] * 2);
tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F");
}
}
public void HalveTempo()
{
if (tempoObj != null)
{
tempoObj.SetTempo(tempoObj.chartEntity["tempo"] * 0.5f);
tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F");
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 52f9e265c99322341afb394674cc6233
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -29,7 +29,11 @@ namespace HeavenStudio.Editor.Track
public void UpdateLabel()
{
sectionLabel.text = chartEntity["sectionName"];
//<sprite="categoryMarker" name="cat0">
if (string.IsNullOrEmpty(chartEntity["sectionName"]))
sectionLabel.text = $"<sprite=\"categoryMarker\" name=\"cat{chartEntity["category"]}\"> x{chartEntity["weight"]:0}";
else
sectionLabel.text = $"<sprite=\"categoryMarker\" name=\"cat{chartEntity["category"]}\"> x{chartEntity["weight"]:0} | {chartEntity["sectionName"]}";
if (!moving)
SetX(chartEntity);
}
@ -56,6 +60,7 @@ namespace HeavenStudio.Editor.Track
public override bool OnMove(float beat, bool final = false)
{
if (beat < 0) beat = 0;
foreach (RiqEntity sectionChange in GameManager.instance.Beatmap.SectionMarkers)
{
if (this.chartEntity == sectionChange)
@ -88,9 +93,17 @@ namespace HeavenStudio.Editor.Track
}
else
{
gameObject.SetActive(false);
gameObject.SetActive(false);
}
}
public void Remove()
{
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.ChartSection)
{
DeleteObj();
}
}
}
}

View File

@ -104,8 +104,6 @@ namespace HeavenStudio.Editor.Track
{
if (first) return;
CommandManager.Instance.AddCommand(new Commands.DeleteMarker(chartEntity.guid, type));
// transform.parent.GetComponent<SpecialTimeline>().specialTimelineObjs.Remove(this);
// Destroy(this.gameObject);
}
//events

View File

@ -15,6 +15,7 @@ namespace HeavenStudio.Editor.Track
[Header("Components")]
[SerializeField] private TMP_Text tempoTXT;
[SerializeField] private GameObject tempoLine;
[SerializeField] private TempoDialog tempoDialog;
new private void Update()
{
@ -22,6 +23,7 @@ namespace HeavenStudio.Editor.Track
if (hovering)
{
SpecialTimeline.hoveringTypes |= SpecialTimeline.HoveringTypes.TempoChange;
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.TempoChange)
{
float newTempo = Input.mouseScrollDelta.y;
@ -31,19 +33,25 @@ namespace HeavenStudio.Editor.Track
if (Input.GetKey(KeyCode.LeftControl))
newTempo *= 0.01f;
chartEntity["tempo"] += newTempo;
if (newTempo != 0)
{
SetTempo(chartEntity["tempo"] + newTempo);
tempoDialog.RefreshDialog();
}
//make sure tempo is positive
if (chartEntity["tempo"] < 1)
chartEntity["tempo"] = 1;
if (first && newTempo != 0)
Timeline.instance.UpdateStartingBPMText();
Timeline.instance.FitToSong();
}
}
UpdateTempo();
}
public void SetTempo(float tempo)
{
chartEntity["tempo"] = Mathf.Clamp(tempo, 1, 10000);
if (first)
{
Timeline.instance.UpdateStartingBPMText();
}
Timeline.instance.FitToSong();
UpdateTempo();
}
@ -67,15 +75,16 @@ namespace HeavenStudio.Editor.Track
public override void OnRightClick()
{
if (first) return;
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.TempoChange)
{
DeleteObj();
tempoDialog.SetTempoObj(this);
tempoDialog.SwitchTempoDialog();
}
}
public override bool OnMove(float beat, bool final = false)
{
if (beat < 0) beat = 0;
foreach (var tempoChange in GameManager.instance.Beatmap.TempoChanges)
{
if (this.chartEntity == tempoChange)
@ -101,7 +110,16 @@ namespace HeavenStudio.Editor.Track
tempoLine.SetActive(false);
}
else
gameObject.SetActive(false);
gameObject.SetActive(false);
}
public void Remove()
{
if (first) return;
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.TempoChange)
{
DeleteObj();
}
}
}
}

View File

@ -15,6 +15,7 @@ namespace HeavenStudio.Editor.Track
[Header("Components")]
[SerializeField] private TMP_Text volumeTXT;
[SerializeField] private GameObject volumeLine;
[SerializeField] private VolumeDialog volumeDialog;
new private void Update()
{
@ -22,6 +23,7 @@ namespace HeavenStudio.Editor.Track
if (hovering)
{
SpecialTimeline.hoveringTypes |= SpecialTimeline.HoveringTypes.VolumeChange;
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.MusicVolume)
{
float newVolume = Input.mouseScrollDelta.y;
@ -31,18 +33,26 @@ namespace HeavenStudio.Editor.Track
if (Input.GetKey(KeyCode.LeftControl))
newVolume *= 0.01f;
chartEntity["volume"] += newVolume;
//make sure volume is positive
chartEntity["volume"] = Mathf.Clamp(chartEntity["volume"], 0, 100);
if (first && newVolume != 0)
Timeline.instance.UpdateStartingVolText();
if (newVolume != 0)
{
SetVolume(chartEntity["volume"] + newVolume);
volumeDialog.RefreshDialog();
}
}
}
UpdateVolume();
}
public void SetVolume(float volume)
{
chartEntity["volume"] = Mathf.Clamp(volume, 0, 100);
if (first)
{
Timeline.instance.UpdateStartingVolText();
}
UpdateVolume();
}
private void UpdateVolume()
{
volumeTXT.text = $"{chartEntity["volume"].ToString("F")}%";
@ -63,15 +73,16 @@ namespace HeavenStudio.Editor.Track
public override void OnRightClick()
{
if (first) return;
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.MusicVolume)
{
DeleteObj();
volumeDialog.SetVolumeObj(this);
volumeDialog.SwitchVolumeDialog();
}
}
public override bool OnMove(float beat, bool final = false)
{
if (beat < 0) beat = 0;
foreach (var volumeChange in GameManager.instance.Beatmap.VolumeChanges)
{
if (this.chartEntity == volumeChange)
@ -99,5 +110,14 @@ namespace HeavenStudio.Editor.Track
else
gameObject.SetActive(false);
}
public void Remove()
{
if (first) return;
if (Timeline.instance.timelineState.currentState == Timeline.CurrentTimelineState.State.MusicVolume)
{
DeleteObj();
}
}
}
}

View File

@ -0,0 +1,88 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using HeavenStudio;
using HeavenStudio.Editor;
using HeavenStudio.Editor.Track;
using TMPro;
public class VolumeDialog : Dialog
{
VolumeTimelineObj volumeObj;
[SerializeField] Button deleteButton;
[SerializeField] Slider volumeSlider;
[SerializeField] TMP_InputField volumeInput;
public void SwitchVolumeDialog()
{
if (dialog.activeSelf)
{
volumeObj = null;
dialog.SetActive(false);
Editor.instance.inAuthorativeMenu = false;
}
else
{
Editor.instance.inAuthorativeMenu = true;
ResetAllDialogs();
dialog.SetActive(true);
volumeSlider.maxValue = 100;
volumeSlider.minValue = 0;
}
}
public void RefreshDialog()
{
if (volumeObj != null)
{
volumeInput.text = volumeObj.chartEntity["volume"].ToString("F");
volumeSlider.value = volumeObj.chartEntity["volume"];
}
}
public void SetVolumeObj(VolumeTimelineObj volumeObj)
{
this.volumeObj = volumeObj;
deleteButton.gameObject.SetActive(!volumeObj.first);
volumeSlider.value = volumeObj.chartEntity["volume"];
volumeInput.text = volumeObj.chartEntity["volume"].ToString("F");
}
public void DeleteVolume()
{
if (volumeObj != null)
{
volumeObj.Remove();
}
if (dialog.activeSelf)
{
SwitchVolumeDialog();
}
}
public void VolumeSliderUpdate()
{
if (volumeObj != null)
{
volumeObj.SetVolume(System.MathF.Round(volumeSlider.value, 2));
volumeInput.text = volumeObj.chartEntity["volume"].ToString("F");
volumeSlider.value = volumeObj.chartEntity["volume"];
}
}
public void SetVolume()
{
if (volumeObj != null)
{
float volume = float.Parse(volumeInput.text);
volumeObj.SetVolume(volume);
volumeInput.text = volumeObj.chartEntity["volume"].ToString("F");
volumeSlider.value = volumeObj.chartEntity["volume"];
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5bbf1f35c27906543b7eb55560d811e1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -396,6 +396,21 @@ namespace HeavenStudio.Editor.Track
if (MouseInTimeline)
MouseInTimeline = RectTransformUtility.RectangleContainsScreenPoint(TimelineScroll.viewport,
Input.mousePosition, Editor.instance.EditorCamera);
PlaybackSpeed.interactable = !Conductor.instance.isPaused;
foreach (var rect in GameObject.FindGameObjectsWithTag("BlocksEditor"))
{
if (!rect.activeInHierarchy) continue;
if (rect.TryGetComponent(out RectTransform rectTransform))
{
if (RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition, Camera.main))
{
MouseInTimeline = false;
break;
}
}
}
/*
if (MouseInTimeline)
@ -671,7 +686,7 @@ namespace HeavenStudio.Editor.Track
TimelineSongPosLine.gameObject.SetActive(true);
}
GameManager.instance.Play(time);
GameManager.instance.SafePlay(time, 0, false);
SetTimeButtonColors(false, true, true);
}
@ -1100,15 +1115,30 @@ namespace HeavenStudio.Editor.Track
const float SpeedSnap = 0.25f;
public void SetPlaybackSpeed(float speed)
{
float spd = Mathp.Round2Nearest(speed, SpeedSnap);
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
Conductor.instance.SetTimelinePitch(spd);
PlaybackSpeed.value = spd;
if (Conductor.instance.isPaused)
{
float spd = Conductor.instance.TimelinePitch;
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
PlaybackSpeed.value = spd;
}
else
{
float spd = Mathp.Round2Nearest(speed, SpeedSnap);
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
Conductor.instance.SetTimelinePitch(spd);
PlaybackSpeed.value = spd;
}
}
public void ResetPlaybackSpeed()
{
if (Input.GetMouseButton(1))
if (Conductor.instance.isPaused)
{
float spd = Conductor.instance.TimelinePitch;
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: {spd}x";
PlaybackSpeed.value = spd;
}
else if (Input.GetMouseButton(1))
{
PlaybackSpeed.transform.GetChild(3).GetComponent<TMP_Text>().text = $"Playback Speed: 1x";
PlaybackSpeed.value = 1f;