diff --git a/Assets/Assets.sln.meta b/Assets/Assets.sln.meta deleted file mode 100644 index 2aff0f81..00000000 --- a/Assets/Assets.sln.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 28802a2f6f0ff2942bd2a248b9b68960 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/DefaultVolumeProfile.asset b/Assets/DefaultVolumeProfile.asset index f626eeca..1d5536f7 100644 --- a/Assets/DefaultVolumeProfile.asset +++ b/Assets/DefaultVolumeProfile.asset @@ -703,10 +703,10 @@ MonoBehaviour: m_Value: 0 strengthX: m_OverrideState: 1 - m_Value: 1920 + m_Value: 1 strengthY: m_OverrideState: 1 - m_Value: 1080 + m_Value: 1 --- !u!114 &3182184296376474618 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Assets/NLayer/NLayer.csproj.meta b/Assets/NLayer/NLayer.csproj.meta deleted file mode 100644 index 4b6b01c4..00000000 --- a/Assets/NLayer/NLayer.csproj.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 88f0993afef43b34eb23a79fbdd94e9b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/StartMenu.unity b/Assets/Scenes/StartMenu.unity index e8ada01e..2c664108 100644 --- a/Assets/Scenes/StartMenu.unity +++ b/Assets/Scenes/StartMenu.unity @@ -7138,55 +7138,6 @@ RectTransform: m_AnchoredPosition: {x: -200, y: 0} m_SizeDelta: {x: 25, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1395701959 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1395701961} - - component: {fileID: 1395701960} - m_Layer: 0 - m_Name: Volume - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1395701960 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1395701959} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} - m_Name: - m_EditorClassIdentifier: Unity.RenderPipelines.Core.Runtime::UnityEngine.Rendering.Volume - m_IsGlobal: 1 - priority: 0 - blendDistance: 0 - weight: 1 - sharedProfile: {fileID: 11400000, guid: a6560a915ef98420e9faacc1c7438823, type: 2} ---- !u!4 &1395701961 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1395701959} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1405224696 GameObject: m_ObjectHideFlags: 0 @@ -17920,4 +17871,3 @@ SceneRoots: - {fileID: 250681945} - {fileID: 398605647} - {fileID: 1050672441} - - {fileID: 1395701961} diff --git a/Assets/Scripts/Game/DataCore/GameElements_BM/GeneralEffects/PixelateEffect_BM.cs b/Assets/Scripts/Game/DataCore/GameElements_BM/GeneralEffects/PixelateEffect_BM.cs index 014ab6ec..321c41c9 100644 --- a/Assets/Scripts/Game/DataCore/GameElements_BM/GeneralEffects/PixelateEffect_BM.cs +++ b/Assets/Scripts/Game/DataCore/GameElements_BM/GeneralEffects/PixelateEffect_BM.cs @@ -6,8 +6,8 @@ namespace Ichni.RhythmGame.Beatmap public class PixelateEffect_BM : EffectBase_BM { [System.Obsolete] public float duration; - public float bottomX; - public float bottomY; + [Range(0f, 1f)] public float bottomX; + [Range(0f, 1f)] public float bottomY; public AnimationCurve intensityCurve; public PixelateEffect_BM() @@ -19,8 +19,8 @@ namespace Ichni.RhythmGame.Beatmap { this.effectTime = duration; this.duration = duration; - this.bottomX = bottomX; - this.bottomY = bottomY; + this.bottomX = Mathf.Clamp01(bottomX); + this.bottomY = Mathf.Clamp01(bottomY); this.intensityCurve = intensityCurve; } diff --git a/Assets/Scripts/Game/EditorCore/GameElements_Editor/GeneralEffects/PixelateEffect_Editor.cs b/Assets/Scripts/Game/EditorCore/GameElements_Editor/GeneralEffects/PixelateEffect_Editor.cs index cafd4277..cf90212d 100644 --- a/Assets/Scripts/Game/EditorCore/GameElements_Editor/GeneralEffects/PixelateEffect_Editor.cs +++ b/Assets/Scripts/Game/EditorCore/GameElements_Editor/GeneralEffects/PixelateEffect_Editor.cs @@ -11,8 +11,8 @@ namespace Ichni.RhythmGame InspectorBuilder.For(this) .Section("Pixelate Effect") .InputField(nameof(effectTime), "Effect Time") - .InputField(nameof(bottomX), "Bottom X") - .InputField(nameof(bottomY), "Bottom Y") + .InputField(nameof(bottomX), "Bottom X (0-1)") + .InputField(nameof(bottomY), "Bottom Y (0-1)") .Button("Intensity Curve", () => insp.GenerateCompositeParameterWindow(this, "Intensity Curve", nameof(intensityCurve)).SetAsCustomCurve()) .Button("Clear Pixelate", Recover) .Button("Remove", () => { nowEffectState = EffectState.Before; AccommodatingList.Remove(this); EditorManager.instance.uiManager.inspector.SetInspector(attachedGameElement); }) diff --git a/Assets/Scripts/Game/RuntimeCore/Components/EffectSubmodule.cs b/Assets/Scripts/Game/RuntimeCore/Components/EffectSubmodule.cs index 1e56fba4..beb54e74 100644 --- a/Assets/Scripts/Game/RuntimeCore/Components/EffectSubmodule.cs +++ b/Assets/Scripts/Game/RuntimeCore/Components/EffectSubmodule.cs @@ -41,7 +41,7 @@ namespace Ichni.RhythmGame { "Vignette", () => new VignetteEffect(1, 1, 0.4f, Color.black, CustomCurvePresets.Parabolic(1, 0, 1)) }, { "SetInteger", () => new SetIntegerEffect("New Variable", 0, false, 0, 1) }, { "EnableControl", () => new EnableControlEffect(null, "New Variable", 0, false, "") }, - { "Pixelate", () => new PixelateEffect(1, 320, 180, CustomCurvePresets.Instant()) }, + { "Pixelate", () => new PixelateEffect(1, 1f / 6f, 1f / 6f, CustomCurvePresets.Instant()) }, { "LowPassFilter", () => new LowPassFilterEffect(1, 20, true, CustomCurvePresets.Parabolic(1, 0, 1)) }, { "HighPassFilter", () => new HighPassFilterEffect(1, 20000, true, CustomCurvePresets.Parabolic(1, 0, 1)) }, { "SpeedLines", () => new SpeedLinesEffect(1f, CustomCurvePresets.Parabolic(1, 0, 1), new Color(1f, 1f, 1f, 0.5f), peakRemap: 0f) }, diff --git a/Assets/Scripts/Game/RuntimeCore/GameElements/GeneralEffects/PixelateEffect.cs b/Assets/Scripts/Game/RuntimeCore/GameElements/GeneralEffects/PixelateEffect.cs index 41b356a3..4dbb045f 100644 --- a/Assets/Scripts/Game/RuntimeCore/GameElements/GeneralEffects/PixelateEffect.cs +++ b/Assets/Scripts/Game/RuntimeCore/GameElements/GeneralEffects/PixelateEffect.cs @@ -7,8 +7,8 @@ namespace Ichni.RhythmGame public partial class PixelateEffect : EffectBase { #region [运行时缓存数据] Property Caches - public float bottomX; - public float bottomY; + [Range(0f, 1f)] public float bottomX; + [Range(0f, 1f)] public float bottomY; public AnimationCurve intensityCurve; private PixelateVolume _pixelateVolume; @@ -18,8 +18,8 @@ namespace Ichni.RhythmGame public PixelateEffect(float duration, float bottomX, float bottomY, AnimationCurve intensityCurve) : base(duration) { - this.bottomX = bottomX; - this.bottomY = bottomY; + this.bottomX = Mathf.Clamp01(bottomX); + this.bottomY = Mathf.Clamp01(bottomY); this.intensityCurve = intensityCurve; } @@ -28,8 +28,8 @@ namespace Ichni.RhythmGame if (other is PixelateEffect otherEffect) { this.effectTime = otherEffect.effectTime; - this.bottomX = otherEffect.bottomX; - this.bottomY = otherEffect.bottomY; + this.bottomX = Mathf.Clamp01(otherEffect.bottomX); + this.bottomY = Mathf.Clamp01(otherEffect.bottomY); this.intensityCurve = otherEffect.intensityCurve != null ? new AnimationCurve(otherEffect.intensityCurve.keys) : null; } } @@ -50,8 +50,8 @@ namespace Ichni.RhythmGame if (_pixelateVolume != null) { _pixelateVolume.forceActive.value = true; - _pixelateVolume.strengthX.value = Screen.width; - _pixelateVolume.strengthY.value = Screen.height; + _pixelateVolume.strengthX.value = 1f; + _pixelateVolume.strengthY.value = 1f; } } @@ -59,8 +59,9 @@ namespace Ichni.RhythmGame { if (_pixelateVolume != null) { - float x = Mathf.Lerp(Screen.width, bottomX, intensityCurve.Evaluate(effectProgressPercent)); - float y = Mathf.Lerp(Screen.height, bottomY, intensityCurve.Evaluate(effectProgressPercent)); + float progress = intensityCurve == null ? effectProgressPercent : intensityCurve.Evaluate(effectProgressPercent); + float x = Mathf.Lerp(1f, Mathf.Clamp01(bottomX), progress); + float y = Mathf.Lerp(1f, Mathf.Clamp01(bottomY), progress); _pixelateVolume.strengthX.value = x; _pixelateVolume.strengthY.value = y; } @@ -75,8 +76,8 @@ namespace Ichni.RhythmGame if (_pixelateVolume != null) { _pixelateVolume.forceActive.value = false; - _pixelateVolume.strengthX.value = Screen.width; - _pixelateVolume.strengthY.value = Screen.height; + _pixelateVolume.strengthX.value = 1f; + _pixelateVolume.strengthY.value = 1f; } } #endregion diff --git a/Assets/Settings/SampleSceneProfile.asset b/Assets/Settings/SampleSceneProfile.asset index ed8a8c32..0cba031a 100644 --- a/Assets/Settings/SampleSceneProfile.asset +++ b/Assets/Settings/SampleSceneProfile.asset @@ -139,10 +139,10 @@ MonoBehaviour: m_Value: 1 strengthX: m_OverrideState: 1 - m_Value: 1920 + m_Value: 1 strengthY: m_OverrideState: 1 - m_Value: 1080 + m_Value: 1 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Shaders/ScriptablePostProcessor/Shaders/Pixelate.shader b/Assets/Shaders/ScriptablePostProcessor/Shaders/Pixelate.shader index 85e026de..a1356a95 100644 --- a/Assets/Shaders/ScriptablePostProcessor/Shaders/Pixelate.shader +++ b/Assets/Shaders/ScriptablePostProcessor/Shaders/Pixelate.shader @@ -23,15 +23,14 @@ Shader "Hidden/Custom/Pixelate" half4 Frag(Varyings input) : SV_Target { float2 uv = input.texcoord; - float2 strength = float2(_PixelateStrengthX, _PixelateStrengthY); - - // 防止除数为0的极小可能崩溃 - strength = max(strength, float2(1.0, 1.0)); + float2 resolutionRatio = saturate(float2(_PixelateStrengthX, _PixelateStrengthY)); + // 使用当前渲染目标分辨率，而不是设备固定分辨率，兼容动态分辨率和渲染缩放。 + float2 targetResolution = max(floor(_ScreenParams.xy * resolutionRatio), float2(1.0, 1.0)); - float2 uvScaled = uv * strength; + float2 uvScaled = uv * targetResolution; float2 uvFloor = floor(uvScaled); float2 uvCenter = uvFloor + 0.5; - float2 uvPixelated = uvCenter / strength; + float2 uvPixelated = uvCenter / targetResolution; // Blitter框架将自动把 SourceTexture 注入为 _BlitTexture return SAMPLE_TEXTURE2D_X(_BlitTexture, sampler_LinearClamp, uvPixelated); diff --git a/Assets/Shaders/ScriptablePostProcessor/Volumes/Pixelate.cs b/Assets/Shaders/ScriptablePostProcessor/Volumes/Pixelate.cs index b97026ed..c6119635 100644 --- a/Assets/Shaders/ScriptablePostProcessor/Volumes/Pixelate.cs +++ b/Assets/Shaders/ScriptablePostProcessor/Volumes/Pixelate.cs @@ -17,9 +17,12 @@ namespace SLSUtilities.Rendering.PostProcessing [Tooltip("是否强制开启像素化效果")] public BoolParameter forceActive = new BoolParameter(false); - - public FloatParameter strengthX = new FloatParameter(1920f); - public FloatParameter strengthY = new FloatParameter(1080f); + + [Tooltip("横向分辨率比例，0 到 1；1 为当前渲染分辨率")] + public FloatParameter strengthX = new FloatParameter(1f); + + [Tooltip("纵向分辨率比例，0 到 1；1 为当前渲染分辨率")] + public FloatParameter strengthY = new FloatParameter(1f); // 返回我们在 Shader 里定义的名字，保证管家可以据此获取材质 public override string GetShaderName() => "Hidden/Custom/Pixelate"; @@ -34,11 +37,11 @@ namespace SLSUtilities.Rendering.PostProcessing { if (material == null) return; - cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthX, strengthX.value); - cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthY, strengthY.value); + cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthX, Mathf.Clamp01(strengthX.value)); + cmd.SetGlobalFloat(InternalShaderHelpers.ID._PixelateStrengthY, Mathf.Clamp01(strengthY.value)); // 使用你的统一管家分发的 Blitter 进行优雅渲染 Blitter.BlitCameraTexture(cmd, source, destination, material, 0); } } -} \ No newline at end of file +} diff --git a/Assets/StreamingAssets/Clips/1.json b/Assets/StreamingAssets/Clips/1.json index f146ae48..8bdfd7a4 100644 --- a/Assets/StreamingAssets/Clips/1.json +++ b/Assets/StreamingAssets/Clips/1.json @@ -109,8 +109,8 @@ },{ "__type" : "Ichni.RhythmGame.Beatmap.PixelateEffect_BM,Assembly-CSharp", "duration" : 5, - "bottomX" : 320, - "bottomY" : 180, + "bottomX" : 0.16666666666666666, + "bottomY" : 0.16666666666666666, "intensityCurve" : { "keys" : [ { diff --git a/Assets/StreamingAssets/Projects/Your Shadow EZ/Beatmap.json b/Assets/StreamingAssets/Projects/Your Shadow EZ/Beatmap.json index 282d9dc2..ef0903dc 100644 --- a/Assets/StreamingAssets/Projects/Your Shadow EZ/Beatmap.json +++ b/Assets/StreamingAssets/Projects/Your Shadow EZ/Beatmap.json @@ -117,7 +117,7 @@ "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMStarrySkybox_BM,Assembly-CSharp", "skyColorR" : 0, "skyColorG" : 0, - "skyColorB" : 0, + "skyColorB" : 0.35, "skyColorA" : 1, "horizonR" : 0, "horizonG" : 0, @@ -215,7 +215,7 @@ },{ "__type" : "Ichni.RhythmGame.Beatmap.CrossTrackPoint_BM,Assembly-CSharp", "trackSwitch" : { - "value" : 0, + "value" : 1, "animations" : [ { "value" : 0, @@ -242,7 +242,7 @@ ] }, "trackPercent" : { - "value" : 0, + "value" : 0.316253871, "animations" : [ { "startValue" : 0, @@ -38814,7 +38814,7 @@ ], "elementGuid" : { - "value" : "6f3f8348-133d-4fed-831b-47e2df9b2e82" + "value" : "a691401c-7f0b-4a71-b926-55b8424506e0" }, "attachedElementGuid" : { "value" : "e7d3f910-cb0a-43c2-861e-3f22cb0e5534" @@ -38837,7 +38837,7 @@ "z" : 1 }, "attachedElementGuid" : { - "value" : "6f3f8348-133d-4fed-831b-47e2df9b2e82" + "value" : "a691401c-7f0b-4a71-b926-55b8424506e0" } },{ "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", @@ -38857,7 +38857,7 @@ ] }, "attachedElementGuid" : { - "value" : "6f3f8348-133d-4fed-831b-47e2df9b2e82" + "value" : "a691401c-7f0b-4a71-b926-55b8424506e0" } },{ "__type" : "Ichni.RhythmGame.Beatmap.TimeEffectsCollection_BM,Assembly-CSharp", @@ -38867,7 +38867,7 @@ ], "elementGuid" : { - "value" : "b2d406d2-9930-4e31-9f6a-9beac8cdf66b" + "value" : "2921bb52-195e-4298-af86-a06625654c8d" }, "attachedElementGuid" : { "value" : "e7d3f910-cb0a-43c2-861e-3f22cb0e5534" @@ -38890,7 +38890,7 @@ "z" : 1 }, "attachedElementGuid" : { - "value" : "b2d406d2-9930-4e31-9f6a-9beac8cdf66b" + "value" : "2921bb52-195e-4298-af86-a06625654c8d" } },{ "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", @@ -38910,7 +38910,7 @@ ] }, "attachedElementGuid" : { - "value" : "b2d406d2-9930-4e31-9f6a-9beac8cdf66b" + "value" : "2921bb52-195e-4298-af86-a06625654c8d" } },{ "__type" : "Ichni.RhythmGame.Beatmap.Stay_BM,Assembly-CSharp", @@ -43248,7 +43248,7 @@ ], "elementGuid" : { - "value" : "b3939cb1-1f49-4daf-9fc4-d51f3d9a11f6" + "value" : "0ec64979-8a01-40fb-b047-003b4d6b7151" }, "attachedElementGuid" : { "value" : "e7d3f910-cb0a-43c2-861e-3f22cb0e5534" @@ -43271,7 +43271,7 @@ "z" : 1 }, "attachedElementGuid" : { - "value" : "b3939cb1-1f49-4daf-9fc4-d51f3d9a11f6" + "value" : "0ec64979-8a01-40fb-b047-003b4d6b7151" } },{ "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", @@ -43291,7 +43291,7 @@ ] }, "attachedElementGuid" : { - "value" : "b3939cb1-1f49-4daf-9fc4-d51f3d9a11f6" + "value" : "0ec64979-8a01-40fb-b047-003b4d6b7151" } },{ "__type" : "Ichni.RhythmGame.Beatmap.PropertyAnimationColor_BM,Assembly-CSharp", @@ -60861,6 +60861,119 @@ "attachedElementGuid" : { "value" : "fce8eda1-5cd4-4ca2-9e36-1f058d4c6408" } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.ElementFolder_BM,Assembly-CSharp", + "elementName" : "Folder", + "tags" : [ + + ], + "elementGuid" : { + "value" : "5bf4bfef-9b62-4c96-8882-cc392acae05e" + }, + "attachedElementGuid" : { + "value" : "00000000-0000-0000-0000-000000000000" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "5bf4bfef-9b62-4c96-8882-cc392acae05e" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "5bf4bfef-9b62-4c96-8882-cc392acae05e" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeEffectsCollection_BM,Assembly-CSharp", + "time" : 1, + "elementName" : "New Time Effects Collection", + "tags" : [ + + ], + "elementGuid" : { + "value" : "7159e01d-a37c-448d-9ee3-807dcb04d225" + }, + "attachedElementGuid" : { + "value" : "5bf4bfef-9b62-4c96-8882-cc392acae05e" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "7159e01d-a37c-448d-9ee3-807dcb04d225" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", + "effectCollection" : {"Prior":[ + + ],"Default":[ + { + "__type" : "Ichni.RhythmGame.Beatmap.PixelateEffect_BM,Assembly-CSharp", + "bottomX" : 0.166666672, + "bottomY" : 0.166666672, + "intensityCurve" : { + "keys" : [ + { + "time" : 0, + "value" : 0, + "inTangent" : 0, + "outTangent" : 0 + },{ + "time" : 0.5, + "value" : 1, + "inTangent" : 0, + "outTangent" : 0 + },{ + "time" : 1, + "value" : 0, + "inTangent" : 0, + "outTangent" : 0 + } + ], + "preWrapMode" : 8, + "postWrapMode" : 8 + }, + "effectTime" : 10 + } + ],"Late":[ + + ] + }, + "attachedElementGuid" : { + "value" : "7159e01d-a37c-448d-9ee3-807dcb04d225" + } } ], "attachedElementGuid" : { diff --git a/Assets/StreamingAssets/Projects/Your Shadow EZ/ProjectInfo.json b/Assets/StreamingAssets/Projects/Your Shadow EZ/ProjectInfo.json index e9489971..966d6db8 100644 --- a/Assets/StreamingAssets/Projects/Your Shadow EZ/ProjectInfo.json +++ b/Assets/StreamingAssets/Projects/Your Shadow EZ/ProjectInfo.json @@ -6,7 +6,7 @@ "creatorName" : "Trader", "editorVersion" : "0.1.0", "createTime" : "2026\/6\/29 18:47:14", - "lastSaveTime" : "2026\/6\/29 21:59:46", + "lastSaveTime" : "7\/9\/2026 5:01:08 PM", "selectedThemeBundleList" : [ "basic","departure_to_multiverse" ], diff --git a/Assets/StreamingAssets/Projects/world for white/Beatmap.json b/Assets/StreamingAssets/Projects/world for white/Beatmap.json index 2e4daa75..ce3470e8 100644 --- a/Assets/StreamingAssets/Projects/world for white/Beatmap.json +++ b/Assets/StreamingAssets/Projects/world for white/Beatmap.json @@ -131598,8 +131598,8 @@ ],"GeneralJudge":[ { "__type" : "Ichni.RhythmGame.Beatmap.PixelateEffect_BM,Assembly-CSharp", - "bottomX" : 110, - "bottomY" : 180, + "bottomX" : 0.057291666666666664, + "bottomY" : 0.16666666666666666, "intensityCurve" : { "keys" : [ { @@ -134436,8 +134436,8 @@ ],"GeneralJudge":[ { "__type" : "Ichni.RhythmGame.Beatmap.PixelateEffect_BM,Assembly-CSharp", - "bottomX" : 320, - "bottomY" : 180, + "bottomX" : 0.16666666666666666, + "bottomY" : 0.16666666666666666, "intensityCurve" : { "keys" : [ { @@ -139378,8 +139378,8 @@ "effectTime" : 0.326 },{ "__type" : "Ichni.RhythmGame.Beatmap.PixelateEffect_BM,Assembly-CSharp", - "bottomX" : 100, - "bottomY" : 100, + "bottomX" : 0.052083333333333336, + "bottomY" : 0.092592592592592587, "intensityCurve" : { "keys" : [ { diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 index fb2301ef..03c9e204 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 and b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64 differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest index 2bc3e4e4..05c5895f 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest @@ -1,6 +1,6 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 1993203890 +CRC: 1128305406 HashAppended: 0 AssetBundleManifest: AssetBundleInfos: @@ -8,15 +8,15 @@ AssetBundleManifest: Name: basic Dependencies: {} Info_1: - Name: metropolis_on_orbit - Dependencies: {} - Info_2: Name: departure_to_multiverse Dependencies: Dependency_0: shapes - Info_3: - Name: shapes + Info_2: + Name: metropolis_on_orbit Dependencies: {} - Info_4: + Info_3: Name: unifiedraytracing Dependencies: {} + Info_4: + Name: shapes + Dependencies: {} diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/basic b/Assets/StreamingAssets/ThemeBundles/Windows64/basic index adffbad1..b9e1e1ca 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/basic and b/Assets/StreamingAssets/ThemeBundles/Windows64/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest index db5b966d..a2d57803 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 3638124941 +CRC: 170739097 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 512abf9fbba3b36e548e305dd8626dd2 + Hash: efb2a63b46fc84014c1fe307785a1838 TypeTreeHash: serializedVersion: 2 Hash: 51a9c20dab19416e261c53882aece497 IncrementalBuildHash: serializedVersion: 2 - Hash: 52cebab8000e947422055163300814fe + Hash: 89114e17dccffbc3a51842b810fa96c4 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse index e54e39c1..1188208e 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse and b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse differ diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest index c8ff8df7..128fd9ad 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest @@ -1,16 +1,16 @@ ManifestFileVersion: 0 UnityVersion: 6000.3.7f1 -CRC: 2726739895 +CRC: 542120700 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 7b58a316150ca63b781436f90de219a8 + Hash: 325f31f020822b789d2942c6475754f6 TypeTreeHash: serializedVersion: 2 - Hash: 11b50dc240e3c1d18c8aaf60bb985109 + Hash: 18cfab2a6b4e689dd1e9255aa8b69d98 IncrementalBuildHash: serializedVersion: 2 - Hash: e3034052693149879f9ec931a035ac39 + Hash: 2521259acc3946dca476d627d2f8f230 HashAppended: 0 ClassTypes: - Class: 1 @@ -45,8 +45,6 @@ ClassTypes: Script: {fileID: 11500000, guid: 0def5156137c6d14082064fa7b5d5247, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 77ab80dc0820f9d4a8cd9fddbbc89057, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: b73aa7982dc9e4261b2ff45db0112d48, type: 3} - Class: 114 Script: {fileID: 11500000, guid: b37c44f04f3075045aef6be2c0506551, type: 3} - Class: 114 @@ -63,6 +61,8 @@ ClassTypes: Script: {fileID: 11500000, guid: ba4e16116c88a4c49b992f6d0b71c05d, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 26a21b12ae64bfc43aa9129823e862ac, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 8fe763000f430ea498bfc8d7883bda31, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 3fe829cad763c61439c6596ef1e4c181, type: 3} - Class: 114 @@ -118,4 +118,4 @@ Assets: - Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualStay.prefab - Assets/ThemeBundles/DepartureToMultiverse/Textures/Skybox/DTM_NoiseStar0.png Dependencies: -- C:/ichniEditor-Source/IchniCreatorStudio/Assets/StreamingAssets/ThemeBundles/Windows64/shapes +- D:/Projects/IchniCreatorStudio/Assets/StreamingAssets/ThemeBundles/Windows64/shapes diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest index f4915e44..368ad2fc 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest @@ -10,7 +10,7 @@ Hashes: Hash: 2059feeebcfd643174e01ec401e33f9c IncrementalBuildHash: serializedVersion: 2 - Hash: 65c06be21750950eb290914e3969973c + Hash: 3004808577d6b30419ecd70193bf605a HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest b/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest index 44460476..ac746193 100644 --- a/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest +++ b/Assets/StreamingAssets/ThemeBundles/Windows64/shapes.manifest @@ -10,7 +10,7 @@ Hashes: Hash: bc9f87c7e64ff656997db0f2b2a91703 IncrementalBuildHash: serializedVersion: 2 - Hash: 9d54c70c3cd81a791e67665a159682b8 + Hash: 87a218d1ec15b08d97b6180b944afca3 HashAppended: 0 ClassTypes: - Class: 28 diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab index cb1b8242..a41726c3 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab +++ b/Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_Trail.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &448133524246398677 Transform: m_ObjectHideFlags: 0 @@ -10031,7 +10031,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4577072593820393137 Transform: m_ObjectHideFlags: 0 @@ -19789,7 +19789,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4577072594143320191 Transform: m_ObjectHideFlags: 0 @@ -24695,7 +24695,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &4577072594657777397 Transform: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 701286db..54023e6f 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,7 @@ GraphicsSettings: - {fileID: 4800000, guid: a46d3ad17881bcc40bb90b165375974f, type: 3} - {fileID: 4800000, guid: 7b9c9313dd6fd7a4c95981c520b6c617, type: 3} - {fileID: 4800000, guid: 3bc1d4066f58f6e47aeb7c358d24d593, type: 3} + - {fileID: 4800000, guid: 4bfe329b76eedf443b922d74642c32a7, type: 3} m_PreloadedShaders: [] m_PreloadShadersBatchTimeLimit: -1 m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,