修修补补

Signed-off-by: TRADER_FOER <lhf190@outlook.com>
2026-07-17 21:09:34 +08:00
parent df453844e4
commit 19bf49289e
26 changed files with 228698 additions and 47852 deletions
--- a/Assets/Scenes/EditorScene.unity.BACKUP.unity.meta
+++ b/Assets/Scenes/EditorScene.unity.BACKUP.unity.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 55fe9f4dfb9631f4381b4cf94f831d06
+guid: 28802a2f6f0ff2942bd2a248b9b68960
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/Dreamteck/Splines/Components/ComplexSurfaceGenerator.cs
+++ b/Assets/Dreamteck/Splines/Components/ComplexSurfaceGenerator.cs
@@ -147,7 +147,9 @@ namespace Dreamteck.Splines
        private Spline[] _splines = new Spline[0];
        [SerializeField]
        [HideInInspector]
+#pragma warning disable CS0414
        private bool _initializedInEditor = false;
+#pragma warning restore CS0414
       
        private int iterations => _subdivisions * _otherComputers.Length;

--- a/Assets/Dreamteck/Splines/Core/TransformModule.cs
+++ b/Assets/Dreamteck/Splines/Core/TransformModule.cs
@@ -231,7 +231,7 @@ namespace Dreamteck.Splines
 #endif
            input.transform.localScale = GetScale(input.transform.localScale);
            input.position = GetPosition(input.position);
-            if (!input.isKinematic)
+            if (input.bodyType != RigidbodyType2D.Kinematic)
            {
 #if UNITY_6000_OR_NEWER
            input.linearVelocity = HandleVelocity(input.linearVelocity);
--- a/Assets/Dreamteck/Utilities/Singleton.cs
+++ b/Assets/Dreamteck/Utilities/Singleton.cs
@@ -11,7 +11,7 @@ namespace Dreamteck
            {
                if (_instance == null)
                {
-                    _instance = Object.FindObjectsOfType<T>().FirstOrDefault();
+                    _instance = Object.FindFirstObjectByType<T>();
                }

                return _instance;
--- a/Assets/FR2_Cache.asset
+++ b/Assets/FR2_Cache.asset
--- a/Assets/I2/Localization/Scripts/Manager/LocalizationManager_Parameters.cs
+++ b/Assets/I2/Localization/Scripts/Manager/LocalizationManager_Parameters.cs
@@ -25,7 +25,7 @@ namespace I2.Loc

        public static void AutoLoadGlobalParamManagers()
        {
-            foreach (var manager in Object.FindObjectsOfType<LocalizationParamsManager>())
+            foreach (var manager in Object.FindObjectsByType<LocalizationParamsManager>(FindObjectsSortMode.None))
            {
                if (manager._IsGlobalManager && !ParamManagers.Contains(manager))
                {
--- a/Assets/I2/Localization/Scripts/Utils/ResourceManager.cs
+++ b/Assets/I2/Localization/Scripts/Utils/ResourceManager.cs
@@ -20,7 +20,7 @@ namespace I2.Loc
 				bool changed = mInstance==null;

 				if (mInstance==null)
-					mInstance = (ResourceManager)FindObjectOfType(typeof(ResourceManager));
+					mInstance = (ResourceManager)FindFirstObjectByType(typeof(ResourceManager));

 				if (mInstance==null)
 				{
--- a/3/Resources/ES3/ES3GlobalReferences.asset
+++ b/3/Resources/ES3/ES3GlobalReferences.asset
--- a/Assets/Scenes/EditorScene.unity.BACKUP.unity
+++ b/Assets/Scenes/EditorScene.unity.BACKUP.unity
--- a/Assets/Scripts/Console/consoleOnMono.cs
+++ b/Assets/Scripts/Console/consoleOnMono.cs
@@ -108,6 +108,7 @@ public class consoleOnMono : MonoBehaviour
        yield return GenerateLegacyNoteVisualOverrides(elements, stats);
        yield return GenerateLegacyAnimations(elements, stats);
        yield return RefreshLegacyImport(stats);
+        yield return ApplyLegacyPositionSyncInitialPass();

        LogWindow.Log(
            $"Legacy tbm import finished. Created {stats.created}, skipped {stats.skipped}, failed {stats.failed}.",
@@ -743,6 +744,36 @@ public class consoleOnMono : MonoBehaviour
        Debug.Log($"[LegacyImport] Refresh complete: {refreshed} elements refreshed, {stats.failed} failures");
    }

+    private IEnumerator ApplyLegacyPositionSyncInitialPass()
+    {
+        float songTime = CoreServices.TimeProvider?.SongTime ?? 0f;
+        int syncCount = 0;
+
+        foreach (GameElement element in legacyIdToElement.Values)
+        {
+            if (element is IHaveTransformSubmodule transformHost)
+            {
+                transformHost.UpdateTransform(false);
+            }
+        }
+
+        foreach (GameElement element in legacyIdToElement.Values)
+        {
+            if (element is not PositionSync sync)
+            {
+                continue;
+            }
+
+            sync.ScheduledUpdate(UpdatePhase.Animation, songTime);
+            sync.ScheduledUpdate(UpdatePhase.Effect, songTime);
+            syncCount++;
+
+            yield return null;
+        }
+
+        Debug.Log($"[LegacyImport] PositionSync initial pass complete: {syncCount} syncs applied at songTime={songTime}");
+    }
+
    private void TryCreateLegacyElement(JSONNode node, Func<GameElement> create, LegacyImportStats stats)
    {
        string legacyId = GetString(node, "id", string.Empty);
--- a/Assets/Scripts/Game/DataCore/GameElements_BM/GeneralEffects/PixelateEffect_BM.cs
+++ b/Assets/Scripts/Game/DataCore/GameElements_BM/GeneralEffects/PixelateEffect_BM.cs
@@ -18,7 +18,9 @@ namespace Ichni.RhythmGame.Beatmap
        public PixelateEffect_BM(float duration, float bottomX, float bottomY, AnimationCurve intensityCurve)
        {
            this.effectTime = duration;
+#pragma warning disable CS0612
            this.duration = duration;
+#pragma warning restore CS0612
            this.bottomX = Mathf.Clamp01(bottomX);
            this.bottomY = Mathf.Clamp01(bottomY);
            this.intensityCurve = intensityCurve;
--- a/Assets/Scripts/Game/RuntimeCore/GameElements/Notes/NoteObjects/Hold.cs
+++ b/Assets/Scripts/Game/RuntimeCore/GameElements/Notes/NoteObjects/Hold.cs
@@ -17,7 +17,7 @@ namespace Ichni.RhythmGame
        public float holdEndTime;
        public float holdingTime;
        public bool isHolding;
-        public new bool isFinalJudged;
+        public bool isFinalJudged;
        
        protected List<EffectBase> startHoldEffects;
        protected List<EffectBase> holdingEffects;
--- a/Assets/Scripts/Gird/SimpleGridController.cs
+++ b/Assets/Scripts/Gird/SimpleGridController.cs
@@ -62,7 +62,6 @@ public class SimpleGridController : MonoBehaviour
    }
    GameObject coordTextObj = null;

-    [System.Obsolete]
    IEnumerator Pressing()
    {
        if (coordTextObj != null)
@@ -107,7 +106,7 @@ public class SimpleGridController : MonoBehaviour
                if (coordText == null) coordText = coordTextObj.GetComponent<TextMeshPro>();
                coordText.text = $"({xz.x:F2}, {xz.y:F2})\n({Mathf.Round(xz.x):F2}, {Mathf.Round(xz.y):F2})";
                coordText.fontSize = 8;
-                coordText.enableWordWrapping = false;
+                coordText.textWrappingMode = TextWrappingModes.NoWrap;
                coordText.color = Color.yellow;
            }
            yield return null;
--- a/Assets/Shaders/ClearRTAfterTransparent.cs
+++ b/Assets/Shaders/ClearRTAfterTransparent.cs
@@ -8,6 +8,7 @@ public class ClearRTAfterTransparent : ScriptableRendererFeature
 {
    class ClearPass : ScriptableRenderPass
    {
+        [System.Obsolete]
        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
        {
            CommandBuffer cmd = CommandBufferPool.Get("Clear RT After Transparent");
--- a/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs
+++ b/Assets/Shaders/ScriptablePostProcessor/Volumes/AnimeBloom.cs
@@ -64,7 +64,8 @@ namespace SLSUtilities.Rendering.PostProcessing
            
            // 【移动端极限优化】：强制降级到 32位 HDR 格式 (B10G11R11)，
            // 相比主相机默认的 64位 R16G16B16A16，带宽消耗直接砍半，且肉眼几乎无损！
-            if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32, FormatUsage.Linear | FormatUsage.Render))
+            if (SystemInfo.IsFormatSupported(GraphicsFormat.B10G11R11_UFloatPack32,
+                    GraphicsFormatUsage.Linear | GraphicsFormatUsage.Render))
            {
                desc.graphicsFormat = GraphicsFormat.B10G11R11_UFloatPack32;
            }
@@ -116,7 +117,7 @@ namespace SLSUtilities.Rendering.PostProcessing
            desc.width  = Mathf.Max(1, desc.width  >> shift);
            desc.height = Mathf.Max(1, desc.height >> shift);

-            RenderingUtils.ReAllocateIfNeeded(ref _bloomMipDown[0], desc, FilterMode.Bilinear,
+            RenderingUtils.ReAllocateHandleIfNeeded(ref _bloomMipDown[0], desc, FilterMode.Bilinear,
                TextureWrapMode.Clamp, name: "_BloomDown0");

            // Source → Down[0] via Pass 0 (Prefilter)
@@ -131,7 +132,7 @@ namespace SLSUtilities.Rendering.PostProcessing
                desc.width  = Mathf.Max(1, desc.width  >> 1);
                desc.height = Mathf.Max(1, desc.height >> 1);

-                RenderingUtils.ReAllocateIfNeeded(ref _bloomMipDown[i], desc, FilterMode.Bilinear,
+                RenderingUtils.ReAllocateHandleIfNeeded(ref _bloomMipDown[i], desc, FilterMode.Bilinear,
                    TextureWrapMode.Clamp, name: "_BloomDown" + i);

                // Down[i-1] → Down[i]  via Pass 1 (Dual Kawase Downsample)
@@ -153,7 +154,7 @@ namespace SLSUtilities.Rendering.PostProcessing
            // 由于 desc 已经在 downsample 中不断减半，我们要重新从 Down[i] 读尺寸
            for (int i = mipCount - 1; i >= 0; i--)
            {
-                RenderingUtils.ReAllocateIfNeeded(ref _bloomMipUp[i],
+                RenderingUtils.ReAllocateHandleIfNeeded(ref _bloomMipUp[i],
                    _bloomMipDown[i].rt.descriptor, FilterMode.Bilinear,
                    TextureWrapMode.Clamp, name: "_BloomUp" + i);
            }
--- a/Assets/StreamingAssets/AutoSave/Fate
+++ b/Assets/StreamingAssets/AutoSave/Fate
--- a/Assets/StreamingAssets/AutoSave/Fate
+++ b/Assets/StreamingAssets/AutoSave/Fate
--- a/Assets/StreamingAssets/AutoSave/Fate
+++ b/Assets/StreamingAssets/AutoSave/Fate
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0fde1bdf1f75c7f4aa0e734a74c5e3f9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/StreamingAssets/AutoSave/Fate
+++ b/Assets/StreamingAssets/AutoSave/Fate
--- a/Assets/StreamingAssets/AutoSave/Fate
+++ b/Assets/StreamingAssets/AutoSave/Fate
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 19f517802c7f3d44fa92eb17dcae89f9
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/Windows64
--- 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: 2830559764
+CRC: 160404636
 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_2:
-      Name: metropolis_on_orbit
-      Dependencies: {}
    Info_3:
-      Name: unifiedraytracing
-      Dependencies: {}
-    Info_4:
      Name: shapes
      Dependencies: {}
+    Info_4:
+      Name: unifiedraytracing
+      Dependencies: {}
--- 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: 170739097
+CRC: 3638124941
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: efb2a63b46fc84014c1fe307785a1838
+    Hash: 512abf9fbba3b36e548e305dd8626dd2
  TypeTreeHash:
    serializedVersion: 2
    Hash: 51a9c20dab19416e261c53882aece497
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: 6ad136e423316b4e28b06c231c73f24c
+    Hash: 09c664075a66a3f3c303b1a6a780a1c4
 HashAppended: 0
 ClassTypes:
 - Class: 1
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse
--- 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: 978989022
+CRC: 1473640568
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: 1b09568bb134c0d52b4a0f5b1b89ca8f
+    Hash: f3e7a91b00f9879bf37bcc2f810f8479
  TypeTreeHash:
    serializedVersion: 2
    Hash: 18cfab2a6b4e689dd1e9255aa8b69d98
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: 516bd98ea3f8ab8f85f5f97b7f6fb625
+    Hash: 7709e7ef4e06ade3df72796f7cbe6363
 HashAppended: 0
 ClassTypes:
 - Class: 1
@@ -118,4 +118,4 @@ Assets:
 - Assets/ThemeBundles/DepartureToMultiverse/Prefabs/DTM_NoteVisualStay.prefab
 - Assets/ThemeBundles/DepartureToMultiverse/Textures/Skybox/DTM_NoiseStar0.png
 Dependencies:
- D:/Projects/IchniCreatorStudio/Assets/StreamingAssets/ThemeBundles/Windows64/shapes
+- C:/ichniEditor-Source/IchniCreatorStudio/Assets/StreamingAssets/ThemeBundles/Windows64/shapes
--- 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: 63eda978819f97c897b2e37a3c9c1106
+    Hash: ef1f17e74074fd8562d9e9c62f4de18b
 HashAppended: 0
 ClassTypes:
 - Class: 1