Code cleanup.

This commit is contained in:
2023-01-14 22:03:08 +08:00
parent 4fdd4e1935
commit c39f258a19
4 changed files with 8 additions and 10 deletions

View File

@@ -538,10 +538,10 @@ namespace Cryville.Crtr {
foreach (var ts in gs.Value.Children) { foreach (var ts in gs.Value.Children) {
ContainerHandler th; ContainerHandler th;
if (ts.Key is Chart.Note) { if (ts.Key is Chart.Note) {
th = new NoteHandler(gh, (Chart.Note)ts.Key, pruleset); th = new NoteHandler((Chart.Note)ts.Key, gh);
} }
else { else {
th = new TrackHandler(gh, (Chart.Track)ts.Key); th = new TrackHandler((Chart.Track)ts.Key, gh);
} }
ts.Value.AttachHandler(th); ts.Value.AttachHandler(th);
} }

View File

@@ -137,7 +137,7 @@ namespace Cryville.Crtr.Event {
public virtual void Update(ContainerState s, StampedEvent ev) { public virtual void Update(ContainerState s, StampedEvent ev) {
bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16; bool flag = !Awoken && s.CloneType >= 2 && s.CloneType < 16;
if (flag) PreAwake(s); if (flag) PreAwake(s);
if (s.CloneType <= 2) if (gogroup) skinContainer.MatchDynamic(s); if (gogroup && s.CloneType <= 2) skinContainer.MatchDynamic(s);
if (flag) Awake(s); if (flag) Awake(s);
} }
public virtual void ExUpdate(ContainerState s, StampedEvent ev) { public virtual void ExUpdate(ContainerState s, StampedEvent ev) {

View File

@@ -10,11 +10,9 @@ namespace Cryville.Crtr {
public class NoteHandler : ContainerHandler { public class NoteHandler : ContainerHandler {
readonly GroupHandler gh; readonly GroupHandler gh;
public readonly Chart.Note Event; public readonly Chart.Note Event;
readonly PdtRuleset ruleset; public NoteHandler(Chart.Note ev, GroupHandler gh) : base() {
public NoteHandler(GroupHandler gh, Chart.Note ev, PdtRuleset rs) : base() {
this.gh = gh;
Event = ev; Event = ev;
ruleset = rs; this.gh = gh;
} }
public override string TypeName { public override string TypeName {
@@ -46,8 +44,8 @@ namespace Cryville.Crtr {
base.PreInit(); base.PreInit();
foreach (var j in Event.judges) { foreach (var j in Event.judges) {
judges.Add(j, new JudgeState(this, j.Id.Key)); judges.Add(j, new JudgeState(this, j.Id.Key));
}
} }
}
public override void Init() { public override void Init() {
base.Init(); base.Init();
sgos = gogroup.GetComponentsInChildren<SectionalGameObject>(); sgos = gogroup.GetComponentsInChildren<SectionalGameObject>();

View File

@@ -7,8 +7,8 @@ namespace Cryville.Crtr {
readonly GroupHandler gh; readonly GroupHandler gh;
readonly Chart.Track track; readonly Chart.Track track;
public TrackHandler(GroupHandler gh, Chart.Track _track) : base() { public TrackHandler(Chart.Track ev, GroupHandler gh) : base() {
track = _track; track = ev;
this.gh = gh; this.gh = gh;
} }