修Hold的圈圈

Assets/Assets.sln.meta

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

Assets/FR2_Cache.asset

@@ -49,10 +49,10 @@ MonoBehaviour:
     m_addressable: 
     m_atlas: 
     m_fileSize: 26776
-    m_assetChangeTS: 1759322158
+    m_assetChangeTS: 1759462517
-    m_fileInfoReadTS: 1759322245
+    m_fileInfoReadTS: 1759462518
-    m_fileWriteTS: 1759322157
+    m_fileWriteTS: 1759462517
-    m_cachefileWriteTS: 1759322157
+    m_cachefileWriteTS: 1759462517
     refreshStamp: 3
     UseGUIDsList:
     - guid: cd62869af1bc6534d83427c72b66bb9f
@@ -11648,10 +11648,10 @@ MonoBehaviour:
     m_addressable: 
     m_atlas: 
     m_fileSize: 3645
-    m_assetChangeTS: 1759322158
+    m_assetChangeTS: 1759461747
-    m_fileInfoReadTS: 1759322245
+    m_fileInfoReadTS: 1759461797
-    m_fileWriteTS: 1759322158
+    m_fileWriteTS: 1759461747
-    m_cachefileWriteTS: 1759322158
+    m_cachefileWriteTS: 1759461747
     refreshStamp: 3
     UseGUIDsList:
     - guid: bf2edee5c58d82540a51f03df9d42094
@@ -27898,10 +27898,10 @@ MonoBehaviour:
     m_addressable: 
     m_atlas: 
     m_fileSize: 3642
-    m_assetChangeTS: 1759322158
+    m_assetChangeTS: 1759461747
-    m_fileInfoReadTS: 1759322245
+    m_fileInfoReadTS: 1759461797
-    m_fileWriteTS: 1759322157
+    m_fileWriteTS: 1759461747
-    m_cachefileWriteTS: 1759322157
+    m_cachefileWriteTS: 1759461747
     refreshStamp: 3
     UseGUIDsList:
     - guid: bf2edee5c58d82540a51f03df9d42094
@@ -52019,15 +52019,15 @@ MonoBehaviour:
     UseGUIDsList: []
   - guid: b388e3ab3a2252f429acfdc008621406
     type: 9
-    m_fileInfoHash: 3623.manifest
+    m_fileInfoHash: 3531.manifest
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 3623
+    m_fileSize: 3531
-    m_assetChangeTS: 1755238926
+    m_assetChangeTS: 1759461821
-    m_fileInfoReadTS: 1755605440
+    m_fileInfoReadTS: 1759461826
-    m_fileWriteTS: 1755605185
+    m_fileWriteTS: 1759461796
-    m_cachefileWriteTS: 1755605185
+    m_cachefileWriteTS: 1759461796
     refreshStamp: 3
     UseGUIDsList: []
   - guid: b3f8be1d5379c4d059d88a709145ec48
@@ -82029,15 +82029,15 @@ MonoBehaviour:
     UseGUIDsList: []
   - guid: d58e7a7433f91a24db26a8712f3592da
     type: 9
-    m_fileInfoHash: 284.manifest
+    m_fileInfoHash: 271.manifest
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 284
+    m_fileSize: 271
-    m_assetChangeTS: 1755238926
+    m_assetChangeTS: 1759461821
-    m_fileInfoReadTS: 1755605440
+    m_fileInfoReadTS: 1759461826
-    m_fileWriteTS: 1755605185
+    m_fileWriteTS: 1759461796
-    m_cachefileWriteTS: 1755605185
+    m_cachefileWriteTS: 1759461796
     refreshStamp: 3
     UseGUIDsList: []
   - guid: d5deddb7ed7802d41947ef9ac98ccd56
@@ -153612,15 +153612,15 @@ MonoBehaviour:
     UseGUIDsList: []
   - guid: 0b426e434ca7bbe4b9dce2a80472de6f
     type: 2
-    m_fileInfoHash: 8382.cs
+    m_fileInfoHash: 8573.cs
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 8382
+    m_fileSize: 8573
-    m_assetChangeTS: 1755714598
+    m_assetChangeTS: 1759462458
-    m_fileInfoReadTS: 1755714604
+    m_fileInfoReadTS: 1759462465
-    m_fileWriteTS: 1755237682
+    m_fileWriteTS: 1759462397
-    m_cachefileWriteTS: 1755237682
+    m_cachefileWriteTS: 1759462397
     refreshStamp: 3
     UseGUIDsList: []
   - guid: 0b5227e76e9fbe647aa4958ddf3b4f34
@@ -160209,10 +160209,10 @@ MonoBehaviour:
     m_addressable: 
     m_atlas: 
     m_fileSize: 3649
-    m_assetChangeTS: 1759322158
+    m_assetChangeTS: 1759461747
-    m_fileInfoReadTS: 1759322245
+    m_fileInfoReadTS: 1759461797
-    m_fileWriteTS: 1759322157
+    m_fileWriteTS: 1759461747
-    m_cachefileWriteTS: 1759322157
+    m_cachefileWriteTS: 1759461747
     refreshStamp: 3
     UseGUIDsList:
     - guid: bf2edee5c58d82540a51f03df9d42094
@@ -172920,23 +172920,21 @@ MonoBehaviour:
     UseGUIDsList: []
   - guid: 7c10da0d74d78364bac94506d77290bf
     type: 5
-    m_fileInfoHash: 2814.mat
+    m_fileInfoHash: 2759.mat
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 2814
+    m_fileSize: 2759
-    m_assetChangeTS: 1759317583
+    m_assetChangeTS: 1759462517
-    m_fileInfoReadTS: 1759317611
+    m_fileInfoReadTS: 1759462518
-    m_fileWriteTS: 1759317582
+    m_fileWriteTS: 1759462517
-    m_cachefileWriteTS: 1759317582
+    m_cachefileWriteTS: 1759462517
     refreshStamp: 3
     UseGUIDsList:
     - guid: 06e8da9b2b26f09459e8a93e84b2e0c9
       ids: 30000000
     - guid: f7cb012c92543074491a665c761d51dc
       ids: 59000000
-    - guid: 7ba462c2dc80b544eacfdc537aab22c6
-      ids: 59000000
   - guid: 7ca043dc9da4b1e49a30103f3e9a5fa8
     type: 2
     m_fileInfoHash: 7039.cs
@@ -175094,15 +175092,15 @@ MonoBehaviour:
     UseGUIDsList: []
   - guid: 9c6906848c3ff094bb7de22ec40de351
     type: 9
-    m_fileInfoHash: 44580478
+    m_fileInfoHash: 44916899
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 44580478
+    m_fileSize: 44916899
-    m_assetChangeTS: 1755238926
+    m_assetChangeTS: 1759461821
-    m_fileInfoReadTS: 1755605440
+    m_fileInfoReadTS: 1759461826
-    m_fileWriteTS: 1755605185
+    m_fileWriteTS: 1759461795
-    m_cachefileWriteTS: 1755605185
+    m_cachefileWriteTS: 1759461795
     refreshStamp: 3
     UseGUIDsList: []
   - guid: 9c99ec9330979f94aa6e33f0bec7752f
@@ -196393,15 +196391,15 @@ MonoBehaviour:
       ids: 73000000
   - guid: 2e498d1c8094910479dc3e1b768306a4
     type: 5
-    m_fileInfoHash: 9628.asset
+    m_fileInfoHash: 568857.asset
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 9628
+    m_fileSize: 568857
-    m_assetChangeTS: 1759322158
+    m_assetChangeTS: 1759462517
-    m_fileInfoReadTS: 1759322245
+    m_fileInfoReadTS: 1759462518
-    m_fileWriteTS: 1759322157
+    m_fileWriteTS: 1759462517
-    m_cachefileWriteTS: 1759322157
+    m_cachefileWriteTS: 1759462517
     refreshStamp: 3
     UseGUIDsList:
     - guid: fe393ace9b354375a9cb14cdbbc28be4
@@ -215057,10 +215055,10 @@ MonoBehaviour:
     m_addressable: 
     m_atlas: 
     m_fileSize: 1105
-    m_assetChangeTS: 1755238926
+    m_assetChangeTS: 1759461821
-    m_fileInfoReadTS: 1755605440
+    m_fileInfoReadTS: 1759461826
-    m_fileWriteTS: 1755605185
+    m_fileWriteTS: 1759461796
-    m_cachefileWriteTS: 1755605185
+    m_cachefileWriteTS: 1759461796
     refreshStamp: 3
     UseGUIDsList: []
   - guid: 9f959286f2d624a08b56b6d290871b33
@@ -222538,19 +222536,6 @@ MonoBehaviour:
     m_cachefileWriteTS: 0
     refreshStamp: 3
     UseGUIDsList: []
-  - guid: 459a7ea4ef65c664482b6377848ac5c3
-    type: 9
-    m_fileInfoHash: 1113.sln
-    m_assetbundle: 
-    m_addressable: 
-    m_atlas: 
-    m_fileSize: 1113
-    m_assetChangeTS: 0
-    m_fileInfoReadTS: 1757811248
-    m_fileWriteTS: 1757811210
-    m_cachefileWriteTS: 1757811210
-    refreshStamp: 3
-    UseGUIDsList: []
   - guid: 76a54313693b9554c8c1a118fb9a3e21
     type: 9
     m_fileInfoHash: 5722222.json
@@ -222603,19 +222588,6 @@ MonoBehaviour:
     m_cachefileWriteTS: 1757157435
     refreshStamp: 3
     UseGUIDsList: []
-  - guid: 6dbdd314784e80440b48088e6357c1ef
-    type: 9
-    m_fileInfoHash: 722.csproj
-    m_assetbundle: 
-    m_addressable: 
-    m_atlas: 
-    m_fileSize: 722
-    m_assetChangeTS: 0
-    m_fileInfoReadTS: 1757811248
-    m_fileWriteTS: 1757811210
-    m_cachefileWriteTS: 1757811210
-    refreshStamp: 3
-    UseGUIDsList: []
   - guid: 9dd772961eb02fa4f89c9591206c541f
     type: 9
     m_fileInfoHash: 448.json
@@ -223077,15 +223049,15 @@ MonoBehaviour:
     UseGUIDsList: []
   - guid: b1438f6915b948343ad2e2cd0af4f227
     type: 5
-    m_fileInfoHash: 25144.mat
+    m_fileInfoHash: 24347.mat
     m_assetbundle: 
     m_addressable: 
     m_atlas: 
-    m_fileSize: 25144
+    m_fileSize: 24347
-    m_assetChangeTS: 0
+    m_assetChangeTS: 1759461745
-    m_fileInfoReadTS: 1758433350
+    m_fileInfoReadTS: 1759461747
-    m_fileWriteTS: 1758432920
+    m_fileWriteTS: 1759461745
-    m_cachefileWriteTS: 1758432920
+    m_cachefileWriteTS: 1759461745
     refreshStamp: 3
     UseGUIDsList:
     - guid: 7184a95c20fc1a441a8815af4c795ccd
@@ -226763,6 +226735,84 @@ MonoBehaviour:
     m_cachefileWriteTS: 1759309529
     refreshStamp: 3
     UseGUIDsList: []
+  - guid: 72a537e19a9032a41bb95ae02311c661
+    type: 9
+    m_fileInfoHash: 6798551.json
+    m_assetbundle: 
+    m_addressable: 
+    m_atlas: 
+    m_fileSize: 6798551
+    m_assetChangeTS: 0
+    m_fileInfoReadTS: 1759461438
+    m_fileWriteTS: 1759461301
+    m_cachefileWriteTS: 1759461301
+    refreshStamp: 3
+    UseGUIDsList: []
+  - guid: 264af7ffb6d4d8145b9da61df2f7e0bf
+    type: 9
+    m_fileInfoHash: 1494956.json
+    m_assetbundle: 
+    m_addressable: 
+    m_atlas: 
+    m_fileSize: 1494956
+    m_assetChangeTS: 0
+    m_fileInfoReadTS: 1759461438
+    m_fileWriteTS: 1759461301
+    m_cachefileWriteTS: 1759461301
+    refreshStamp: 3
+    UseGUIDsList: []
+  - guid: 48117c741d5266849bafe0735278224d
+    type: 9
+    m_fileInfoHash: 1493191.json
+    m_assetbundle: 
+    m_addressable: 
+    m_atlas: 
+    m_fileSize: 1493191
+    m_assetChangeTS: 0
+    m_fileInfoReadTS: 1759461438
+    m_fileWriteTS: 1759461301
+    m_cachefileWriteTS: 1759461301
+    refreshStamp: 3
+    UseGUIDsList: []
+  - guid: c9aa8aaf39c47324a9ec3ed7a8365d09
+    type: 9
+    m_fileInfoHash: 6798551.json
+    m_assetbundle: 
+    m_addressable: 
+    m_atlas: 
+    m_fileSize: 6798551
+    m_assetChangeTS: 0
+    m_fileInfoReadTS: 1759461438
+    m_fileWriteTS: 1759461301
+    m_cachefileWriteTS: 1759461301
+    refreshStamp: 3
+    UseGUIDsList: []
+  - guid: 0cf746cded775b64db218e4c91509ce4
+    type: 1
+    m_fileInfoHash: 
+    m_assetbundle: 
+    m_addressable: 
+    m_atlas: 
+    m_fileSize: 0
+    m_assetChangeTS: 0
+    m_fileInfoReadTS: 1759461438
+    m_fileWriteTS: 0
+    m_cachefileWriteTS: 0
+    refreshStamp: 3
+    UseGUIDsList: []
+  - guid: 4f5c7be7553de29479b3e234c8b11417
+    type: 9
+    m_fileInfoHash: 6798551.json
+    m_assetbundle: 
+    m_addressable: 
+    m_atlas: 
+    m_fileSize: 6798551
+    m_assetChangeTS: 0
+    m_fileInfoReadTS: 1759461438
+    m_fileWriteTS: 1759461301
+    m_cachefileWriteTS: 1759461301
+    refreshStamp: 3
+    UseGUIDsList: []
   setting:
     alternateColor: 1
     excludeTypes: 0

Assets/NLayer/NLayer.csproj.meta

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

Assets/Skybox Blender/Script/Resources/Material & Shader/Skybox Blend Material.mat

@@ -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:

Assets/StreamingAssets/ThemeBundles/Windows64/Windows64.manifest

@@ -1,5 +1,5 @@
 ManifestFileVersion: 0
-CRC: 154007440
+CRC: 4104178501
 AssetBundleManifest:
   AssetBundleInfos:
     Info_0:

Assets/StreamingAssets/ThemeBundles/Windows64/departure_to_multiverse.manifest

@@ -1,15 +1,15 @@
 ManifestFileVersion: 0
-CRC: 3278439072
+CRC: 2900657974
 Hashes:
   AssetFileHash:
     serializedVersion: 2
-    Hash: caa4b5dc9bb70a4b3e1f4a52af05cdb4
+    Hash: 7a355fca0b240aaced850c89238ba48d
   TypeTreeHash:
     serializedVersion: 2
     Hash: 5f75b1d159db4349b37b25336eb07c68
   IncrementalBuildHash:
     serializedVersion: 2
-    Hash: caa4b5dc9bb70a4b3e1f4a52af05cdb4
+    Hash: 7a355fca0b240aaced850c89238ba48d
 HashAppended: 0
 ClassTypes:
 - Class: 1

Assets/ThemeBundles/DepartureToMultiverse/Materials/Note/Tap/M_tap_02.mat

@@ -253,7 +253,7 @@ Material:
     - _W9ParticleShaderFlags: 2056
     - _W9ParticleShaderFlags1: 8388608
     - _W9ParticleShaderGUIFoldToggle: 134217743
-    - _W9ParticleShaderGUIFoldToggle1: 8388608
+    - _W9ParticleShaderGUIFoldToggle1: 10485760
     - _W9ParticleShaderGUIFoldToggle2: 0
     - _W9ParticleShaderWrapFlags: 0
     m_Floats:
@@ -650,7 +650,7 @@ Material:
     - _VertexOffset_Toggle: 0
     - _WorkflowMode: 1
     - _XianXingCH_UVRota: 0
-    - _ZOffset_Toggle: 0
+    - _ZOffset_Toggle: 1
     - _ZTest: 4
     - _ZWrite: 0
     - _Ztest: 4
@@ -663,7 +663,7 @@ Material:
     - _jingxiangCH_dire: 0
     - _noiseMaskMap_Toggle: 0
     - _noisemapEnabled: 0
-    - _offsetFactor: 0
+    - _offsetFactor: -1000
     - _offsetUnits: 0
     - _softFacotr: 0
     - _sot_sting_A: 0

Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisualHold.cs

@@ -18,11 +18,11 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
 
         public override Vector3 noteVisualPosition => headPoint.transform.position;
 
-        public static DTMNoteVisualHold GenerateElement(string elementName, Guid id, List<string> tags,
+        public new static DTMNoteVisualHold GenerateElement(string elementName, Guid id, List<string> tags,
-            bool isFirstGenerated, GameElement parentElement, string themeBundleName, string objectName)
+            bool isFirstGenerated, string themeBundleName, string objectName, GameElement parentElement, bool isHighlighted)
         {
-            DTMNoteVisualHold noteVisualHold = SubstantialObject.GenerateElement(elementName, id, tags,
+            DTMNoteVisualHold noteVisualHold = NoteVisualBase.GenerateElement(elementName, id, tags,
-                isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent<DTMNoteVisualHold>();
+                isFirstGenerated, themeBundleName, objectName, parentElement, isHighlighted).GetComponent<DTMNoteVisualHold>();
 
             return noteVisualHold;
         }
@@ -98,17 +98,14 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
             base.Refresh();
             //  judgeEffect.transform.position = tailPoint.transform.position;
         }
-        public override void SetHighlight()
-        {
-            return; // HoldNoteVisual不需要高亮
-        }
     }
 
     public partial class DTMNoteVisualHold
     {
         public override void SaveBM()
         {
-            matchedBM = new DTMNoteVisualHold_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName);
+            matchedBM = new DTMNoteVisualHold_BM(elementName, elementGuid, tags,  
+                themeBundleName, objectName, parentElement.matchedBM as GameElement_BM, isHighlighted);
         }
 
         private float startPercent, endPercent;
@@ -182,7 +179,7 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
 
     namespace Beatmap
     {
-        public class DTMNoteVisualHold_BM : SubstantialObject_BM
+        public class DTMNoteVisualHold_BM : DTMNoteVisual_BM
         {
             public DTMNoteVisualHold_BM()
             {
@@ -190,21 +187,22 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse
             }
 
             public DTMNoteVisualHold_BM(string elementName, Guid id, List<string> tags,
-                GameElement_BM parent, string themeBundleName, string objectName) :
+                string themeBundleName, string objectName, GameElement_BM parent, bool isHighlighted) :
-                base(elementName, id, tags, parent, themeBundleName, objectName)
+                base(elementName, id, tags, parent, themeBundleName, objectName, isHighlighted)
             {
 
             }
-
+            
             public override void ExecuteBM()
             {
                 matchedElement = DTMNoteVisualHold.GenerateElement(elementName, elementGuid, tags, false,
-                    GetElement(attachedElementGuid), themeBundleName, objectName);
+                    themeBundleName, objectName, GetElement(attachedElementGuid), isHighlighted);
             }
 
             public override GameElement DuplicateBM(GameElement parent)
             {
-                return DTMNoteVisualHold.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName);
+                return DTMNoteVisualHold.GenerateElement(elementName, Guid.NewGuid(), tags, false, 
+                    themeBundleName, objectName, parent, isHighlighted);
             }
         }
     }