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

Cleanup.

Browse Source
This commit is contained in:
PopSlime
2023-01-09 22:17:42 +08:00
parent 4e851d9b73
commit ea9000f2b0
6 changed files with 6 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Assets/Cryville/Crtr/Chart.cs
View File

@@ -130,15 +130,6 @@ namespace Cryville.Crtr {
get { return Duration > 0; } get { return Duration > 0; }
} }
private InstantEvent attev = null;
[JsonIgnore]
public InstantEvent AttackEvent {
get {
if (attev == null) attev = new InstantEvent(this);
return attev;
}
}
private InstantEvent relev = null; private InstantEvent relev = null;
[JsonIgnore] [JsonIgnore]
public InstantEvent ReleaseEvent { public InstantEvent ReleaseEvent {

2
Assets/Cryville/Crtr/Event/ContainerState.cs
View File

@@ -333,7 +333,7 @@ namespace Cryville.Crtr.Event {
ccs.Working = true; ccs.Working = true;
ccs.StartUpdate(); ccs.StartUpdate();
UpdateMotions(); UpdateMotions();
if (!ev.Unstamped.IsLong) { if (!cev.IsLong) {
ccs.Working = false; ccs.Working = false;
ccs.BroadcastEndUpdate(); ccs.BroadcastEndUpdate();
if (CloneType == 1) ccs.Dispose(); if (CloneType == 1) ccs.Dispose();

11
Assets/Cryville/Crtr/Event/EventBatcher.cs
View File

@@ -154,12 +154,11 @@ namespace Cryville.Crtr.Event {
int CompareStampedEvents(StampedEvent a, StampedEvent b) { int CompareStampedEvents(StampedEvent a, StampedEvent b) {
int u = a.CompareTo(b); int u = a.CompareTo(b);
if (u != 0) return u; if (u != 0) return u;
if (a.Unstamped != null && b.Unstamped != null) if (a.Unstamped != null && b.Unstamped != null && containerMap.ContainsKey(a.Unstamped) && containerMap.ContainsKey(b.Unstamped)) {
if (containerMap.ContainsKey(a.Unstamped) && containerMap.ContainsKey(b.Unstamped)) { u = containerMap[a.Unstamped].Depth.CompareTo(containerMap[b.Unstamped].Depth);
u = containerMap[a.Unstamped].Depth.CompareTo(containerMap[b.Unstamped].Depth); if (u != 0) return u;
if (u != 0) return u; }
} return 0;
return a.GetHashCode().CompareTo(b.GetHashCode());
} }
} }
} }

7
Assets/Cryville/Crtr/StampedEvent.cs
View File

@@ -35,13 +35,6 @@ namespace Cryville.Crtr {
} }
} }
public StampedEvent AttackEvent {
get {
if (attev == null) attev = Subevents.FirstOrDefault(ev => ev.Time == this.Time);
return attev;
}
}
public StampedEvent ReleaseEvent { public StampedEvent ReleaseEvent {
get { get {
if (relev == null) relev = Subevents.FirstOrDefault(ev => ((InstantEvent)ev.Unstamped).IsRelease); if (relev == null) relev = Subevents.FirstOrDefault(ev => ((InstantEvent)ev.Unstamped).IsRelease);

406
Assets/YamlDotNet/Examples.unity
View File

File diff suppressed because it is too large Load Diff

7
Assets/YamlDotNet/Examples.unity.meta
View File

@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a5b20befc03909345bd7d08158c02462
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: