mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-22 09:35:11 +00:00
update Jukebox to latest version
fixes for inferred entity loading
This commit is contained in:
parent
8954b8c269
commit
8b0544246d
5 changed files with 14 additions and 10 deletions
|
@ -55,7 +55,7 @@ namespace HeavenStudio
|
||||||
{
|
{
|
||||||
if (editorGO == null && OpeningManager.OnOpenFile.IndexOfAny(Path.GetInvalidPathChars()) == -1)
|
if (editorGO == null && OpeningManager.OnOpenFile.IndexOfAny(Path.GetInvalidPathChars()) == -1)
|
||||||
{
|
{
|
||||||
if (File.Exists(OpeningManager.OnOpenFile))
|
if (File.Exists(OpeningManager.OnOpenFile) && Path.GetExtension(OpeningManager.OnOpenFile) == ".riq")
|
||||||
{
|
{
|
||||||
input = OpeningManager.OnOpenFile;
|
input = OpeningManager.OnOpenFile;
|
||||||
fromCmd = true;
|
fromCmd = true;
|
||||||
|
|
|
@ -6,8 +6,7 @@ using UnityEngine;
|
||||||
|
|
||||||
using Starpelly;
|
using Starpelly;
|
||||||
using Jukebox;
|
using Jukebox;
|
||||||
using Jukebox.Legacy;
|
using HeavenStudio.Util;
|
||||||
using Newtonsoft.Json;
|
|
||||||
using HeavenStudio.Games;
|
using HeavenStudio.Games;
|
||||||
using HeavenStudio.Common;
|
using HeavenStudio.Common;
|
||||||
|
|
||||||
|
@ -237,6 +236,15 @@ namespace HeavenStudio
|
||||||
{
|
{
|
||||||
SetGame("noGame");
|
SetGame("noGame");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (editor)
|
||||||
|
{
|
||||||
|
Debug.Log(Beatmap.data.riqOrigin);
|
||||||
|
if (Beatmap.data.riqOrigin != "HeavenStudio")
|
||||||
|
{
|
||||||
|
GlobalGameManager.ShowErrorMessage("Warning", "This chart was made for another game,\nand thus may not be playable in Heaven Studio.\n<color=\"yellow\">You may be able to edit this chart in Heaven Studio to be used in its original game.</color>\n\n<alpha=#AA>Chart Origin: " + Beatmap.data.riqOrigin.DisplayName());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ScoreInputAccuracy(double accuracy, bool late, double time, double weight = 1, bool doDisplay = true)
|
public void ScoreInputAccuracy(double accuracy, bool late, double time, double weight = 1, bool doDisplay = true)
|
||||||
|
|
|
@ -386,9 +386,7 @@ namespace HeavenStudio.Editor
|
||||||
{
|
{
|
||||||
var extensions = new[]
|
var extensions = new[]
|
||||||
{
|
{
|
||||||
new ExtensionFilter("All Supported Files ", new string[] { "riq", "tengoku", "rhmania" }),
|
|
||||||
new ExtensionFilter("Heaven Studio Remix File ", new string[] { "riq" }),
|
new ExtensionFilter("Heaven Studio Remix File ", new string[] { "riq" }),
|
||||||
new ExtensionFilter("Legacy Heaven Studio Remix ", new string[] { "tengoku", "rhmania" })
|
|
||||||
};
|
};
|
||||||
|
|
||||||
StandaloneFileBrowser.OpenFilePanelAsync("Open Remix", "", extensions, false, (string[] paths) =>
|
StandaloneFileBrowser.OpenFilePanelAsync("Open Remix", "", extensions, false, (string[] paths) =>
|
||||||
|
|
|
@ -170,15 +170,13 @@ namespace HeavenStudio
|
||||||
if (item.Key == "track")
|
if (item.Key == "track")
|
||||||
continue;
|
continue;
|
||||||
if (item.Value == null)
|
if (item.Value == null)
|
||||||
{
|
continue;
|
||||||
e[item.Key] = 0;
|
|
||||||
}
|
|
||||||
var value = item.Value;
|
var value = item.Value;
|
||||||
if (value.GetType() == typeof(long))
|
if (value.GetType() == typeof(long))
|
||||||
value = new EntityTypes.Integer(int.MinValue, int.MaxValue, (int)value);
|
value = new EntityTypes.Integer(int.MinValue, int.MaxValue, (int)value);
|
||||||
else if (value.GetType() == typeof(double))
|
else if (value.GetType() == typeof(double))
|
||||||
value = new EntityTypes.Float(float.NegativeInfinity, float.PositiveInfinity, (float)value);
|
value = new EntityTypes.Float(float.NegativeInfinity, float.PositiveInfinity, (float)value);
|
||||||
parameters.Add(new Minigames.Param(item.Key, value, item.Key, "[inferred from remix.json]"));
|
parameters.Add(new Minigames.Param(item.Key, value, item.Key.DisplayName(), "[inferred from remix.json]"));
|
||||||
}
|
}
|
||||||
action = new Minigames.GameAction(actionName, actionName.DisplayName(), e.length, true, parameters);
|
action = new Minigames.GameAction(actionName, actionName.DisplayName(), e.length, true, parameters);
|
||||||
game.actions.Add(action);
|
game.actions.Add(action);
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.nuget.newtonsoft-json": "3.2.1"
|
"com.unity.nuget.newtonsoft-json": "3.2.1"
|
||||||
},
|
},
|
||||||
"hash": "619442ba26163fb6a00dd50ba52e2fdeaea33e37"
|
"hash": "769b4fe2c85792b34defb00e051e823442b78564"
|
||||||
},
|
},
|
||||||
"com.unity.2d.sprite": {
|
"com.unity.2d.sprite": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
|
|
Loading…
Reference in a new issue