From 1c964b20707bb9aff62077452bf6856db95e7094 Mon Sep 17 00:00:00 2001 From: SoulliesOfficial Date: Wed, 30 Jul 2025 03:42:15 -0400 Subject: [PATCH] fix --- Assets/FR2_Cache.asset | 214 ++++++++++-------- Assets/NLayer/NLayer.csproj.meta | 7 - .../GameElements/Notes/NoteObjects/Hold.cs | 2 +- .../Notes/NoteObjects/NoteBase.cs | 3 +- .../Notes/NoteVisual/NoteVisualBase.cs | 2 + .../Scripts/NoteVisual/DTMNoteVisualHold.cs | 2 + 6 files changed, 126 insertions(+), 104 deletions(-) delete mode 100644 Assets/NLayer/NLayer.csproj.meta diff --git a/Assets/FR2_Cache.asset b/Assets/FR2_Cache.asset index 1ecc5458..f7f3506c 100644 --- a/Assets/FR2_Cache.asset +++ b/Assets/FR2_Cache.asset @@ -49,10 +49,10 @@ MonoBehaviour: m_addressable: m_atlas: m_fileSize: 26536 - m_assetChangeTS: 1753795365 - m_fileInfoReadTS: 1753795372 - m_fileWriteTS: 1753795365 - m_cachefileWriteTS: 1753795365 + m_assetChangeTS: 1753860905 + m_fileInfoReadTS: 1753860906 + m_fileWriteTS: 1753860905 + m_cachefileWriteTS: 1753860905 refreshStamp: 2 UseGUIDsList: - guid: cd62869af1bc6534d83427c72b66bb9f @@ -14858,15 +14858,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 01fba1b4480fc4988be3f80598f285c1 type: 2 - m_fileInfoHash: 23880.cs + m_fileInfoHash: 23919.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 23880 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160209 - m_fileWriteTS: 1752570455 - m_cachefileWriteTS: 1752570455 + m_fileSize: 23919 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: [] - guid: 01fb2e405de427a47bbd366ee75d1772 @@ -19512,15 +19512,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 6191c60211a05c04ea9265f89896f4d0 type: 5 - m_fileInfoHash: 100106.prefab + m_fileInfoHash: 103473.prefab m_assetbundle: m_addressable: m_atlas: - m_fileSize: 100106 - m_assetChangeTS: 1753527255 - m_fileInfoReadTS: 1753527256 - m_fileWriteTS: 1753527255 - m_cachefileWriteTS: 1753527255 + m_fileSize: 103473 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: - guid: f4688fdb7df04437aeb418b961361dc5 @@ -21497,15 +21497,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 81a06df931b999c4e9a0ac510cb0f3ea type: 2 - m_fileInfoHash: 9924.cs + m_fileInfoHash: 11127.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 9924 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160208 - m_fileWriteTS: 1752585795 - m_cachefileWriteTS: 1752585795 + m_fileSize: 11127 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: [] - guid: 8101c376367d6e44f84e602722e5ac10 @@ -48245,15 +48245,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 639bb9fcaa03850408e734f8fab73889 type: 9 - m_fileInfoHash: 2464889.json + m_fileInfoHash: 2628173.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 2464889 - m_assetChangeTS: 1753795275 - m_fileInfoReadTS: 1753795283 - m_fileWriteTS: 1753720871 - m_cachefileWriteTS: 1753720871 + m_fileSize: 2628173 + m_assetChangeTS: 1753811427 + m_fileInfoReadTS: 1753811439 + m_fileWriteTS: 1753810653 + m_cachefileWriteTS: 1753810653 refreshStamp: 2 UseGUIDsList: [] - guid: 63eb0700074954e23aa09edcc4b81016 @@ -49449,15 +49449,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 836ab6bd424664b3cb74dd0fcb08c039 type: 2 - m_fileInfoHash: 5267.cs + m_fileInfoHash: 7458.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 5267 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160191 - m_fileWriteTS: 1751094936 - m_cachefileWriteTS: 1751094936 + m_fileSize: 7458 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: [] - guid: 836aceb6bf15047ffb768a3f1b73f56a @@ -78286,15 +78286,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 95d3a881bc3654f05ba69138e8c703cb type: 2 - m_fileInfoHash: 10810.cs + m_fileInfoHash: 10784.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 10810 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160184 - m_fileWriteTS: 1753072105 - m_cachefileWriteTS: 1753072105 + m_fileSize: 10784 + m_assetChangeTS: 1753860888 + m_fileInfoReadTS: 1753860898 + m_fileWriteTS: 1753860883 + m_cachefileWriteTS: 1753860883 refreshStamp: 2 UseGUIDsList: [] - guid: 95140e49213aa6f49a470a81873b87c0 @@ -80592,15 +80592,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: b52db00b83c3efd48ac75f48f15cf1ef type: 9 - m_fileInfoHash: 96795.json + m_fileInfoHash: 139784.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 96795 - m_assetChangeTS: 1753541565 - m_fileInfoReadTS: 1753541566 - m_fileWriteTS: 1753541562 - m_cachefileWriteTS: 1753541562 + m_fileSize: 139784 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: [] - guid: b52d68e305b98a94bac88855d8ea5936 @@ -92730,15 +92730,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: a6e56f21472670046ab4dfe41e9c739f type: 5 - m_fileInfoHash: 59785.prefab + m_fileInfoHash: 61851.prefab m_assetbundle: m_addressable: m_atlas: - m_fileSize: 59785 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160182 - m_fileWriteTS: 1752140516 - m_cachefileWriteTS: 1752140516 + m_fileSize: 61851 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: - guid: 1344c3c82d62a2a41a3576d8abb8e3ea @@ -153030,10 +153030,10 @@ MonoBehaviour: m_addressable: m_atlas: m_fileSize: 19133 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160171 - m_fileWriteTS: 1752674446 - m_cachefileWriteTS: 1752674446 + m_assetChangeTS: 1753811427 + m_fileInfoReadTS: 1753811439 + m_fileWriteTS: 1753811412 + m_cachefileWriteTS: 1753811412 refreshStamp: 2 UseGUIDsList: [] - guid: ea6dbc5d03b50f148a26b55c617dcb22 @@ -154435,15 +154435,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 0b426e434ca7bbe4b9dce2a80472de6f type: 2 - m_fileInfoHash: 8067.cs + m_fileInfoHash: 8261.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 8067 - m_assetChangeTS: 1753165613 - m_fileInfoReadTS: 1753165633 - m_fileWriteTS: 1753165600 - m_cachefileWriteTS: 1753165600 + m_fileSize: 8261 + m_assetChangeTS: 1753861130 + m_fileInfoReadTS: 1753861143 + m_fileWriteTS: 1753861126 + m_cachefileWriteTS: 1753861126 refreshStamp: 2 UseGUIDsList: [] - guid: 0b5227e76e9fbe647aa4958ddf3b4f34 @@ -173884,15 +173884,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 7c10da0d74d78364bac94506d77290bf type: 5 - m_fileInfoHash: 2835.mat + m_fileInfoHash: 2814.mat m_assetbundle: m_addressable: m_atlas: - m_fileSize: 2835 - m_assetChangeTS: 1753591337 - m_fileInfoReadTS: 1753591344 - m_fileWriteTS: 1753591337 - m_cachefileWriteTS: 1753591337 + m_fileSize: 2814 + m_assetChangeTS: 1753860905 + m_fileInfoReadTS: 1753860906 + m_fileWriteTS: 1753860905 + m_cachefileWriteTS: 1753860905 refreshStamp: 2 UseGUIDsList: - guid: 06e8da9b2b26f09459e8a93e84b2e0c9 @@ -184713,10 +184713,10 @@ MonoBehaviour: m_addressable: m_atlas: m_fileSize: 11046 - m_assetChangeTS: 1753269636 - m_fileInfoReadTS: 1753269655 - m_fileWriteTS: 1753269632 - m_cachefileWriteTS: 1753269632 + m_assetChangeTS: 1753860888 + m_fileInfoReadTS: 1753860898 + m_fileWriteTS: 1753860852 + m_cachefileWriteTS: 1753860852 refreshStamp: 2 UseGUIDsList: [] - guid: 3db6f9b04a31ea949aa7369a94fbbb8e @@ -190625,15 +190625,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: add3d51f41f934e4587c625e503dbdf5 type: 2 - m_fileInfoHash: 3396.cs + m_fileInfoHash: 3489.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 3396 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160164 - m_fileWriteTS: 1753072105 - m_cachefileWriteTS: 1753072105 + m_fileSize: 3489 + m_assetChangeTS: 1753861130 + m_fileInfoReadTS: 1753861143 + m_fileWriteTS: 1753861128 + m_cachefileWriteTS: 1753861128 refreshStamp: 2 UseGUIDsList: [] - guid: adf3c8361dd31e1448483775ea241c10 @@ -197466,10 +197466,10 @@ MonoBehaviour: m_addressable: m_atlas: m_fileSize: 574949 - m_assetChangeTS: 1753592665 - m_fileInfoReadTS: 1753592666 - m_fileWriteTS: 1753592665 - m_cachefileWriteTS: 1753592665 + m_assetChangeTS: 1753860905 + m_fileInfoReadTS: 1753860906 + m_fileWriteTS: 1753860905 + m_cachefileWriteTS: 1753860905 refreshStamp: 2 UseGUIDsList: - guid: fe393ace9b354375a9cb14cdbbc28be4 @@ -214735,15 +214735,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 7f59135bf6881b347b3d735f68a680ca type: 9 - m_fileInfoHash: 94860.json + m_fileInfoHash: 137515.json m_assetbundle: m_addressable: m_atlas: - m_fileSize: 94860 - m_assetChangeTS: 1753527271 - m_fileInfoReadTS: 1753527292 - m_fileWriteTS: 1753527062 - m_cachefileWriteTS: 1753527062 + m_fileSize: 137515 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: [] - guid: 7fc947ed5e1e2b141bd741eca43b418c @@ -216429,15 +216429,15 @@ MonoBehaviour: UseGUIDsList: [] - guid: 9f5915d0f462947f5bec62ea7e118953 type: 2 - m_fileInfoHash: 4182.cs + m_fileInfoHash: 6215.cs m_assetbundle: m_addressable: m_atlas: - m_fileSize: 4182 - m_assetChangeTS: 0 - m_fileInfoReadTS: 1753160160 - m_fileWriteTS: 1752284832 - m_cachefileWriteTS: 1752284832 + m_fileSize: 6215 + m_assetChangeTS: 1753860325 + m_fileInfoReadTS: 1753860337 + m_fileWriteTS: 1753811463 + m_cachefileWriteTS: 1753811463 refreshStamp: 2 UseGUIDsList: [] - guid: 9f59acaa662cd914b90c445b845103c5 @@ -222583,6 +222583,32 @@ MonoBehaviour: m_cachefileWriteTS: 1753795362 refreshStamp: 2 UseGUIDsList: [] + - guid: 1a864586b3cd01640a83d6564b5c3c7e + type: 9 + m_fileInfoHash: 2889489.json + m_assetbundle: + m_addressable: + m_atlas: + m_fileSize: 2889489 + m_assetChangeTS: 0 + m_fileInfoReadTS: 1753810241 + m_fileWriteTS: 1753810231 + m_cachefileWriteTS: 1753810231 + refreshStamp: 2 + UseGUIDsList: [] + - guid: 0f6ec5285bcc8f44ca77fa84379898fd + type: 1 + m_fileInfoHash: + m_assetbundle: + m_addressable: + m_atlas: + m_fileSize: 0 + m_assetChangeTS: 0 + m_fileInfoReadTS: 1753810241 + m_fileWriteTS: 0 + m_cachefileWriteTS: 0 + refreshStamp: 2 + UseGUIDsList: [] setting: alternateColor: 1 excludeTypes: 0 diff --git a/Assets/NLayer/NLayer.csproj.meta b/Assets/NLayer/NLayer.csproj.meta deleted file mode 100644 index e0885ac2..00000000 --- a/Assets/NLayer/NLayer.csproj.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6dbdd314784e80440b48088e6357c1ef -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs index 29e45ee2..9b7ebb85 100644 --- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs +++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs @@ -231,7 +231,7 @@ namespace Ichni.RhythmGame if (EditorManager.instance.cameraManager.haveGameCamera) { - noteScreenPosition = EditorManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.transform.position); + noteScreenPosition = EditorManager.instance.cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.noteVisualPosition); } } diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs index 3d2781c0..b2bd3c9b 100644 --- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs +++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/NoteBase.cs @@ -127,8 +127,7 @@ namespace Ichni.RhythmGame // 屏幕位置更新（降低频率） if (cameraManager.haveGameCamera)//&& Time.frameCount % 3 == 0) { - noteScreenPosition = cameraManager.gameCamera.gameCamera.WorldToScreenPoint( - noteVisual.transform.position); + noteScreenPosition = cameraManager.gameCamera.gameCamera.WorldToScreenPoint(noteVisual.noteVisualPosition); } // 碰撞体状态 diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBase.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBase.cs index 1596bfdc..16d54dc3 100644 --- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBase.cs +++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBase.cs @@ -19,6 +19,8 @@ namespace Ichni.RhythmGame public List notePartList; public List effectPrefabList; + public virtual Vector3 noteVisualPosition => noteMain.transform.position; + public EffectSubmodule effectSubmodule { get; set; } public SelectSubmodule selectSubmodule { get; set; } diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisualHold.cs b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisualHold.cs index adac439a..676967c8 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisualHold.cs +++ b/Assets/ThemeBundles/DepartureToMultiverse/Scripts/NoteVisual/DTMNoteVisualHold.cs @@ -16,6 +16,8 @@ namespace Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse public MeshGenerator meshGenerator; public SplinePositioner headPoint, tailPoint; + public override Vector3 noteVisualPosition => headPoint.transform.position; + public static DTMNoteVisualHold GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement parentElement, string themeBundleName, string objectName) {