From c0d6b89edc02e3b282008aa22b968cb6643c4348 Mon Sep 17 00:00:00 2001 From: PopSlime Date: Sat, 29 Oct 2022 00:46:14 +0800 Subject: [PATCH] Remove judge properties from note event. --- Assets/Cryville/Crtr/Chart.cs | 8 -------- Assets/Cryville/Crtr/NoteHandler.cs | 9 ++++----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Assets/Cryville/Crtr/Chart.cs b/Assets/Cryville/Crtr/Chart.cs index 32c5493..e8fea3c 100644 --- a/Assets/Cryville/Crtr/Chart.cs +++ b/Assets/Cryville/Crtr/Chart.cs @@ -377,21 +377,13 @@ namespace Cryville.Crtr { } public Note() { - SubmitPropSrc("judge", new PropSrc.String(() => judge)); - SubmitPropSrc("endjudge", new PropSrc.String(() => endjudge)); SubmitPropSrc("track", new PropSrc.Float(() => { var i = motions.FirstOrDefault(m => m.RelativeNode == null && m.Name.MainName == "track"); if (i == null) return ((Vec1)ChartPlayer.motionRegistry["track"].InitValue).Value; else return ((Vec1)i.AbsoluteValue).Value; })); - SubmitPropOp("judge", new PropOp.String(v => judge = v)); - SubmitPropOp("endjudge", new PropOp.String(v => endjudge = v)); } - [Obsolete] - public string judge; - [Obsolete] - public string endjudge; public override EventList GetEventsOfType(string type) { switch (type) { case "judges": return new EventList(judges); diff --git a/Assets/Cryville/Crtr/NoteHandler.cs b/Assets/Cryville/Crtr/NoteHandler.cs index 7cc828d..86b27d2 100644 --- a/Assets/Cryville/Crtr/NoteHandler.cs +++ b/Assets/Cryville/Crtr/NoteHandler.cs @@ -3,7 +3,6 @@ using Cryville.Crtr.Components; using Cryville.Crtr.Event; using System; using System.Collections.Generic; -using System.Linq; using UnityEngine; namespace Cryville.Crtr { @@ -66,10 +65,10 @@ namespace Cryville.Crtr { public override void StartUpdate(ContainerState s) { base.StartUpdate(s); - if (s.CloneType == 16 && Event.judge != null) { + /*if (s.CloneType == 16 && Event.judge != null) { // var etor = new Evaluator(); //CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.judge], s.Time, etor, patchedJudgeEvents, !Event.@long); - } + }*/ } public override void Update(ContainerState s, StampedEvent ev) { @@ -172,11 +171,11 @@ namespace Cryville.Crtr { #endif } else if (s.CloneType == 16) { - if (Event.endjudge != null) { + /*if (Event.endjudge != null) { //var etor = new Evaluator(); //CompiledRuleset.PatchJudge(Event, ChartPlayer.cruleset.primary_judges[Event.endjudge], ps.Time, etor, patchedJudgeEvents, true); } - cs.Bus.IssuePatch(patchedJudgeEvents.Cast()); + cs.Bus.IssuePatch(patchedJudgeEvents.Cast());*/ } OpenAnchor("tail"); base.EndUpdate(s);