mirror of
https://github.com/RHeavenStudio/HeavenStudio.git
synced 2025-06-13 02:17:40 +02:00
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
@ -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()
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1543b6414667350478cffeb9243f308c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -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;
|
||||
|
||||
@ -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!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2b9ca0465f11dcf47b3e129ef391c862
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -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;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@ -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...");
|
||||
|
||||
@ -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);
|
||||
|
||||
Reference in New Issue
Block a user