Merge branch 'main' of https://github.com/MiracleForest-Ichni/IchniCreatorStudio

2025-10-18 16:00:15 +08:00
parent 3361e276e5 3efb472a17
commit 02fd8d52f7
18 changed files with 46826 additions and 29784 deletions
--- a/Assets/Assets.sln.meta
+++ b/Assets/Assets.sln.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 459a7ea4ef65c664482b6377848ac5c3
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/FR2_Cache.asset
+++ b/Assets/FR2_Cache.asset
--- a/Assets/NLayer/NLayer.csproj.meta
+++ b/Assets/NLayer/NLayer.csproj.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6dbdd314784e80440b48088e6357c1ef
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Blender/Script/Resources/Material
+++ b/Blender/Script/Resources/Material
@@ -64,7 +64,7 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _Tex:
-        m_Texture: {fileID: 8900000, guid: 7ba462c2dc80b544eacfdc537aab22c6, type: 3}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _Tex2:
--- a/Assets/StreamingAssets/AutoSave/Pof-Hard/AutoSave_0.json
+++ b/Assets/StreamingAssets/AutoSave/Pof-Hard/AutoSave_0.json
--- a/Assets/StreamingAssets/AutoSave/Pof-Hard/AutoSave_1.json
+++ b/Assets/StreamingAssets/AutoSave/Pof-Hard/AutoSave_1.json
--- a/Assets/StreamingAssets/AutoSave/Pof-Hard/AutoSave_2.json
+++ b/Assets/StreamingAssets/AutoSave/Pof-Hard/AutoSave_2.json
--- a/Assets/StreamingAssets/Projects/wow/Beatmap.json
+++ b/Assets/StreamingAssets/Projects/wow/Beatmap.json
--- a/Assets/StreamingAssets/Projects/wow/wow.7z
+++ b/Assets/StreamingAssets/Projects/wow/wow.7z
--- a/Assets/StreamingAssets/Projects/wow/wow.7z.meta
+++ b/Assets/StreamingAssets/Projects/wow/wow.7z.meta
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: aab0a1e1bbcfaa94593d0ecd80273516
-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,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 1464640023
+CRC: 3609114831
 AssetBundleManifest:
  AssetBundleInfos:
    Info_0:
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/basic.manifest
@@ -3,13 +3,13 @@ CRC: 4004955531
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: 69269a9a82f30090d767ca198c6385e3
+    Hash: 3767361ba73ce842be25cf1d49371c6d
  TypeTreeHash:
    serializedVersion: 2
    Hash: 6800a16f3e87d1e6002804cd7e7d1484
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: 69269a9a82f30090d767ca198c6385e3
+    Hash: 3767361ba73ce842be25cf1d49371c6d
 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,15 +1,15 @@
 ManifestFileVersion: 0
-CRC: 741543640
+CRC: 2012891135
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: cfa4fad709db0caeb187b033c6e7963b
+    Hash: a8f539e75c6085b1ee9ad873ccafc284
  TypeTreeHash:
    serializedVersion: 2
    Hash: 5f75b1d159db4349b37b25336eb07c68
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: cfa4fad709db0caeb187b033c6e7963b
+    Hash: a8f539e75c6085b1ee9ad873ccafc284
 HashAppended: 0
 ClassTypes:
 - Class: 1
--- a/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest
+++ b/Assets/StreamingAssets/ThemeBundles/Windows64/metropolis_on_orbit.manifest
@@ -3,13 +3,13 @@ CRC: 242580278
 Hashes:
  AssetFileHash:
    serializedVersion: 2
-    Hash: 666362b2c770ff92cfb41fae32ced3d8
+    Hash: d634945bd31871bca9358fff884e430b
  TypeTreeHash:
    serializedVersion: 2
    Hash: 01240d37f7fa22d4c5221d86925e1342
  IncrementalBuildHash:
    serializedVersion: 2
-    Hash: 666362b2c770ff92cfb41fae32ced3d8
+    Hash: d634945bd31871bca9358fff884e430b
 HashAppended: 0
 ClassTypes:
 - Class: 1
--- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Note/Hold/M_hold
+++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Note/Hold/M_hold
@@ -30,7 +30,7 @@ Material:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2999
+  m_CustomRenderQueue: 2998
  stringTagMap: {}
  disabledShaderPasses: []
  m_LockedProperties: 
@@ -157,7 +157,7 @@ Material:
    - _Outline_Thickness: 0.01
    - _Parallax: 0.005
    - _QueueControl: 0
-    - _QueueOffset: -1
+    - _QueueOffset: -2
    - _RampMapLoaded: 0
    - _ReceiveShadows: 1
    - _Rotation: 84
--- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Note/Hold/M_hold.mat
+++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Note/Hold/M_hold.mat
@@ -30,7 +30,7 @@ Material:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
+  m_CustomRenderQueue: 2999
  stringTagMap: {}
  disabledShaderPasses: []
  m_LockedProperties: 
@@ -136,7 +136,7 @@ Material:
    - _Opacity: 0
    - _Parallax: 0.005
    - _QueueControl: 0
-    - _QueueOffset: 0
+    - _QueueOffset: -1
    - _ReceiveShadows: 1
    - _Smoothness: 0.5
    - _SmoothnessTextureChannel: 0