Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Pull down scroll velocity option. Add property categories for ruleset config.

Browse Source
This commit is contained in:
PopSlime
2022-11-16 17:30:33 +08:00
parent 87e406e903
commit 80cc5fdbda
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Cryville/Crtr/ChartPlayer.cs
View File

@@ -309,7 +309,6 @@ namespace Cryville.Crtr {
autoRenderStep = renderStep == 0; autoRenderStep = renderStep == 0;
soundOffset = Settings.Default.SoundOffset; soundOffset = Settings.Default.SoundOffset;
startOffset = Settings.Default.StartOffset; startOffset = Settings.Default.StartOffset;
sv = Settings.Default.ScrollVelocity;
firstFrame = true; firstFrame = true;
texloaddone = false; texloaddone = false;
Game.NetworkTaskWorker.SuspendBackgroundTasks(); Game.NetworkTaskWorker.SuspendBackgroundTasks();
@@ -333,10 +332,12 @@ namespace Cryville.Crtr {
FileInfo chartFile = new FileInfo( FileInfo chartFile = new FileInfo(
Game.GameDataPath + "/charts/" + Settings.Default.LoadChart Game.GameDataPath + "/charts/" + Settings.Default.LoadChart
); );
FileInfo rulesetFile = new FileInfo( FileInfo rulesetFile = new FileInfo(
Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
); );
if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset"); if (!rulesetFile.Exists) throw new FileNotFoundException("Ruleset for the chart not found\nMake sure you have imported the ruleset");
FileInfo rulesetConfigFile = new FileInfo( FileInfo rulesetConfigFile = new FileInfo(
Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
); );
@@ -346,6 +347,8 @@ namespace Cryville.Crtr {
MissingMemberHandling = MissingMemberHandling.Error MissingMemberHandling = MissingMemberHandling.Error
}); });
} }
sv = _rscfg.generic.ScrollVelocity;
FileInfo skinFile = new FileInfo( FileInfo skinFile = new FileInfo(
string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin) string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin)
); );

16
Assets/Cryville/Crtr/Config/RulesetConfig.cs
View File

@@ -1,12 +1,26 @@
using Newtonsoft.Json; using Cryville.Common.ComponentModel;
using Newtonsoft.Json;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
namespace Cryville.Crtr.Config { namespace Cryville.Crtr.Config {
public class RulesetConfig { public class RulesetConfig {
public Generic generic = new Generic(); public Generic generic = new Generic();
public class Generic { public class Generic {
[Category("basic")]
[JsonProperty("skin")] [JsonProperty("skin")]
public string Skin { get; set; } public string Skin { get; set; }
[Category("deprecated")][Obsolete]
[JsonProperty("scroll_velocity")][DefaultValue(1)]
[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
public float ScrollVelocity { get; set; }
public Generic() {
Skin = "";
ScrollVelocity = 1;
}
} }
public Dictionary<string, InputEntry> inputs public Dictionary<string, InputEntry> inputs
= new Dictionary<string, InputEntry>(); = new Dictionary<string, InputEntry>();

11
Assets/Cryville/Crtr/Settings.cs
View File

@@ -131,17 +131,6 @@ namespace Cryville.Crtr {
} }
} }
[Category("gameplay")]
[LogarithmicScale][Step(0.5f)][Precision(1e-1)]
public float ScrollVelocity {
get {
return PlayerPrefs.GetFloat("ScrollVelocity", 1);
}
set {
PlayerPrefs.SetFloat("ScrollVelocity", value);
}
}
[Category("gameplay")] [Category("gameplay")]
[Step(0.04f)][Precision(1e-3)] [Step(0.04f)][Precision(1e-3)]
public float SoundOffset { public float SoundOffset {