From 45739dd8fad993a9da52cfa82014313f491557ef Mon Sep 17 00:00:00 2001 From: TRAfoer Date: Sat, 8 Nov 2025 23:21:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8A=A8=20Signed-off-by:=20TRAfoer?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/FR2_Cache.asset | 100 +++--- .../EditorAnimations/DisplacementTracker.cs | 11 +- .../EditorAnimations/ScaleTracker.cs | 12 +- .../EditorAnimations/SwirlTracker.cs | 11 +- .../AutoSave/1/AutoSave_0.json | 320 ++++++++++++------ .../AutoSave/1/AutoSave_1.json | 288 ++++++++++------ .../AutoSave/1/AutoSave_2.json | 261 +++++++------- .../StreamingAssets/Projects/1/Beatmap.json | 59 ++++ 8 files changed, 692 insertions(+), 370 deletions(-) diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index 5d3a099e..4e8f09dc 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -49,10 +49,10 @@ MonoBehaviour: m_addressable: m_atlas: m_fileSize: 26810 - m_assetChangeTS: 1762020007 - m_fileInfoReadTS: 1762020026 - m_fileWriteTS: 1762020007 - m_cachefileWriteTS: 1762020007 + m_assetChangeTS: 1762614198 + m_fileInfoReadTS: 1762614202 + m_fileWriteTS: 1762614197 + m_cachefileWriteTS: 1762614197 refreshStamp: 2 UseGUIDsList: - guid: cd62869af1bc6534d83427c72b66bb9f @@ -196542,10 +196542,10 @@ MonoBehaviour: m_addressable: m_atlas: m_fileSize: 569620 - m_assetChangeTS: 1762020007 - m_fileInfoReadTS: 1762020026 - m_fileWriteTS: 1762020007 - m_cachefileWriteTS: 1762020007 + m_assetChangeTS: 1762614198 + m_fileInfoReadTS: 1762614202 + m_fileWriteTS: 1762614197 + m_cachefileWriteTS: 1762614197 refreshStamp: 2 UseGUIDsList: - guid: fe393ace9b354375a9cb14cdbbc28be4 @@ -222619,15 +222619,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: a4f7d2c6cab636c47b06b244a10752c1 type: 9 - m_fileInfoHash: 28857.json + m_fileInfoHash: 31051.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 28857 - m_assetChangeTS: 1762023839 - m_fileInfoReadTS: 1762023856 - m_fileWriteTS: 1762023835 - m_cachefileWriteTS: 1762023835 + m_fileSize: 31051 + m_assetChangeTS: 1762613879 + m_fileInfoReadTS: 1762613898 + m_fileWriteTS: 1762613822 + m_cachefileWriteTS: 1762613822 refreshStamp: 2 UseGUIDsList: [] - guid: f4ff864c59d959f4e98c0119f0259d6d @@ -222710,28 +222710,28 @@ MonoBehaviour: UseGUIDsList: [] - guid: 1f4f8092e8f9f4c428ae331e7f354862 type: 9 - m_fileInfoHash: 29202.json + m_fileInfoHash: 31051.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 29202 - m_assetChangeTS: 1762022969 - m_fileInfoReadTS: 1762022978 - m_fileWriteTS: 1762022562 - m_cachefileWriteTS: 1762022562 + m_fileSize: 31051 + m_assetChangeTS: 1762614880 + m_fileInfoReadTS: 1762614897 + m_fileWriteTS: 1762613846 + m_cachefileWriteTS: 1762613846 refreshStamp: 2 UseGUIDsList: [] - guid: dcf79458996b9294e9622caeeeabacc4 type: 9 - m_fileInfoHash: 29202.json + m_fileInfoHash: 29590.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 29202 - m_assetChangeTS: 1762022969 - m_fileInfoReadTS: 1762022978 - m_fileWriteTS: 1762022262 - m_cachefileWriteTS: 1762022262 + m_fileSize: 29590 + m_assetChangeTS: 1762614880 + m_fileInfoReadTS: 1762614897 + m_fileWriteTS: 1762613546 + m_cachefileWriteTS: 1762613546 refreshStamp: 2 UseGUIDsList: [] - guid: 102e46de009e849cdba7cdbee965fb23 @@ -227572,15 +227572,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 6d87960788a4be94e87ff13bb81625cd type: 2 - m_fileInfoHash: 9658.cs + m_fileInfoHash: 9800.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 9658 - m_assetChangeTS: 1762020242 - m_fileInfoReadTS: 1762020260 - m_fileWriteTS: 1762020239 - m_cachefileWriteTS: 1762020239 + m_fileSize: 9800 + m_assetChangeTS: 1762615068 + m_fileInfoReadTS: 1762615085 + m_fileWriteTS: 1762615066 + m_cachefileWriteTS: 1762615066 refreshStamp: 2 UseGUIDsList: [] - guid: 43c59b01d1d25b9448e5a5fecbc7e989 @@ -227702,41 +227702,41 @@ MonoBehaviour: UseGUIDsList: [] - guid: 8fb22b1768a50f049bbe1a932e358f8d type: 9 - m_fileInfoHash: 29365.json + m_fileInfoHash: 31664.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 29365 - m_assetChangeTS: 1762022969 - m_fileInfoReadTS: 1762022978 - m_fileWriteTS: 1762022862 - m_cachefileWriteTS: 1762022862 + m_fileSize: 31664 + m_assetChangeTS: 1762614880 + m_fileInfoReadTS: 1762614897 + m_fileWriteTS: 1762614672 + m_cachefileWriteTS: 1762614672 refreshStamp: 2 UseGUIDsList: [] - guid: fa441a41a13cc794cb909abea76cd7a1 type: 2 - m_fileInfoHash: 8784.cs + m_fileInfoHash: 9339.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 8784 - m_assetChangeTS: 1762021720 - m_fileInfoReadTS: 1762021736 - m_fileWriteTS: 1762021719 - m_cachefileWriteTS: 1762021719 + m_fileSize: 9339 + m_assetChangeTS: 1762615068 + m_fileInfoReadTS: 1762615085 + m_fileWriteTS: 1762615066 + m_cachefileWriteTS: 1762615066 refreshStamp: 2 UseGUIDsList: [] - guid: 771a58a2b0d89ca4d9440f8463a03ff2 type: 2 - m_fileInfoHash: 8754.cs + m_fileInfoHash: 9307.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 8754 - m_assetChangeTS: 1762023198 - m_fileInfoReadTS: 1762023216 - m_fileWriteTS: 1762023197 - m_cachefileWriteTS: 1762023197 + m_fileSize: 9307 + m_assetChangeTS: 1762615068 + m_fileInfoReadTS: 1762615085 + m_fileWriteTS: 1762615066 + m_cachefileWriteTS: 1762615066 refreshStamp: 2 UseGUIDsList: [] setting: diff --git a/Assets/Scripts/EditorGame/Animations/EditorAnimations/DisplacementTracker.cs b/Assets/Scripts/EditorGame/Animations/EditorAnimations/DisplacementTracker.cs index 19e926eb..b111aa0e 100644 --- a/Assets/Scripts/EditorGame/Animations/EditorAnimations/DisplacementTracker.cs +++ b/Assets/Scripts/EditorGame/Animations/EditorAnimations/DisplacementTracker.cs @@ -18,6 +18,8 @@ namespace Ichni.RhythmGame public float TimeOffset; public BaseElement_BM MatchingExportElement { get; set; } = null; public List Interferometers { get; set; } = new(); + private bool isSwitchingReturnType = false; + public static DisplacementTracker GenerateElement(string elementName, System.Guid id, List tags, bool isFirstGenerated, GameElement animatedObject, Displacement targetDisplacement, float timeOffset) { @@ -44,10 +46,12 @@ namespace Ichni.RhythmGame { animationReturnType = FlexibleReturnType.MiddleExecuting; ApplyValue(songTime); + isSwitchingReturnType = true; } - else if (x.Item2 || y.Item2 || z.Item2) + else if (isSwitchingReturnType) { animationReturnType = FlexibleReturnType.MiddleExecuting; + isSwitchingReturnType = false; ApplyValue(songTime); } else @@ -108,6 +112,11 @@ namespace Ichni.RhythmGame string ShowConnection() => targetDisplacement == null ? "No Displacement Connected" : "Connected With: " + ((GameElement)targetDisplacement).elementName; var connectHintText = inspector.GenerateHintText(this, effectSettings, ShowConnection); var InputField = inspector.GenerateInputField(this, effectSettings, "Offset", nameof(TimeOffset)); + var interferometerButton = inspector.GenerateButton(this, effectSettings, "Interferometer", () => + { + Vector3Interferometer.GenerateElement("New Vector3 Interferometer", Guid.NewGuid(), new List(), true, + this, InterferomType.Additive, Vector3.zero); + }); } diff --git a/Assets/Scripts/EditorGame/Animations/EditorAnimations/ScaleTracker.cs b/Assets/Scripts/EditorGame/Animations/EditorAnimations/ScaleTracker.cs index 0f58bcab..7c05a779 100644 --- a/Assets/Scripts/EditorGame/Animations/EditorAnimations/ScaleTracker.cs +++ b/Assets/Scripts/EditorGame/Animations/EditorAnimations/ScaleTracker.cs @@ -18,6 +18,8 @@ namespace Ichni.RhythmGame public float TimeOffset; public BaseElement_BM MatchingExportElement { get; set; } = null; public List Interferometers { get; set; } = new(); + private bool isSwitchingReturnType = false; + public static ScaleTracker GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement animatedObject, ICanBeTrackedScale targetScale, float timeOffset) { @@ -44,10 +46,12 @@ namespace Ichni.RhythmGame { animationReturnType = FlexibleReturnType.MiddleExecuting; ApplyValue(songTime); + isSwitchingReturnType = true; } - else if (x.Item2 || y.Item2 || z.Item2) + else if (isSwitchingReturnType) { animationReturnType = FlexibleReturnType.MiddleExecuting; + isSwitchingReturnType = false; ApplyValue(songTime); } else @@ -104,6 +108,12 @@ namespace Ichni.RhythmGame string ShowConnection() => targetScale == null ? "No Scale Connected" : "Connected With: " + ((GameElement)targetScale).elementName; var connectHintText = inspector.GenerateHintText(this, effectSettings, ShowConnection); var InputField = inspector.GenerateInputField(this, effectSettings, "Offset", nameof(TimeOffset)); + var interferometerButton = inspector.GenerateButton(this, effectSettings, "Interferometer", () => + { + Vector3Interferometer.GenerateElement("New Vector3 Interferometer", Guid.NewGuid(), new List(), true, + this, InterferomType.Additive, Vector3.zero); + }); + } public override void SaveBM() diff --git a/Assets/Scripts/EditorGame/Animations/EditorAnimations/SwirlTracker.cs b/Assets/Scripts/EditorGame/Animations/EditorAnimations/SwirlTracker.cs index 1519f362..cdb36530 100644 --- a/Assets/Scripts/EditorGame/Animations/EditorAnimations/SwirlTracker.cs +++ b/Assets/Scripts/EditorGame/Animations/EditorAnimations/SwirlTracker.cs @@ -18,6 +18,8 @@ namespace Ichni.RhythmGame public float TimeOffset; public BaseElement_BM MatchingExportElement { get; set; } = null; public List Interferometers { get; set; } = new(); + private bool isSwitchingReturnType = false; + public static SwirlTracker GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement animatedObject, Swirl targetSwirl, float timeOffset) { @@ -44,10 +46,12 @@ namespace Ichni.RhythmGame { animationReturnType = FlexibleReturnType.MiddleExecuting; ApplyValue(songTime); + isSwitchingReturnType = true; } - else if (x.Item2 || y.Item2 || z.Item2) + else if (isSwitchingReturnType) { animationReturnType = FlexibleReturnType.MiddleExecuting; + isSwitchingReturnType = false; ApplyValue(songTime); } else @@ -104,6 +108,11 @@ namespace Ichni.RhythmGame string ShowConnection() => targetSwirl == null ? "No Swirl Connected" : "Connected With: " + ((GameElement)targetSwirl).elementName; var connectHintText = inspector.GenerateHintText(this, effectSettings, ShowConnection); var InputField = inspector.GenerateInputField(this, effectSettings, "Offset", nameof(TimeOffset)); + var interferometerButton = inspector.GenerateButton(this, effectSettings, "Interferometer", () => + { + Vector3Interferometer.GenerateElement("New Vector3 Interferometer", Guid.NewGuid(), new List(), true, + this, InterferomType.Additive, Vector3.zero); + }); } public override void SaveBM() diff --git a/Assets/StreamingAssets/AutoSave/1/AutoSave_0.json b/Assets/StreamingAssets/AutoSave/1/AutoSave_0.json index 6fc65827..d4876d62 100644 --- a/Assets/StreamingAssets/AutoSave/1/AutoSave_0.json +++ b/Assets/StreamingAssets/AutoSave/1/AutoSave_0.json @@ -253,10 +253,22 @@ "animationCurveType" : 1 },{ "startValue" : 12, - "endValue" : 0, + "endValue" : 3, "startTime" : 6, "endTime" : 6.6, "animationCurveType" : 1 + },{ + "startValue" : 3, + "endValue" : 0, + "startTime" : 7.2, + "endTime" : 7.8, + "animationCurveType" : 1 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 8.400001, + "endTime" : 9.000001, + "animationCurveType" : 1 } ] }, @@ -906,12 +918,6 @@ "startTime" : 7.2, "endTime" : 8.4, "animationCurveType" : 3 - },{ - "startValue" : 15, - "endValue" : 0, - "startTime" : 8.400001, - "endTime" : 9.000001, - "animationCurveType" : 3 } ] }, @@ -934,20 +940,151 @@ "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Ichni.RhythmGame.Beatmap.Scale_BM,Assembly-CSharp", + "scaleX" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 2, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 1.2, + "endTime" : 1.8, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 1.8, + "endTime" : 2.4, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 2.4, + "endTime" : 3, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 3, + "endTime" : 3.60000014, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 3.60000014, + "endTime" : 4.2, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 4.20000029, + "endTime" : 4.8, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 4.8, + "endTime" : 5.40000057, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 5.40000057, + "endTime" : 6.00000048, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 6.00000048, + "endTime" : 6.60000038, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 6.60000038, + "endTime" : 7.20000029, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 7.20000029, + "endTime" : 7.8, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 7.8, + "endTime" : 8.400001, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 8.400001, + "endTime" : 9, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 9, + "endTime" : 9.6, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 9.6, + "endTime" : 10.2000008, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 10.2000008, + "endTime" : 10.8000011, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 10.8000011, + "endTime" : 11.4000006, + "animationCurveType" : 0 + } + ] }, - "timeOffset" : 0, - "elementName" : "qwe", + "scaleY" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "scaleZ" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Scale", "tags" : [ ], "elementGuid" : { - "value" : "13bf29cc-5544-444a-8959-b084f7ff313d" + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" }, "attachedElementGuid" : { - "value" : "52f0fdc8-19fd-4d8a-92d1-56771c7e70b9" + "value" : "96021c96-07c7-4684-a8b9-39b8ca17347f" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -955,23 +1092,23 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "13bf29cc-5544-444a-8959-b084f7ff313d" + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Beatmap.ScaleTracker_BM,Assembly-CSharp", + "targetScaleGuid" : { + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" }, - "timeOffset" : 0, - "elementName" : "qwe", + "timeOffset" : 0.04, + "elementName" : "New Scale Tracker", "tags" : [ ], "elementGuid" : { - "value" : "c039b16d-33fc-49b5-bc8e-6cee000a36fe" + "value" : "ede46dfd-b718-4e33-8838-060bee61514b" }, "attachedElementGuid" : { - "value" : "0357bf36-2dc9-4fdd-a7c6-d2fb9d77645d" + "value" : "11fa6295-76d4-4969-8ca0-30e05484f7da" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -979,23 +1116,70 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "c039b16d-33fc-49b5-bc8e-6cee000a36fe" + "value" : "ede46dfd-b718-4e33-8838-060bee61514b" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Ichni.RhythmGame.Beatmap.Displacement_BM,Assembly-CSharp", + "positionX" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] }, - "timeOffset" : 0, - "elementName" : "qwe", + "positionY" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + },{ + "startValue" : 1, + "endValue" : 2, + "startTime" : 1, + "endTime" : 4.8, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 5.4, + "endTime" : 6, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 0, + "startTime" : 6, + "endTime" : 6.6, + "animationCurveType" : 0 + } + ] + }, + "positionZ" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Displacement", "tags" : [ ], "elementGuid" : { - "value" : "36fe92b8-11cc-4cd8-af7d-31e0a24ae152" + "value" : "95a2a15b-5f34-48f4-8be4-569fd41fc9cd" }, "attachedElementGuid" : { - "value" : "b54bd2b2-ae60-4b93-9eef-ab10beb69baa" + "value" : "11fa6295-76d4-4969-8ca0-30e05484f7da" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -1003,81 +1187,7 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "36fe92b8-11cc-4cd8-af7d-31e0a24ae152" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "39254197-dbb5-4e45-a4af-7599d962b6c2" - }, - "attachedElementGuid" : { - "value" : "9a80b99c-61fc-4368-8b5c-90999050a516" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "39254197-dbb5-4e45-a4af-7599d962b6c2" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "8b99f921-d4a2-493a-9aa9-841d53a76a95" - }, - "attachedElementGuid" : { - "value" : "cda87023-10d3-4545-8d3b-34f778d18369" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "8b99f921-d4a2-493a-9aa9-841d53a76a95" - } - },{ - "__type" : "Beatmap.Vector3Interferometer_BM,Assembly-CSharp", - "InterferomValueVector3" : { - "x" : 1, - "y" : 1, - "z" : 1 - }, - "InterferomType" : 1, - "elementName" : "New Vector3 Interferometer", - "tags" : [ - - ], - "elementGuid" : { - "value" : "3e09b896-cca1-4616-9823-a1d784337321" - }, - "attachedElementGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "3e09b896-cca1-4616-9823-a1d784337321" + "value" : "95a2a15b-5f34-48f4-8be4-569fd41fc9cd" } } ], diff --git a/Assets/StreamingAssets/AutoSave/1/AutoSave_1.json b/Assets/StreamingAssets/AutoSave/1/AutoSave_1.json index b6f1bf59..b3167fb0 100644 --- a/Assets/StreamingAssets/AutoSave/1/AutoSave_1.json +++ b/Assets/StreamingAssets/AutoSave/1/AutoSave_1.json @@ -928,20 +928,151 @@ "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Ichni.RhythmGame.Beatmap.Scale_BM,Assembly-CSharp", + "scaleX" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 2, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 1.2, + "endTime" : 1.8, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 1.8, + "endTime" : 2.4, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 2.4, + "endTime" : 3, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 3, + "endTime" : 3.60000014, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 3.60000014, + "endTime" : 4.2, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 4.20000029, + "endTime" : 4.8, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 4.8, + "endTime" : 5.40000057, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 5.40000057, + "endTime" : 6.00000048, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 6.00000048, + "endTime" : 6.60000038, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 6.60000038, + "endTime" : 7.20000029, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 7.20000029, + "endTime" : 7.8, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 7.8, + "endTime" : 8.400001, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 8.400001, + "endTime" : 9, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 9, + "endTime" : 9.6, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 9.6, + "endTime" : 10.2000008, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 10.2000008, + "endTime" : 10.8000011, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 10.8000011, + "endTime" : 11.4000006, + "animationCurveType" : 0 + } + ] }, - "timeOffset" : 0, - "elementName" : "qwe", + "scaleY" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "scaleZ" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Scale", "tags" : [ ], "elementGuid" : { - "value" : "13bf29cc-5544-444a-8959-b084f7ff313d" + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" }, "attachedElementGuid" : { - "value" : "52f0fdc8-19fd-4d8a-92d1-56771c7e70b9" + "value" : "96021c96-07c7-4684-a8b9-39b8ca17347f" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -949,23 +1080,23 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "13bf29cc-5544-444a-8959-b084f7ff313d" + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Beatmap.ScaleTracker_BM,Assembly-CSharp", + "targetScaleGuid" : { + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" }, - "timeOffset" : 0, - "elementName" : "qwe", + "timeOffset" : 0.04, + "elementName" : "New Scale Tracker", "tags" : [ ], "elementGuid" : { - "value" : "c039b16d-33fc-49b5-bc8e-6cee000a36fe" + "value" : "ede46dfd-b718-4e33-8838-060bee61514b" }, "attachedElementGuid" : { - "value" : "0357bf36-2dc9-4fdd-a7c6-d2fb9d77645d" + "value" : "11fa6295-76d4-4969-8ca0-30e05484f7da" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -973,23 +1104,58 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "c039b16d-33fc-49b5-bc8e-6cee000a36fe" + "value" : "ede46dfd-b718-4e33-8838-060bee61514b" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Ichni.RhythmGame.Beatmap.Displacement_BM,Assembly-CSharp", + "positionX" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] }, - "timeOffset" : 0, - "elementName" : "qwe", + "positionY" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + },{ + "startValue" : 1, + "endValue" : 2, + "startTime" : 1, + "endTime" : 10.8, + "animationCurveType" : 0 + } + ] + }, + "positionZ" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Displacement", "tags" : [ ], "elementGuid" : { - "value" : "36fe92b8-11cc-4cd8-af7d-31e0a24ae152" + "value" : "95a2a15b-5f34-48f4-8be4-569fd41fc9cd" }, "attachedElementGuid" : { - "value" : "b54bd2b2-ae60-4b93-9eef-ab10beb69baa" + "value" : "11fa6295-76d4-4969-8ca0-30e05484f7da" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -997,81 +1163,7 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "36fe92b8-11cc-4cd8-af7d-31e0a24ae152" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "39254197-dbb5-4e45-a4af-7599d962b6c2" - }, - "attachedElementGuid" : { - "value" : "9a80b99c-61fc-4368-8b5c-90999050a516" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "39254197-dbb5-4e45-a4af-7599d962b6c2" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "8b99f921-d4a2-493a-9aa9-841d53a76a95" - }, - "attachedElementGuid" : { - "value" : "cda87023-10d3-4545-8d3b-34f778d18369" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "8b99f921-d4a2-493a-9aa9-841d53a76a95" - } - },{ - "__type" : "Beatmap.Vector3Interferometer_BM,Assembly-CSharp", - "InterferomValueVector3" : { - "x" : 1, - "y" : 1, - "z" : 1 - }, - "InterferomType" : 1, - "elementName" : "New Vector3 Interferometer", - "tags" : [ - - ], - "elementGuid" : { - "value" : "3e09b896-cca1-4616-9823-a1d784337321" - }, - "attachedElementGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "3e09b896-cca1-4616-9823-a1d784337321" + "value" : "95a2a15b-5f34-48f4-8be4-569fd41fc9cd" } } ], diff --git a/Assets/StreamingAssets/AutoSave/1/AutoSave_2.json b/Assets/StreamingAssets/AutoSave/1/AutoSave_2.json index b6f1bf59..0bff043c 100644 --- a/Assets/StreamingAssets/AutoSave/1/AutoSave_2.json +++ b/Assets/StreamingAssets/AutoSave/1/AutoSave_2.json @@ -928,20 +928,151 @@ "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Ichni.RhythmGame.Beatmap.Scale_BM,Assembly-CSharp", + "scaleX" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 2, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 1.2, + "endTime" : 1.8, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 1.8, + "endTime" : 2.4, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 2.4, + "endTime" : 3, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 3, + "endTime" : 3.60000014, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 3.60000014, + "endTime" : 4.2, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 4.20000029, + "endTime" : 4.8, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 4.8, + "endTime" : 5.40000057, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 5.40000057, + "endTime" : 6.00000048, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 6.00000048, + "endTime" : 6.60000038, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 6.60000038, + "endTime" : 7.20000029, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 7.20000029, + "endTime" : 7.8, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 7.8, + "endTime" : 8.400001, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 8.400001, + "endTime" : 9, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 9, + "endTime" : 9.6, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 9.6, + "endTime" : 10.2000008, + "animationCurveType" : 0 + },{ + "startValue" : 0, + "endValue" : 2, + "startTime" : 10.2000008, + "endTime" : 10.8000011, + "animationCurveType" : 0 + },{ + "startValue" : 2, + "endValue" : 0, + "startTime" : 10.8000011, + "endTime" : 11.4000006, + "animationCurveType" : 0 + } + ] }, - "timeOffset" : 0, - "elementName" : "qwe", + "scaleY" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "scaleZ" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Scale", "tags" : [ ], "elementGuid" : { - "value" : "13bf29cc-5544-444a-8959-b084f7ff313d" + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" }, "attachedElementGuid" : { - "value" : "52f0fdc8-19fd-4d8a-92d1-56771c7e70b9" + "value" : "96021c96-07c7-4684-a8b9-39b8ca17347f" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -949,23 +1080,23 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "13bf29cc-5544-444a-8959-b084f7ff313d" + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" } },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" + "__type" : "Beatmap.ScaleTracker_BM,Assembly-CSharp", + "targetScaleGuid" : { + "value" : "bf5ad721-e0fb-40f5-bd3f-a3f5bdf6681f" }, - "timeOffset" : 0, - "elementName" : "qwe", + "timeOffset" : 0.04, + "elementName" : "New Scale Tracker", "tags" : [ ], "elementGuid" : { - "value" : "c039b16d-33fc-49b5-bc8e-6cee000a36fe" + "value" : "ede46dfd-b718-4e33-8838-060bee61514b" }, "attachedElementGuid" : { - "value" : "0357bf36-2dc9-4fdd-a7c6-d2fb9d77645d" + "value" : "11fa6295-76d4-4969-8ca0-30e05484f7da" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", @@ -973,105 +1104,7 @@ "startTime" : -32767, "endTime" : 32767, "attachedElementGuid" : { - "value" : "c039b16d-33fc-49b5-bc8e-6cee000a36fe" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "36fe92b8-11cc-4cd8-af7d-31e0a24ae152" - }, - "attachedElementGuid" : { - "value" : "b54bd2b2-ae60-4b93-9eef-ab10beb69baa" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "36fe92b8-11cc-4cd8-af7d-31e0a24ae152" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "39254197-dbb5-4e45-a4af-7599d962b6c2" - }, - "attachedElementGuid" : { - "value" : "9a80b99c-61fc-4368-8b5c-90999050a516" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "39254197-dbb5-4e45-a4af-7599d962b6c2" - } - },{ - "__type" : "Beatmap.SwirlTracker_BM,Assembly-CSharp", - "targetSwirlGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - }, - "timeOffset" : 0, - "elementName" : "qwe", - "tags" : [ - - ], - "elementGuid" : { - "value" : "8b99f921-d4a2-493a-9aa9-841d53a76a95" - }, - "attachedElementGuid" : { - "value" : "cda87023-10d3-4545-8d3b-34f778d18369" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "8b99f921-d4a2-493a-9aa9-841d53a76a95" - } - },{ - "__type" : "Beatmap.Vector3Interferometer_BM,Assembly-CSharp", - "InterferomValueVector3" : { - "x" : 1, - "y" : 1, - "z" : 1 - }, - "InterferomType" : 1, - "elementName" : "New Vector3 Interferometer", - "tags" : [ - - ], - "elementGuid" : { - "value" : "3e09b896-cca1-4616-9823-a1d784337321" - }, - "attachedElementGuid" : { - "value" : "68538fb5-ce4a-464a-b7b8-de3e2fc1deb8" - } - },{ - "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", - "isOverridingDuration" : false, - "startTime" : -32767, - "endTime" : 32767, - "attachedElementGuid" : { - "value" : "3e09b896-cca1-4616-9823-a1d784337321" + "value" : "ede46dfd-b718-4e33-8838-060bee61514b" } } ], diff --git a/Assets/StreamingAssets/Projects/1/Beatmap.json b/Assets/StreamingAssets/Projects/1/Beatmap.json index 0bff043c..b3167fb0 100644 --- a/Assets/StreamingAssets/Projects/1/Beatmap.json +++ b/Assets/StreamingAssets/Projects/1/Beatmap.json @@ -1106,6 +1106,65 @@ "attachedElementGuid" : { "value" : "ede46dfd-b718-4e33-8838-060bee61514b" } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Displacement_BM,Assembly-CSharp", + "positionX" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "positionY" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + },{ + "startValue" : 1, + "endValue" : 2, + "startTime" : 1, + "endTime" : 10.8, + "animationCurveType" : 0 + } + ] + }, + "positionZ" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 0, + "startTime" : 0, + "endTime" : 1, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Displacement", + "tags" : [ + + ], + "elementGuid" : { + "value" : "95a2a15b-5f34-48f4-8be4-569fd41fc9cd" + }, + "attachedElementGuid" : { + "value" : "11fa6295-76d4-4969-8ca0-30e05484f7da" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "95a2a15b-5f34-48f4-8be4-569fd41fc9cd" + } } ], "attachedElementGuid" : {