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

Code cleanup.

Browse Source
This commit is contained in:
PopSlime
2023-11-21 18:03:34 +08:00
parent ad625e3e35
commit 92fb34cfa8
9 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,6 @@ namespace Cryville.Crtr {
Popup.CreateException(ex);
ReturnToMenu();
}
// Camera.main.RenderToCubemap();
}
void OnDestroy() {
@@ -300,16 +298,15 @@ namespace Cryville.Crtr {
#region Triggers
private void ReturnToMenu() {
#if UNITY_EDITOR
Invoke(nameof(_returnToMenu), 4);
Invoke(nameof(ReturnToMenuImpl), 4);
#else
_returnToMenu();
ReturnToMenuImpl();
#endif
}
#pragma warning disable IDE1006
private void _returnToMenu() {
GameObject.Find("Master").GetComponent<Master>().ShowMenu();
GameObject.Destroy(gameObject);
private void ReturnToMenuImpl() {
Master.Instance.ShowMenu();
Destroy(gameObject);
#if UNITY_5_5_OR_NEWER
SceneManager.UnloadSceneAsync("Play");
#elif UNITY_5_3_OR_NEWER
@@ -319,7 +316,6 @@ namespace Cryville.Crtr {
DiscordController.Instance.SetIdle();
#endif
}
#pragma warning restore IDE1006
bool logEnabled = true;
public void ToggleLogs() {
@@ -401,14 +397,14 @@ namespace Cryville.Crtr {
FileInfo chartFile = new FileInfo(Settings.Default.LoadChart);
FileInfo rulesetFile = new FileInfo(
Game.GameDataPath + "/rulesets/" + Settings.Default.LoadRuleset
);
FileInfo rulesetFile = new FileInfo(Path.Combine(
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");
FileInfo rulesetConfigFile = new FileInfo(
Game.GameDataPath + "/config/rulesets/" + Settings.Default.LoadRulesetConfig
);
FileInfo rulesetConfigFile = new FileInfo(Path.Combine(
Game.GameDataPath, "config", "rulesets", Settings.Default.LoadRulesetConfig
));
if (!rulesetConfigFile.Exists) throw new FileNotFoundException("Ruleset config not found\nPlease open the config to generate");
using (StreamReader cfgreader = new StreamReader(rulesetConfigFile.FullName, Encoding.UTF8)) {
_rscfg = JsonConvert.DeserializeObject<RulesetConfig>(cfgreader.ReadToEnd(), new JsonSerializerSettings() {
@@ -418,9 +414,9 @@ namespace Cryville.Crtr {
sv = _rscfg.generic.ScrollVelocity;
soundOffset += _rscfg.generic.SoundOffset;
FileInfo skinFile = new FileInfo(
string.Format("{0}/skins/{1}/{2}/.umgs", Game.GameDataPath, rulesetFile.Directory.Name, _rscfg.generic.Skin)
);
FileInfo skinFile = new FileInfo(Path.Combine(
Game.GameDataPath, "skins", rulesetFile.Directory.Name, _rscfg.generic.Skin, ".umgs"
));
if (!skinFile.Exists) throw new FileNotFoundException("Skin not found\nPlease specify an available skin in the config");
using (StreamReader reader = new StreamReader(skinFile.FullName, Encoding.UTF8)) {
skin = JsonConvert.DeserializeObject<SkinDefinition>(reader.ReadToEnd(), new JsonSerializerSettings() {