From 400de5ef6886f3fb28e11c802858a050e7e12137 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Mon, 13 Jan 2025 21:49:58 +0800 Subject: [PATCH 01/26] feat: slide star prefab --- Assets/Prefab/Game/Slides/Slide_Wifi.prefab | 3 ++ .../Prefab/Game/Slides/Star_Circle_1.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_2.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_3.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_4.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_5.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_6.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_7.prefab | 38 +++++++++++++++++++ .../Prefab/Game/Slides/Star_Circle_8.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_L_2.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_L_3.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_L_4.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_L_5.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_Line_3.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_Line_4.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_Line_5.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_Line_6.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_Line_7.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_S.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_1.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_2.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_3.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_4.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_6.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_7.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_V_8.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_1.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_2.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_3.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_4.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_5.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_6.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_7.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_ppqq_8.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_1.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_2.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_3.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_4.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_5.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_6.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_7.prefab | 38 +++++++++++++++++++ Assets/Prefab/Game/Slides/Star_pq_8.prefab | 38 +++++++++++++++++++ Assets/Script/Misc/Types/Enums/NoteStatus.cs | 4 +- .../Game/NoteControllers/NoteUpdater.cs | 1 - .../Script/Scenes/Game/Notes/EachLineDrop.cs | 8 ++-- Assets/Script/Scenes/Game/Notes/HoldDrop.cs | 10 ++--- Assets/Script/Scenes/Game/Notes/NoteDrop.cs | 2 +- Assets/Script/Scenes/Game/Notes/SlideBase.cs | 7 ++++ Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 10 +++-- Assets/Script/Scenes/Game/Notes/TapDrop.cs | 4 +- Assets/Script/Scenes/Game/Notes/TouchDrop.cs | 8 ++-- .../Script/Scenes/Game/Notes/TouchHoldDrop.cs | 10 ++--- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 2 +- Assets/Script/Scenes/Game/Types/NoteInfo.cs | 4 +- 54 files changed, 1600 insertions(+), 31 deletions(-) diff --git a/Assets/Prefab/Game/Slides/Slide_Wifi.prefab b/Assets/Prefab/Game/Slides/Slide_Wifi.prefab index 8c129719..6749fef3 100644 --- a/Assets/Prefab/Game/Slides/Slide_Wifi.prefab +++ b/Assets/Prefab/Game/Slides/Slide_Wifi.prefab @@ -1032,6 +1032,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dce01e6efa89ca542a1491788bab73ef, type: 3} m_Name: m_EditorClassIdentifier: + _state: 0 _startPos: 0 _timing: 0 _speed: 7 @@ -1041,7 +1042,9 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] + _slideBarRenderers: [] _stars: - {fileID: 0} - {fileID: 0} diff --git a/Assets/Prefab/Game/Slides/Star_Circle_1.prefab b/Assets/Prefab/Game/Slides/Star_Circle_1.prefab index 148a6277..ef548fde 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_1.prefab @@ -2193,6 +2193,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6286670162287555626} + - component: {fileID: 4321524551827378399} m_Layer: 0 m_Name: Star_Circle_1 m_TagString: Untagged @@ -2279,6 +2280,43 @@ Transform: - {fileID: 5596905080353444796} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4321524551827378399 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3811942671679594881} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &3880718947095525592 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_2.prefab b/Assets/Prefab/Game/Slides/Star_Circle_2.prefab index a06be9b6..ab741a25 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_2.prefab @@ -429,6 +429,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5333470779701183810} + - component: {fileID: -761030973856931566} m_Layer: 0 m_Name: Star_Circle_2 m_TagString: Untagged @@ -459,6 +460,43 @@ Transform: - {fileID: 4132567073616200544} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-761030973856931566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4771184315770581227} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &5969952551158348178 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_3.prefab b/Assets/Prefab/Game/Slides/Star_Circle_3.prefab index eac40f3c..b0a1f0fd 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_3.prefab @@ -429,6 +429,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4959977715872069077} + - component: {fileID: -1024460224284718397} m_Layer: 0 m_Name: Star_Circle_3 m_TagString: Untagged @@ -467,6 +468,43 @@ Transform: - {fileID: 3672156181829589010} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-1024460224284718397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3779266362854166925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &3967625451836103947 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_4.prefab b/Assets/Prefab/Game/Slides/Star_Circle_4.prefab index 17e638c1..6ca95b1e 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_4.prefab @@ -1909,6 +1909,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1569632001641100095} + - component: {fileID: -7982052286459308924} m_Layer: 0 m_Name: Star_Circle_4 m_TagString: Untagged @@ -1955,6 +1956,43 @@ Transform: - {fileID: 5397759460337934511} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-7982052286459308924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8390738787376868268} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8598244046855296502 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_5.prefab b/Assets/Prefab/Game/Slides/Star_Circle_5.prefab index 11746b9a..266fa775 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_5.prefab @@ -2361,6 +2361,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5075201865271903236} + - component: {fileID: -8466939326913221265} m_Layer: 0 m_Name: Star_Circle_5 m_TagString: Untagged @@ -2415,6 +2416,43 @@ Transform: - {fileID: 1836430134254452113} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-8466939326913221265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8385692067622607824} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8485280449831498836 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_6.prefab b/Assets/Prefab/Game/Slides/Star_Circle_6.prefab index 9c01d08c..cd2110fe 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_6.prefab @@ -2329,6 +2329,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2701549621537390117} + - component: {fileID: 4906516328718388477} m_Layer: 0 m_Name: Star_Circle_6 m_TagString: Untagged @@ -2391,6 +2392,43 @@ Transform: - {fileID: 2438186078665917410} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4906516328718388477 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5756437215818999019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &6252188938400849797 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_7.prefab b/Assets/Prefab/Game/Slides/Star_Circle_7.prefab index 50bcda13..0e4c627e 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_7.prefab @@ -597,6 +597,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6452680219656410185} + - component: {fileID: -669529246388541155} m_Layer: 0 m_Name: Star_Circle_7 m_TagString: Untagged @@ -667,6 +668,43 @@ Transform: - {fileID: 8992497300061141582} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-669529246388541155 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1523015595177315187} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &1777600767941551293 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_8.prefab b/Assets/Prefab/Game/Slides/Star_Circle_8.prefab index 1ceca83e..5d68be4a 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_8.prefab @@ -901,6 +901,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7292729158011186174} + - component: {fileID: 816752109529866927} m_Layer: 0 m_Name: Star_Circle_8 m_TagString: Untagged @@ -979,6 +980,43 @@ Transform: - {fileID: 6337358977022435737} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &816752109529866927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1147044652582484651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &1266724528122456748 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_L_2.prefab b/Assets/Prefab/Game/Slides/Star_L_2.prefab index d97eb8fa..48cc0fec 100644 --- a/Assets/Prefab/Game/Slides/Star_L_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_2.prefab @@ -1741,6 +1741,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4831295135796987854} + - component: {fileID: 2989288792638033462} m_Layer: 0 m_Name: Star_L_2 m_TagString: Untagged @@ -1796,6 +1797,43 @@ Transform: - {fileID: 1477381887162016954} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2989288792638033462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4666287949468113778} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &5811950547420022797 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_L_3.prefab b/Assets/Prefab/Game/Slides/Star_L_3.prefab index 7dafdff6..1b16a56b 100644 --- a/Assets/Prefab/Game/Slides/Star_L_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_3.prefab @@ -933,6 +933,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6787134500062537572} + - component: {fileID: 2740914391010461112} m_Layer: 0 m_Name: Star_L_3 m_TagString: Untagged @@ -990,6 +991,43 @@ Transform: - {fileID: 189913620692579584} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2740914391010461112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3347333010027816482} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &3544393113263502257 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_L_4.prefab b/Assets/Prefab/Game/Slides/Star_L_4.prefab index 561b41d4..2e4637d7 100644 --- a/Assets/Prefab/Game/Slides/Star_L_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_4.prefab @@ -2329,6 +2329,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6995989914360437517} + - component: {fileID: -7953544408041336709} m_Layer: 0 m_Name: Star_L_4 m_TagString: Untagged @@ -2384,6 +2385,43 @@ Transform: - {fileID: 4136122414293237498} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-7953544408041336709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8148946950682681393} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8191849591632476485 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_L_5.prefab b/Assets/Prefab/Game/Slides/Star_L_5.prefab index 4031933b..e8a40597 100644 --- a/Assets/Prefab/Game/Slides/Star_L_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_5.prefab @@ -2329,6 +2329,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7464115008178339832} + - component: {fileID: 998449014842915467} m_Layer: 0 m_Name: Star_L_5 m_TagString: Untagged @@ -2380,6 +2381,43 @@ Transform: - {fileID: 8856203951160341924} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &998449014842915467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8389343569395675099} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &9004375827057786586 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Line_3.prefab b/Assets/Prefab/Game/Slides/Star_Line_3.prefab index 9380f71f..8eaf7a11 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_3.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 51001413267503470} + - component: {fileID: -6337731192819031973} m_Layer: 0 m_Name: Star_Line_3 m_TagString: Untagged @@ -45,6 +46,43 @@ Transform: - {fileID: 258668945211108605} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-6337731192819031973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51001413267503469} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &754929904959641404 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Line_4.prefab b/Assets/Prefab/Game/Slides/Star_Line_4.prefab index 0436cc0f..e62dbceb 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_4.prefab @@ -1437,6 +1437,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7987079123466364498} + - component: {fileID: -1901342878387056590} m_Layer: 0 m_Name: Star_Line_4 m_TagString: Untagged @@ -1478,6 +1479,43 @@ Transform: - {fileID: 3656774227332327950} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-1901342878387056590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7987079123466364501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8912202577190464993 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Line_5.prefab b/Assets/Prefab/Game/Slides/Star_Line_5.prefab index 8296aee3..c756a24d 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_5.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 162252113955721595} + - component: {fileID: 5715934130158152868} m_Layer: 0 m_Name: Star_Line_5 m_TagString: Untagged @@ -51,6 +52,43 @@ Transform: - {fileID: 3185750837372996579} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5715934130158152868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 162252113955721592} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &487594880957267860 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Line_6.prefab b/Assets/Prefab/Game/Slides/Star_Line_6.prefab index fd342bc3..a08a3c4b 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_6.prefab @@ -681,6 +681,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4063889838514241291} + - component: {fileID: -6057579666304584579} m_Layer: 0 m_Name: Star_Line_6 m_TagString: Untagged @@ -722,6 +723,43 @@ Transform: - {fileID: 8220250582884221845} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-6057579666304584579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4063889838514241290} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &4173032185633843902 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Line_7.prefab b/Assets/Prefab/Game/Slides/Star_Line_7.prefab index 609eaca5..88977910 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_7.prefab @@ -597,6 +597,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4385958340107344275} + - component: {fileID: 1787255866376709484} m_Layer: 0 m_Name: Star_Line_7 m_TagString: Untagged @@ -633,6 +634,43 @@ Transform: - {fileID: 7932642826819209176} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1787255866376709484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4385958340107344272} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &5553777981122894940 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_S.prefab b/Assets/Prefab/Game/Slides/Star_S.prefab index 32981d4e..17a052ca 100644 --- a/Assets/Prefab/Game/Slides/Star_S.prefab +++ b/Assets/Prefab/Game/Slides/Star_S.prefab @@ -177,6 +177,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5436578077489055470} + - component: {fileID: 3820995505793534774} m_Layer: 0 m_Name: Star_S m_TagString: Untagged @@ -230,6 +231,43 @@ Transform: - {fileID: 1287287786365442908} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3820995505793534774 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5436578077489055471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &5436578077523661335 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_1.prefab b/Assets/Prefab/Game/Slides/Star_V_1.prefab index 9e257699..71cdd5a8 100644 --- a/Assets/Prefab/Game/Slides/Star_V_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_1.prefab @@ -93,6 +93,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 349982270078930303} + - component: {fileID: -284180768206356970} m_Layer: 0 m_Name: Star_V_1 m_TagString: Untagged @@ -136,6 +137,43 @@ Transform: - {fileID: 6916987564842224821} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-284180768206356970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349982270078930302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &349982270184433799 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_2.prefab b/Assets/Prefab/Game/Slides/Star_V_2.prefab index 7b90b0da..bb69a136 100644 --- a/Assets/Prefab/Game/Slides/Star_V_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_2.prefab @@ -261,6 +261,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 349982270078930303} + - component: {fileID: -923746542344298134} m_Layer: 0 m_Name: Star_V_2 m_TagString: Untagged @@ -303,6 +304,43 @@ Transform: - {fileID: 6916987564842224821} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-923746542344298134 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 349982270078930302} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &349982270184433799 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_3.prefab b/Assets/Prefab/Game/Slides/Star_V_3.prefab index cc0f262f..b38c65b5 100644 --- a/Assets/Prefab/Game/Slides/Star_V_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_3.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8949524144708029664} + - component: {fileID: -4586872037046383785} m_Layer: 0 m_Name: Star_V_3 m_TagString: Untagged @@ -51,6 +52,43 @@ Transform: - {fileID: 7342276898328424513} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-4586872037046383785 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8949524144708029665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8949524144843154839 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_4.prefab b/Assets/Prefab/Game/Slides/Star_V_4.prefab index 8397c6ac..4eed729a 100644 --- a/Assets/Prefab/Game/Slides/Star_V_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_4.prefab @@ -1017,6 +1017,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8856240846847104427} + - component: {fileID: -386282727900373471} m_Layer: 0 m_Name: Star_V_4 m_TagString: Untagged @@ -1059,6 +1060,43 @@ Transform: - {fileID: 7543212540317958397} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-386282727900373471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8856240846847104426} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8856240846899936165 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_6.prefab b/Assets/Prefab/Game/Slides/Star_V_6.prefab index 8f117ea4..c4d1e5fd 100644 --- a/Assets/Prefab/Game/Slides/Star_V_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_6.prefab @@ -177,6 +177,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8481175540677500504} + - component: {fileID: 694249012880978636} m_Layer: 0 m_Name: Star_V_6 m_TagString: Untagged @@ -219,6 +220,43 @@ Transform: - {fileID: 8036091809700296989} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &694249012880978636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115498022132103969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &2394662909394771660 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_7.prefab b/Assets/Prefab/Game/Slides/Star_V_7.prefab index be337c8d..e0f650fc 100644 --- a/Assets/Prefab/Game/Slides/Star_V_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_7.prefab @@ -1353,6 +1353,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3988672090900188644} + - component: {fileID: 3259676251623012447} m_Layer: 0 m_Name: Star_V_7 m_TagString: Untagged @@ -1395,6 +1396,43 @@ Transform: - {fileID: 4822925470612110683} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3259676251623012447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7402194249673173763} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &7633751091860705249 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_V_8.prefab b/Assets/Prefab/Game/Slides/Star_V_8.prefab index 533ea876..692675be 100644 --- a/Assets/Prefab/Game/Slides/Star_V_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_8.prefab @@ -513,6 +513,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5144368064500705874} + - component: {fileID: 8651483579522924998} m_Layer: 0 m_Name: Star_V_8 m_TagString: Untagged @@ -555,6 +556,43 @@ Transform: - {fileID: 471955719810912077} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &8651483579522924998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2992700185771566843} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &3135360204407326552 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab index fda0495e..e62ef7af 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab @@ -1689,6 +1689,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4064843442730294977} + - component: {fileID: 3465050376112273392} m_Layer: 0 m_Name: Star_ppqq_1 m_TagString: Untagged @@ -1747,6 +1748,43 @@ Transform: - {fileID: 6576045817776909188} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3465050376112273392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4481343721486563910} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &4517341654776747428 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab index 8ce0f11d..646f652b 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab @@ -2329,6 +2329,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 120400519729866694} + - component: {fileID: -1853696123004999585} m_Layer: 0 m_Name: Star_ppqq_2 m_TagString: Untagged @@ -2380,6 +2381,43 @@ Transform: - {fileID: 8921031264339709243} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-1853696123004999585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8395920848427136886} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8580206461961989832 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab index aa2ea5e7..592ab5a4 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab @@ -1605,6 +1605,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8644234516124905536} + - component: {fileID: -7679074703447806821} m_Layer: 0 m_Name: Star_ppqq_3 m_TagString: Untagged @@ -1650,6 +1651,43 @@ Transform: - {fileID: 7897240608834503268} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-7679074703447806821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7073340198924737011} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &7396897144070760997 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab index 12feabe2..875c9c6a 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7532755370495286030} + - component: {fileID: 319602867161358597} m_Layer: 0 m_Name: Star_ppqq_4 m_TagString: Untagged @@ -81,6 +82,43 @@ Transform: - {fileID: 8950750867340217098} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &319602867161358597 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 69623090116495014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &146600403597225806 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab index adb28bb7..0b9d1226 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab @@ -681,6 +681,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7582733149966635014} + - component: {fileID: -2983453316465426764} m_Layer: 0 m_Name: Star_ppqq_5 m_TagString: Untagged @@ -753,6 +754,43 @@ Transform: - {fileID: 3057164659121080741} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-2983453316465426764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 994777228038712772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &996437527645057397 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab index 543b15f1..b4ae8ae8 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab @@ -1941,6 +1941,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7674391905153332899} + - component: {fileID: -6256708730566603481} m_Layer: 0 m_Name: Star_ppqq_6 m_TagString: Untagged @@ -2012,6 +2013,43 @@ Transform: - {fileID: 79620989499602251} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-6256708730566603481 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4833279577871880707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &4833744931375690521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab index 02edc74e..7f3d6022 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab @@ -3621,6 +3621,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2741051877658597353} + - component: {fileID: -890016528014672081} m_Layer: 0 m_Name: Star_ppqq_7 m_TagString: Untagged @@ -3690,6 +3691,43 @@ Transform: - {fileID: 1199531215474873966} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-890016528014672081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8514205390634160081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8772722309363375930 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab index 718cfcdd..fb024733 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab @@ -1741,6 +1741,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2209511711516166332} + - component: {fileID: -443495768589162786} m_Layer: 0 m_Name: Star_ppqq_8 m_TagString: Untagged @@ -1805,6 +1806,43 @@ Transform: - {fileID: 7593562862540429754} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-443495768589162786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3845287763176181976} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &4471034425484838123 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_1.prefab b/Assets/Prefab/Game/Slides/Star_pq_1.prefab index 9d78d6df..bed56e2f 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_1.prefab @@ -2077,6 +2077,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3158804426977110101} + - component: {fileID: -3391237438439552514} m_Layer: 0 m_Name: Star_pq_1 m_TagString: Untagged @@ -2133,6 +2134,43 @@ Transform: - {fileID: 3042996818074314441} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-3391237438439552514 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6967555913822829999} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &7134940954673391103 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_2.prefab b/Assets/Prefab/Game/Slides/Star_pq_2.prefab index e7fd7d93..7fed81b4 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_2.prefab @@ -2161,6 +2161,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6528371387398208999} + - component: {fileID: 1083006261895798109} m_Layer: 0 m_Name: Star_pq_2 m_TagString: Untagged @@ -2214,6 +2215,43 @@ Transform: - {fileID: 4198466887280069933} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1083006261895798109 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7220423140814551699} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8340445480101220833 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_3.prefab b/Assets/Prefab/Game/Slides/Star_pq_3.prefab index 5d3f3c56..a3707a1c 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_3.prefab @@ -1521,6 +1521,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2341967858640350970} + - component: {fileID: 3797670330987215786} m_Layer: 0 m_Name: Star_pq_3 m_TagString: Untagged @@ -1571,6 +1572,43 @@ Transform: - {fileID: 1117520241052736366} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3797670330987215786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5598722730420239630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &6647266310545108700 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_4.prefab b/Assets/Prefab/Game/Slides/Star_pq_4.prefab index 53a650aa..0ff1e841 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_4.prefab @@ -1825,6 +1825,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7920043548282662323} + - component: {fileID: 297919941851415056} m_Layer: 0 m_Name: Star_pq_4 m_TagString: Untagged @@ -1872,6 +1873,43 @@ Transform: - {fileID: 9135558724515080981} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &297919941851415056 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7695249693278585890} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &8655302532841722744 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_5.prefab b/Assets/Prefab/Game/Slides/Star_pq_5.prefab index 1a431332..30d97b59 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_5.prefab @@ -513,6 +513,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7061486334638501933} + - component: {fileID: 2464887499013316620} m_Layer: 0 m_Name: Star_pq_5 m_TagString: Untagged @@ -557,6 +558,43 @@ Transform: - {fileID: 5942760481481724994} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2464887499013316620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2255730539399038605} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &2284099411173797767 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_6.prefab b/Assets/Prefab/Game/Slides/Star_pq_6.prefab index e9b89d37..9b427713 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_6.prefab @@ -3673,6 +3673,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7452358191144450848} + - component: {fileID: -5843118957594736802} m_Layer: 0 m_Name: Star_pq_6 m_TagString: Untagged @@ -3738,3 +3739,40 @@ Transform: - {fileID: 6067484357363937285} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-5843118957594736802 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8323648564071886062} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_7.prefab b/Assets/Prefab/Game/Slides/Star_pq_7.prefab index c680a35f..5d24318a 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_7.prefab @@ -2361,6 +2361,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6749226474973957704} + - component: {fileID: -4425606207454500657} m_Layer: 0 m_Name: Star_pq_7 m_TagString: Untagged @@ -2424,6 +2425,43 @@ Transform: - {fileID: 7022566368858204207} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-4425606207454500657 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6285532811684223671} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &6393229959341328161 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_8.prefab b/Assets/Prefab/Game/Slides/Star_pq_8.prefab index 562681eb..5ee2faa3 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_8.prefab @@ -429,6 +429,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4757348343660508144} + - component: {fileID: 1169793479627888942} m_Layer: 0 m_Name: Star_pq_8 m_TagString: Untagged @@ -488,6 +489,43 @@ Transform: - {fileID: 5646482134862962482} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1169793479627888942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1520358378427187981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 459af02eacf371a4abc06af3fc80b24c, type: 3} + m_Name: + m_EditorClassIdentifier: + _state: 0 + _startPos: 0 + _timing: 0 + _speed: 7 + _sortOrder: 0 + _isEach: 0 + _isBreak: 0 + _isEX: 0 + _playerIdleTime: 0 + _length: 1 + _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideBars: [] + _slideBarRenderers: [] + _stars: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + _startTiming: 0 + _isJustR: 0 + _fadeInTiming: 0 + _fullFadeInTiming: 0.2 + _endPos: 1 + _slideType: + _isMirror: 0 + _isSpecialFlip: 0 --- !u!1 &1590452806205293865 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Misc/Types/Enums/NoteStatus.cs b/Assets/Script/Misc/Types/Enums/NoteStatus.cs index be16fda9..55ff425c 100644 --- a/Assets/Script/Misc/Types/Enums/NoteStatus.cs +++ b/Assets/Script/Misc/Types/Enums/NoteStatus.cs @@ -7,7 +7,7 @@ public enum NoteStatus Initialized, Scaling, Running, - End, - Destroyed + Arrived, + End } } diff --git a/Assets/Script/Scenes/Game/NoteControllers/NoteUpdater.cs b/Assets/Script/Scenes/Game/NoteControllers/NoteUpdater.cs index 19970463..267489ca 100644 --- a/Assets/Script/Scenes/Game/NoteControllers/NoteUpdater.cs +++ b/Assets/Script/Scenes/Game/NoteControllers/NoteUpdater.cs @@ -6,7 +6,6 @@ using System; using System.Collections.Generic; using UnityEngine; -using Debug = UnityEngine.Debug; namespace MajdataPlay.Game { diff --git a/Assets/Script/Scenes/Game/Notes/EachLineDrop.cs b/Assets/Script/Scenes/Game/Notes/EachLineDrop.cs index 89b22027..0a199c47 100644 --- a/Assets/Script/Scenes/Game/Notes/EachLineDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/EachLineDrop.cs @@ -34,7 +34,7 @@ public RendererStatus RendererState public IStatefulNote? NoteA { get; set; } public IStatefulNote? NoteB { get; set; } public NoteStatus State { get; set; } = NoteStatus.Start; - public bool IsDestroyed => State == NoteStatus.Destroyed; + public bool IsDestroyed => State == NoteStatus.End; public NoteQueueInfo QueueInfo => TapQueueInfo.Default; public GameObject GameObject => gameObject; public bool IsInitialized => State >= NoteStatus.Initialized; @@ -50,7 +50,7 @@ public RendererStatus RendererState NotePoolManager poolManager; public void Initialize(EachLinePoolingInfo poolingInfo) { - if (State >= NoteStatus.Initialized && State < NoteStatus.Destroyed) + if (State >= NoteStatus.Initialized && State < NoteStatus.End) return; startPosition = poolingInfo.StartPos; timing = poolingInfo.Timing; @@ -68,7 +68,7 @@ public void Initialize(EachLinePoolingInfo poolingInfo) } public void End(bool forceEnd = false) { - State = NoteStatus.Destroyed; + State = NoteStatus.End; RendererState = RendererStatus.Off; if (forceEnd) return; @@ -125,7 +125,7 @@ public void ComponentLateUpdate() transform.localScale = new Vector3(lineScale, lineScale, 1f); if (NoteA is not null && NoteB is not null) { - if (NoteA.State == NoteStatus.Destroyed || NoteB.State == NoteStatus.Destroyed) + if (NoteA.State == NoteStatus.End || NoteB.State == NoteStatus.End) { End(); return; diff --git a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs index ff7bdedf..7c2ca48b 100644 --- a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs @@ -126,7 +126,7 @@ protected override async void Autoplay() } public void Initialize(HoldPoolingInfo poolingInfo) { - if (State >= NoteStatus.Initialized && State < NoteStatus.Destroyed) + if (State >= NoteStatus.Initialized && State < NoteStatus.End) return; StartPos = poolingInfo.StartPos; Timing = poolingInfo.Timing; @@ -168,7 +168,7 @@ public void Initialize(HoldPoolingInfo poolingInfo) } public void End(bool forceEnd = false) { - State = NoteStatus.Destroyed; + State = NoteStatus.End; UnsubscribeEvent(); if (forceEnd) return; @@ -392,8 +392,8 @@ public override void ComponentUpdate() case NoteStatus.Running: if(remaining == 0) { - State = NoteStatus.End; - goto case NoteStatus.End; + State = NoteStatus.Arrived; + goto case NoteStatus.Arrived; } if (holdDistance < 1.225f && distance >= 4.8f) // 头到达 尾未出现 { @@ -430,7 +430,7 @@ public override void ComponentUpdate() _endTransform.localPosition = new Vector3(0f, 0.6825f - size / 2); Transform.localScale = new Vector3(1f, 1f); break; - case NoteStatus.End: + case NoteStatus.Arrived: var endTiming = timing - Length; var endDistance = endTiming * Speed + 4.8f; _tapLineTransform.localScale = new Vector3(1f, 1f, 1f); diff --git a/Assets/Script/Scenes/Game/Notes/NoteDrop.cs b/Assets/Script/Scenes/Game/Notes/NoteDrop.cs index 4c8aa1df..f5c4959a 100644 --- a/Assets/Script/Scenes/Game/Notes/NoteDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/NoteDrop.cs @@ -68,7 +68,7 @@ public bool IsEX /// public Transform Transform => _transform; public bool IsInitialized => State >= NoteStatus.Initialized; - public bool IsDestroyed => State == NoteStatus.Destroyed; + public bool IsDestroyed => State == NoteStatus.End; public bool IsClassic => _gameSetting.Judge.Mode == JudgeMode.Classic; public NoteStatus State { diff --git a/Assets/Script/Scenes/Game/Notes/SlideBase.cs b/Assets/Script/Scenes/Game/Notes/SlideBase.cs index ae0402a2..936a9b39 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideBase.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideBase.cs @@ -89,6 +89,13 @@ public string SlideType Memory.Empty, Memory.Empty }; // 判定队列 + + /// + /// Slide star prefab + /// Readonly + /// + [SerializeField] + protected GameObject _slideStar; /// /// Arrows /// diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 60a9bd60..471a28f7 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -36,6 +36,8 @@ public bool IsSpecialFlip protected override void Awake() { base.Awake(); + _stars[0] = Instantiate(_slideStar) + } /// /// Slide初始化 @@ -187,7 +189,7 @@ public override void ComponentFixedUpdate() } public override void ComponentUpdate() { - BodyCheck(); + SlideCheck(); // ConnSlide var star = _stars[0]; var starTransform = _starTransforms[0]; @@ -309,7 +311,7 @@ void CheckSensor() } _isChecking = false; } - void BodyCheck() + void SlideCheck() { /// time 是Slide启动的时间点 /// timeStart 是Slide完全显示但未启动 @@ -381,7 +383,7 @@ public override void End(bool forceEnd = false) { if (IsDestroyed) return; - State = NoteStatus.Destroyed; + State = NoteStatus.End; //foreach (var sensor in ArrayHelper.ToEnumerable(_judgeAreas)) // _ioManager.UnbindSensor(_noteChecker, sensor); base.End(); @@ -440,7 +442,7 @@ void StarUpdate() var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); var indexProcess = (_slidePositions.Count - 1) * process; - var index = ((int)indexProcess).Clamp(0, _slidePositions.Count - 2); + var index = (int)indexProcess; var pos = indexProcess - index; if (process == 1) diff --git a/Assets/Script/Scenes/Game/Notes/TapDrop.cs b/Assets/Script/Scenes/Game/Notes/TapDrop.cs index f824a6cd..b096b1f3 100644 --- a/Assets/Script/Scenes/Game/Notes/TapDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TapDrop.cs @@ -78,7 +78,7 @@ protected override void Awake() } public void Initialize(TapPoolingInfo poolingInfo) { - if (State >= NoteStatus.Initialized && State < NoteStatus.Destroyed) + if (State >= NoteStatus.Initialized && State < NoteStatus.End) return; StartPos = poolingInfo.StartPos; Timing = poolingInfo.Timing; @@ -116,7 +116,7 @@ public void Initialize(TapPoolingInfo poolingInfo) } public void End(bool forceEnd = false) { - State = NoteStatus.Destroyed; + State = NoteStatus.End; //UnsubscribeEvent(); if (!_isJudged || forceEnd) return; diff --git a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs index 83b7f10f..0d5e719b 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs @@ -108,7 +108,7 @@ protected override void Awake() } public void Initialize(TouchPoolingInfo poolingInfo) { - if (State >= NoteStatus.Initialized && State < NoteStatus.Destroyed) + if (State >= NoteStatus.Initialized && State < NoteStatus.End) return; StartPos = poolingInfo.StartPos; @@ -161,7 +161,7 @@ public void Initialize(TouchPoolingInfo poolingInfo) } public void End(bool forceEnd = false) { - State = NoteStatus.Destroyed; + State = NoteStatus.End; UnsubscribeEvent(); if (!_isJudged || forceEnd) return; @@ -298,7 +298,7 @@ public override void ComponentUpdate() var _pow = -Mathf.Exp(-0.85f) + 0.42f; var _distance = Mathf.Clamp(_pow, 0f, 0.4f); SetFansPosition(_distance); - State = NoteStatus.End; + State = NoteStatus.Arrived; } else { @@ -306,7 +306,7 @@ public override void ComponentUpdate() } } return; - case NoteStatus.End: + case NoteStatus.Arrived: return; } } diff --git a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs index 6dec604d..a2fc1381 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs @@ -144,7 +144,7 @@ protected override async void Autoplay() } public void Initialize(TouchHoldPoolingInfo poolingInfo) { - if (State >= NoteStatus.Initialized && State < NoteStatus.Destroyed) + if (State >= NoteStatus.Initialized && State < NoteStatus.End) return; StartPos = poolingInfo.StartPos; @@ -201,7 +201,7 @@ public void Initialize(TouchHoldPoolingInfo poolingInfo) } public void End(bool forceEnd = false) { - State = NoteStatus.Destroyed; + State = NoteStatus.End; UnsubscribeEvent(); if (forceEnd) return; @@ -439,14 +439,14 @@ public override void ComponentUpdate() SetFansPosition(_distance); SetBorderActive(true); _borderMask.enabled = true; - State = NoteStatus.End; - goto case NoteStatus.End; + State = NoteStatus.Arrived; + goto case NoteStatus.Arrived; } else SetFansPosition(distance); } return; - case NoteStatus.End: + case NoteStatus.Arrived: { var value = 0.91f * (1 - (Length - timing) / Length); var alpha = value.Clamp(0, 1f); diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 3fef1924..6aa66e19 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -357,7 +357,7 @@ public override void End(bool forceEnd = false) return; //foreach (var sensor in ArrayHelper.ToEnumerable(_judgeAreas)) // _ioManager.UnbindSensor(_noteChecker, sensor); - State = NoteStatus.Destroyed; + State = NoteStatus.End; base.End(); if (forceEnd) { diff --git a/Assets/Script/Scenes/Game/Types/NoteInfo.cs b/Assets/Script/Scenes/Game/Types/NoteInfo.cs index c8c03fed..70e7235e 100644 --- a/Assets/Script/Scenes/Game/Types/NoteInfo.cs +++ b/Assets/Script/Scenes/Game/Types/NoteInfo.cs @@ -18,7 +18,7 @@ public unsafe class NoteInfo : ComponentInfo> public bool IsValid => _update is not null || _fixedUpdate is not null || _lateUpdate is not null; - public NoteStatus State => Object?.State ?? NoteStatus.Destroyed; + public NoteStatus State => Object?.State ?? NoteStatus.End; delegate void ComponentMethod(); @@ -75,7 +75,7 @@ public override void FixedUpdate() [MethodImpl(MethodImplOptions.AggressiveInlining)] public bool CanExecute() { - return State is not (NoteStatus.Start or NoteStatus.Destroyed) && + return State is not (NoteStatus.Start or NoteStatus.End) && ((_updatableComponent?.Active ?? _fixedUpdatableComponent?.Active ?? _lateUpdatableComponent?.Active) ?? false); } } From 307bb0fb2789497bb31017c8c311a0417d546c4a Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Mon, 13 Jan 2025 22:16:19 +0800 Subject: [PATCH 02/26] feat: slideType --- Assets/Prefab/Game/Slides/Slide_Wifi.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_1.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_2.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_3.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_4.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_5.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_6.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_7.prefab | 8 ++---- .../Prefab/Game/Slides/Star_Circle_8.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_L_2.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_L_3.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_L_4.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_L_5.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_Line_3.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_Line_4.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_Line_5.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_Line_6.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_Line_7.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_S.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_1.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_2.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_3.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_4.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_6.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_7.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_V_8.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_1.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_2.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_3.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_4.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_5.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_6.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_7.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_ppqq_8.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_1.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_2.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_3.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_4.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_5.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_6.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_7.prefab | 8 ++---- Assets/Prefab/Game/Slides/Star_pq_8.prefab | 8 ++---- Assets/Script/Scenes/Game/NoteLoader.cs | 26 +++++++++---------- Assets/Script/Scenes/Game/Notes/SlideBase.cs | 5 ++-- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 3 ++- 45 files changed, 101 insertions(+), 269 deletions(-) diff --git a/Assets/Prefab/Game/Slides/Slide_Wifi.prefab b/Assets/Prefab/Game/Slides/Slide_Wifi.prefab index 6749fef3..8569b818 100644 --- a/Assets/Prefab/Game/Slides/Slide_Wifi.prefab +++ b/Assets/Prefab/Game/Slides/Slide_Wifi.prefab @@ -1042,19 +1042,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: wifi --- !u!1 &7964666901942964958 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_1.prefab b/Assets/Prefab/Game/Slides/Star_Circle_1.prefab index ef548fde..94ce127a 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_1.prefab @@ -2302,19 +2302,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle1 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3880718947095525592 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_2.prefab b/Assets/Prefab/Game/Slides/Star_Circle_2.prefab index ab741a25..dced9117 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_2.prefab @@ -482,19 +482,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle2 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &5969952551158348178 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_3.prefab b/Assets/Prefab/Game/Slides/Star_Circle_3.prefab index b0a1f0fd..48bd5cd0 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_3.prefab @@ -490,19 +490,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle3 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3967625451836103947 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_4.prefab b/Assets/Prefab/Game/Slides/Star_Circle_4.prefab index 6ca95b1e..2e309783 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_4.prefab @@ -1978,19 +1978,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle4 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8598244046855296502 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_5.prefab b/Assets/Prefab/Game/Slides/Star_Circle_5.prefab index 266fa775..950b7a68 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_5.prefab @@ -2438,19 +2438,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle5 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8485280449831498836 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_6.prefab b/Assets/Prefab/Game/Slides/Star_Circle_6.prefab index cd2110fe..d0c6178d 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_6.prefab @@ -2414,19 +2414,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle6 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &6252188938400849797 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_7.prefab b/Assets/Prefab/Game/Slides/Star_Circle_7.prefab index 0e4c627e..5471ab12 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_7.prefab @@ -690,19 +690,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle7 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &1777600767941551293 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_8.prefab b/Assets/Prefab/Game/Slides/Star_Circle_8.prefab index 5d68be4a..44effa6d 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_8.prefab @@ -1002,19 +1002,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: circle8 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &1266724528122456748 diff --git a/Assets/Prefab/Game/Slides/Star_L_2.prefab b/Assets/Prefab/Game/Slides/Star_L_2.prefab index 48cc0fec..eea43bf7 100644 --- a/Assets/Prefab/Game/Slides/Star_L_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_2.prefab @@ -1819,19 +1819,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: L2 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &5811950547420022797 diff --git a/Assets/Prefab/Game/Slides/Star_L_3.prefab b/Assets/Prefab/Game/Slides/Star_L_3.prefab index 1b16a56b..825bf9a8 100644 --- a/Assets/Prefab/Game/Slides/Star_L_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_3.prefab @@ -1013,19 +1013,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: L3 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3544393113263502257 diff --git a/Assets/Prefab/Game/Slides/Star_L_4.prefab b/Assets/Prefab/Game/Slides/Star_L_4.prefab index 2e4637d7..98ba8396 100644 --- a/Assets/Prefab/Game/Slides/Star_L_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_4.prefab @@ -2407,19 +2407,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: L4 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8191849591632476485 diff --git a/Assets/Prefab/Game/Slides/Star_L_5.prefab b/Assets/Prefab/Game/Slides/Star_L_5.prefab index e8a40597..6961fe8b 100644 --- a/Assets/Prefab/Game/Slides/Star_L_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_5.prefab @@ -2403,19 +2403,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: L5 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &9004375827057786586 diff --git a/Assets/Prefab/Game/Slides/Star_Line_3.prefab b/Assets/Prefab/Game/Slides/Star_Line_3.prefab index 8eaf7a11..3bc8a60e 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_3.prefab @@ -68,19 +68,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: line3 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &754929904959641404 diff --git a/Assets/Prefab/Game/Slides/Star_Line_4.prefab b/Assets/Prefab/Game/Slides/Star_Line_4.prefab index e62dbceb..708c8a48 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_4.prefab @@ -1501,19 +1501,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: line4 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8912202577190464993 diff --git a/Assets/Prefab/Game/Slides/Star_Line_5.prefab b/Assets/Prefab/Game/Slides/Star_Line_5.prefab index c756a24d..5eb304e1 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_5.prefab @@ -74,19 +74,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: line5 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &487594880957267860 diff --git a/Assets/Prefab/Game/Slides/Star_Line_6.prefab b/Assets/Prefab/Game/Slides/Star_Line_6.prefab index a08a3c4b..9400dc10 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_6.prefab @@ -745,19 +745,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: line6 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4173032185633843902 diff --git a/Assets/Prefab/Game/Slides/Star_Line_7.prefab b/Assets/Prefab/Game/Slides/Star_Line_7.prefab index 88977910..e603c4d3 100644 --- a/Assets/Prefab/Game/Slides/Star_Line_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_Line_7.prefab @@ -656,19 +656,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: line7 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &5553777981122894940 diff --git a/Assets/Prefab/Game/Slides/Star_S.prefab b/Assets/Prefab/Game/Slides/Star_S.prefab index 17a052ca..5c477cc8 100644 --- a/Assets/Prefab/Game/Slides/Star_S.prefab +++ b/Assets/Prefab/Game/Slides/Star_S.prefab @@ -253,19 +253,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: s _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &5436578077523661335 diff --git a/Assets/Prefab/Game/Slides/Star_V_1.prefab b/Assets/Prefab/Game/Slides/Star_V_1.prefab index 71cdd5a8..9bb3056c 100644 --- a/Assets/Prefab/Game/Slides/Star_V_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_1.prefab @@ -159,19 +159,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v1 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &349982270184433799 diff --git a/Assets/Prefab/Game/Slides/Star_V_2.prefab b/Assets/Prefab/Game/Slides/Star_V_2.prefab index bb69a136..eadfc6a6 100644 --- a/Assets/Prefab/Game/Slides/Star_V_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_2.prefab @@ -326,19 +326,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v2 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &349982270184433799 diff --git a/Assets/Prefab/Game/Slides/Star_V_3.prefab b/Assets/Prefab/Game/Slides/Star_V_3.prefab index b38c65b5..0dc269ff 100644 --- a/Assets/Prefab/Game/Slides/Star_V_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_3.prefab @@ -74,19 +74,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v3 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8949524144843154839 diff --git a/Assets/Prefab/Game/Slides/Star_V_4.prefab b/Assets/Prefab/Game/Slides/Star_V_4.prefab index 4eed729a..1f8d037a 100644 --- a/Assets/Prefab/Game/Slides/Star_V_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_4.prefab @@ -1082,19 +1082,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v4 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8856240846899936165 diff --git a/Assets/Prefab/Game/Slides/Star_V_6.prefab b/Assets/Prefab/Game/Slides/Star_V_6.prefab index c4d1e5fd..25294a63 100644 --- a/Assets/Prefab/Game/Slides/Star_V_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_6.prefab @@ -242,19 +242,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v6 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &2394662909394771660 diff --git a/Assets/Prefab/Game/Slides/Star_V_7.prefab b/Assets/Prefab/Game/Slides/Star_V_7.prefab index e0f650fc..5b54f8fb 100644 --- a/Assets/Prefab/Game/Slides/Star_V_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_7.prefab @@ -1418,19 +1418,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v7 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &7633751091860705249 diff --git a/Assets/Prefab/Game/Slides/Star_V_8.prefab b/Assets/Prefab/Game/Slides/Star_V_8.prefab index 692675be..b2ee5dff 100644 --- a/Assets/Prefab/Game/Slides/Star_V_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_V_8.prefab @@ -578,19 +578,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: v8 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3135360204407326552 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab index e62ef7af..f5f34713 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab @@ -1770,19 +1770,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq1 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4517341654776747428 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab index 646f652b..927fae18 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab @@ -2403,19 +2403,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq2 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8580206461961989832 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab index 592ab5a4..f92d5f2d 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab @@ -1673,19 +1673,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq3 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &7396897144070760997 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab index 875c9c6a..58b4ec4f 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab @@ -104,19 +104,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq4 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &146600403597225806 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab index 0b9d1226..aff94160 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab @@ -776,19 +776,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq5 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &996437527645057397 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab index b4ae8ae8..56c4bc2e 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab @@ -2035,19 +2035,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq6 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4833744931375690521 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab index 7f3d6022..e22f3afb 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab @@ -3713,19 +3713,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq7 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8772722309363375930 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab index fb024733..b1e55216 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab @@ -1828,19 +1828,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: ppqq8 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4471034425484838123 diff --git a/Assets/Prefab/Game/Slides/Star_pq_1.prefab b/Assets/Prefab/Game/Slides/Star_pq_1.prefab index bed56e2f..2c22a797 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_1.prefab @@ -2156,19 +2156,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq1 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &7134940954673391103 diff --git a/Assets/Prefab/Game/Slides/Star_pq_2.prefab b/Assets/Prefab/Game/Slides/Star_pq_2.prefab index 7fed81b4..f2b4f911 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_2.prefab @@ -2237,19 +2237,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq2 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8340445480101220833 diff --git a/Assets/Prefab/Game/Slides/Star_pq_3.prefab b/Assets/Prefab/Game/Slides/Star_pq_3.prefab index a3707a1c..c80fb1b3 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_3.prefab @@ -1594,19 +1594,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq3 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &6647266310545108700 diff --git a/Assets/Prefab/Game/Slides/Star_pq_4.prefab b/Assets/Prefab/Game/Slides/Star_pq_4.prefab index 0ff1e841..ca06ee56 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_4.prefab @@ -1895,19 +1895,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq4 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8655302532841722744 diff --git a/Assets/Prefab/Game/Slides/Star_pq_5.prefab b/Assets/Prefab/Game/Slides/Star_pq_5.prefab index 30d97b59..dc6ad7a1 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_5.prefab @@ -580,19 +580,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq5 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &2284099411173797767 diff --git a/Assets/Prefab/Game/Slides/Star_pq_6.prefab b/Assets/Prefab/Game/Slides/Star_pq_6.prefab index 9b427713..6fdb3889 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_6.prefab @@ -3761,18 +3761,14 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq6 _isMirror: 0 _isSpecialFlip: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_7.prefab b/Assets/Prefab/Game/Slides/Star_pq_7.prefab index 5d24318a..4711d270 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_7.prefab @@ -2447,19 +2447,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq7 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &6393229959341328161 diff --git a/Assets/Prefab/Game/Slides/Star_pq_8.prefab b/Assets/Prefab/Game/Slides/Star_pq_8.prefab index 5ee2faa3..3d464892 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_8.prefab @@ -511,19 +511,15 @@ MonoBehaviour: _isEX: 0 _playerIdleTime: 0 _length: 1 - _slideStar: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} + _slideStarPrefab: {fileID: 3082733108601366817, guid: 42156a3b3ae4d054da74641cd739534f, type: 3} _slideBars: [] _slideBarRenderers: [] - _stars: - - {fileID: 0} - - {fileID: 0} - - {fileID: 0} _startTiming: 0 _isJustR: 0 _fadeInTiming: 0 _fullFadeInTiming: 0.2 _endPos: 1 - _slideType: + _slideType: pq8 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &1590452806205293865 diff --git a/Assets/Script/Scenes/Game/NoteLoader.cs b/Assets/Script/Scenes/Game/NoteLoader.cs index 4a4bd4dc..146b9240 100644 --- a/Assets/Script/Scenes/Game/NoteLoader.cs +++ b/Assets/Script/Scenes/Game/NoteLoader.cs @@ -1015,12 +1015,12 @@ private CreateSlideResult CreateSlide(SimaiTimingPoint timing, SubSli } var slideIndex = SLIDE_PREFAB_MAP[slideShape]; var slide = Instantiate(slidePrefab[slideIndex], notes.transform.GetChild(3)); - var slide_star = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); - var SliCompo = slide.AddComponent(); + //var slide_star = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); + var SliCompo = slide.GetComponent(); var isJustR = detectJustType(note.noteContent, out int endPos); var startPos = note.startPosition; - slide_star.SetActive(true); + //slide_star.SetActive(true); slide.SetActive(true); startPos = Rotation(startPos); endPos = Rotation(endPos); @@ -1072,7 +1072,7 @@ private CreateSlideResult CreateSlide(SimaiTimingPoint timing, SubSli SliCompo.Speed = Math.Abs(NoteSpeed * timing.HSpeed); SliCompo.StartTiming = (float)timing.time; SliCompo.StartPos = startPos; - SliCompo._stars = new GameObject[] { slide_star }; + //SliCompo._stars = new GameObject[] { slide_star }; SliCompo.Timing = (float)note.slideStartTime; SliCompo.Length = (float)note.slideTime; //SliCompo.sortIndex = -7000 + (int)((lastNoteTime - timing.time) * -100) + sort * 5; @@ -1146,15 +1146,15 @@ private CreateSlideResult CreateWifi(SimaiTimingPoint timing, SubSlide WifiCompo.StartPos = startPos; WifiCompo.Timing = (float)note.slideStartTime; WifiCompo.Length = (float)note.slideTime; - var centerStar = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); - var leftStar = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); - var rightStar = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); - WifiCompo._stars = new GameObject[3] - { - rightStar, - centerStar, - leftStar - }; + //var centerStar = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); + //var leftStar = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); + //var rightStar = Instantiate(star_slidePrefab, notes.transform.GetChild(3)); + //WifiCompo._stars = new GameObject[3] + //{ + // rightStar, + // centerStar, + // leftStar + //}; if (MajInstances.Setting.Display.SlideSortOrder == JudgeMode.Classic) { _slideLayer += SLIDE_AREA_STEP_MAP["wifi"].Last(); diff --git a/Assets/Script/Scenes/Game/Notes/SlideBase.cs b/Assets/Script/Scenes/Game/Notes/SlideBase.cs index 936a9b39..cad74b05 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideBase.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideBase.cs @@ -95,7 +95,7 @@ public string SlideType /// Readonly /// [SerializeField] - protected GameObject _slideStar; + protected GameObject _slideStarPrefab; /// /// Arrows /// @@ -114,7 +114,7 @@ public string SlideType /// /// Slide star /// - public GameObject?[] _stars = new GameObject[3]; + protected GameObject?[] _stars = new GameObject[3]; protected GameObject _slideOK; protected Animator _slideOKAnim; @@ -421,7 +421,6 @@ protected void JudgeResultCorrection(ref JudgeGrade result) [ReadOnlyField] [SerializeField] protected int _endPos = 1; - [ReadOnlyField] [SerializeField] protected string _slideType = string.Empty; } diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 471a28f7..99b1b49c 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -36,7 +36,8 @@ public bool IsSpecialFlip protected override void Awake() { base.Awake(); - _stars[0] = Instantiate(_slideStar) + var starObj = Instantiate(_slideStarPrefab, _noteManager.transform.GetChild(3)); + _stars[0] = starObj; } /// From 96c71ac11d2322eb1dbcdae84cc6dd116b5a25c5 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 00:03:34 +0800 Subject: [PATCH 03/26] perf: Slide & WifiSlide --- Assets/Script/Scenes/Game/NoteLoader.cs | 9 +- Assets/Script/Scenes/Game/Notes/NoteDrop.cs | 7 +- Assets/Script/Scenes/Game/Notes/SlideBase.cs | 36 +- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 523 +++++++++--------- Assets/Script/Scenes/Game/Notes/TouchDrop.cs | 2 +- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 320 +++++++---- .../Types/Interfaces/IConnectableSlide.cs | 2 +- 7 files changed, 517 insertions(+), 382 deletions(-) diff --git a/Assets/Script/Scenes/Game/NoteLoader.cs b/Assets/Script/Scenes/Game/NoteLoader.cs index 146b9240..ec11bba7 100644 --- a/Assets/Script/Scenes/Game/NoteLoader.cs +++ b/Assets/Script/Scenes/Game/NoteLoader.cs @@ -931,6 +931,7 @@ double getTimeFromBeats(string noteText, float currentBpm) eachNotes.Add(result.StarInfo); AddSlideToQueue(timing, result.SlideInstance); UpdateStarRotateSpeed(result, (float)subSlide[i].slideTime, 8.93760109f); + sliObj.Initialize(); } else { @@ -961,8 +962,7 @@ double getTimeFromBeats(string noteText, float currentBpm) var isEnd = i == slideCount - 1; var table = SlideTables.FindTableByName(s.SlideType); - s.Initialize(); - totalSlideLen += s.GetSlideLength(); + totalSlideLen += s.SlideLength; if (isEnd) judgeQueueLen += table!.JudgeQueue.Length; else @@ -973,7 +973,8 @@ double getTimeFromBeats(string noteText, float currentBpm) s.ConnectInfo.TotalSlideLen = totalSlideLen; s.ConnectInfo.TotalJudgeQueueLen = judgeQueueLen; }); - if(slideResult is not null) + subSlides.ForEach(s => s.Initialize()); + if (slideResult is not null) { UpdateStarRotateSpeed((CreateSlideResult)slideResult, totalLen, totalSlideLen); } @@ -1033,7 +1034,7 @@ private CreateSlideResult CreateSlide(SimaiTimingPoint timing, SubSli starInfo = _info; } - SliCompo.SlideType = slideShape; + //SliCompo.SlideType = slideShape; if (timing.noteList.Count > 1) { diff --git a/Assets/Script/Scenes/Game/Notes/NoteDrop.cs b/Assets/Script/Scenes/Game/Notes/NoteDrop.cs index f5c4959a..668d7789 100644 --- a/Assets/Script/Scenes/Game/Notes/NoteDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/NoteDrop.cs @@ -68,7 +68,7 @@ public bool IsEX /// public Transform Transform => _transform; public bool IsInitialized => State >= NoteStatus.Initialized; - public bool IsDestroyed => State == NoteStatus.End; + public bool IsEnded => State == NoteStatus.End; public bool IsClassic => _gameSetting.Judge.Mode == JudgeMode.Classic; public NoteStatus State { @@ -78,6 +78,7 @@ public NoteStatus State public float JudgeTiming => _judgeTiming + _gameSetting.Judge.JudgeOffset; public float CurrentSec => _gpManager.AudioTime; + protected bool IsAutoplay => _isAutoplay; protected Material BreakMaterial => _breakMaterial; protected Material DefaultMaterial => _defaultMaterial; protected Material HoldShineMaterial => _holdShineMaterial; @@ -111,6 +112,7 @@ public NoteStatus State GameObject _gameObject; Transform _transform; + bool _isAutoplay = false; protected virtual void Awake() { _gameObject = gameObject; @@ -124,6 +126,7 @@ protected virtual void Awake() _breakMaterial = _gpManager.BreakMaterial; _defaultMaterial = _gpManager.DefaultMaterial; _holdShineMaterial = _gpManager.HoldShineMaterial; + _isAutoplay = _gpManager.IsAutoplay; } void OnDestroy() { @@ -355,7 +358,7 @@ void ConvertToGORI(ref JudgeGrade judgeType) } [ReadOnlyField] [SerializeField] - protected int _startPos; + protected int _startPos = 1; [ReadOnlyField] [SerializeField] protected float _timing; diff --git a/Assets/Script/Scenes/Game/Notes/SlideBase.cs b/Assets/Script/Scenes/Game/Notes/SlideBase.cs index cad74b05..8394ceb8 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideBase.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideBase.cs @@ -81,7 +81,10 @@ public int EndPos public string SlideType { get => _slideType; - set => _slideType = value; + } + public float SlideLength + { + get => _slideLength; } protected readonly Memory[] _judgeQueues = new Memory[3] { @@ -109,7 +112,7 @@ public string SlideType [SerializeField] protected SpriteRenderer[] _slideBarRenderers = { }; - protected Transform[] _starTransforms = { }; + protected readonly Transform[] _starTransforms = new Transform[3]; protected Transform[] _slideBarTransforms = { }; /// /// Slide star @@ -121,10 +124,11 @@ public string SlideType protected LoadJustSprite _slideOKController; protected float _lastWaitTime; - protected bool _canCheck = false; + protected float _maxFadeInAlpha = 0.5f; // 淡入时最大不透明度 // Flags + protected bool _isCheckable = false; protected bool _isSoundPlayed = false; protected bool _isChecking = false; protected bool _isStarActive = false; @@ -254,13 +258,14 @@ protected void SetSlideBarAlpha(float alpha) { foreach (var sr in _slideBarRenderers.AsSpan()) { - if (IsDestroyed) + if (IsEnded) return; if (alpha <= 0f) { sr.forceRenderingOff = true; } - else { + else + { sr.forceRenderingOff = false; sr.color = new Color(1f, 1f, 1f, alpha); } @@ -271,20 +276,14 @@ public override void SetActive(bool state) base.SetActive(state); if (state) { - if (State >= NoteStatus.PreInitialized && State <= NoteStatus.Initialized) - { - //foreach (var sensor in ArrayHelper.ToEnumerable(_judgeAreas)) - // _ioManager.BindSensor(_noteChecker, sensor); - State = NoteStatus.Running; - } foreach (var slideBar in _slideBars.AsSpan()) - slideBar.layer = 0; + slideBar.layer = MajEnv.DEFAULT_LAYER; } else { foreach (var slideBar in _slideBars.AsSpan()) - slideBar.layer = 3; + slideBar.layer = MajEnv.HIDDEN_LAYER; } SetStarActive(state); Active = state; @@ -298,7 +297,7 @@ protected void SetStarActive(bool state) { if (star is null) continue; - star.layer = 0; + star.layer = MajEnv.DEFAULT_LAYER; } break; case false: @@ -306,7 +305,7 @@ protected void SetStarActive(bool state) { if (star is null) continue; - star.layer = 3; + star.layer = MajEnv.HIDDEN_LAYER; } break; } @@ -340,7 +339,7 @@ protected virtual void TooLateJudge() /// public virtual void End(bool forceEnd = false) { - if (Parent is not null && !Parent.IsDestroyed) + if (Parent is not null && !Parent.IsEnded) Parent.End(true); //foreach (var obj in _slideBars.AsSpan()) // obj.SetActive(false); @@ -356,7 +355,7 @@ public void ForceFinish() if (!ConnectInfo.IsConnSlide || ConnectInfo.IsGroupPartEnd) return; HideAllBar(); - var emptyQueue = Array.Empty(); + var emptyQueue = Memory.Empty; for (int i = 0; i < 2; i++) _judgeQueues[i] = emptyQueue; } @@ -423,5 +422,8 @@ protected void JudgeResultCorrection(ref JudgeGrade result) protected int _endPos = 1; [SerializeField] protected string _slideType = string.Empty; + [ReadOnlyField] + [SerializeField] + protected float _slideLength = 0f; } } diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 99b1b49c..d6408dbf 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -11,6 +11,8 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; +using Unity.VisualScripting; +using System.Diagnostics; #nullable enable namespace MajdataPlay.Game.Notes { @@ -27,8 +29,8 @@ public bool IsSpecialFlip set => _isSpecialFlip = value; } // fixes known star problem - readonly List _slidePositions = new(); - readonly List _slideRotations = new(); + List _slidePositions = new(); + List _slideRotations = new(); SpriteRenderer _starRenderer; SlideTable _table; @@ -36,35 +38,71 @@ public bool IsSpecialFlip protected override void Awake() { base.Awake(); - var starObj = Instantiate(_slideStarPrefab, _noteManager.transform.GetChild(3)); - _stars[0] = starObj; - - } - /// - /// Slide初始化 - /// - public override void Initialize() - { - if (State >= NoteStatus.PreInitialized) - return; - State = NoteStatus.PreInitialized; - var star = _stars[0]; + var star = Instantiate(_slideStarPrefab, _noteManager.transform.GetChild(3)); var slideTable = SlideTables.FindTableByName(_slideType); - + if (slideTable is null) throw new MissingComponentException($"Slide table of \"{_slideType}\" is not found"); - else if (star is null) - throw new MissingComponentException("Slide star not found"); _table = slideTable; + _judgeQueues[0] = _table.JudgeQueue; + _endPos = _slideType switch + { + "line3" => 3, + "line4" => 4, + "line5" => 5, + "line6" => 6, + "line7" => 7, + "circle1" => 2, + "circle2" => 3, + "circle3" => 4, + "circle4" => 5, + "circle5" => 6, + "circle6" => 7, + "circle7" => 8, + "circle8" => 1, + "v1" => 1, + "v2" => 2, + "v3" => 3, + "v4" => 4, + "v6" => 6, + "v7" => 7, + "v8" => 8, + "ppqq1" => 1, + "ppqq2" => 2, + "ppqq3" => 3, + "ppqq4" => 4, + "ppqq5" => 5, + "ppqq6" => 6, + "ppqq7" => 7, + "ppqq8" => 8, + "pq1" => 1, + "pq2" => 2, + "pq3" => 3, + "pq4" => 4, + "pq5" => 5, + "pq6" => 6, + "pq7" => 7, + "pq8" => 8, + "s" => 5, + "L2" => 2, + "L3" => 3, + "L4" => 4, + "L5" => 5, + _ => 1 + }; + + star.SetActive(true); + _stars[0] = star; + _starTransforms[0] = star.transform; + _starRenderer = star.GetComponent(); _slideOK = transform.GetChild(transform.childCount - 1).gameObject; //slideok is the last one _slideOKAnim = _slideOK.GetComponent(); _slideOKController = _slideOK.GetComponent(); + _slideOK.SetActive(false); + _slideOK.transform.SetParent(transform.parent); - _starTransforms = new Transform[1]; - _starTransforms[0] = star.transform; - _starRenderer = star.GetComponent(); _slideBars = new GameObject[transform.childCount - 1]; _slideBarTransforms = new Transform[transform.childCount - 1]; _slideBarRenderers = new SpriteRenderer[transform.childCount - 1]; @@ -75,7 +113,27 @@ public override void Initialize() _slideBarRenderers[i] = _slideBars[i].GetComponent(); _slideBarTransforms[i] = _slideBars[i].transform; } + LoadSlidePath(); + SetActive(false); + SetStarActive(false); + SetSlideBarAlpha(0f); + for (int i = 0; i < _slidePositions.Count - 2; i++) + { + var a = _slidePositions[i]; + var b = _slidePositions[i + 1]; + _slideLength += (b - a).magnitude; + } + _starTransforms[0].position = _slidePositions[0]; + _starTransforms[0].transform.localScale = new Vector3(0f, 0f, 1f); + } + /// + /// Slide初始化 + /// + public override void Initialize() + { + if (IsInitialized) + return; if (_isMirror) { @@ -91,12 +149,12 @@ public override void Initialize() var diff = Math.Abs(1 - StartPos); if(diff != 0) + { _table.Diff(diff); + } - LoadPath(); + LoadSlidePath(); LoadSkin(); - SetActive(false); - SetStarActive(false); // 计算Slide淡入时机 // 在8.0速时应当提前300ms显示Slide _fadeInTiming = -3.926913f / Speed; @@ -111,11 +169,19 @@ public override void Initialize() //淡入时机与正解帧间隔小于200ms时，加快淡入动画的播放速度 //fadeInAnimator.speed = 0.2f / interval; //fadeInAnimator.SetTrigger("slide"); - SetSlideBarAlpha(0f); + _starTransforms[0].position = _slidePositions[0]; _starTransforms[0].transform.localScale = new Vector3(0f, 0f, 1f); _judgeQueues[0] = _table.JudgeQueue; + + InitializeSlideGroup(); + + State = NoteStatus.Initialized; + } + void InitializeSlideGroup() + { var judgeQueue = _judgeQueues[0].Span; + if (ConnectInfo.IsConnSlide && ConnectInfo.IsGroupPartEnd) { judgeQueue[judgeQueue.Length - 1].SetIsLast(); @@ -124,6 +190,26 @@ public override void Initialize() { judgeQueue[judgeQueue.Length - 1].SetNonLast(); } + + if (ConnectInfo.IsConnSlide) + { + Length = ConnectInfo.TotalLength / ConnectInfo.TotalSlideLen * _slideLength; + if (!ConnectInfo.IsGroupPartHead) + { + if (Parent is null) + throw new NullReferenceException(); + var parent = Parent.GameObject.GetComponent(); + Timing = parent.Timing + parent.Length; + } + UpdateJudgeQueue(); + } + + if (ConnectInfo.IsGroupPartEnd || !ConnectInfo.IsConnSlide) + { + var percent = _table.Const; + _judgeTiming = Timing + Length * (1 - percent); + _lastWaitTime = Length * percent; + } } void UpdateJudgeQueue() { @@ -147,41 +233,8 @@ void UpdateJudgeQueue() judgeArea.IsSkippable = true; } } - public float GetSlideLength() - { - float len = 0; - for (int i = 0; i < _slidePositions.Count - 2; i++) - { - var a = _slidePositions[i]; - var b = _slidePositions[i + 1]; - len += (b - a).magnitude; - } - return len; - } void Start() { - Initialize(); - if (ConnectInfo.IsConnSlide) - { - Length = ConnectInfo.TotalLength / ConnectInfo.TotalSlideLen * GetSlideLength(); - if (!ConnectInfo.IsGroupPartHead) - { - if (Parent is null) - throw new NullReferenceException(); - var parent = Parent.GameObject.GetComponent(); - Timing = parent.Timing + parent.Length; - } - UpdateJudgeQueue(); - } - - if(ConnectInfo.IsGroupPartEnd || !ConnectInfo.IsConnSlide) - { - var percent = _table.Const; - _judgeTiming = Timing + Length * (1 - percent); - _lastWaitTime = Length * percent; - } - - FadeIn().Forget(); } public override void ComponentFixedUpdate() @@ -191,126 +244,164 @@ public override void ComponentFixedUpdate() public override void ComponentUpdate() { SlideCheck(); + CheckSensor(); // ConnSlide - var star = _stars[0]; + //var star = _stars[0]; var starTransform = _starTransforms[0]; - if (_stars.IsEmpty() || star is null) - { - if (IsFinished) - { - End(); - return; - } - CheckSensor(); - return; - } - else if(_isArrived) + + switch(State) { - CheckSensor(); - return; - } + case NoteStatus.Initialized: + SetStarActive(false); + if (CurrentSec - StartTiming > 0) + { + if (!(ConnectInfo.IsConnSlide && !ConnectInfo.IsGroupPartHead)) + { + SetStarActive(true); + } + + _starRenderer.color = new Color(1, 1, 1, 0); + starTransform.localScale = new Vector3(0, 0, 1); + starTransform.position = _slidePositions[0]; + ApplyStarRotation(_slideRotations[0]); + State = NoteStatus.Scaling; + goto case NoteStatus.Scaling; + } + break; + case NoteStatus.Scaling: + var timing = CurrentSec - Timing; + if (timing > 0f) + { + _starRenderer.color = new Color(1, 1, 1, 1); + starTransform.localScale = new Vector3(1.5f, 1.5f, 1.5f); + SetStarActive(true); - if(!_isStarActive) - { - SetStarActive(true); - _isStarActive = true; - } - var timing = CurrentSec - Timing; - if (timing <= 0f) - { - float alpha; - if (ConnectInfo.IsConnSlide && !ConnectInfo.IsGroupPartHead) - alpha = 0; - else - { + State = NoteStatus.Running; + goto case NoteStatus.Running; + } + if (ConnectInfo.IsConnSlide && !ConnectInfo.IsGroupPartHead) + { + return; + } // 只有当它是一个起点Slide（而非Slide Group中的子部分）的时候，才会有开始的星星渐入动画 - alpha = 1f - -timing / (_timing - _startTiming); - alpha = alpha > 1f ? 1f : alpha; - alpha = alpha < 0f ? 0f : alpha; - } + var alpha = (1f - -timing / (_timing - _startTiming)).Clamp(0, 1); - _starRenderer.color = new Color(1, 1, 1, alpha); - starTransform.localScale = new Vector3(alpha + 0.5f, alpha + 0.5f, alpha + 0.5f); - starTransform.position = _slidePositions[0]; - ApplyStarRotation(_slideRotations[0]); - } - else - { - StarUpdate(); + _starRenderer.color = new Color(1, 1, 1, alpha); + starTransform.localScale = new Vector3(alpha + 0.5f, alpha + 0.5f, alpha + 0.5f); + + break; + case NoteStatus.Running: + if(GetRemainingTimeWithoutOffset() == 0) + { + starTransform.position = _slidePositions[_slidePositions.Count - 1]; + ApplyStarRotation(_slideRotations[_slideRotations.Count - 1]); + if (ConnectInfo.IsConnSlide && !ConnectInfo.IsGroupPartEnd) + { + DestroyStars(); + } + State = NoteStatus.Arrived; + goto case NoteStatus.Arrived; + } + var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); + var indexProcess = (_slidePositions.Count - 1) * process; + var index = (int)indexProcess; + var pos = indexProcess - index; + + var a = _slidePositions[index + 1]; + var b = _slidePositions[index]; + var ba = a - b; + var newPos = ba * pos + b; + + starTransform.position = newPos; + if (index < _slideRotations.Count - 1) + { + var _a = _slideRotations[index + 1].eulerAngles.z; + var _b = _slideRotations[index].eulerAngles.z; + var dAngle = Mathf.DeltaAngle(_b, _a) * pos; + dAngle = Mathf.Abs(dAngle); + var newRotation = Quaternion.Euler(0f, 0f, + Mathf.MoveTowardsAngle(_b, _a, dAngle)); + ApplyStarRotation(newRotation); + } + Autoplay(); + break; + case NoteStatus.Arrived: + break; } - CheckSensor(); } /// /// 判定队列检查 /// void CheckSensor() { - if (IsDestroyed || !IsInitialized) + if (IsAutoplay || !_isCheckable) return; - else if (IsFinished || !_canCheck) + else if (IsEnded || !IsInitialized) return; - else if (_isChecking) + else if (IsFinished) return; - else if (_gpManager.IsAutoplay) + else if (_isChecking) return; - ref var queueMemory = ref _judgeQueues[0]; - var queue = queueMemory.Span; - _isChecking = true; - - var first = queue[0]; - var fAreas = first.IncludedAreas; - var canPlaySFX = ConnectInfo.IsGroupPartHead || !ConnectInfo.IsConnSlide; - SlideArea? second = null; - - if (queue.Length >= 2) - second = queue[1]; - - foreach (var area in fAreas) + _isChecking = true; + try { - var sensorState = _noteManager.CheckSensorStateInThisFrame(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; - first.Check(area, sensorState); - } + ref var queueMemory = ref _judgeQueues[0]; + var queue = queueMemory.Span; + var first = queue[0]; + var fAreas = first.IncludedAreas; + var canPlaySFX = ConnectInfo.IsGroupPartHead || !ConnectInfo.IsConnSlide; + SlideArea? second = null; - if(canPlaySFX && first.On) - PlaySFX(); + if (queue.Length >= 2) + second = queue[1]; - if (second is not null && (first.IsSkippable || first.On)) - { - var sAreas = second.IncludedAreas; - foreach (var area in sAreas) + foreach (var area in fAreas) { var sensorState = _noteManager.CheckSensorStateInThisFrame(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; - second.Check(area, sensorState); + first.Check(area, sensorState); } - if (second.IsFinished) + if (canPlaySFX && first.On) + PlaySFX(); + + if (second is not null && (first.IsSkippable || first.On)) { - HideBar(first.SlideIndex); - queueMemory = queueMemory.Slice(2); - _isChecking = false; - SetParentFinish(); - return; + var sAreas = second.IncludedAreas; + foreach (var area in sAreas) + { + var sensorState = _noteManager.CheckSensorStateInThisFrame(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; + second.Check(area, sensorState); + } + + if (second.IsFinished) + { + HideBar(first.SlideIndex); + queueMemory = queueMemory.Slice(2); + SetParentFinish(); + return; + } + else if (second.On) + { + HideBar(first.SlideIndex); + queueMemory = queueMemory.Slice(1); + SetParentFinish(); + return; + } } - else if (second.On) + + if (first.IsFinished) { HideBar(first.SlideIndex); queueMemory = queueMemory.Slice(1); - _isChecking = false; SetParentFinish(); return; } } - - if (first.IsFinished) + finally { - HideBar(first.SlideIndex); - queueMemory = queueMemory.Slice(1); _isChecking = false; - SetParentFinish(); - return; } - _isChecking = false; } void SlideCheck() { @@ -322,22 +413,22 @@ void SlideCheck() var tooLateTiming = _timing + _length + 0.6 + MathF.Min(_gameSetting.Judge.JudgeOffset, 0); var isTooLate = _gpManager.AudioTime - tooLateTiming >= 0; - if (!_canCheck) + if (!_isCheckable) { if (ConnectInfo.IsGroupPart) { if (ConnectInfo.IsGroupPartHead && startTiming >= -0.05f) - _canCheck = true; + _isCheckable = true; else if (!ConnectInfo.IsGroupPartHead) - _canCheck = ConnectInfo.ParentFinished || ConnectInfo.ParentPendingFinish; + _isCheckable = ConnectInfo.ParentFinished || ConnectInfo.ParentPendingFinish; } else if (startTiming >= -0.05f) - _canCheck = true; + _isCheckable = true; } - var canJudge = ConnectInfo.IsGroupPartEnd || !ConnectInfo.IsConnSlide; + var isJudgable = ConnectInfo.IsGroupPartEnd || !ConnectInfo.IsConnSlide; - if (canJudge) + if (isJudgable) { if (!_isJudged) { @@ -382,7 +473,7 @@ protected override void TooLateJudge() } public override void End(bool forceEnd = false) { - if (IsDestroyed) + if (IsEnded) return; State = NoteStatus.End; //foreach (var sensor in ArrayHelper.ToEnumerable(_judgeAreas)) @@ -430,83 +521,43 @@ public override void End(bool forceEnd = false) // Destroy(gameObject); //SetActive(false); } - /// - /// 更新引导Star状态 - /// 包括位置，角度 - /// - void StarUpdate() + protected override void Autoplay() { - var starTransform = _starTransforms[0]; - - _starRenderer.color = Color.white; - starTransform.localScale = new Vector3(1.5f, 1.5f, 1.5f); - + if (!IsAutoplay) + return; var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); - var indexProcess = (_slidePositions.Count - 1) * process; - var index = (int)indexProcess; - var pos = indexProcess - index; - - if (process == 1) - { - starTransform.position = _slidePositions[_slidePositions.Count - 1]; - ApplyStarRotation(_slideRotations[_slideRotations.Count - 1]); - if (ConnectInfo.IsConnSlide && !ConnectInfo.IsGroupPartEnd) - DestroyStars(); - _isArrived = true; - } - else + var queueMemory = _judgeQueues[0]; + var queue = queueMemory.Span; + var canPlaySFX = ConnectInfo.IsGroupPartHead || !ConnectInfo.IsConnSlide; + if (queueMemory.IsEmpty) + return; + else if (process >= 1) { - var a = _slidePositions[index + 1]; - var b = _slidePositions[index]; - var ba = a - b; - var newPos = ba * pos + b; - - starTransform.position = newPos; - if (index < _slideRotations.Count - 1) + HideAllBar(); + var autoplayParam = _gpManager.AutoplayParam; + if (autoplayParam.InRange(0, 14)) + _judgeResult = (JudgeGrade)autoplayParam; + else + _judgeResult = (JudgeGrade)_randomizer.Next(0, 15); + _isJudged = true; + _lastWaitTime = 0; + _judgeDiff = _judgeResult switch { - var _a = _slideRotations[index + 1].eulerAngles.z; - var _b = _slideRotations[index].eulerAngles.z; - var dAngle = Mathf.DeltaAngle(_b, _a) * pos; - dAngle = Mathf.Abs(dAngle); - var newRotation = Quaternion.Euler(0f, 0f, - Mathf.MoveTowardsAngle(_b, _a, dAngle)); - ApplyStarRotation(newRotation); - } + < JudgeGrade.Perfect => 1, + > JudgeGrade.Perfect => -1, + _ => 0 + }; + return; } - - if(_gpManager.IsAutoplay) + else if (process > 0 && canPlaySFX) { - var queueMemory = _judgeQueues[0]; - var queue = queueMemory.Span; - var canPlaySFX = ConnectInfo.IsGroupPartHead || !ConnectInfo.IsConnSlide; - if (queueMemory.IsEmpty) - return; - else if(process >= 1) - { - HideAllBar(); - var autoplayParam = _gpManager.AutoplayParam; - if (autoplayParam.InRange(0, 14)) - _judgeResult = (JudgeGrade)autoplayParam; - else - _judgeResult = (JudgeGrade)_randomizer.Next(0, 15); - _isJudged = true; - _lastWaitTime = 0; - _judgeDiff = _judgeResult switch - { - < JudgeGrade.Perfect => 1, - > JudgeGrade.Perfect => -1, - _ => 0 - }; - return; - } - else if(process > 0 && canPlaySFX) - PlaySFX(); - var areaIndex = (int)(process * queueMemory.Length) - 1; - if (areaIndex < 0) - return; - var barIndex = queue[areaIndex].SlideIndex; - HideBar(barIndex); + PlaySFX(); } + var areaIndex = (int)(process * queueMemory.Length) - 1; + if (areaIndex < 0) + return; + var barIndex = queue[areaIndex].SlideIndex; + HideBar(barIndex); } void ApplyStarRotation(Quaternion newRotation) { @@ -523,8 +574,11 @@ void ApplyStarRotation(Quaternion newRotation) starTransform.rotation = newRotation; //starTransform.rotation = newRotation; } - void LoadPath() + void LoadSlidePath() { + _slidePositions = new(); + _slideRotations = new(); + _slidePositions.Add(GetPositionFromDistance(4.8f)); for (int i = 0; i < _slideBars.Length; i++) { @@ -539,34 +593,10 @@ void LoadPath() var diff = a - b; var newEulerAugle = b - diff; _slideRotations.Add(Quaternion.Euler(newEulerAugle + new Vector3(0f, 0f, 18f))); - //if(diff.z != 0) - //{ - // var _a = _slideBars[i - 1].transform.position; - // var _b = bar.transform.position; - // var m = (_a - _b).magnitude; - // var _c = m / Mathf.Tan(Mathf.Deg2Rad * 5.625f); - // var d = GetPositionFromDistance(4.8f, _endPos); - - // var _m = (_b - d).magnitude; - // var angle = Mathf.Atan(_m / _c) * Mathf.Rad2Deg; - // var newEulerAugle = new Vector3(0, 0, angle); - // var magicNum = angle / 5.625f * 18f; - // if (diff.z < 0) - // { - // newEulerAugle = new Vector3(0, 0, -angle); - // } - // newEulerAugle = b - newEulerAugle; - // _slideRotations.Add(Quaternion.Euler(newEulerAugle + new Vector3(0f, 0f, magicNum))); - //} - //else - //{ - // _slideRotations.Add(Quaternion.Euler(bar.transform.rotation.normalized.eulerAngles + new Vector3(0f, 0f, 18f))); - //} } } var endPos = GetPositionFromDistance(4.8f, _endPos); _slidePositions.Add(endPos); - //_slideRotations.Add(_slideRotations.LastOrDefault()); } protected override void LoadSkin() { @@ -617,7 +647,7 @@ protected override void LoadSkin() if (_isJustR) { - if (_slideOK.GetComponent().SetR() == 1 && _isMirror) + if (_slideOKController.SetR() == 1 && _isMirror) { _slideOK.transform.Rotate(new Vector3(0f, 0f, 180f)); var angel = _slideOK.transform.rotation.eulerAngles.z * Mathf.Deg2Rad; @@ -626,16 +656,13 @@ protected override void LoadSkin() } else { - if (_slideOK.GetComponent().SetL() == 1 && !_isMirror) + if (_slideOKController.SetL() == 1 && !_isMirror) { _slideOK.transform.Rotate(new Vector3(0f, 0f, 180f)); var angel = _slideOK.transform.rotation.eulerAngles.z * Mathf.Deg2Rad; _slideOK.transform.position += new Vector3(Mathf.Sin(angel) * 0.27f, Mathf.Cos(angel) * -0.27f); } } - - _slideOK.SetActive(false); - _slideOK.transform.SetParent(transform.parent); } [ReadOnlyField] diff --git a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs index 0d5e719b..bff80cda 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs @@ -222,7 +222,7 @@ protected override void LoadSkin() } public override void ComponentFixedUpdate() { - if (State < NoteStatus.Running || IsDestroyed) + if (State < NoteStatus.Running || IsEnded) return; var isTooLate = GetTimeSpanToJudgeTiming() >= 0.316667f; if (!_isJudged && !isTooLate) diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 6aa66e19..e7bf2a7a 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -9,7 +9,9 @@ using MajdataPlay.Utils; using System; using System.Collections.Generic; +using System.Diagnostics; using System.Linq; +using System.Windows.Forms; using Unity.VisualScripting; using UnityEngine; @@ -28,18 +30,93 @@ public sealed class WifiDrop : SlideBase protected override void Awake() { base.Awake(); + _endPos = 5; + var slideParent = _noteManager.transform.GetChild(3); + var centerStar = Instantiate(_slideStarPrefab, slideParent); + var leftStar = Instantiate(_slideStarPrefab, slideParent); + var rightStar = Instantiate(_slideStarPrefab, slideParent); + var wifiTable = SlideTables.GetWifiTable(StartPos); + + var sensorPos = (SensorType)(_endPos - 1); + var rIndex = sensorPos.Diff(-1).GetIndex(); + var lIndex = sensorPos.Diff(1).GetIndex(); + + rightStar.SetActive(true); + centerStar.SetActive(true); + leftStar.SetActive(true); + _stars[0] = rightStar; + _stars[1] = centerStar; + _stars[2] = leftStar; + _starRenderers[0] = _stars[0].GetComponent(); + _starRenderers[1] = _stars[1].GetComponent(); + _starRenderers[2] = _stars[2].GetComponent(); + _judgeQueues[0] = wifiTable[0]; + _judgeQueues[1] = wifiTable[1]; + _judgeQueues[2] = wifiTable[2]; + _slideEndPositions[0] = GetPositionFromDistance(4.8f, rIndex);// R + _slideEndPositions[1] = GetPositionFromDistance(4.8f, _endPos);// Center + _slideEndPositions[2] = GetPositionFromDistance(4.8f, lIndex); // L + + if (IsClassic) + { + _slideStartPositions[0] = GetPositionFromDistance(4.55f, StartPos + 0.11f); + _slideStartPositions[1] = GetPositionFromDistance(4.8f); + _slideStartPositions[2] = GetPositionFromDistance(4.55f, StartPos - 0.13f); + } + else + { + _slideStartPositions[0] = GetPositionFromDistance(4.8f); + _slideStartPositions[1] = GetPositionFromDistance(4.8f); + _slideStartPositions[2] = GetPositionFromDistance(4.8f); + } + + _slideOK = Transform.GetChild(Transform.childCount - 1).gameObject; //slideok is the last one + _slideOKAnim = _slideOK.GetComponent(); + _slideOKController = _slideOK.GetComponent(); + _slideOK.SetActive(false); + _slideOK.transform.SetParent(transform.parent); + + //Transform.rotation = Quaternion.Euler(0f, 0f, -45f * (StartPos - 1)); + _slideBars = new GameObject[Transform.childCount - 1]; + _slideBarRenderers = new SpriteRenderer[Transform.childCount - 1]; + _slideBarTransforms = new Transform[Transform.childCount - 1]; + + for (var i = 0; i < Transform.childCount - 1; i++) + { + _slideBars[i] = Transform.GetChild(i).gameObject; + _slideBarTransforms[i] = _slideBars[i].transform; + _slideBarRenderers[i] = _slideBars[i].GetComponent(); + } + + SetActive(false); + SetStarActive(false); + SetSlideBarAlpha(0f); + + for (var i = 0; i < _stars.Length; i++) + { + var star = _stars[i]; + if (star is null) + continue; + _starTransforms[i] = star.transform; + star.transform.position = _slideStartPositions[i]; + star.transform.localScale = new Vector3(0f, 0f, 1f); + } + _slideLength = (_slideStartPositions[1] - _slideEndPositions[1]).magnitude; } public override void Initialize() { - if (State >= NoteStatus.PreInitialized) + if (State >= NoteStatus.Initialized) return; - State = NoteStatus.PreInitialized; - ConnectInfo.StartTiming = Timing; var wifiTable = SlideTables.GetWifiTable(StartPos); + const float wifiConst = 0.162870f; + _judgeQueues[0] = wifiTable[0]; _judgeQueues[1] = wifiTable[1]; _judgeQueues[2] = wifiTable[2]; + _judgeTiming = Timing + (Length * (1 - wifiConst)); + _lastWaitTime = Length * wifiConst; + // 计算Slide淡入时机 // 在8.0速时应当提前300ms显示Slide _fadeInTiming = -3.926913f / Speed; @@ -66,6 +143,9 @@ public override void Initialize() _slideStartPositions[0] = GetPositionFromDistance(4.55f,StartPos + 0.11f); _slideStartPositions[1] = GetPositionFromDistance(4.8f); _slideStartPositions[2] = GetPositionFromDistance(4.55f, StartPos - 0.13f); + + _starRenderers[0].sortingOrder = -1; + _starRenderers[2].sortingOrder = -1; } else { @@ -74,27 +154,10 @@ public override void Initialize() _slideStartPositions[2] = GetPositionFromDistance(4.8f); } - _slideOK = Transform.GetChild(Transform.childCount - 1).gameObject; //slideok is the last one - _slideOKAnim = _slideOK.GetComponent(); - _slideOKController = _slideOK.GetComponent(); - Transform.rotation = Quaternion.Euler(0f, 0f, -45f * (StartPos - 1)); - _starTransforms = new Transform[3]; - _slideBars = new GameObject[Transform.childCount - 1]; - _slideBarRenderers = new SpriteRenderer[Transform.childCount - 1]; - _slideBarTransforms = new Transform[Transform.childCount - 1]; - - for (var i = 0; i < Transform.childCount - 1; i++) - { - _slideBars[i] = Transform.GetChild(i).gameObject; - _slideBarTransforms[i] = _slideBars[i].transform; - _slideBarRenderers[i] = _slideBars[i].GetComponent(); - } LoadSkin(); - SetActive(false); - SetStarActive(false); - SetSlideBarAlpha(0f); + for (var i = 0; i < _stars.Length; i++) { var star = _stars[i]; @@ -103,39 +166,40 @@ public override void Initialize() _starTransforms[i] = star.transform; star.transform.position = _slideStartPositions[i]; star.transform.localScale = new Vector3(0f, 0f, 1f); - star.SetActive(true); } + + State = NoteStatus.Initialized; } void Start() { - Initialize(); - var wifiConst = 0.162870f; - _judgeTiming = Timing + (Length * (1 - wifiConst)); - _lastWaitTime = Length * wifiConst; - - FadeIn().Forget(); } public override void ComponentFixedUpdate() { } - void CheckAll() + void CheckSensor() { - if (IsDestroyed || !IsInitialized) + if (IsAutoplay || !_isCheckable) return; - else if (IsFinished || !_canCheck) + else if (IsEnded || !IsInitialized) return; - else if (_isChecking) + else if (IsFinished) return; - else if (_gpManager.IsAutoplay) + else if (_isChecking) return; _isChecking = true; - for (int i = 0; i < 3; i++) + try + { + for (int i = 0; i < 3; i++) + { + Check(ref _judgeQueues[i]); + } + } + finally { - Check(ref _judgeQueues[i]); + _isChecking = false; } - _isChecking = false; } void Check(ref Memory queueMemory) { @@ -189,7 +253,7 @@ void Check(ref Memory queueMemory) } } - void BodyCheck() + void SlideCheck() { /// time 是Slide启动的时间点 /// timeStart 是Slide完全显示但未启动 @@ -200,7 +264,7 @@ void BodyCheck() var isTooLate = _gpManager.AudioTime - tooLateTiming >= 0; if (startTiming >= -0.05f) - _canCheck = true; + _isCheckable = true; if (!_isJudged) { @@ -248,39 +312,110 @@ int GetIndex() } public override void ComponentUpdate() { - BodyCheck(); - if (_isArrived) - { - CheckAll(); - return; - } - if (!_isStarActive) + SlideCheck(); + CheckSensor(); + + switch (State) { - SetStarActive(true); - _isStarActive = true; + case NoteStatus.Initialized: + SetStarActive(false); + if (CurrentSec - StartTiming > 0) + { + SetStarActive(true); + for (var i = 0; i < _stars.Length; i++) + { + var starTransform = _starTransforms[i]; + + starTransform.position = _slideStartPositions[i]; + } + State = NoteStatus.Scaling; + goto case NoteStatus.Scaling; + } + break; + case NoteStatus.Scaling: + var timing = CurrentSec - Timing; + if (timing > 0f) + { + for (var i = 0; i < _stars.Length; i++) + { + var starTransform = _starTransforms[i]; + + _starRenderers[i].color = new Color(1, 1, 1, 1); + starTransform.localScale = new Vector3(1.5f, 1.5f, 1.5f); + } + State = NoteStatus.Running; + goto case NoteStatus.Running; + } + var alpha = (1f - -timing / (_timing - _startTiming)).Clamp(0, 1); + + for (var i = 0; i < _stars.Length; i++) + { + var starTransform = _starTransforms[i]; + + _starRenderers[i].color = new Color(1, 1, 1, alpha); + starTransform.localScale = new Vector3(alpha + 0.5f, alpha + 0.5f, alpha + 0.5f); + } + break; + case NoteStatus.Running: + if (GetRemainingTimeWithoutOffset() == 0) + { + for (var i = 0; i < _stars.Length; i++) + { + var starTransform = _starTransforms[i]; + starTransform.position = _slideEndPositions[i]; + } + State = NoteStatus.Arrived; + goto case NoteStatus.Arrived; + } + var process = 1f - ((Length - GetRemainingTimeWithoutOffset()) / Length); + + for (var i = 0; i < _stars.Length; i++) + { + var starTransform = _starTransforms[i]; + + starTransform.position = + (_slideEndPositions[i] - _slideStartPositions[i]) * process + _slideStartPositions[i]; //TODO add some runhua + } + Autoplay(); + break; + case NoteStatus.Arrived: + break; } - var timing = CurrentSec - _timing; - if (timing <= 0f) + } + protected override void Autoplay() + { + if (!IsAutoplay) + return; + var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); + var queueMemory = _judgeQueues[0]; + var queue = queueMemory.Span; + if (queueMemory.IsEmpty) + return; + else if (process >= 1) { - float alpha; - alpha = 1f - -timing / (_timing - _startTiming); - alpha = alpha > 1f ? 1f : alpha; - alpha = alpha < 0f ? 0f : alpha; - - for (var i = 0; i < _stars.Length; i++) + HideAllBar(); + var autoplayParam = _gpManager.AutoplayParam; + if (autoplayParam.InRange(0, 14)) + _judgeResult = (JudgeGrade)autoplayParam; + else + _judgeResult = (JudgeGrade)_randomizer.Next(0, 15); + _isJudged = true; + _lastWaitTime = 0; + _judgeDiff = _judgeResult switch { - var starTransform = _starTransforms[i]; - - _starRenderers[i].color = new Color(1, 1, 1, alpha); - starTransform.localScale = new Vector3(alpha + 0.5f, alpha + 0.5f, alpha + 0.5f); - starTransform.position = _slideStartPositions[i]; - } - } - else - { - StarUpdate(); + < JudgeGrade.Perfect => 1, + > JudgeGrade.Perfect => -1, + _ => 0 + }; + return; } - CheckAll(); + else if (process > 0) + PlaySFX(); + var areaIndex = (int)(process * queueMemory.Length) - 1; + if (areaIndex < 0) + return; + var barIndex = queue[areaIndex].SlideIndex; + HideBar(barIndex); } void StarUpdate() { @@ -310,35 +445,7 @@ void StarUpdate() if (_gpManager.IsAutoplay) { - var queueMemory = _judgeQueues[0]; - var queue = queueMemory.Span; - if (queueMemory.IsEmpty) - return; - else if (process >= 1) - { - HideAllBar(); - var autoplayParam = _gpManager.AutoplayParam; - if (autoplayParam.InRange(0, 14)) - _judgeResult = (JudgeGrade)autoplayParam; - else - _judgeResult = (JudgeGrade)_randomizer.Next(0, 15); - _isJudged = true; - _lastWaitTime = 0; - _judgeDiff = _judgeResult switch - { - < JudgeGrade.Perfect => 1, - > JudgeGrade.Perfect => -1, - _ => 0 - }; - return; - } - else if (process > 0) - PlaySFX(); - var areaIndex = (int)(process * queueMemory.Length) - 1; - if (areaIndex < 0) - return; - var barIndex = queue[areaIndex].SlideIndex; - HideBar(barIndex); + } } protected override void TooLateJudge() @@ -353,7 +460,7 @@ protected override void TooLateJudge() } public override void End(bool forceEnd = false) { - if (IsDestroyed) + if (IsEnded) return; //foreach (var sensor in ArrayHelper.ToEnumerable(_judgeAreas)) // _ioManager.UnbindSensor(_noteChecker, sensor); @@ -430,31 +537,26 @@ protected override void LoadSkin() } foreach(var (i, star) in _stars.WithIndex()) { - var starRenderer = star!.GetComponent(); - _starRenderers[i] = starRenderer; + var starRenderer = _starRenderers[i]; starRenderer.sprite = starSprite; if (breakMaterial is not null) { starRenderer.sharedMaterial = breakMaterial; } - star.transform.rotation = Quaternion.Euler(0, 0, -22.5f * (8 + i + 2 * (StartPos - 1))); - star.SetActive(false); - } - if(IsClassic) - { - _starRenderers[0].sortingOrder = -1; - _starRenderers[2].sortingOrder = -1; + star!.transform.rotation = Quaternion.Euler(0, 0, -22.5f * (8 + i + 2 * (StartPos - 1))); + star!.SetActive(false); } + if (_isJustR) - _slideOK.GetComponent().SetR(); + { + _slideOKController.SetR(); + } else { - _slideOK.GetComponent().SetL(); + _slideOKController.SetL(); _slideOK.transform.Rotate(new Vector3(0f, 0f, 180f)); } - _slideOK.SetActive(false); - _slideOK.transform.SetParent(transform.parent); } } } \ No newline at end of file diff --git a/Assets/Script/Scenes/Game/Types/Interfaces/IConnectableSlide.cs b/Assets/Script/Scenes/Game/Types/Interfaces/IConnectableSlide.cs index b7c5da03..40f2470f 100644 --- a/Assets/Script/Scenes/Game/Types/Interfaces/IConnectableSlide.cs +++ b/Assets/Script/Scenes/Game/Types/Interfaces/IConnectableSlide.cs @@ -11,7 +11,7 @@ public interface IConnectableSlide : IStatefulNote, IEndableNote { ConnSlideInfo ConnectInfo { get; } GameObject GameObject { get; } - bool IsDestroyed { get; } + bool IsEnded { get; } /// /// 如果判定队列已经完成，返回True，反之False /// From d75ca3f90e37c2e07b46793b501d2f47dc64100b Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 00:23:21 +0800 Subject: [PATCH 04/26] fix: slide & wifiSlide --- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 4 ++-- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index d6408dbf..30d2c0f0 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -101,8 +101,7 @@ protected override void Awake() _slideOKAnim = _slideOK.GetComponent(); _slideOKController = _slideOK.GetComponent(); _slideOK.SetActive(false); - _slideOK.transform.SetParent(transform.parent); - + _slideBars = new GameObject[transform.childCount - 1]; _slideBarTransforms = new Transform[transform.childCount - 1]; _slideBarRenderers = new SpriteRenderer[transform.childCount - 1]; @@ -155,6 +154,7 @@ public override void Initialize() LoadSlidePath(); LoadSkin(); + _slideOK.transform.SetParent(transform.parent); // 计算Slide淡入时机 // 在8.0速时应当提前300ms显示Slide _fadeInTiming = -3.926913f / Speed; diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index e7bf2a7a..d81ae53c 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -74,7 +74,6 @@ protected override void Awake() _slideOKAnim = _slideOK.GetComponent(); _slideOKController = _slideOK.GetComponent(); _slideOK.SetActive(false); - _slideOK.transform.SetParent(transform.parent); //Transform.rotation = Quaternion.Euler(0f, 0f, -45f * (StartPos - 1)); _slideBars = new GameObject[Transform.childCount - 1]; @@ -157,7 +156,7 @@ public override void Initialize() Transform.rotation = Quaternion.Euler(0f, 0f, -45f * (StartPos - 1)); LoadSkin(); - + _slideOK.transform.SetParent(transform.parent); for (var i = 0; i < _stars.Length; i++) { var star = _stars[i]; @@ -367,14 +366,17 @@ public override void ComponentUpdate() State = NoteStatus.Arrived; goto case NoteStatus.Arrived; } - var process = 1f - ((Length - GetRemainingTimeWithoutOffset()) / Length); + var process = (Length - GetRemainingTimeWithoutOffset()) / Length; for (var i = 0; i < _stars.Length; i++) { var starTransform = _starTransforms[i]; + var a = _slideEndPositions[i]; + var b = _slideStartPositions[i]; + var ba = a - b; + var newPos = ba * process + b; - starTransform.position = - (_slideEndPositions[i] - _slideStartPositions[i]) * process + _slideStartPositions[i]; //TODO add some runhua + starTransform.position = newPos; //TODO add some runhua } Autoplay(); break; @@ -544,7 +546,6 @@ protected override void LoadSkin() starRenderer.sharedMaterial = breakMaterial; } star!.transform.rotation = Quaternion.Euler(0, 0, -22.5f * (8 + i + 2 * (StartPos - 1))); - star!.SetActive(false); } From 3bf6f78f0543587b3fa5f62c981dd8cbd1c3579f Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 00:38:32 +0800 Subject: [PATCH 05/26] fix: various fix --- Assets/Script/Scenes/Game/Notes/HoldDrop.cs | 5 ++--- Assets/Script/Scenes/Game/Notes/NoteDrop.cs | 1 + Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 10 +++++----- Assets/Script/Scenes/Game/Notes/TapDrop.cs | 5 ++--- Assets/Script/Scenes/Game/Notes/TouchDrop.cs | 5 ++--- Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs | 5 ++--- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 10 +++++----- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs index 7c2ca48b..ff54100a 100644 --- a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs @@ -218,7 +218,7 @@ void Check() var timing = GetTimeSpanToJudgeTiming(); var isTooLate = timing > 0.15f; - if (_judgableRange.InRange(_gpManager.ThisFrameSec)) + if (_judgableRange.InRange(ThisFrameSec)) { var btnState = _noteManager.GetButtonStateInThisFrame(_sensorPos); var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); @@ -247,10 +247,9 @@ void Check(in InputEventArgs args, ref bool isUsedInThisFrame) else if (isUsedInThisFrame) return; - var thisFrameSec = _gpManager.ThisFrameSec; isUsedInThisFrame = true; - Judge(thisFrameSec); + Judge(ThisFrameSec); } void BodyCheck() { diff --git a/Assets/Script/Scenes/Game/Notes/NoteDrop.cs b/Assets/Script/Scenes/Game/Notes/NoteDrop.cs index 668d7789..4171a08c 100644 --- a/Assets/Script/Scenes/Game/Notes/NoteDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/NoteDrop.cs @@ -77,6 +77,7 @@ public NoteStatus State } public float JudgeTiming => _judgeTiming + _gameSetting.Judge.JudgeOffset; public float CurrentSec => _gpManager.AudioTime; + public float ThisFrameSec => _gpManager.ThisFrameSec; protected bool IsAutoplay => _isAutoplay; protected Material BreakMaterial => _breakMaterial; diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 30d2c0f0..640e5960 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -253,7 +253,7 @@ public override void ComponentUpdate() { case NoteStatus.Initialized: SetStarActive(false); - if (CurrentSec - StartTiming > 0) + if (ThisFrameSec - StartTiming > 0) { if (!(ConnectInfo.IsConnSlide && !ConnectInfo.IsGroupPartHead)) { @@ -269,7 +269,7 @@ public override void ComponentUpdate() } break; case NoteStatus.Scaling: - var timing = CurrentSec - Timing; + var timing = ThisFrameSec - Timing; if (timing > 0f) { _starRenderer.color = new Color(1, 1, 1, 1); @@ -302,7 +302,7 @@ public override void ComponentUpdate() State = NoteStatus.Arrived; goto case NoteStatus.Arrived; } - var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); + var process = (Length - GetRemainingTimeWithoutOffset() / Length).Clamp(0, 1); var indexProcess = (_slidePositions.Count - 1) * process; var index = (int)indexProcess; var pos = indexProcess - index; @@ -436,9 +436,9 @@ void SlideCheck() { HideAllBar(); if (IsClassic) - Judge_Classic(_gpManager.ThisFrameSec); + Judge_Classic(ThisFrameSec); else - Judge(_gpManager.ThisFrameSec); + Judge(ThisFrameSec); return; } else if (isTooLate) diff --git a/Assets/Script/Scenes/Game/Notes/TapDrop.cs b/Assets/Script/Scenes/Game/Notes/TapDrop.cs index b096b1f3..9fb089af 100644 --- a/Assets/Script/Scenes/Game/Notes/TapDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TapDrop.cs @@ -238,7 +238,7 @@ void Check() var timing = GetTimeSpanToJudgeTiming(); var isTooLate = timing > 0.15f; - if (_judgableRange.InRange(_gpManager.ThisFrameSec)) + if (_judgableRange.InRange(ThisFrameSec)) { var btnState = _noteManager.GetButtonStateInThisFrame(_sensorPos); var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); @@ -267,10 +267,9 @@ void Check(in InputEventArgs args, ref bool isUsedInThisFrame) else if (isUsedInThisFrame) return; - var thisFrameSec = _gpManager.ThisFrameSec; isUsedInThisFrame = true; - Judge(thisFrameSec); + Judge(ThisFrameSec); } protected override void LoadSkin() { diff --git a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs index bff80cda..d670a0c3 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs @@ -360,7 +360,7 @@ void Check() var isTooLate = timing > 0.316667f; - if (_judgableRange.InRange(_gpManager.ThisFrameSec)) + if (_judgableRange.InRange(ThisFrameSec)) { var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); @@ -397,10 +397,9 @@ void Check(in InputEventArgs args, ref bool isUsedInThisFrame) else if (isUsedInThisFrame) return; - var thisFrameSec = _gpManager.ThisFrameSec; isUsedInThisFrame = true; - Judge(thisFrameSec); + Judge(ThisFrameSec); } public override void SetActive(bool state) { diff --git a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs index a2fc1381..03965a9f 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs @@ -247,7 +247,7 @@ void Check() var timing = GetTimeSpanToJudgeTiming(); var isTooLate = timing > 0.316667f; - if (_judgableRange.InRange(_gpManager.ThisFrameSec)) + if (_judgableRange.InRange(ThisFrameSec)) { var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); @@ -289,10 +289,9 @@ void Check(in InputEventArgs args, ref bool isUsedInThisFrame) else if (isUsedInThisFrame) return; - var thisFrameSec = _gpManager.ThisFrameSec; isUsedInThisFrame = true; - Judge(thisFrameSec); + Judge(ThisFrameSec); } void BodyCheck() { diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index d81ae53c..263f045b 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -271,9 +271,9 @@ void SlideCheck() { HideAllBar(); if (IsClassic) - Judge_Classic(_gpManager.ThisFrameSec); + Judge_Classic(ThisFrameSec); else - Judge(_gpManager.ThisFrameSec); + Judge(ThisFrameSec); } else if (isTooLate) TooLateJudge(); @@ -318,7 +318,7 @@ public override void ComponentUpdate() { case NoteStatus.Initialized: SetStarActive(false); - if (CurrentSec - StartTiming > 0) + if (ThisFrameSec - StartTiming > 0) { SetStarActive(true); for (var i = 0; i < _stars.Length; i++) @@ -332,7 +332,7 @@ public override void ComponentUpdate() } break; case NoteStatus.Scaling: - var timing = CurrentSec - Timing; + var timing = ThisFrameSec - Timing; if (timing > 0f) { for (var i = 0; i < _stars.Length; i++) @@ -366,7 +366,7 @@ public override void ComponentUpdate() State = NoteStatus.Arrived; goto case NoteStatus.Arrived; } - var process = (Length - GetRemainingTimeWithoutOffset()) / Length; + var process = ((Length - GetRemainingTimeWithoutOffset()) / Length).Clamp(0, 1); for (var i = 0; i < _stars.Length; i++) { From b1edd35d2f0e74340218814c5aac983e16508227 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 01:10:41 +0800 Subject: [PATCH 06/26] fix: various fix --- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 11 ++++++----- Assets/Script/Scenes/Game/Notes/TapDrop.cs | 5 ++++- Assets/Script/Scenes/Game/Notes/TouchDrop.cs | 3 +++ Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 11 ++++++----- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 640e5960..0e2437c3 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -302,7 +302,7 @@ public override void ComponentUpdate() State = NoteStatus.Arrived; goto case NoteStatus.Arrived; } - var process = (Length - GetRemainingTimeWithoutOffset() / Length).Clamp(0, 1); + var process = ((Length - GetRemainingTimeWithoutOffset()) / Length).Clamp(0, 1); var indexProcess = (_slidePositions.Count - 1) * process; var index = (int)indexProcess; var pos = indexProcess - index; @@ -326,6 +326,7 @@ public override void ComponentUpdate() Autoplay(); break; case NoteStatus.Arrived: + Autoplay(); break; } } @@ -409,9 +410,9 @@ void SlideCheck() /// timeStart 是Slide完全显示但未启动 /// LastFor 是Slide的时值 //var timing = _gpManager.AudioTime - _timing; - var startTiming = _gpManager.AudioTime - _startTiming; + var startTiming = ThisFrameSec - _startTiming; var tooLateTiming = _timing + _length + 0.6 + MathF.Min(_gameSetting.Judge.JudgeOffset, 0); - var isTooLate = _gpManager.AudioTime - tooLateTiming >= 0; + var isTooLate = ThisFrameSec - tooLateTiming >= 0; if (!_isCheckable) { @@ -446,7 +447,7 @@ void SlideCheck() } else { - if (_lastWaitTime < 0) + if (_lastWaitTime <= 0) End(); else _lastWaitTime -= Time.deltaTime; @@ -525,7 +526,7 @@ protected override void Autoplay() { if (!IsAutoplay) return; - var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); + var process = ((Length - GetRemainingTimeWithoutOffset()) / Length).Clamp(0, 1); var queueMemory = _judgeQueues[0]; var queue = queueMemory.Span; var canPlaySFX = ConnectInfo.IsGroupPartHead || !ConnectInfo.IsConnSlide; diff --git a/Assets/Script/Scenes/Game/Notes/TapDrop.cs b/Assets/Script/Scenes/Game/Notes/TapDrop.cs index 9fb089af..1b8ac024 100644 --- a/Assets/Script/Scenes/Game/Notes/TapDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TapDrop.cs @@ -108,7 +108,7 @@ public void Initialize(TapPoolingInfo poolingInfo) SetActive(true); SetTapLineActive(false); - if (_gpManager.IsAutoplay) + if (IsAutoplay) Autoplay(); //else // SubscribeEvent(); @@ -231,7 +231,10 @@ public override void ComponentUpdate() void Check() { if (_isJudged) + { + End(); return; + } else if (!_noteManager.CanJudge(QueueInfo)) return; diff --git a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs index d670a0c3..907768a3 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs @@ -352,7 +352,10 @@ protected override void Judge(float currentSec) void Check() { if (_isJudged) + { + End(); return; + } else if (!_noteManager.CanJudge(QueueInfo)) return; diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 263f045b..60f916b5 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -257,10 +257,10 @@ void SlideCheck() /// time 是Slide启动的时间点 /// timeStart 是Slide完全显示但未启动 /// LastFor 是Slide的时值 - var timing = _gpManager.AudioTime - _timing; - var startTiming = _gpManager.AudioTime - _startTiming; + var timing = ThisFrameSec - _timing; + var startTiming = ThisFrameSec - _startTiming; var tooLateTiming = _timing + Length + 0.6 + MathF.Min(_gameSetting.Judge.JudgeOffset, 0); - var isTooLate = _gpManager.AudioTime - tooLateTiming >= 0; + var isTooLate = ThisFrameSec - tooLateTiming >= 0; if (startTiming >= -0.05f) _isCheckable = true; @@ -280,7 +280,7 @@ void SlideCheck() } else { - if (_lastWaitTime < 0) + if (_lastWaitTime <= 0) End(); else _lastWaitTime -= Time.deltaTime; @@ -381,6 +381,7 @@ public override void ComponentUpdate() Autoplay(); break; case NoteStatus.Arrived: + Autoplay(); break; } } @@ -388,7 +389,7 @@ protected override void Autoplay() { if (!IsAutoplay) return; - var process = MathF.Min((Length - GetRemainingTimeWithoutOffset()) / Length, 1); + var process = ((Length - GetRemainingTimeWithoutOffset()) / Length).Clamp(0, 1); var queueMemory = _judgeQueues[0]; var queue = queueMemory.Span; if (queueMemory.IsEmpty) From 22336e5addc4714c87885d0bab57f95725c15ba1 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 01:19:39 +0800 Subject: [PATCH 07/26] fix: hold --- Assets/Script/Scenes/Game/Notes/HoldDrop.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs index ff54100a..ed61d247 100644 --- a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs @@ -294,7 +294,14 @@ void BodyCheck() var on = _noteManager.CheckAreaStateInThisFrame(_sensorPos, SensorStatus.On); if (on || _gpManager.IsAutoplay) { - PlayHoldEffect(); + if(remainingTime == 0) + { + StopHoldEffect(); + } + else + { + PlayHoldEffect(); + } } else { From 6da750be340067f84a9ca9587d22fd39e59f1527 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 01:20:07 +0800 Subject: [PATCH 08/26] misc: bump version --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bdaab24c..79fb9b04 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0-alpha.4.4.2E + bundleVersion: 0.1.0-alpha.4.4.3E preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 From 2dd46ea61d96e7cd4634d201cf3903934d1c5ae9 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 13:07:44 +0800 Subject: [PATCH 09/26] fix: Hold --- Assets/Script/Scenes/Game/Notes/HoldDrop.cs | 2 +- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 31 --------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs index ed61d247..5e6ea00d 100644 --- a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs @@ -296,7 +296,7 @@ void BodyCheck() { if(remainingTime == 0) { - StopHoldEffect(); + _effectManager.ResetHoldEffect(StartPos); } else { diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 60f916b5..75696f9d 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -420,37 +420,6 @@ protected override void Autoplay() var barIndex = queue[areaIndex].SlideIndex; HideBar(barIndex); } - void StarUpdate() - { - var timing = _gpManager.AudioTime - _timing; - var process = (Length - timing) / Length; - process = 1f - process; - - for (var i = 0; i < _stars.Length; i++) - { - var starTransform = _starTransforms[i]; - if (process >= 1) - { - _starRenderers[i].color = Color.white; - starTransform.position = _slideEndPositions[i]; - starTransform.localScale = new Vector3(1.5f, 1.5f, 1.5f); - _isArrived = true; - } - else - { - _starRenderers[i].color = Color.white; - starTransform.position = - (_slideEndPositions[i] - _slideStartPositions[i]) * process + _slideStartPositions[i]; //TODO add some runhua - starTransform.localScale = new Vector3(1.5f, 1.5f, 1.5f); - } - } - - - if (_gpManager.IsAutoplay) - { - - } - } protected override void TooLateJudge() { if (_isJudged) From b24dafab50af2cf22a751db67678afbab13320ad Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 13:32:45 +0800 Subject: [PATCH 10/26] perf: SlideOK --- .../NoteEffects/SlideAnims/BreakStarOver.anim | 547 +++++++------- .../SlideAnims/ClassicStarOver.anim | 46 +- .../SlideAnims/JudgeBreakShine.anim | 702 ------------------ .../SlideAnims/JudgeBreakShine.anim.meta | 8 - .../SlideAnims/JudgeBreakShine.controller | 72 -- .../JudgeBreakShine.controller.meta | 8 - .../SlideAnims/Just_Break.controller | 62 +- .../SlideAnims/Just_curv.controller | 81 +- .../NoteEffects/SlideAnims/StarOver.anim | 164 ++-- Assets/Prefab/Game/Just_str.prefab | 16 +- .../Prefab/Game/Slides/Star_Circle_1.prefab | 15 +- .../Prefab/Game/Slides/Star_Circle_2.prefab | 15 +- .../Prefab/Game/Slides/Star_Circle_3.prefab | 15 +- .../Prefab/Game/Slides/Star_Circle_4.prefab | 15 +- .../Prefab/Game/Slides/Star_Circle_5.prefab | 15 +- .../Prefab/Game/Slides/Star_Circle_6.prefab | 15 +- .../Prefab/Game/Slides/Star_Circle_7.prefab | 15 +- Assets/Prefab/Game/Slides/Star_L_2.prefab | 15 +- Assets/Prefab/Game/Slides/Star_L_3.prefab | 15 +- Assets/Prefab/Game/Slides/Star_L_4.prefab | 15 +- Assets/Prefab/Game/Slides/Star_L_5.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_1.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_2.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_3.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_4.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_5.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_6.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_7.prefab | 15 +- Assets/Prefab/Game/Slides/Star_ppqq_8.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_1.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_2.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_3.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_4.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_5.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_6.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_7.prefab | 15 +- Assets/Prefab/Game/Slides/Star_pq_8.prefab | 15 +- Assets/Script/Misc/Types/Enums/NoteStatus.cs | 1 - Assets/Script/Scenes/Game/Notes/SlideBase.cs | 2 - 39 files changed, 497 insertions(+), 1617 deletions(-) delete mode 100644 Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim delete mode 100644 Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim.meta delete mode 100644 Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller delete mode 100644 Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller.meta diff --git a/Assets/Animation/NoteEffects/SlideAnims/BreakStarOver.anim b/Assets/Animation/NoteEffects/SlideAnims/BreakStarOver.anim index 1ff3a839..e4519413 100644 --- a/Assets/Animation/NoteEffects/SlideAnims/BreakStarOver.anim +++ b/Assets/Animation/NoteEffects/SlideAnims/BreakStarOver.anim @@ -23,88 +23,25 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.41666666 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.55 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: ifDestroy - path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 - value: 1 + time: 0.033333335 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 - value: 1 + time: 0.06666667 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -112,29 +49,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 1 + time: 0.1 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 - value: 0 + time: 0.13333334 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -142,8 +67,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 - value: 1 + time: 0.16666667 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -151,8 +76,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 1 + time: 0.2 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -160,28 +85,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 - value: 0 + time: 0.23333333 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 + time: 0.26666668 value: 0.9 inSlope: 0 outSlope: 0 @@ -190,8 +103,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 - value: 1.4 + time: 0.3 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -199,7 +112,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.33333334 value: 0.9 inSlope: 0 outSlope: 0 @@ -208,8 +121,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 - value: 1.4 + time: 0.36666667 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -217,7 +130,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.4 value: 0.9 inSlope: 0 outSlope: 0 @@ -226,44 +139,92 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 1.4 + time: 0.43333334 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Brightness + path: + classID: 212 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.2 - value: 0.9 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.23333333 - value: 1.4 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.26666668 - value: 0.9 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.3 - value: 1.4 + time: 0 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -271,8 +232,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0.9 + time: 0.033333335 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -280,8 +241,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 - value: 1.4 + time: 0.28333333 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -289,41 +250,62 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 0.9 + time: 0.41666666 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.43333334 - value: 1.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 - time: 0.55 - value: 1.3 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Brightness + attribute: m_Enabled path: classID: 212 script: {fileID: 0} - flags: 16 - m_PPtrCurves: [] + flags: 0 + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, type: 2} + attribute: m_Materials.Array.data[0] + path: + classID: 212 + script: {fileID: 0} + flags: 2 m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -333,10 +315,10 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 0 - attribute: 785836788 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - typeID: 114 - customType: 0 + attribute: 2237670731 + script: {fileID: 0} + typeID: 212 + customType: 22 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 @@ -351,13 +333,22 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 2237670731 + attribute: 3305885265 script: {fileID: 0} typeID: 212 - customType: 22 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 21 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 2526845255 @@ -385,13 +376,14 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - pptrCurveMapping: [] + pptrCurveMapping: + - {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, type: 2} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.55 + m_StopTime: 0.43333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -413,88 +405,25 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.41666666 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.55 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: ifDestroy - path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 - value: 1 + time: 0.033333335 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 - value: 1 + time: 0.06666667 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -502,29 +431,17 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 1 + time: 0.1 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 - value: 0 + time: 0.13333334 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -532,8 +449,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 - value: 1 + time: 0.16666667 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -541,8 +458,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.28333333 - value: 1 + time: 0.2 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -550,28 +467,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.41666666 - value: 0 + time: 0.23333333 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - serializedVersion: 3 - time: 0 + time: 0.26666668 value: 0.9 inSlope: 0 outSlope: 0 @@ -580,8 +485,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.033333335 - value: 1.4 + time: 0.3 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -589,7 +494,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.06666667 + time: 0.33333334 value: 0.9 inSlope: 0 outSlope: 0 @@ -598,8 +503,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.1 - value: 1.4 + time: 0.36666667 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -607,7 +512,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.13333334 + time: 0.4 value: 0.9 inSlope: 0 outSlope: 0 @@ -616,44 +521,92 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.16666667 - value: 1.4 + time: 0.43333334 + value: 1.6 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: material._Brightness + path: + classID: 212 + script: {fileID: 0} + flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.2 - value: 0.9 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.r + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.23333333 - value: 1.4 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.g + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.26666668 - value: 0.9 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.b + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.3 - value: 1.4 + time: 0 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -661,8 +614,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.33333334 - value: 0.9 + time: 0.033333335 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -670,8 +623,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.36666667 - value: 1.4 + time: 0.28333333 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -679,40 +632,52 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 - value: 0.9 + time: 0.41666666 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: + classID: 212 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: - serializedVersion: 3 - time: 0.43333334 - value: 1.4 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 - time: 0.55 - value: 1.3 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: material._Brightness + attribute: m_Enabled path: classID: 212 script: {fileID: 0} - flags: 16 + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim b/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim index 94fd846c..988c685f 100644 --- a/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim +++ b/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim @@ -191,15 +191,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -208,8 +199,8 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.55 - value: 1 + time: 0.5 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -219,10 +210,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: ifDestroy + attribute: m_Enabled path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} + classID: 212 + script: {fileID: 0} flags: 0 m_PPtrCurves: - serializedVersion: 2 @@ -261,9 +252,9 @@ AnimationClip: isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 785836788 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - typeID: 114 + attribute: 3305885265 + script: {fileID: 0} + typeID: 212 customType: 0 isPPtrCurve: 0 isIntCurve: 0 @@ -311,7 +302,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.55 + m_StopTime: 0.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -501,15 +492,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -518,8 +500,8 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.55 - value: 1 + time: 0.5 + value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -529,10 +511,10 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: ifDestroy + attribute: m_Enabled path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} + classID: 212 + script: {fileID: 0} flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 diff --git a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim b/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim deleted file mode 100644 index 3e904001..00000000 --- a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim +++ /dev/null @@ -1,702 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: JudgeBreakShine - serializedVersion: 7 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.13333334 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.23333333 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.26666668 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.36666667 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.43333334 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Brightness - path: - classID: 212 - script: {fileID: 0} - flags: 16 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.28333333 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.41666666 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.55 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: ifDestroy - path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - flags: 0 - m_PPtrCurves: - - serializedVersion: 2 - curve: - - time: 0 - value: {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, type: 2} - attribute: m_Materials.Array.data[0] - path: - classID: 212 - script: {fileID: 0} - flags: 2 - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 2237670731 - script: {fileID: 0} - typeID: 212 - customType: 22 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 785836788 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - typeID: 114 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 21 - isPPtrCurve: 1 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 2526845255 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 4215373228 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 2334886179 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - isIntCurve: 0 - isSerializeReferenceCurve: 0 - pptrCurveMapping: - - {fileID: 2100000, guid: 6cea13e5ba8275446be27a38daed20c7, type: 2} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.55 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.13333334 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.16666667 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.23333333 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.26666668 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.33333334 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.36666667 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.4 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.43333334 - value: 1.6 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Brightness - path: - classID: 212 - script: {fileID: 0} - flags: 16 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.28333333 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.41666666 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 212 - script: {fileID: 0} - flags: 0 - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.41666666 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.55 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: ifDestroy - path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - flags: 0 - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim.meta b/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim.meta deleted file mode 100644 index 41e7c785..00000000 --- a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 84f6165c9352b1d489f86a286c350be2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller b/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller deleted file mode 100644 index 04702d7a..00000000 --- a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-4198565473876126163 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BreakJudgeShine - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 84f6165c9352b1d489f86a286c350be2, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1107 &-1840210796515808066 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -4198565473876126163} - m_Position: {x: 290, y: 30, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 480, y: 140, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -4198565473876126163} ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: JudgeBreakShine - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -1840210796515808066} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} diff --git a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller.meta b/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller.meta deleted file mode 100644 index fc499579..00000000 --- a/Assets/Animation/NoteEffects/SlideAnims/JudgeBreakShine.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 68e114e3215572c4380cbd3b06c36ad0 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Animation/NoteEffects/SlideAnims/Just_Break.controller b/Assets/Animation/NoteEffects/SlideAnims/Just_Break.controller index 8b01f5c7..8f76133f 100644 --- a/Assets/Animation/NoteEffects/SlideAnims/Just_Break.controller +++ b/Assets/Animation/NoteEffects/SlideAnims/Just_Break.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7630235966917367968 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8382789896721019105} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1.0000001 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -29,10 +51,11 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: JudgeBreakShine + m_Name: BreakStarOver m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -7630235966917367968} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -59,14 +82,43 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 5501282408649859673} - m_Position: {x: 170, y: 140, z: 0} + m_Position: {x: 200, y: 140, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8382789896721019105} + m_Position: {x: 280, y: 250, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 390, y: 0, z: 0} + m_AnyStatePosition: {x: 400, y: 30, z: 0} m_EntryPosition: {x: 170, y: 40, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 440, y: 150, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 5501282408649859673} +--- !u!1102 &8382789896721019105 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animation/NoteEffects/SlideAnims/Just_curv.controller b/Assets/Animation/NoteEffects/SlideAnims/Just_curv.controller index d1e37e02..f376da60 100644 --- a/Assets/Animation/NoteEffects/SlideAnims/Just_curv.controller +++ b/Assets/Animation/NoteEffects/SlideAnims/Just_curv.controller @@ -69,7 +69,8 @@ AnimatorState: m_Name: StarOver m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 2513279380455265351} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -85,6 +86,54 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &2154984582574138226 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Empty + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2513279380455265351 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2154984582574138226} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &2908732713160496523 AnimatorState: serializedVersion: 6 @@ -95,7 +144,8 @@ AnimatorState: m_Name: ClassicStarOver m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 6293929868352536005} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -126,6 +176,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 2908732713160496523} m_Position: {x: 310, y: 160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2154984582574138226} + m_Position: {x: 190, y: 270, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 7917580838285310258} @@ -135,9 +188,31 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 340, y: 40, z: 0} m_EntryPosition: {x: 160, y: 30, z: 0} - m_ExitPosition: {x: 200, y: 270, z: 0} + m_ExitPosition: {x: 210, y: 330, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: 1505484899582144106} +--- !u!1101 &6293929868352536005 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 2154984582574138226} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 1 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &7917580838285310258 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Animation/NoteEffects/SlideAnims/StarOver.anim b/Assets/Animation/NoteEffects/SlideAnims/StarOver.anim index 916e0630..c0bcd1e8 100644 --- a/Assets/Animation/NoteEffects/SlideAnims/StarOver.anim +++ b/Assets/Animation/NoteEffects/SlideAnims/StarOver.anim @@ -17,54 +17,6 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.28333333 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.41666666 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.55 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: ifDestroy - path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - flags: 16 - serializedVersion: 2 curve: serializedVersion: 2 @@ -212,6 +164,36 @@ AnimationClip: classID: 212 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -222,16 +204,16 @@ AnimationClip: genericBindings: - serializedVersion: 2 path: 0 - attribute: 785836788 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - typeID: 114 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 - attribute: 304273561 + attribute: 3305885265 script: {fileID: 0} typeID: 212 customType: 0 @@ -287,54 +269,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.28333333 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.41666666 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.55 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: ifDestroy - path: - classID: 114 - script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - flags: 16 - serializedVersion: 2 curve: serializedVersion: 2 @@ -482,6 +416,36 @@ AnimationClip: classID: 212 script: {fileID: 0} flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.41666666 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Prefab/Game/Just_str.prefab b/Assets/Prefab/Game/Just_str.prefab index 5d48d537..639a3cae 100644 --- a/Assets/Prefab/Game/Just_str.prefab +++ b/Assets/Prefab/Game/Just_str.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 310387828536440237} - component: {fileID: 548578996992170818} - component: {fileID: 4084572716065402907} - - component: {fileID: 7559728760609664144} - component: {fileID: 1122872627157435716} m_Layer: 0 m_Name: Just_str @@ -74,7 +73,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1147667381 - m_SortingLayer: 3 + m_SortingLayer: 4 m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4f671ae21079cda49869d9d899758ac9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -108,19 +107,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7559728760609664144 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5096008454062299820} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &1122872627157435716 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_1.prefab b/Assets/Prefab/Game/Slides/Star_Circle_1.prefab index 94ce127a..95fd87a8 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_1.prefab @@ -2311,6 +2311,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle1 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3880718947095525592 @@ -2576,7 +2577,6 @@ GameObject: - component: {fileID: 5596905080353444796} - component: {fileID: 8506267051645915450} - component: {fileID: 1543298242387002033} - - component: {fileID: 848998123341107209} - component: {fileID: 5097084601054153436} m_Layer: 0 m_Name: Just_curv @@ -2673,19 +2673,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &848998123341107209 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4225221723248985605} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &5097084601054153436 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_2.prefab b/Assets/Prefab/Game/Slides/Star_Circle_2.prefab index dced9117..60243ef0 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_2.prefab @@ -491,6 +491,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle2 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &5969952551158348178 @@ -504,7 +505,6 @@ GameObject: - component: {fileID: 4132567073616200544} - component: {fileID: 3447572913147361100} - component: {fileID: 2186768862838006681} - - component: {fileID: 3820275019036935256} - component: {fileID: 4920820485170983891} m_Layer: 0 m_Name: Just_curv @@ -601,19 +601,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &3820275019036935256 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5969952551158348178} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &4920820485170983891 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_3.prefab b/Assets/Prefab/Game/Slides/Star_Circle_3.prefab index 48bd5cd0..5cadcb88 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_3.prefab @@ -499,6 +499,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle3 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3967625451836103947 @@ -680,7 +681,6 @@ GameObject: - component: {fileID: 3672156181829589010} - component: {fileID: 3696897028348548209} - component: {fileID: 2587639581840887194} - - component: {fileID: 2446221538368027604} - component: {fileID: 2771390453768572070} m_Layer: 0 m_Name: Just_curv @@ -777,19 +777,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &2446221538368027604 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5054024315330001769} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &2771390453768572070 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_4.prefab b/Assets/Prefab/Game/Slides/Star_Circle_4.prefab index 2e309783..9c0c2980 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_4.prefab @@ -851,7 +851,6 @@ GameObject: - component: {fileID: 5397759460337934511} - component: {fileID: 6850330935688890429} - component: {fileID: 8138510121944070783} - - component: {fileID: 5061051337098216826} - component: {fileID: 2238462665189517872} m_Layer: 0 m_Name: Just_curv @@ -948,19 +947,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5061051337098216826 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3801990197378175637} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &2238462665189517872 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1987,6 +1973,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle4 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8598244046855296502 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_5.prefab b/Assets/Prefab/Game/Slides/Star_Circle_5.prefab index 950b7a68..afdea1cf 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_5.prefab @@ -2447,6 +2447,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle5 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8485280449831498836 @@ -2712,7 +2713,6 @@ GameObject: - component: {fileID: 1836430134254452113} - component: {fileID: 7714401113597827625} - component: {fileID: 6133013256352664471} - - component: {fileID: 1171636963059387567} - component: {fileID: 1137361713200525102} m_Layer: 0 m_Name: Just_curv @@ -2809,19 +2809,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1171636963059387567 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9211939807871122267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &1137361713200525102 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_6.prefab b/Assets/Prefab/Game/Slides/Star_Circle_6.prefab index d0c6178d..6fd47d9e 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_6.prefab @@ -599,7 +599,6 @@ GameObject: - component: {fileID: 2438186078665917410} - component: {fileID: 4380812448237721261} - component: {fileID: 2052962861440628454} - - component: {fileID: 1096741417085887286} - component: {fileID: 9216475090154565023} m_Layer: 0 m_Name: Just_curv @@ -696,19 +695,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1096741417085887286 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1203865062987107948} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &9216475090154565023 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2423,6 +2409,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle6 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &6252188938400849797 diff --git a/Assets/Prefab/Game/Slides/Star_Circle_7.prefab b/Assets/Prefab/Game/Slides/Star_Circle_7.prefab index 5471ab12..a5fb1414 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_7.prefab @@ -699,6 +699,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle7 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &1777600767941551293 @@ -3904,7 +3905,6 @@ GameObject: - component: {fileID: 8992497300061141582} - component: {fileID: 6125523786557025123} - component: {fileID: 5918837311079719148} - - component: {fileID: 1630778694511027665} - component: {fileID: 6056553432024961644} m_Layer: 0 m_Name: Just_curv @@ -4001,19 +4001,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1630778694511027665 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8892484876307624508} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &6056553432024961644 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_L_2.prefab b/Assets/Prefab/Game/Slides/Star_L_2.prefab index eea43bf7..d519daaa 100644 --- a/Assets/Prefab/Game/Slides/Star_L_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_2.prefab @@ -263,7 +263,6 @@ GameObject: - component: {fileID: 1477381887162016954} - component: {fileID: 5947692140821331396} - component: {fileID: 8516245961990190175} - - component: {fileID: 6475943925538512338} - component: {fileID: 8894979029039445553} m_Layer: 0 m_Name: Just_str @@ -360,19 +359,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &6475943925538512338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 737928938636884747} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &8894979029039445553 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1828,6 +1814,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: L2 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &5811950547420022797 diff --git a/Assets/Prefab/Game/Slides/Star_L_3.prefab b/Assets/Prefab/Game/Slides/Star_L_3.prefab index 825bf9a8..cfc649d5 100644 --- a/Assets/Prefab/Game/Slides/Star_L_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_3.prefab @@ -1022,6 +1022,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: L3 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &3544393113263502257 @@ -2799,7 +2800,6 @@ GameObject: - component: {fileID: 189913620692579584} - component: {fileID: 3646517271426061774} - component: {fileID: 8157027934980207907} - - component: {fileID: 999293329073050797} - component: {fileID: 7791965344498038904} m_Layer: 0 m_Name: Just_str @@ -2896,19 +2896,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &999293329073050797 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8802423058899538199} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &7791965344498038904 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_L_4.prefab b/Assets/Prefab/Game/Slides/Star_L_4.prefab index 98ba8396..5cfa40f6 100644 --- a/Assets/Prefab/Game/Slides/Star_L_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_4.prefab @@ -347,7 +347,6 @@ GameObject: - component: {fileID: 4136122414293237498} - component: {fileID: 6277081141908523130} - component: {fileID: 253671643982781152} - - component: {fileID: 1720479180698604845} - component: {fileID: 2493164809977308998} m_Layer: 0 m_Name: Just_str @@ -444,19 +443,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1720479180698604845 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2805819883205920509} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &2493164809977308998 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2416,6 +2402,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: L4 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8191849591632476485 diff --git a/Assets/Prefab/Game/Slides/Star_L_5.prefab b/Assets/Prefab/Game/Slides/Star_L_5.prefab index 6961fe8b..a2b788fb 100644 --- a/Assets/Prefab/Game/Slides/Star_L_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_L_5.prefab @@ -2027,7 +2027,6 @@ GameObject: - component: {fileID: 8856203951160341924} - component: {fileID: 7916337113856749932} - component: {fileID: 6879723235371703819} - - component: {fileID: 275814942023385725} - component: {fileID: 7573240167559242336} m_Layer: 0 m_Name: Just_str @@ -2124,19 +2123,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &275814942023385725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7545855411980673724} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &7573240167559242336 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2412,6 +2398,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: L5 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &9004375827057786586 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab index f5f34713..3d71c37e 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_1.prefab @@ -1779,6 +1779,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq1 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4517341654776747428 @@ -2800,7 +2801,6 @@ GameObject: - component: {fileID: 6576045817776909188} - component: {fileID: 2504946802681868391} - component: {fileID: 3378586745440054765} - - component: {fileID: 3236321453599128965} - component: {fileID: 3143933057450872233} m_Layer: 0 m_Name: Just_str @@ -2897,19 +2897,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &3236321453599128965 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7563555400941975376} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &3143933057450872233 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab index 927fae18..7f7599d3 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_2.prefab @@ -1103,7 +1103,6 @@ GameObject: - component: {fileID: 8921031264339709243} - component: {fileID: 4846656382273755614} - component: {fileID: 1757290379809052392} - - component: {fileID: 7129040920298001688} - component: {fileID: 1893254940867606880} m_Layer: 0 m_Name: Just_str @@ -1200,19 +1199,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7129040920298001688 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5488564208961952608} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &1893254940867606880 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2412,6 +2398,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq2 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8580206461961989832 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab index f92d5f2d..c74214fa 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_3.prefab @@ -1682,6 +1682,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq3 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &7396897144070760997 @@ -1863,7 +1864,6 @@ GameObject: - component: {fileID: 7897240608834503268} - component: {fileID: 1483698864512486559} - component: {fileID: 3803578158309551921} - - component: {fileID: 7206115094433232212} - component: {fileID: 5963169173311148938} m_Layer: 0 m_Name: Just_str @@ -1960,19 +1960,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7206115094433232212 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8285960806926904159} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &5963169173311148938 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab index 58b4ec4f..75ca93ea 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_4.prefab @@ -113,6 +113,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq4 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &146600403597225806 @@ -3906,7 +3907,6 @@ GameObject: - component: {fileID: 8950750867340217098} - component: {fileID: 1588611387089723431} - component: {fileID: 201730100021634621} - - component: {fileID: 4685107481370875633} - component: {fileID: 2200728221465524618} m_Layer: 0 m_Name: Just_str @@ -4003,19 +4003,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &4685107481370875633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7609955709331246145} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &2200728221465524618 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab index aff94160..b572cb86 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_5.prefab @@ -785,6 +785,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq5 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &996437527645057397 @@ -798,7 +799,6 @@ GameObject: - component: {fileID: 3057164659121080741} - component: {fileID: 8919058984412919728} - component: {fileID: 7189651467836669782} - - component: {fileID: 3074268211907478004} - component: {fileID: 6789507303487313909} m_Layer: 0 m_Name: Just_str @@ -895,19 +895,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &3074268211907478004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 996437527645057397} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &6789507303487313909 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab index 56c4bc2e..c1743b6a 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_6.prefab @@ -2044,6 +2044,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq6 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4833744931375690521 @@ -3569,7 +3570,6 @@ GameObject: - component: {fileID: 79620989499602251} - component: {fileID: 7345606126681490629} - component: {fileID: 6337503848221151796} - - component: {fileID: 4672992139027908581} - component: {fileID: 5295357268941778248} m_Layer: 0 m_Name: Just_str @@ -3666,19 +3666,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &4672992139027908581 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7702985124661991601} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &5295357268941778248 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab index e22f3afb..e76f902a 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_7.prefab @@ -3722,6 +3722,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq7 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8772722309363375930 @@ -3987,7 +3988,6 @@ GameObject: - component: {fileID: 1199531215474873966} - component: {fileID: 7720560122247702519} - component: {fileID: 2142934262348833444} - - component: {fileID: 5817684696771556823} - component: {fileID: 8239583625264658571} m_Layer: 0 m_Name: Just_str @@ -4084,19 +4084,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5817684696771556823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9096667417146528383} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &8239583625264658571 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab b/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab index b1e55216..7c74afcb 100644 --- a/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_ppqq_8.prefab @@ -1019,7 +1019,6 @@ GameObject: - component: {fileID: 7593562862540429754} - component: {fileID: 1725205969392519927} - component: {fileID: 3245242406558185748} - - component: {fileID: 5353977932775984348} - component: {fileID: 6079172355758177034} m_Layer: 0 m_Name: Just_str @@ -1116,19 +1115,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5353977932775984348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2691869242943687650} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &6079172355758177034 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1837,6 +1823,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: ppqq8 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &4471034425484838123 diff --git a/Assets/Prefab/Game/Slides/Star_pq_1.prefab b/Assets/Prefab/Game/Slides/Star_pq_1.prefab index 2c22a797..da5b8050 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_1.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_1.prefab @@ -683,7 +683,6 @@ GameObject: - component: {fileID: 3042996818074314441} - component: {fileID: 3413973689074666323} - component: {fileID: 882539706607425167} - - component: {fileID: 6430534858730084549} - component: {fileID: 4998707173682047162} m_Layer: 0 m_Name: Just_str @@ -780,19 +779,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &6430534858730084549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2429965903983850809} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &4998707173682047162 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2165,6 +2151,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq1 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &7134940954673391103 diff --git a/Assets/Prefab/Game/Slides/Star_pq_2.prefab b/Assets/Prefab/Game/Slides/Star_pq_2.prefab index f2b4f911..0e6a948c 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_2.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_2.prefab @@ -515,7 +515,6 @@ GameObject: - component: {fileID: 4198466887280069933} - component: {fileID: 7174627987073953715} - component: {fileID: 1180887138962396508} - - component: {fileID: 5577329404184570467} - component: {fileID: 143558944012216271} m_Layer: 0 m_Name: Just_str @@ -612,19 +611,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5577329404184570467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2895338047576736937} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &143558944012216271 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2246,6 +2232,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq2 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8340445480101220833 diff --git a/Assets/Prefab/Game/Slides/Star_pq_3.prefab b/Assets/Prefab/Game/Slides/Star_pq_3.prefab index c80fb1b3..483200af 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_3.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_3.prefab @@ -1603,6 +1603,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq3 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &6647266310545108700 @@ -1784,7 +1785,6 @@ GameObject: - component: {fileID: 1117520241052736366} - component: {fileID: 7988978152462173037} - component: {fileID: 4725628379590947854} - - component: {fileID: 5812929851750370229} - component: {fileID: 199471142086674464} m_Layer: 0 m_Name: Just_str @@ -1881,19 +1881,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &5812929851750370229 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6926934977099510170} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &199471142086674464 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_4.prefab b/Assets/Prefab/Game/Slides/Star_pq_4.prefab index ca06ee56..34d54e90 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_4.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_4.prefab @@ -1271,7 +1271,6 @@ GameObject: - component: {fileID: 9135558724515080981} - component: {fileID: 8327770620473035019} - component: {fileID: 8862562638386270218} - - component: {fileID: 7395842945896915127} - component: {fileID: 9158144410271720952} m_Layer: 0 m_Name: Just_str @@ -1368,19 +1367,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7395842945896915127 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5641116732402798543} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &9158144410271720952 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1904,6 +1890,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq4 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &8655302532841722744 diff --git a/Assets/Prefab/Game/Slides/Star_pq_5.prefab b/Assets/Prefab/Game/Slides/Star_pq_5.prefab index dc6ad7a1..5dc67388 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_5.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_5.prefab @@ -589,6 +589,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq5 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &2284099411173797767 @@ -1778,7 +1779,6 @@ GameObject: - component: {fileID: 5942760481481724994} - component: {fileID: 8586261027833094678} - component: {fileID: 2684445064800682238} - - component: {fileID: 8778105657910542504} - component: {fileID: 5292460994918341083} m_Layer: 0 m_Name: Just_str @@ -1875,19 +1875,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &8778105657910542504 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8759126402733621386} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &5292460994918341083 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_6.prefab b/Assets/Prefab/Game/Slides/Star_pq_6.prefab index 6fdb3889..9c143c10 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_6.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_6.prefab @@ -1103,7 +1103,6 @@ GameObject: - component: {fileID: 6067484357363937285} - component: {fileID: 83893825657118097} - component: {fileID: 1847438871312501364} - - component: {fileID: 6181247627071157322} - component: {fileID: 1887598807149295365} m_Layer: 0 m_Name: Just_str @@ -1200,19 +1199,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &6181247627071157322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3904608617776259898} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &1887598807149295365 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3770,5 +3756,6 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq6 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_7.prefab b/Assets/Prefab/Game/Slides/Star_pq_7.prefab index 4711d270..9884ccf3 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_7.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_7.prefab @@ -2456,6 +2456,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq7 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &6393229959341328161 @@ -2721,7 +2722,6 @@ GameObject: - component: {fileID: 7022566368858204207} - component: {fileID: 6745324483940378180} - component: {fileID: 605979005507627779} - - component: {fileID: 6352169262815153612} - component: {fileID: 4725199339680220289} m_Layer: 0 m_Name: Just_str @@ -2818,19 +2818,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &6352169262815153612 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7151622756559305292} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &4725199339680220289 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefab/Game/Slides/Star_pq_8.prefab b/Assets/Prefab/Game/Slides/Star_pq_8.prefab index 3d464892..83a2005e 100644 --- a/Assets/Prefab/Game/Slides/Star_pq_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_pq_8.prefab @@ -520,6 +520,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: pq8 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &1590452806205293865 @@ -2717,7 +2718,6 @@ GameObject: - component: {fileID: 5646482134862962482} - component: {fileID: 7599656736436161274} - component: {fileID: 5976989563808148532} - - component: {fileID: 1412160725243801953} - component: {fileID: 6889559904755844144} m_Layer: 0 m_Name: Just_str @@ -2814,19 +2814,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1412160725243801953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7893239407966762739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &6889559904755844144 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Misc/Types/Enums/NoteStatus.cs b/Assets/Script/Misc/Types/Enums/NoteStatus.cs index 55ff425c..619d2900 100644 --- a/Assets/Script/Misc/Types/Enums/NoteStatus.cs +++ b/Assets/Script/Misc/Types/Enums/NoteStatus.cs @@ -3,7 +3,6 @@ public enum NoteStatus { Start, - PreInitialized, Initialized, Scaling, Running, diff --git a/Assets/Script/Scenes/Game/Notes/SlideBase.cs b/Assets/Script/Scenes/Game/Notes/SlideBase.cs index 8394ceb8..9c390417 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideBase.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideBase.cs @@ -131,8 +131,6 @@ public float SlideLength protected bool _isCheckable = false; protected bool _isSoundPlayed = false; protected bool _isChecking = false; - protected bool _isStarActive = false; - protected bool _isArrived = false; public abstract void Initialize(); protected override void Judge(float currentSec) From 3dc21d087f9b5b3f6ec6907943e24c1fc04bceca Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 13:39:36 +0800 Subject: [PATCH 11/26] perf: SlideOK --- Assets/Prefab/Game/Slides/Star_Circle_8.prefab | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Assets/Prefab/Game/Slides/Star_Circle_8.prefab b/Assets/Prefab/Game/Slides/Star_Circle_8.prefab index 44effa6d..cab797a0 100644 --- a/Assets/Prefab/Game/Slides/Star_Circle_8.prefab +++ b/Assets/Prefab/Game/Slides/Star_Circle_8.prefab @@ -347,7 +347,6 @@ GameObject: - component: {fileID: 6337358977022435737} - component: {fileID: 5923824587172886082} - component: {fileID: 5119147417171046117} - - component: {fileID: 7360183491313216835} - component: {fileID: 2313626896766993415} m_Layer: 0 m_Name: Just_curv @@ -444,19 +443,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &7360183491313216835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 355543776150517975} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ff4d7167d6265845aade36b6f37d48c, type: 3} - m_Name: - m_EditorClassIdentifier: - ifDestroy: 0 --- !u!114 &2313626896766993415 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1011,6 +997,7 @@ MonoBehaviour: _fullFadeInTiming: 0.2 _endPos: 1 _slideType: circle8 + _slideLength: 0 _isMirror: 0 _isSpecialFlip: 0 --- !u!1 &1266724528122456748 From 87eb7c2a0b8f373b6ec4cd4960d825915b1b246a Mon Sep 17 00:00:00 2001 From: bbb Date: Tue, 14 Jan 2025 15:03:38 +0800 Subject: [PATCH 12/26] feat: shared wasapi --- Assets/Script/DontDestroy/IO/AudioManager.cs | 32 +++++++++++++++---- .../Misc/Types/Enums/SoundBackendType.cs | 2 +- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/Assets/Script/DontDestroy/IO/AudioManager.cs b/Assets/Script/DontDestroy/IO/AudioManager.cs index 96d3ebba..23994a5c 100644 --- a/Assets/Script/DontDestroy/IO/AudioManager.cs +++ b/Assets/Script/DontDestroy/IO/AudioManager.cs @@ -77,6 +77,7 @@ void Start() BassAsio.Start(); } break; + case SoundBackendType.WasapiShared: case SoundBackendType.Wasapi: { //Bass.Init(-1, sampleRate); @@ -91,12 +92,23 @@ void Start() return Bass.ChannelGetData(BassGlobalMixer, buffer, length); }; - MajDebug.Log("Wasapi Init: " + BassWasapi.Init( - -1, 0, 0, - WasapiInitFlags.Exclusive | WasapiInitFlags.EventDriven | WasapiInitFlags.Async | WasapiInitFlags.Raw, - 0.02f, //buffer - 0.005f, //peried - wasapiProcedure)); + if (backend == SoundBackendType.WasapiShared) + { + MajDebug.Log("Wasapi Init: " + BassWasapi.Init( + -1, 0, 0, + WasapiInitFlags.Exclusive | WasapiInitFlags.EventDriven | WasapiInitFlags.Async | WasapiInitFlags.Raw, + 0.02f, //buffer + 0.005f, //peried + wasapiProcedure)); + } + else { + MajDebug.Log("Wasapi Init: " + BassWasapi.Init( + -1, 0, 0, + WasapiInitFlags.Shared | WasapiInitFlags.EventDriven | WasapiInitFlags.Raw, + 0, //buffer + 0, //peried + wasapiProcedure)); + } MajDebug.Log(Bass.LastError); BassWasapi.GetInfo(out var wasapiInfo); BassGlobalMixer = BassMix.CreateMixerStream(wasapiInfo.Frequency, wasapiInfo.Channels, BassFlags.MixerNonStop | BassFlags.Decode | BassFlags.Float); @@ -133,6 +145,7 @@ void InitSFXSample(string[] fileNameList,string rootPath) break; case SoundBackendType.Asio: case SoundBackendType.Wasapi: + case SoundBackendType.WasapiShared: sample = BassAudioSample.Create(path, BassGlobalMixer, false, false); break; default: @@ -168,7 +181,8 @@ void OnAnyAreaDown(object sender, InputEventArgs e) private void OnDestroy() { if(MajInstances.Setting.Audio.Backend == SoundBackendType.Wasapi - || MajInstances.Setting.Audio.Backend == SoundBackendType.Asio) + || MajInstances.Setting.Audio.Backend == SoundBackendType.Asio|| + MajInstances.Setting.Audio.Backend == SoundBackendType.WasapiShared) { foreach (var sample in SFXSamples) { @@ -218,6 +232,7 @@ public void ReadVolumeFromSettings() return UnityAudioSample.Create($"file://{path}", gameObject); case SoundBackendType.Asio: case SoundBackendType.Wasapi: + case SoundBackendType.WasapiShared: return BassAudioSample.Create(path, BassGlobalMixer, true, speedChange); default: throw new NotImplementedException("Backend not supported"); @@ -238,6 +253,7 @@ public void ReadVolumeFromSettings() return UnityAudioSample.Create(uri.OriginalString, gameObject); case SoundBackendType.Asio: case SoundBackendType.Wasapi: + case SoundBackendType.WasapiShared: return BassAudioSample.CreateFromUri(uri, BassGlobalMixer); default: throw new NotImplementedException("Backend not supported"); @@ -256,6 +272,7 @@ public void ReadVolumeFromSettings() return await UnityAudioSample.CreateAsync($"file://{path}", gameObject); case SoundBackendType.Asio: case SoundBackendType.Wasapi: + case SoundBackendType.WasapiShared: return await BassAudioSample.CreateAsync(path, BassGlobalMixer, true, speedChange); default: throw new NotImplementedException("Backend not supported"); @@ -278,6 +295,7 @@ public void ReadVolumeFromSettings() return await UnityAudioSample.CreateAsync(uri.OriginalString, gameObject); case SoundBackendType.Asio: case SoundBackendType.Wasapi: + case SoundBackendType.WasapiShared: return BassAudioSample.CreateFromUri(uri, BassGlobalMixer); default: throw new NotImplementedException("Backend not supported"); diff --git a/Assets/Script/Misc/Types/Enums/SoundBackendType.cs b/Assets/Script/Misc/Types/Enums/SoundBackendType.cs index c935c4c7..8d9c2d08 100644 --- a/Assets/Script/Misc/Types/Enums/SoundBackendType.cs +++ b/Assets/Script/Misc/Types/Enums/SoundBackendType.cs @@ -2,6 +2,6 @@ { public enum SoundBackendType { - Unity, Wasapi, Asio + Unity, Wasapi, Asio, WasapiShared } } From b3acd3836df5f0f810dbe537d376a8f4eef3ca6e Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 15:04:56 +0800 Subject: [PATCH 13/26] perf: SlideTable --- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 13 +- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 4 +- Assets/Script/Scenes/Game/Types/SlideArea.cs | 24 +- .../Script/Scenes/Game/Utils/SlideTables.cs | 599 +++++++++--------- 4 files changed, 338 insertions(+), 302 deletions(-) diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 0e2437c3..29d4333d 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -377,14 +377,14 @@ void CheckSensor() if (second.IsFinished) { - HideBar(first.SlideIndex); + HideBar(second.ArrowProgressWhenFinished); queueMemory = queueMemory.Slice(2); SetParentFinish(); return; } else if (second.On) { - HideBar(first.SlideIndex); + HideBar(first.ArrowProgressWhenOn); queueMemory = queueMemory.Slice(1); SetParentFinish(); return; @@ -393,11 +393,16 @@ void CheckSensor() if (first.IsFinished) { - HideBar(first.SlideIndex); + HideBar(first.ArrowProgressWhenFinished); queueMemory = queueMemory.Slice(1); SetParentFinish(); return; } + else if(first.On) + { + HideBar(first.ArrowProgressWhenOn); + return; + } } finally { @@ -557,7 +562,7 @@ protected override void Autoplay() var areaIndex = (int)(process * queueMemory.Length) - 1; if (areaIndex < 0) return; - var barIndex = queue[areaIndex].SlideIndex; + var barIndex = queue[areaIndex].ArrowProgressWhenFinished; HideBar(barIndex); } void ApplyStarRotation(Quaternion newRotation) diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 75696f9d..2cf74821 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -307,7 +307,7 @@ int GetIndex() var max = nums.Max(); var index = nums.FindIndex(x => x == max); - return _judgeQueues[index].Span[0].SlideIndex; + return _judgeQueues[index].Span[0].ArrowProgressWhenFinished; } public override void ComponentUpdate() { @@ -417,7 +417,7 @@ protected override void Autoplay() var areaIndex = (int)(process * queueMemory.Length) - 1; if (areaIndex < 0) return; - var barIndex = queue[areaIndex].SlideIndex; + var barIndex = queue[areaIndex].ArrowProgressWhenFinished; HideBar(barIndex); } protected override void TooLateJudge() diff --git a/Assets/Script/Scenes/Game/Types/SlideArea.cs b/Assets/Script/Scenes/Game/Types/SlideArea.cs index b890bfc5..341a0426 100644 --- a/Assets/Script/Scenes/Game/Types/SlideArea.cs +++ b/Assets/Script/Scenes/Game/Types/SlideArea.cs @@ -23,17 +23,24 @@ public bool IsFinished } public ReadOnlySpan IncludedAreas => _includedAreas.Span; public AreaPolicy Policy { get; init; } = AreaPolicy.OR; - public int SlideIndex { get; set; } - + public int ArrowProgressWhenFinished + { + get => _arrowProgressWhenFinished; + } + public int ArrowProgressWhenOn + { + get => _arrowProgressWhenOn; + } bool _isFinished = false; bool _isOn = false; + int _arrowProgressWhenFinished = 0; + int _arrowProgressWhenOn = 0; Memory _areas = Memory.Empty; ReadOnlyMemory _includedAreas = Memory.Empty; - - public SlideArea(Dictionary types, int slideIndex) + + public SlideArea(Dictionary types,int progressWhenOn ,int progressWhenFinished) { - SlideIndex = slideIndex; if (types is null || types.Count == 0) return; Span registeredAreas = stackalloc SensorType?[types.Count]; @@ -68,7 +75,12 @@ public SlideArea(Dictionary types, int slideIndex) } this._areas = _areas.ToArray(); _includedAreas = _registeredAreas.ToArray(); - SlideIndex = slideIndex; + _arrowProgressWhenFinished = progressWhenFinished; + _arrowProgressWhenOn = progressWhenOn; + } + public SlideArea(Dictionary types, int arrowProgress) : this(types, arrowProgress, arrowProgress) + { + } public SlideArea() { diff --git a/Assets/Script/Scenes/Game/Utils/SlideTables.cs b/Assets/Script/Scenes/Game/Utils/SlideTables.cs index 2dab3f4d..a1c2697a 100644 --- a/Assets/Script/Scenes/Game/Utils/SlideTables.cs +++ b/Assets/Script/Scenes/Game/Utils/SlideTables.cs @@ -17,8 +17,8 @@ public static class SlideTables Name = "circle2", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3,false), - BuildJudgeArea(SensorType.A2,7,true,true) + BuildSlideArea(SensorType.A1,0,3,false), + BuildSlideArea(SensorType.A2,5,7,true,true) }, Const = 0.46526f }, @@ -27,9 +27,9 @@ public static class SlideTables Name = "circle3", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11,false), - BuildJudgeArea(SensorType.A3,15,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11,false), + BuildSlideArea(SensorType.A3,13,15,true,true) }, Const = 0.23263f }, @@ -38,10 +38,10 @@ public static class SlideTables Name = "circle4", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11), - BuildJudgeArea(SensorType.A3,19), - BuildJudgeArea(SensorType.A4,23,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11), + BuildSlideArea(SensorType.A3,14,19), + BuildSlideArea(SensorType.A4,21,23,true,true) }, Const = 0.15509f }, @@ -50,11 +50,11 @@ public static class SlideTables Name = "circle5", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11), - BuildJudgeArea(SensorType.A3,19), - BuildJudgeArea(SensorType.A4,27), - BuildJudgeArea(SensorType.A5,31,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11), + BuildSlideArea(SensorType.A3,14,19), + BuildSlideArea(SensorType.A4,23,27), + BuildSlideArea(SensorType.A5,29,31,true,true) }, Const = 0.11631f }, @@ -63,12 +63,12 @@ public static class SlideTables Name = "circle6", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11), - BuildJudgeArea(SensorType.A3,19), - BuildJudgeArea(SensorType.A4,27), - BuildJudgeArea(SensorType.A5,35), - BuildJudgeArea(SensorType.A6,39,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11), + BuildSlideArea(SensorType.A3,14,19), + BuildSlideArea(SensorType.A4,23,27), + BuildSlideArea(SensorType.A5,31,35), + BuildSlideArea(SensorType.A6,37,39,true,true) }, Const = 0.09305f }, @@ -77,13 +77,13 @@ public static class SlideTables Name = "circle7", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11), - BuildJudgeArea(SensorType.A3,19), - BuildJudgeArea(SensorType.A4,27), - BuildJudgeArea(SensorType.A5,35), - BuildJudgeArea(SensorType.A6,43), - BuildJudgeArea(SensorType.A7,47,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11), + BuildSlideArea(SensorType.A3,14,19), + BuildSlideArea(SensorType.A4,23,27), + BuildSlideArea(SensorType.A5,31,35), + BuildSlideArea(SensorType.A6,39,43), + BuildSlideArea(SensorType.A7,45,47,true,true) }, Const = 0.07754f }, @@ -92,14 +92,14 @@ public static class SlideTables Name = "circle8", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11), - BuildJudgeArea(SensorType.A3,19), - BuildJudgeArea(SensorType.A4,27), - BuildJudgeArea(SensorType.A5,35), - BuildJudgeArea(SensorType.A6,43), - BuildJudgeArea(SensorType.A7,50), - BuildJudgeArea(SensorType.A8,55,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11), + BuildSlideArea(SensorType.A3,14,19), + BuildSlideArea(SensorType.A4,23,27), + BuildSlideArea(SensorType.A5,31,35), + BuildSlideArea(SensorType.A6,39,43), + BuildSlideArea(SensorType.A7,46,50), + BuildSlideArea(SensorType.A8,53,55,true,true) }, Const = 0.06647f }, @@ -108,15 +108,15 @@ public static class SlideTables Name = "circle1", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.A2,11), - BuildJudgeArea(SensorType.A3,19), - BuildJudgeArea(SensorType.A4,27), - BuildJudgeArea(SensorType.A5,35), - BuildJudgeArea(SensorType.A6,43), - BuildJudgeArea(SensorType.A7,50), - BuildJudgeArea(SensorType.A8,58), - BuildJudgeArea(SensorType.A1,63,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.A2,7,11), + BuildSlideArea(SensorType.A3,14,19), + BuildSlideArea(SensorType.A4,23,27), + BuildSlideArea(SensorType.A5,31,35), + BuildSlideArea(SensorType.A6,39,43), + BuildSlideArea(SensorType.A7,46,50), + BuildSlideArea(SensorType.A8,54,58), + BuildSlideArea(SensorType.A1,61,63,true,true) }, Const = 0.05816f }, @@ -125,9 +125,9 @@ public static class SlideTables Name = "line3", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,2), - BuildJudgeArea(new SensorType[]{SensorType.A2,SensorType.B2 },8,false), - BuildJudgeArea(SensorType.A3,13,true,true) + BuildSlideArea(SensorType.A1,0,2), + BuildSlideArea(new SensorType[]{SensorType.A2,SensorType.B2 },5,8,false), + BuildSlideArea(SensorType.A3,10,13,true,true) }, Const = 0.19195f }, @@ -136,10 +136,10 @@ public static class SlideTables Name = "line4", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B2,8), - BuildJudgeArea(SensorType.B3,12), - BuildJudgeArea(SensorType.A4,18,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B2,5,8), + BuildSlideArea(SensorType.B3,10,12), + BuildSlideArea(SensorType.A4,15,18,true,true) }, Const = 0.17929f }, @@ -148,11 +148,11 @@ public static class SlideTables Name = "line5", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B5,15), - BuildJudgeArea(SensorType.A5,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,9,11), + BuildSlideArea(SensorType.B5,13,15), + BuildSlideArea(SensorType.A5,17,19,true,true) }, Const = 0.16287f }, @@ -161,10 +161,10 @@ public static class SlideTables Name = "line6", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,12), - BuildJudgeArea(SensorType.A6,18,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5,8), + BuildSlideArea(SensorType.B7,10,12), + BuildSlideArea(SensorType.A6,15,18,true,true) }, Const = 0.17929f }, @@ -173,9 +173,9 @@ public static class SlideTables Name = "line7", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,2), - BuildJudgeArea(new SensorType[]{SensorType.A8,SensorType.B8 },8,false), - BuildJudgeArea(SensorType.A7,13,true,true) + BuildSlideArea(SensorType.A1,0,2), + BuildSlideArea(new SensorType[]{SensorType.A8,SensorType.B8 },5,8,false), + BuildSlideArea(SensorType.A7,10,13,true,true) }, Const = 0.19195f }, @@ -184,11 +184,11 @@ public static class SlideTables Name = "v1", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B1,15), - BuildJudgeArea(SensorType.A1,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B1,13,15), + BuildSlideArea(SensorType.A1,17,19,true,true) }, Const = 0.16287f }, @@ -197,11 +197,11 @@ public static class SlideTables Name = "v2", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B2,15), - BuildJudgeArea(SensorType.A2,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B2,13,15), + BuildSlideArea(SensorType.A2,17,19,true,true) }, Const = 0.16287f }, @@ -210,11 +210,11 @@ public static class SlideTables Name = "v3", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B3,15), - BuildJudgeArea(SensorType.A3,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B3,13,15), + BuildSlideArea(SensorType.A3,17,19,true,true) }, Const = 0.16287f }, @@ -223,11 +223,11 @@ public static class SlideTables Name = "v4", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B4,15), - BuildJudgeArea(SensorType.A4,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B4,13,15), + BuildSlideArea(SensorType.A4,17,19,true,true) }, Const = 0.16287f }, @@ -236,11 +236,11 @@ public static class SlideTables Name = "v6", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B6,15), - BuildJudgeArea(SensorType.A6,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B6,13,15), + BuildSlideArea(SensorType.A6,17,19,true,true) }, Const = 0.16287f }, @@ -249,11 +249,11 @@ public static class SlideTables Name = "v7", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B7,15), - BuildJudgeArea(SensorType.A7,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B7,13,15), + BuildSlideArea(SensorType.A7,17,19,true,true) }, Const = 0.16287f }, @@ -262,11 +262,11 @@ public static class SlideTables Name = "v8", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,11), - BuildJudgeArea(SensorType.B8,15), - BuildJudgeArea(SensorType.A8,19,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,8,11), + BuildSlideArea(SensorType.B8,13,15), + BuildSlideArea(SensorType.A8,17,19,true,true) }, Const = 0.16287f }, @@ -275,13 +275,13 @@ public static class SlideTables Name = "ppqq1", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,13), - BuildJudgeArea(SensorType.B4,17), - BuildJudgeArea(SensorType.A3,26), - BuildJudgeArea(SensorType.A2,32), - BuildJudgeArea(SensorType.A1,35,true,true) + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,10,13), + BuildSlideArea(SensorType.B4,15,17), + BuildSlideArea(SensorType.A3,21,26), + BuildSlideArea(SensorType.A2,29,32), + BuildSlideArea(SensorType.A1,33,35,true,true) }, Const = 0.073445f @@ -291,12 +291,12 @@ public static class SlideTables Name = "ppqq2", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,12), - BuildJudgeArea(SensorType.B4,16), - BuildJudgeArea(SensorType.A3,25), - BuildJudgeArea(SensorType.A2,28,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,9,12), + BuildSlideArea(SensorType.B4,14,16), + BuildSlideArea(SensorType.A3,20,25), + BuildSlideArea(SensorType.A2,26,28,true,true), }, Const = 0.087213f }, @@ -305,11 +305,11 @@ public static class SlideTables Name = "ppqq3", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,6), - BuildJudgeArea(SensorType.C,12), - BuildJudgeArea(SensorType.B4,15), - BuildJudgeArea(SensorType.A3,22,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,4,6), + BuildSlideArea(SensorType.C,9,12), + BuildSlideArea(SensorType.B4,13,15), + BuildSlideArea(SensorType.A3,19,22,true,true), }, Const = 0.15091f }, @@ -318,16 +318,16 @@ public static class SlideTables Name = "ppqq4", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,12), - BuildJudgeArea(SensorType.B4,16), - BuildJudgeArea(SensorType.A3,25), - BuildJudgeArea(SensorType.A2,29), - BuildJudgeArea(SensorType.B1,35), - BuildJudgeArea(SensorType.C,40), - BuildJudgeArea(SensorType.B4,44), - BuildJudgeArea(SensorType.A4,49,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,9,12), + BuildSlideArea(SensorType.B4,14,16), + BuildSlideArea(SensorType.A3,20,25), + BuildSlideArea(SensorType.A2,27,29), + BuildSlideArea(SensorType.B1,32,35), + BuildSlideArea(SensorType.C,37,40), + BuildSlideArea(SensorType.B4,42,44), + BuildSlideArea(SensorType.A4,46,49,true,true), }, Const = 0.06976f }, @@ -336,16 +336,16 @@ public static class SlideTables Name = "ppqq5", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,12), - BuildJudgeArea(SensorType.B4,16), - BuildJudgeArea(SensorType.A3,25), - BuildJudgeArea(SensorType.A2,29), - BuildJudgeArea(SensorType.B1,35), - BuildJudgeArea(SensorType.C,40), - BuildJudgeArea(SensorType.B5,44), - BuildJudgeArea(SensorType.A5,49,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,9,12), + BuildSlideArea(SensorType.B4,14,16), + BuildSlideArea(SensorType.A3,20,25), + BuildSlideArea(SensorType.A2,27,29), + BuildSlideArea(SensorType.B1,32,35), + BuildSlideArea(SensorType.C,37,40), + BuildSlideArea(SensorType.B5,42,44), + BuildSlideArea(SensorType.A5,46,49,true,true), }, Const = 0.06976f }, @@ -354,16 +354,16 @@ public static class SlideTables Name = "ppqq6", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,12), - BuildJudgeArea(SensorType.B4,16), - BuildJudgeArea(SensorType.A3,25), - BuildJudgeArea(SensorType.A2,28), - BuildJudgeArea(SensorType.B1,34), - BuildJudgeArea(new SensorType[] { SensorType.C,SensorType.B8 },38), - BuildJudgeArea(new SensorType[] { SensorType.B7,SensorType.B6 },41), - BuildJudgeArea(SensorType.A6,48,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,9,12), + BuildSlideArea(SensorType.B4,14,16), + BuildSlideArea(SensorType.A3,20,25), + BuildSlideArea(SensorType.A2,26,28), + BuildSlideArea(SensorType.B1,31,34), + BuildSlideArea(new SensorType[] { SensorType.C,SensorType.B8 },36,38), + BuildSlideArea(new SensorType[] { SensorType.B7,SensorType.B6 },39,41), + BuildSlideArea(SensorType.A6,45,48,true,true), }, Const = 0.07107f }, @@ -372,15 +372,15 @@ public static class SlideTables Name = "ppqq7", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,13), - BuildJudgeArea(SensorType.B4,17), - BuildJudgeArea(SensorType.A3,27), - BuildJudgeArea(SensorType.A2,31), - BuildJudgeArea(SensorType.B1,37), - BuildJudgeArea(SensorType.B8,41), - BuildJudgeArea(SensorType.A7,46,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,10,13), + BuildSlideArea(SensorType.B4,15,17), + BuildSlideArea(SensorType.A3,22,27), + BuildSlideArea(SensorType.A2,29,31), + BuildSlideArea(SensorType.B1,34,37), + BuildSlideArea(SensorType.B8,39,41), + BuildSlideArea(SensorType.A7,43,46,true,true), }, Const = 0.08106f }, @@ -389,14 +389,14 @@ public static class SlideTables Name = "ppqq8", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B1,7), - BuildJudgeArea(SensorType.C,12), - BuildJudgeArea(SensorType.B4,16), - BuildJudgeArea(SensorType.A3,25), - BuildJudgeArea(SensorType.A2,29), - BuildJudgeArea(new SensorType[] { SensorType.B1,SensorType.A1 },35), - BuildJudgeArea(SensorType.A8,41,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B1,5,7), + BuildSlideArea(SensorType.C,9,12), + BuildSlideArea(SensorType.B4,14,16), + BuildSlideArea(SensorType.A3,20,25), + BuildSlideArea(SensorType.A2,27,29), + BuildSlideArea(new SensorType[] { SensorType.B1,SensorType.A1 },32,35), + BuildSlideArea(SensorType.A8,38,41,true,true), }, Const = 0.06027f }, @@ -405,12 +405,12 @@ public static class SlideTables Name = "L2", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,2), - BuildJudgeArea(new SensorType[] { SensorType.B8,SensorType.A8 },7,false), - BuildJudgeArea(SensorType.A7,15), - BuildJudgeArea(SensorType.B8,21), - BuildJudgeArea(SensorType.A1,26), - BuildJudgeArea(SensorType.A2,32,true,true), + BuildSlideArea(SensorType.A1,0,2), + BuildSlideArea(new SensorType[] { SensorType.B8,SensorType.A8 },4,7,false), + BuildSlideArea(SensorType.A7,11,15), + BuildSlideArea(SensorType.B8,18,21), + BuildSlideArea(SensorType.A1,23,26), + BuildSlideArea(SensorType.A2,29,32,true,true), }, Const = 0.09482f }, @@ -419,13 +419,13 @@ public static class SlideTables Name = "L3", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,2), - BuildJudgeArea(new SensorType[] { SensorType.B8,SensorType.A8 },8,false), - BuildJudgeArea(SensorType.A7,17), - BuildJudgeArea(SensorType.B7,22), - BuildJudgeArea(SensorType.C,26), - BuildJudgeArea(SensorType.B3,29), - BuildJudgeArea(SensorType.A3,34,true,true), + BuildSlideArea(SensorType.A1,0,2), + BuildSlideArea(new SensorType[] { SensorType.B8,SensorType.A8 },5,8,false), + BuildSlideArea(SensorType.A7,12,17), + BuildSlideArea(SensorType.B7,19,22), + BuildSlideArea(SensorType.C,24,26), + BuildSlideArea(SensorType.B3,27,29), + BuildSlideArea(SensorType.A3,31,34,true,true), }, Const = 0.09546f }, @@ -434,12 +434,12 @@ public static class SlideTables Name = "L4", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,2), - BuildJudgeArea(new SensorType[] { SensorType.B8,SensorType.A8 },8,false), - BuildJudgeArea(SensorType.A7,17), - BuildJudgeArea(SensorType.B6,22), - BuildJudgeArea(SensorType.B5,26), - BuildJudgeArea(SensorType.A4,32,true,true), + BuildSlideArea(SensorType.A1,0,2), + BuildSlideArea(new SensorType[] { SensorType.B8,SensorType.A8 },5,8,false), + BuildSlideArea(SensorType.A7,12,17), + BuildSlideArea(SensorType.B6,19,22), + BuildSlideArea(SensorType.B5,24,26), + BuildSlideArea(SensorType.A4,29,32,true,true), }, Const = 0.10176f }, @@ -448,11 +448,11 @@ public static class SlideTables Name = "L5", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,2), - BuildJudgeArea(new SensorType[] { SensorType.B8,SensorType.A8 },8,false), - BuildJudgeArea(SensorType.A7,16), - BuildJudgeArea(new SensorType[] { SensorType.B6,SensorType.A6 },22,false), - BuildJudgeArea(SensorType.A5,28,true,true), + BuildSlideArea(SensorType.A1,0,2), + BuildSlideArea(new SensorType[] { SensorType.B8,SensorType.A8 },5,8,false), + BuildSlideArea(SensorType.A7,12,16), + BuildSlideArea(new SensorType[] { SensorType.B6,SensorType.A6 },19,22,false), + BuildSlideArea(SensorType.A5,25,28,true,true), }, Const = 0.09598f }, @@ -461,13 +461,13 @@ public static class SlideTables Name = "s", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,11), - BuildJudgeArea(SensorType.C,17), - BuildJudgeArea(SensorType.B3,21), - BuildJudgeArea(SensorType.B4,24), - BuildJudgeArea(SensorType.A5,30,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5,8), + BuildSlideArea(SensorType.B7,9,11), + BuildSlideArea(SensorType.C,14,17), + BuildSlideArea(SensorType.B3,19,21), + BuildSlideArea(SensorType.B4,22,24), + BuildSlideArea(SensorType.A5,27,30,true,true), }, Const = 0.10546f }, @@ -476,15 +476,15 @@ public static class SlideTables Name = "pq1", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,11), - BuildJudgeArea(SensorType.B6,14), - BuildJudgeArea(SensorType.B5,17), - BuildJudgeArea(SensorType.B4,21), - BuildJudgeArea(SensorType.B3,24), - BuildJudgeArea(SensorType.B2,27), - BuildJudgeArea(SensorType.A1,33,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5, 8), + BuildSlideArea(SensorType.B7,9,11), + BuildSlideArea(SensorType.B6,12,14), + BuildSlideArea(SensorType.B5,15,17), + BuildSlideArea(SensorType.B4,19,21), + BuildSlideArea(SensorType.B3,22,24), + BuildSlideArea(SensorType.B2,25,27), + BuildSlideArea(SensorType.A1,30,33,true,true), }, Const = 0.09215f }, @@ -493,14 +493,14 @@ public static class SlideTables Name = "pq2", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,11), - BuildJudgeArea(SensorType.B6,14), - BuildJudgeArea(SensorType.B5,18), - BuildJudgeArea(SensorType.B4,21), - BuildJudgeArea(SensorType.B3,24), - BuildJudgeArea(SensorType.A2,30,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5,8), + BuildSlideArea(SensorType.B7,9,11), + BuildSlideArea(SensorType.B6,12,14), + BuildSlideArea(SensorType.B5,16,18), + BuildSlideArea(SensorType.B4,19,21), + BuildSlideArea(SensorType.B3,22,24), + BuildSlideArea(SensorType.A2,27,30,true,true), }, Const = 0.10208f }, @@ -509,13 +509,13 @@ public static class SlideTables Name = "pq3", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,9), - BuildJudgeArea(SensorType.B7,12), - BuildJudgeArea(SensorType.B6,16), - BuildJudgeArea(SensorType.B5,19), - BuildJudgeArea(SensorType.B4,23), - BuildJudgeArea(SensorType.A3,27,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,6,9), + BuildSlideArea(SensorType.B7,10,12), + BuildSlideArea(SensorType.B6,14,16), + BuildSlideArea(SensorType.B5,17,19), + BuildSlideArea(SensorType.B4,21,23), + BuildSlideArea(SensorType.A3,25,27,true,true), }, Const = 0.12468f }, @@ -524,12 +524,12 @@ public static class SlideTables Name = "pq4", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,9), - BuildJudgeArea(SensorType.B7,13), - BuildJudgeArea(SensorType.B6,16), - BuildJudgeArea(SensorType.B5,20), - BuildJudgeArea(SensorType.A4,24,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,6,9), + BuildSlideArea(SensorType.B7,11,13), + BuildSlideArea(SensorType.B6,14,16), + BuildSlideArea(SensorType.B5,18,20), + BuildSlideArea(SensorType.A4,22,24,true,true), }, Const = 0.14359f }, @@ -538,11 +538,11 @@ public static class SlideTables Name = "pq5", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,9), - BuildJudgeArea(SensorType.B7,13), - BuildJudgeArea(SensorType.B6,17), - BuildJudgeArea(SensorType.A5,21,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,6,9), + BuildSlideArea(SensorType.B7,11,13), + BuildSlideArea(SensorType.B6,15,17), + BuildSlideArea(SensorType.A5,19,21,true,true), }, Const = 0.16925f }, @@ -551,18 +551,18 @@ public static class SlideTables Name = "pq6", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,11), - BuildJudgeArea(SensorType.B6,15), - BuildJudgeArea(SensorType.B5,18), - BuildJudgeArea(SensorType.B4,21), - BuildJudgeArea(SensorType.B3,25), - BuildJudgeArea(SensorType.B2,28), - BuildJudgeArea(SensorType.B1,31), - BuildJudgeArea(SensorType.B8,35), - BuildJudgeArea(SensorType.B7,38), - BuildJudgeArea(SensorType.A6,42,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5,8), + BuildSlideArea(SensorType.B7,9,11), + BuildSlideArea(SensorType.B6,13,15), + BuildSlideArea(SensorType.B5,16,18), + BuildSlideArea(SensorType.B4,19,21), + BuildSlideArea(SensorType.B3,23,25), + BuildSlideArea(SensorType.B2,26,28), + BuildSlideArea(SensorType.B1,29,31), + BuildSlideArea(SensorType.B8,33,35), + BuildSlideArea(SensorType.B7,36,38), + BuildSlideArea(SensorType.A6,40,42,true,true), }, Const = 0.07518f }, @@ -571,17 +571,17 @@ public static class SlideTables Name = "pq7", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,12), - BuildJudgeArea(SensorType.B6,15), - BuildJudgeArea(SensorType.B5,18), - BuildJudgeArea(SensorType.B4,22), - BuildJudgeArea(SensorType.B3,25), - BuildJudgeArea(SensorType.B2,28), - BuildJudgeArea(SensorType.B1,32), - BuildJudgeArea(SensorType.B8,35), - BuildJudgeArea(SensorType.A7,40,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5,8), + BuildSlideArea(SensorType.B7,10,12), + BuildSlideArea(SensorType.B6,13,15), + BuildSlideArea(SensorType.B5,16,18), + BuildSlideArea(SensorType.B4,20,22), + BuildSlideArea(SensorType.B3,23,25), + BuildSlideArea(SensorType.B2,26,28), + BuildSlideArea(SensorType.B1,30,32), + BuildSlideArea(SensorType.B8,33,35), + BuildSlideArea(SensorType.A7,37,40,true,true), }, Const = 0.08167f }, @@ -590,16 +590,16 @@ public static class SlideTables Name = "pq8", JudgeQueue = new SlideArea[] { - BuildJudgeArea(SensorType.A1,3), - BuildJudgeArea(SensorType.B8,8), - BuildJudgeArea(SensorType.B7,11), - BuildJudgeArea(SensorType.B6,14), - BuildJudgeArea(SensorType.B5,17), - BuildJudgeArea(SensorType.B4,21), - BuildJudgeArea(SensorType.B3,24), - BuildJudgeArea(SensorType.B2,27), - BuildJudgeArea(SensorType.B1,30), - BuildJudgeArea(SensorType.A8,36,true,true), + BuildSlideArea(SensorType.A1,0,3), + BuildSlideArea(SensorType.B8,5,8), + BuildSlideArea(SensorType.B7,9,11), + BuildSlideArea(SensorType.B6,12,14), + BuildSlideArea(SensorType.B5,15,17), + BuildSlideArea(SensorType.B4,19,21), + BuildSlideArea(SensorType.B3,22,24), + BuildSlideArea(SensorType.B2,25,27), + BuildSlideArea(SensorType.B1,28,30), + BuildSlideArea(SensorType.A8,33,36,true,true), }, Const = 0.08398f }, @@ -608,47 +608,47 @@ public static class SlideTables { new SlideArea[] // L { - BuildJudgeArea(SensorType.A1,0), - BuildJudgeArea(SensorType.B8,2), - BuildJudgeArea(SensorType.B7,4), - BuildJudgeArea(new SensorType[]{ SensorType.A6 , SensorType.D6 },7,true,true) + BuildSlideArea(SensorType.A1,0), + BuildSlideArea(SensorType.B8,2), + BuildSlideArea(SensorType.B7,4), + BuildSlideArea(new SensorType[]{ SensorType.A6 , SensorType.D6 },7,true,true) }, new SlideArea[] // Center { - BuildJudgeArea(SensorType.A1,0), - BuildJudgeArea(SensorType.B1,2), - BuildJudgeArea(SensorType.C,4), - BuildJudgeArea(new SensorType[]{ SensorType.A5 , SensorType.B5 },7,true,true) + BuildSlideArea(SensorType.A1,0), + BuildSlideArea(SensorType.B1,2), + BuildSlideArea(SensorType.C,4), + BuildSlideArea(new SensorType[]{ SensorType.A5 , SensorType.B5 },7,true,true) }, new SlideArea[] // R { - BuildJudgeArea(SensorType.A1,0), - BuildJudgeArea(SensorType.B2,2), - BuildJudgeArea(SensorType.B3,4), - BuildJudgeArea(new SensorType[]{ SensorType.A4 , SensorType.D5 },7,true,true) + BuildSlideArea(SensorType.A1,0), + BuildSlideArea(SensorType.B2,2), + BuildSlideArea(SensorType.B3,4), + BuildSlideArea(new SensorType[]{ SensorType.A4 , SensorType.D5 },7,true,true) } }; public static SlideArea[][] WIFISLIDE_JUDGE_QUEUE_CLASSIC => new SlideArea[][] { new SlideArea[] // L { - BuildJudgeArea(SensorType.A1,0), - BuildJudgeArea(SensorType.B8,2), - BuildJudgeArea(SensorType.B7,4), - BuildJudgeArea(new SensorType[]{ SensorType.A6 , SensorType.D6 },7,true,true) + BuildSlideArea(SensorType.A1,0), + BuildSlideArea(SensorType.B8,2), + BuildSlideArea(SensorType.B7,4), + BuildSlideArea(new SensorType[]{ SensorType.A6 , SensorType.D6 },7,true,true) }, new SlideArea[] // Center { - BuildJudgeArea(SensorType.A1,0), - BuildJudgeArea(SensorType.B1,2), - BuildJudgeArea(SensorType.C,7,true,false), + BuildSlideArea(SensorType.A1,0), + BuildSlideArea(SensorType.B1,2), + BuildSlideArea(SensorType.C,7,true,false), }, new SlideArea[] // R { - BuildJudgeArea(SensorType.A1,0), - BuildJudgeArea(SensorType.B2,2), - BuildJudgeArea(SensorType.B3,4), - BuildJudgeArea(new SensorType[]{ SensorType.A4 , SensorType.D5 },7,true,true) + BuildSlideArea(SensorType.A1,0), + BuildSlideArea(SensorType.B2,2), + BuildSlideArea(SensorType.B3,4), + BuildSlideArea(new SensorType[]{ SensorType.A4 , SensorType.D5 },7,true,true) } }; public static SlideTable? FindTableByName(string prefabName) @@ -680,23 +680,42 @@ public static SlideArea[][] GetWifiTable(int startPos) return _queue; } - static SlideArea BuildJudgeArea(SensorType type, int barIndex, bool canSkip = true, bool isLast = false) + static SlideArea BuildSlideArea(SensorType type, int arrowProgress, bool isSkippable = true, bool isLast = false) { var obj = new SlideArea(new Dictionary { { type, isLast} - }, barIndex); - obj.IsSkippable = canSkip; + }, arrowProgress); + obj.IsSkippable = isSkippable; return obj; } - static SlideArea BuildJudgeArea(SensorType[] type, int barIndex, bool canSkip = true, bool isLast = false) + static SlideArea BuildSlideArea(SensorType type,int progressWhenOn, int progressWhenFinished, bool isSkippable = true, bool isLast = false) + { + var obj = new SlideArea(new Dictionary + { + { type, isLast} + },progressWhenOn,progressWhenFinished); + obj.IsSkippable = isSkippable; + return obj; + } + static SlideArea BuildSlideArea(SensorType[] type, int barIndex, bool isSkippable = true, bool isLast = false) { var table = new Dictionary(); foreach (var sensorType in type) table.Add(sensorType, isLast); var obj = new SlideArea(table, barIndex); - obj.IsSkippable = canSkip; + obj.IsSkippable = isSkippable; + return obj; + } + static SlideArea BuildSlideArea(SensorType[] type,int progressWhenOn, int progressWhenFinished, bool isSkippable = true, bool isLast = false) + { + var table = new Dictionary(); + foreach (var sensorType in type) + table.Add(sensorType, isLast); + + var obj = new SlideArea(table, progressWhenOn, progressWhenFinished); + obj.IsSkippable = isSkippable; return obj; } } From 47375e379afe6757f293210320eb89d0186f4eaf Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 15:08:00 +0800 Subject: [PATCH 14/26] misc: bump version --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 79fb9b04..a3aa5f0f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0-alpha.4.4.3E + bundleVersion: 0.1.0-alpha.4.4.4E preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 From 800cac7fd76d6b4d933d4a694fcfaec2d6a9fd8a Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 15:45:06 +0800 Subject: [PATCH 15/26] fix: classic SlideOK --- .../SlideAnims/ClassicStarOver.anim | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim b/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim index 988c685f..90552e59 100644 --- a/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim +++ b/Assets/Animation/NoteEffects/SlideAnims/ClassicStarOver.anim @@ -177,6 +177,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -207,6 +216,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -302,7 +320,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 0.5833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -478,6 +496,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -508,6 +535,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.5833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 From 83bdaf90ae98104a5a7e69c6b7ee7614b34a328d Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 15:59:38 +0800 Subject: [PATCH 16/26] perf: ThisFrameSec --- Assets/Script/Scenes/Game/GamePlayManager.cs | 17 +++++- .../Game/NoteControllers/NoteManager.cs | 54 +++++++++++++------ 2 files changed, 54 insertions(+), 17 deletions(-) diff --git a/Assets/Script/Scenes/Game/GamePlayManager.cs b/Assets/Script/Scenes/Game/GamePlayManager.cs index 25532adb..c0942156 100644 --- a/Assets/Script/Scenes/Game/GamePlayManager.cs +++ b/Assets/Script/Scenes/Game/GamePlayManager.cs @@ -136,6 +136,7 @@ public float PlaybackSpeed CancellationTokenSource _allTaskTokenSource = new(); List _anwserSoundList = new List(); + readonly CancellationTokenSource _cts = new(); void Awake() { if (_gameInfo is null || _gameInfo.Current is null) @@ -577,7 +578,9 @@ async UniTaskVoid PrepareToPlay() if (FirstNoteAppearTiming != 0) extraTime += -(FirstNoteAppearTiming + 4f); _audioStartTime = (float)(_timer.ElapsedSecondsAsFloat + _audioSample.CurrentSec) + extraTime; + StartToPlayAnswer(); + UpdateThisFrameSec().Forget(); State = ComponentState.Running; @@ -624,9 +627,20 @@ void OnDestroy() MajInstances.GameManager.EnableGC(); MajInstanceHelper.Free(); } + async UniTaskVoid UpdateThisFrameSec() + { + await UniTask.Create(async () => + { + var token = _cts.Token; + while(!token.IsCancellationRequested) + { + _thisFrameSec = _audioTime; + await UniTask.Yield(PlayerLoopTiming.PreUpdate, token); + } + }); + } void Update() { - _thisFrameSec = _audioTime; UpdateAudioTime(); if (_audioSample is null) return; @@ -814,6 +828,7 @@ async UniTaskVoid BackToList() public async UniTaskVoid EndGame(int delayMiliseconds = 100,string targetScene = "Result") { State = ComponentState.Finished; + _cts.Cancel(); MajInstances.InputManager.ClearAllSubscriber(); _bgManager.CancelTimeRef(); diff --git a/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs b/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs index dd68036c..af504d74 100644 --- a/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs +++ b/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs @@ -9,6 +9,7 @@ using MajdataPlay.Game.Types; using MajdataPlay.References; using System; +using System.Threading; #nullable enable namespace MajdataPlay.Game { @@ -29,6 +30,7 @@ public class NoteManager : MonoBehaviour [SerializeField] double _lateUpdateElapsedMs = 0; + readonly CancellationTokenSource _cts = new(); InputManager _inputManager = MajInstances.InputManager; bool[] _isBtnUsedInThisFrame = new bool[8]; @@ -53,34 +55,54 @@ void Awake() _sensorStatusInThisFrame[i] = _inputManager.CheckSensorStatus(area, SensorStatus.On); _sensorStatusInLastFrame[i] = _sensorStatusInThisFrame[i]; } + UpdateGameIOStatus().Forget(); } void OnDestroy() { MajInstanceHelper.Free(); + _cts.Cancel(); } - private void Update() + async UniTaskVoid UpdateGameIOStatus() { - for (var i = 0; i < 8; i++) + await UniTask.Create(async () => { - var area = (SensorType)i; - _btnStatusInLastFrame[i] = _btnStatusInThisFrame[i]; - _btnStatusInThisFrame[i] = _inputManager.CheckButtonStatus(area, SensorStatus.On); - _isBtnUsedInThisFrame[i] = false; - } - for (var i = 0; i < 33; i++) - { - var area = (SensorType)i; - _sensorStatusInLastFrame[i] = _sensorStatusInThisFrame[i]; - _sensorStatusInThisFrame[i] = _inputManager.CheckSensorStatus(area, SensorStatus.On); - _isSensorUsedInThisFrame[i] = false; - } + var token = _cts.Token; + while (!token.IsCancellationRequested) + { + try + { + for (var i = 0; i < 8; i++) + { + var area = (SensorType)i; + _btnStatusInLastFrame[i] = _btnStatusInThisFrame[i]; + _btnStatusInThisFrame[i] = _inputManager.CheckButtonStatus(area, SensorStatus.On); + _isBtnUsedInThisFrame[i] = false; + } + for (var i = 0; i < 33; i++) + { + var area = (SensorType)i; + _sensorStatusInLastFrame[i] = _sensorStatusInThisFrame[i]; + _sensorStatusInThisFrame[i] = _inputManager.CheckSensorStatus(area, SensorStatus.On); + _isSensorUsedInThisFrame[i] = false; + } + } + catch(Exception e) + { + MajDebug.LogException(e); + } + await UniTask.Yield(PlayerLoopTiming.PreUpdate, token); + } + }); + + } + #if UNITY_EDITOR || DEBUG + private void Update() + { _updateElapsedMs = 0; foreach (var updater in _noteUpdaters) _updateElapsedMs += updater.UpdateElapsedMs; -#endif } -#if UNITY_EDITOR || DEBUG private void FixedUpdate() { _fixedUpdateElapsedMs = 0; From 18b6101b30c9eb058b9e5bcc43574f524a6c82aa Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 16:00:24 +0800 Subject: [PATCH 17/26] misc: bump version --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a3aa5f0f..0fc40e2d 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0-alpha.4.4.4E + bundleVersion: 0.1.0-alpha.4.4.5E preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 From a8f51eb86b5ff922c08cafbd406210fd305b655e Mon Sep 17 00:00:00 2001 From: bbb Date: Tue, 14 Jan 2025 16:47:54 +0800 Subject: [PATCH 18/26] fix: replace hash / with _ --- Assets/Script/Scenes/Game/GamePlayManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Script/Scenes/Game/GamePlayManager.cs b/Assets/Script/Scenes/Game/GamePlayManager.cs index c0942156..7250cd08 100644 --- a/Assets/Script/Scenes/Game/GamePlayManager.cs +++ b/Assets/Script/Scenes/Game/GamePlayManager.cs @@ -243,7 +243,7 @@ async UniTaskVoid LoadChart() /// async UniTask DumpOnlineChart() { - var chartFolder = Path.Combine(MajEnv.ChartPath, $"MajnetPlayed/{_songDetail.Hash}"); + var chartFolder = Path.Combine(MajEnv.ChartPath, $"MajnetPlayed/{_songDetail.Hash.Replace('/','_')}"); Directory.CreateDirectory(chartFolder); var dirInfo = new DirectoryInfo(chartFolder); var trackPath = Path.Combine(chartFolder, "track.mp3"); From abb559707a2688d09e8a2be1fbd9b788ec31f5c7 Mon Sep 17 00:00:00 2001 From: bbb Date: Tue, 14 Jan 2025 16:53:14 +0800 Subject: [PATCH 19/26] feat: playlist search online chart first --- Assets/Script/Utils/SongStorage.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Assets/Script/Utils/SongStorage.cs b/Assets/Script/Utils/SongStorage.cs index 4640a3ac..d49bea1f 100644 --- a/Assets/Script/Utils/SongStorage.cs +++ b/Assets/Script/Utils/SongStorage.cs @@ -141,7 +141,10 @@ static async ValueTask GetCollections(string rootPath, IProgre List danSongs = new(); foreach (var hash in dan.SongHashs) { - var songDetail = allcharts.FirstOrDefault(x => x.Hash == hash); + // search online first (so can upload score) + var songDetail = allcharts.FirstOrDefault(x => x.Hash == hash || x.IsOnline == true); + if (songDetail == null) + songDetail = allcharts.FirstOrDefault(x => x.Hash == hash); if (songDetail is not null) danSongs.Add(songDetail); else From da5902fd5ce656bbe48f1693972c17a1ef4d9bae Mon Sep 17 00:00:00 2001 From: bbb Date: Tue, 14 Jan 2025 17:31:22 +0800 Subject: [PATCH 20/26] fix: im sb --- Assets/Script/Utils/SongStorage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Script/Utils/SongStorage.cs b/Assets/Script/Utils/SongStorage.cs index d49bea1f..91815455 100644 --- a/Assets/Script/Utils/SongStorage.cs +++ b/Assets/Script/Utils/SongStorage.cs @@ -142,7 +142,7 @@ static async ValueTask GetCollections(string rootPath, IProgre foreach (var hash in dan.SongHashs) { // search online first (so can upload score) - var songDetail = allcharts.FirstOrDefault(x => x.Hash == hash || x.IsOnline == true); + var songDetail = allcharts.FirstOrDefault(x => x.Hash == hash && x.IsOnline == true); if (songDetail == null) songDetail = allcharts.FirstOrDefault(x => x.Hash == hash); if (songDetail is not null) From 98d4719968eb0197305aa5825868379100bb4563 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 18:05:23 +0800 Subject: [PATCH 21/26] fix: ThisFrameSec --- Assets/Script/Scenes/Game/GamePlayManager.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/Script/Scenes/Game/GamePlayManager.cs b/Assets/Script/Scenes/Game/GamePlayManager.cs index c0942156..64ff1338 100644 --- a/Assets/Script/Scenes/Game/GamePlayManager.cs +++ b/Assets/Script/Scenes/Game/GamePlayManager.cs @@ -634,7 +634,9 @@ await UniTask.Create(async () => var token = _cts.Token; while(!token.IsCancellationRequested) { - _thisFrameSec = _audioTime; + var chartOffset = ((float)_songDetail.First + _setting.Judge.AudioOffset) / PlaybackSpeed; + var timeOffset = _timer.ElapsedSecondsAsFloat - AudioStartTime; + _thisFrameSec = timeOffset - chartOffset; await UniTask.Yield(PlayerLoopTiming.PreUpdate, token); } }); From ae2cf23dc78cf67eb65547b0bb404deda00125ef Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 18:08:53 +0800 Subject: [PATCH 22/26] misc: bump version --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0fc40e2d..e8dbf709 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0-alpha.4.4.5E + bundleVersion: 0.1.0-alpha.4.4.6E preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 From adfed30be1ac27a6cc667c0bcd34f9b3e5798ea2 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 19:12:35 +0800 Subject: [PATCH 23/26] feat: Test --- Assets/Script/DontDestroy/IO/InputManager.cs | 4 ++-- Assets/Script/Scenes/Game/GamePlayManager.cs | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/Script/DontDestroy/IO/InputManager.cs b/Assets/Script/DontDestroy/IO/InputManager.cs index fdad07b5..8234f1f3 100644 --- a/Assets/Script/DontDestroy/IO/InputManager.cs +++ b/Assets/Script/DontDestroy/IO/InputManager.cs @@ -248,7 +248,7 @@ void StartInternalIOListener() { MajDebug.LogException(e); } - await UniTask.Yield(PlayerLoopTiming.FixedUpdate, token); + await UniTask.Yield(PlayerLoopTiming.EarlyUpdate, token); } }); } @@ -271,7 +271,7 @@ void StartExternalIOListener() { MajDebug.LogException(e); } - await UniTask.Yield(PlayerLoopTiming.FixedUpdate, token); + await UniTask.Yield(PlayerLoopTiming.EarlyUpdate, token); } }); } diff --git a/Assets/Script/Scenes/Game/GamePlayManager.cs b/Assets/Script/Scenes/Game/GamePlayManager.cs index deaa0148..234f0c89 100644 --- a/Assets/Script/Scenes/Game/GamePlayManager.cs +++ b/Assets/Script/Scenes/Game/GamePlayManager.cs @@ -580,7 +580,7 @@ async UniTaskVoid PrepareToPlay() _audioStartTime = (float)(_timer.ElapsedSecondsAsFloat + _audioSample.CurrentSec) + extraTime; StartToPlayAnswer(); - UpdateThisFrameSec().Forget(); + //UpdateThisFrameSec().Forget(); State = ComponentState.Running; @@ -668,7 +668,12 @@ void Update() } } - + void LateUpdate() + { + var chartOffset = ((float)_songDetail.First + _setting.Judge.AudioOffset) / PlaybackSpeed; + var timeOffset = _timer.ElapsedSecondsAsFloat - AudioStartTime; + _thisFrameSec = timeOffset - chartOffset; + } private void CalculateScore(bool playEffect = true) { var acc = _objectCounter.CalculateFinalResult(); From 1f4806a5697fa6d316c38ff1d913905514680b98 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Tue, 14 Jan 2025 19:13:14 +0800 Subject: [PATCH 24/26] misc: bump version --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e8dbf709..0bcaa733 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.1.0-alpha.4.4.6E + bundleVersion: 0.1.0-alpha.4.4.7E preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 From b103dd4f3c1c44a94893b9bb6701e5d3b8dbafcc Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Wed, 15 Jan 2025 01:05:45 +0800 Subject: [PATCH 25/26] revert commit fdb1b748a9d014e3c6b15349e3cccca8421a297d --- .../Game/NoteControllers/NoteManager.cs | 2 +- Assets/Script/Scenes/Game/Notes/HoldDrop.cs | 5 +-- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 2 +- .../Script/Scenes/Game/Notes/TouchHoldDrop.cs | 42 +++++++++---------- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 2 +- .../Scenes/Game/Types/GameInputDevice.cs.meta | 11 ----- 6 files changed, 23 insertions(+), 41 deletions(-) delete mode 100644 Assets/Script/Scenes/Game/Types/GameInputDevice.cs.meta diff --git a/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs b/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs index af504d74..839de5fe 100644 --- a/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs +++ b/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs @@ -37,7 +37,7 @@ public class NoteManager : MonoBehaviour bool[] _btnStatusInThisFrame = new bool[8]; bool[] _btnStatusInLastFrame = new bool[8]; - bool[] _isSensorUsedInThisFrame = new bool[33]; + bool[] _isSensorUsedInThisFrame = new bool[8]; bool[] _sensorStatusInThisFrame = new bool[33]; bool[] _sensorStatusInLastFrame = new bool[33]; void Awake() diff --git a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs index 5e6ea00d..a0f15c93 100644 --- a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs @@ -230,7 +230,6 @@ void Check() { _judgeResult = JudgeGrade.Miss; _isJudged = true; - _judgeDiff = 150; } if (_isJudged) @@ -305,13 +304,11 @@ void BodyCheck() } else { - _playerIdleTime += Time.deltaTime; + _playerIdleTime += Time.fixedDeltaTime; StopHoldEffect(); if (IsClassic) - { End(); - } } } protected override void Judge(float currentSec) diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index 29d4333d..a821845c 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -455,7 +455,7 @@ void SlideCheck() if (_lastWaitTime <= 0) End(); else - _lastWaitTime -= Time.deltaTime; + _lastWaitTime -= Time.fixedDeltaTime; } } } diff --git a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs index 03965a9f..f86d4216 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs @@ -241,43 +241,39 @@ void Check() { if (_isJudged) return; + else if (!_judgableRange.InRange(_gpManager.ThisFrameSec)) + return; else if (!_noteManager.CanJudge(QueueInfo)) return; var timing = GetTimeSpanToJudgeTiming(); var isTooLate = timing > 0.316667f; - - if (_judgableRange.InRange(ThisFrameSec)) - { - var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); + var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); + if (isTooLate) + { + _judgeResult = JudgeGrade.Miss; + _isJudged = true; + } + else + { Check(sensorState, ref _noteManager.IsSensorUsedInThisFrame(_sensorPos)); - if (!_isJudged && GroupInfo is not null) + if(!_isJudged) { - if (GroupInfo.Percent > 0.5f && GroupInfo.JudgeResult != null) + if (GroupInfo is not null) { - _isJudged = true; - _judgeResult = (JudgeGrade)GroupInfo.JudgeResult; - _judgeDiff = GroupInfo.JudgeDiff; + if (GroupInfo.Percent > 0.5f && GroupInfo.JudgeResult != null) + { + _isJudged = true; + _judgeResult = (JudgeGrade)GroupInfo.JudgeResult; + _judgeDiff = GroupInfo.JudgeDiff; + } } } } - else if (isTooLate) - { - _judgeResult = JudgeGrade.Miss; - _isJudged = true; - _judgeDiff = 316.667f; - } - if (_isJudged) { _noteManager.NextTouch(QueueInfo); - if (GroupInfo is not null && !_judgeResult.IsMissOrTooFast()) - { - GroupInfo.JudgeResult = _judgeResult; - GroupInfo.JudgeDiff = _judgeDiff; - GroupInfo.RegisterResult(_judgeResult); - } } } void Check(in InputEventArgs args, ref bool isUsedInThisFrame) @@ -321,7 +317,7 @@ void BodyCheck() } else { - _playerIdleTime += Time.deltaTime; + _playerIdleTime += Time.fixedDeltaTime; StopHoldEffect(); } } diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 2cf74821..4abd4c51 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -283,7 +283,7 @@ void SlideCheck() if (_lastWaitTime <= 0) End(); else - _lastWaitTime -= Time.deltaTime; + _lastWaitTime -= Time.fixedDeltaTime; } } int GetIndex() diff --git a/Assets/Script/Scenes/Game/Types/GameInputDevice.cs.meta b/Assets/Script/Scenes/Game/Types/GameInputDevice.cs.meta deleted file mode 100644 index 5c49e72c..00000000 --- a/Assets/Script/Scenes/Game/Types/GameInputDevice.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 76d9b95a2c20b514caeb61c2ea03bea0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: From d7bece335e6e9ed8c2a0c86d5e32e15d0b16afa5 Mon Sep 17 00:00:00 2001 From: LeZi9916 Date: Wed, 15 Jan 2025 01:23:42 +0800 Subject: [PATCH 26/26] revert commit 5582c279abdeb6b5de798da7bef6e336fad2fe0a --- Assets/Script/Scenes/Game/GamePlayManager.cs | 4 + .../Game/NoteControllers/NoteManager.cs | 128 ------------- Assets/Script/Scenes/Game/Notes/HoldDrop.cs | 179 ++++++++---------- Assets/Script/Scenes/Game/Notes/SlideDrop.cs | 4 +- Assets/Script/Scenes/Game/Notes/TapDrop.cs | 66 +++---- Assets/Script/Scenes/Game/Notes/TouchDrop.cs | 83 +++----- .../Script/Scenes/Game/Notes/TouchHoldDrop.cs | 129 ++++++------- Assets/Script/Scenes/Game/Notes/WifiDrop.cs | 4 +- .../Scenes/Game/Types/GameInputDevice.cs | 16 -- 9 files changed, 192 insertions(+), 421 deletions(-) delete mode 100644 Assets/Script/Scenes/Game/Types/GameInputDevice.cs diff --git a/Assets/Script/Scenes/Game/GamePlayManager.cs b/Assets/Script/Scenes/Game/GamePlayManager.cs index 234f0c89..d3621aea 100644 --- a/Assets/Script/Scenes/Game/GamePlayManager.cs +++ b/Assets/Script/Scenes/Game/GamePlayManager.cs @@ -719,6 +719,10 @@ private void CalculateScore(bool playEffect = true) } } + void FixedUpdate() + { + _thisFrameSec = _audioTime; + } void UpdateAudioTime() { if (_audioSample is null) diff --git a/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs b/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs index 839de5fe..8e6c92bd 100644 --- a/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs +++ b/Assets/Script/Scenes/Game/NoteControllers/NoteManager.cs @@ -4,12 +4,6 @@ using MajdataPlay.Utils; using System.Collections.Generic; using UnityEngine; -using MajdataPlay.IO; -using Cysharp.Threading.Tasks; -using MajdataPlay.Game.Types; -using MajdataPlay.References; -using System; -using System.Threading; #nullable enable namespace MajdataPlay.Game { @@ -29,73 +23,14 @@ public class NoteManager : MonoBehaviour [ReadOnlyField] [SerializeField] double _lateUpdateElapsedMs = 0; - - readonly CancellationTokenSource _cts = new(); - InputManager _inputManager = MajInstances.InputManager; - - bool[] _isBtnUsedInThisFrame = new bool[8]; - bool[] _btnStatusInThisFrame = new bool[8]; - bool[] _btnStatusInLastFrame = new bool[8]; - - bool[] _isSensorUsedInThisFrame = new bool[8]; - bool[] _sensorStatusInThisFrame = new bool[33]; - bool[] _sensorStatusInLastFrame = new bool[33]; void Awake() { MajInstanceHelper.Instance = this; - for (var i = 0; i < 8; i++) - { - var area = (SensorType)i; - _btnStatusInThisFrame[i] = _inputManager.CheckButtonStatus(area, SensorStatus.On); - _btnStatusInLastFrame[i] = _btnStatusInThisFrame[i]; - } - for (var i = 0; i < 33; i++) - { - var area = (SensorType)i; - _sensorStatusInThisFrame[i] = _inputManager.CheckSensorStatus(area, SensorStatus.On); - _sensorStatusInLastFrame[i] = _sensorStatusInThisFrame[i]; - } - UpdateGameIOStatus().Forget(); } void OnDestroy() { MajInstanceHelper.Free(); - _cts.Cancel(); } - async UniTaskVoid UpdateGameIOStatus() - { - await UniTask.Create(async () => - { - var token = _cts.Token; - while (!token.IsCancellationRequested) - { - try - { - for (var i = 0; i < 8; i++) - { - var area = (SensorType)i; - _btnStatusInLastFrame[i] = _btnStatusInThisFrame[i]; - _btnStatusInThisFrame[i] = _inputManager.CheckButtonStatus(area, SensorStatus.On); - _isBtnUsedInThisFrame[i] = false; - } - for (var i = 0; i < 33; i++) - { - var area = (SensorType)i; - _sensorStatusInLastFrame[i] = _sensorStatusInThisFrame[i]; - _sensorStatusInThisFrame[i] = _inputManager.CheckSensorStatus(area, SensorStatus.On); - _isSensorUsedInThisFrame[i] = false; - } - } - catch(Exception e) - { - MajDebug.LogException(e); - } - await UniTask.Yield(PlayerLoopTiming.PreUpdate, token); - } - }); - - } - #if UNITY_EDITOR || DEBUG private void Update() { @@ -149,69 +84,6 @@ public bool CanJudge(in TouchQueueInfo queueInfo) return index <= currentIndex; } - public InputEventArgs GetButtonStateInThisFrame(SensorType area) - { - if (area > SensorType.A8) - throw new ArgumentOutOfRangeException(); - var index = (int)area; - return new InputEventArgs() - { - Type = area, - OldStatus = _btnStatusInLastFrame[index] ? SensorStatus.On : SensorStatus.Off, - Status = _btnStatusInThisFrame[index] ? SensorStatus.On : SensorStatus.Off, - IsButton = true - }; - } - public InputEventArgs GetSensorStateInThisFrame(SensorType area) - { - if (area > SensorType.E8) - throw new ArgumentOutOfRangeException(); - - var index = (int)area; - return new InputEventArgs() - { - Type = area, - OldStatus = _sensorStatusInLastFrame[index] ? SensorStatus.On : SensorStatus.Off, - Status = _sensorStatusInThisFrame[index] ? SensorStatus.On : SensorStatus.Off, - IsButton = false - }; - } - public bool CheckAreaStateInThisFrame(SensorType area,SensorStatus state) - { - return CheckSensorStateInThisFrame(area,state) || CheckButtonStateInThisFrame(area, state); - } - public bool CheckButtonStateInThisFrame(SensorType area, SensorStatus state) - { - if (area > SensorType.A8) - throw new ArgumentOutOfRangeException(); - var index = (int)area; - var nowState = _btnStatusInThisFrame[index] ? SensorStatus.On: SensorStatus.Off; - - return nowState == state; - } - public bool CheckSensorStateInThisFrame(SensorType area, SensorStatus state) - { - if (area > SensorType.E8) - throw new ArgumentOutOfRangeException(); - var index = (int)area; - var nowState = _sensorStatusInThisFrame[index] ? SensorStatus.On : SensorStatus.Off; - - return nowState == state; - } - public ref bool IsButtonUsedInThisFrame(SensorType area) - { - if (area > SensorType.A8) - throw new ArgumentOutOfRangeException(); - - return ref _isBtnUsedInThisFrame[(int)area]; - } - public ref bool IsSensorUsedInThisFrame(SensorType area) - { - if (area > SensorType.E8) - throw new ArgumentOutOfRangeException(); - - return ref _isSensorUsedInThisFrame[(int)area]; - } public void NextNote(in TapQueueInfo queueInfo) => _noteCurrentIndex[queueInfo.KeyIndex]++; public void NextTouch(in TouchQueueInfo queueInfo) => _touchCurrentIndex[queueInfo.SensorPos]++; } diff --git a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs index a0f15c93..1e5e41c6 100644 --- a/Assets/Script/Scenes/Game/Notes/HoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/HoldDrop.cs @@ -96,6 +96,8 @@ protected override void Awake() _exObject.layer = MajEnv.HIDDEN_LAYER; _endObject.layer = MajEnv.HIDDEN_LAYER; Active = false; + + _noteChecker = new(Check); } protected override async void Autoplay() { @@ -207,108 +209,31 @@ public void End(bool forceEnd = false) _objectCounter.ReportResult(this, result); _poolManager.Collect(this); } - - void Check() - { - if (_isJudged) - return; - else if (!_noteManager.CanJudge(QueueInfo)) - return; - - var timing = GetTimeSpanToJudgeTiming(); - var isTooLate = timing > 0.15f; - - if (_judgableRange.InRange(ThisFrameSec)) - { - var btnState = _noteManager.GetButtonStateInThisFrame(_sensorPos); - var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); - - Check(btnState, ref _noteManager.IsButtonUsedInThisFrame(_sensorPos)); - Check(sensorState, ref _noteManager.IsSensorUsedInThisFrame(_sensorPos)); - } - else if (isTooLate) - { - _judgeResult = JudgeGrade.Miss; - _isJudged = true; - } - - if (_isJudged) - { - _noteManager.NextNote(QueueInfo); - } - } - void Check(in InputEventArgs args, ref bool isUsedInThisFrame) + + void Check(object sender, InputEventArgs arg) { + var thisFrameSec = _gpManager.ThisFrameSec; if (_isJudged) return; - else if (!args.IsClick) + else if (!arg.IsClick) return; - else if (isUsedInThisFrame) + else if (!_judgableRange.InRange(thisFrameSec)) return; - - isUsedInThisFrame = true; - - Judge(ThisFrameSec); - } - void BodyCheck() - { - if (!_isJudged) + else if (arg.Type != _sensorPos) return; - - var timing = GetTimeSpanToJudgeTiming(); - var endTiming = timing - Length; - var remainingTime = GetRemainingTime(); - - if (IsClassic) - { - if (_gpManager.IsAutoplay && remainingTime == 0) - { - End(); - return; - } - if (endTiming >= 0.333334f || _judgeResult.IsMissOrTooFast()) - { - End(); - return; - } - } - else if (remainingTime == 0) - { - End(); + else if (!_noteManager.CanJudge(QueueInfo)) return; - } - - if (!IsClassic) - { - if (timing <= 0.1f) // 忽略头部6帧 - return; - else if (remainingTime <= 0.2f) // 忽略尾部12帧 - return; - } - - if (!_gpManager.IsStart) // 忽略暂停 + if (!_ioManager.IsIdle(arg)) return; - - var on = _noteManager.CheckAreaStateInThisFrame(_sensorPos, SensorStatus.On); - if (on || _gpManager.IsAutoplay) - { - if(remainingTime == 0) - { - _effectManager.ResetHoldEffect(StartPos); - } - else - { - PlayHoldEffect(); - } - } else - { - _playerIdleTime += Time.fixedDeltaTime; - StopHoldEffect(); + _ioManager.SetBusy(arg); + Judge(thisFrameSec); - if (IsClassic) - End(); + if (_isJudged) + { + _ioManager.UnbindArea(Check, _sensorPos); + _noteManager.NextNote(QueueInfo); } } protected override void Judge(float currentSec) @@ -335,7 +260,7 @@ protected override void PlayJudgeSFX(in JudgeResult judgeResult) } public override void ComponentFixedUpdate() { - + BodyCheck(); } public override void ComponentUpdate() { @@ -348,9 +273,6 @@ public override void ComponentUpdate() var holdTime = timing - Length; var holdDistance = holdTime * Speed + 4.8f; - Check(); - BodyCheck(); - switch (State) { case NoteStatus.Initialized: @@ -457,6 +379,69 @@ public override void ComponentUpdate() //if (IsEX) // _exRenderer.size = _thisRenderer.size; } + void BodyCheck() + { + if (!_isJudged) + return; + + var timing = GetTimeSpanToJudgeTiming(); + var endTiming = timing - Length; + var remainingTime = GetRemainingTime(); + + if (IsClassic) + { + if (_gpManager.IsAutoplay && remainingTime == 0) + { + End(); + return; + } + if (endTiming >= 0.333334f || _judgeResult.IsMissOrTooFast()) + { + End(); + return; + } + } + else if (remainingTime == 0) + { + End(); + return; + } + + + if (!IsClassic) + { + if (timing <= 0.1f) // 忽略头部6帧 + return; + else if (remainingTime <= 0.2f) // 忽略尾部12帧 + return; + } + + if (!_gpManager.IsStart) // 忽略暂停 + return; + + var on = _ioManager.CheckAreaStatus(_sensorPos, SensorStatus.On); + if (on || _gpManager.IsAutoplay) + { + if (remainingTime == 0) + { + _effectManager.ResetHoldEffect(StartPos); + } + else + { + PlayHoldEffect(); + } + } + else + { + _playerIdleTime += Time.deltaTime; + StopHoldEffect(); + + if (IsClassic) + { + End(); + } + } + } JudgeGrade EndJudge(in JudgeGrade result) { if (!_isJudged) @@ -642,11 +627,11 @@ protected override void LoadSkin() } void SubscribeEvent() { - //_ioManager.BindArea(_noteChecker, _sensorPos); + _ioManager.BindArea(_noteChecker, _sensorPos); } void UnsubscribeEvent() { - // _ioManager.UnbindArea(_noteChecker, _sensorPos); + _ioManager.UnbindArea(_noteChecker, _sensorPos); } RendererStatus _rendererState = RendererStatus.Off; } diff --git a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs index a821845c..119a249b 100644 --- a/Assets/Script/Scenes/Game/Notes/SlideDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/SlideDrop.cs @@ -359,7 +359,7 @@ void CheckSensor() foreach (var area in fAreas) { - var sensorState = _noteManager.CheckSensorStateInThisFrame(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; + var sensorState = _ioManager.CheckSensorStatus(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; first.Check(area, sensorState); } @@ -371,7 +371,7 @@ void CheckSensor() var sAreas = second.IncludedAreas; foreach (var area in sAreas) { - var sensorState = _noteManager.CheckSensorStateInThisFrame(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; + var sensorState = _ioManager.CheckSensorStatus(area, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; second.Check(area, sensorState); } diff --git a/Assets/Script/Scenes/Game/Notes/TapDrop.cs b/Assets/Script/Scenes/Game/Notes/TapDrop.cs index 1b8ac024..b731a497 100644 --- a/Assets/Script/Scenes/Game/Notes/TapDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TapDrop.cs @@ -5,7 +5,6 @@ using MajdataPlay.Types; using MajdataPlay.Utils; using System; -using Unity.Burst.Intrinsics; using UnityEngine; #nullable enable namespace MajdataPlay.Game.Notes @@ -75,6 +74,8 @@ protected override void Awake() _tapLineObject.layer = MajEnv.HIDDEN_LAYER; _exObject.layer = MajEnv.HIDDEN_LAYER; Active = false; + + _noteChecker = new(Check); } public void Initialize(TapPoolingInfo poolingInfo) { @@ -110,8 +111,8 @@ public void Initialize(TapPoolingInfo poolingInfo) if (IsAutoplay) Autoplay(); - //else - // SubscribeEvent(); + else + SubscribeEvent(); State = NoteStatus.Initialized; } public void End(bool forceEnd = false) @@ -131,8 +132,8 @@ public void End(bool forceEnd = false) Diff = _judgeDiff }; PlayJudgeSFX(result); - _noteManager.NextNote(QueueInfo); _effectManager.PlayEffect(StartPos, result); + _noteManager.NextNote(QueueInfo); _objectCounter.ReportResult(this, result); _notePoolManager.Collect(this); } @@ -172,8 +173,6 @@ public override void ComponentUpdate() var scaleRate = _gameSetting.Debug.NoteAppearRate; var destScale = distance * scaleRate + (1 - (scaleRate * 1.225f)); - Check(); - switch (State) { case NoteStatus.Initialized: @@ -228,51 +227,26 @@ public override void ComponentUpdate() Transform.Rotate(0f, 0f, RotateSpeed * Time.deltaTime); } } - void Check() + void Check(object sender, InputEventArgs arg) { + var thisFrameSec = _gpManager.ThisFrameSec; if (_isJudged) - { - End(); return; - } - else if (!_noteManager.CanJudge(QueueInfo)) + else if (!arg.IsClick) return; - - var timing = GetTimeSpanToJudgeTiming(); - var isTooLate = timing > 0.15f; - - if (_judgableRange.InRange(ThisFrameSec)) - { - var btnState = _noteManager.GetButtonStateInThisFrame(_sensorPos); - var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); - - Check(btnState, ref _noteManager.IsButtonUsedInThisFrame(_sensorPos)); - Check(sensorState, ref _noteManager.IsSensorUsedInThisFrame(_sensorPos)); - } - else if (isTooLate) - { - _judgeResult = JudgeGrade.Miss; - _isJudged = true; - _judgeDiff = 150; - } - - if(_isJudged) - { - End(); - } - } - void Check(in InputEventArgs args, ref bool isUsedInThisFrame) - { - if (_isJudged) + else if (!_judgableRange.InRange(thisFrameSec)) return; - else if (!args.IsClick) + else if (arg.Type != _sensorPos) return; - else if (isUsedInThisFrame) + else if (!_noteManager.CanJudge(QueueInfo)) return; - isUsedInThisFrame = true; + if (!_ioManager.IsIdle(arg)) + return; + else + _ioManager.SetBusy(arg); - Judge(ThisFrameSec); + Judge(thisFrameSec); } protected override void LoadSkin() { @@ -313,6 +287,14 @@ void SetTapLineActive(bool state) break; } } + void SubscribeEvent() + { + _ioManager.BindArea(_noteChecker, _sensorPos); + } + void UnsubscribeEvent() + { + _ioManager.UnbindArea(_noteChecker, _sensorPos); + } void LoadTapSkin() { var skin = MajInstances.SkinManager.GetTapSkin(); diff --git a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs index 907768a3..59458f0c 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchDrop.cs @@ -6,6 +6,7 @@ using MajdataPlay.Utils; using System; using UnityEngine; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.ProgressBar; #nullable enable namespace MajdataPlay.Game.Notes { @@ -104,6 +105,7 @@ protected override void Awake() SetJustBorderActive(false); SetPointActive(false); Active = false; + _noteChecker = new(Check); RendererState = RendererStatus.Off; } public void Initialize(TouchPoolingInfo poolingInfo) @@ -220,6 +222,27 @@ protected override void LoadSkin() _justBorderRenderer.sprite = skin.JustBorder; } + void Check(object sender, InputEventArgs arg) + { + var type = GetSensor(); + if (State < NoteStatus.Running) + return; + else if (arg.Type != type) + return; + else if (_isJudged || !_noteManager.CanJudge(QueueInfo)) + return; + else if (arg.IsClick) + { + if (!_ioManager.IsIdle(arg)) + return; + else + _ioManager.SetBusy(arg); + Judge(_gpManager.ThisFrameSec); + //ioManager.SetIdle(arg); + if (_isJudged) + End(); + } + } public override void ComponentFixedUpdate() { if (State < NoteStatus.Running || IsEnded) @@ -251,8 +274,6 @@ public override void ComponentUpdate() { var timing = GetTimeSpanToArriveTiming(); - Check(); - switch (State) { case NoteStatus.Initialized: @@ -349,61 +370,7 @@ protected override void Judge(float currentSec) _judgeResult = result; _isJudged = true; } - void Check() - { - if (_isJudged) - { - End(); - return; - } - else if (!_noteManager.CanJudge(QueueInfo)) - return; - - var timing = GetTimeSpanToJudgeTiming(); - var isTooLate = timing > 0.316667f; - - - if (_judgableRange.InRange(ThisFrameSec)) - { - var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); - - Check(sensorState, ref _noteManager.IsSensorUsedInThisFrame(_sensorPos)); - - if (!_isJudged && GroupInfo is not null) - { - if (GroupInfo.Percent > 0.5f && GroupInfo.JudgeResult != null) - { - _isJudged = true; - _judgeResult = (JudgeGrade)GroupInfo.JudgeResult; - _judgeDiff = GroupInfo.JudgeDiff; - } - } - } - else if (isTooLate) - { - _judgeResult = JudgeGrade.Miss; - _isJudged = true; - _judgeDiff = 316.667f; - } - - if (_isJudged) - { - End(); - } - } - void Check(in InputEventArgs args, ref bool isUsedInThisFrame) - { - if (_isJudged) - return; - else if (!args.IsClick) - return; - else if (isUsedInThisFrame) - return; - - isUsedInThisFrame = true; - Judge(ThisFrameSec); - } public override void SetActive(bool state) { if (Active == state) @@ -486,11 +453,11 @@ void SetFansMaterial(Material material) } void SubscribeEvent() { - //_ioManager.BindSensor(_noteChecker, _sensorPos); + _ioManager.BindSensor(_noteChecker, _sensorPos); } void UnsubscribeEvent() { - //_ioManager.UnbindSensor(_noteChecker, _sensorPos); + _ioManager.UnbindSensor(_noteChecker, _sensorPos); } protected override void PlaySFX() { diff --git a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs index f86d4216..ec1487bd 100644 --- a/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/TouchHoldDrop.cs @@ -107,6 +107,7 @@ protected override void Awake() SetBorderActive(false); SetPointActive(false); Active = false; + _noteChecker = new(Check); RendererState = RendererStatus.Off; } protected override async void Autoplay() @@ -237,90 +238,38 @@ public void End(bool forceEnd = false) _notePoolManager.Collect(this); } - void Check() + void Check(object sender, InputEventArgs arg) { + var thisFrameSec = _gpManager.ThisFrameSec; if (_isJudged) return; - else if (!_judgableRange.InRange(_gpManager.ThisFrameSec)) + else if (!arg.IsClick) + return; + else if (!_judgableRange.InRange(thisFrameSec)) + return; + else if (arg.Type != _sensorPos) return; else if (!_noteManager.CanJudge(QueueInfo)) return; - var timing = GetTimeSpanToJudgeTiming(); - var isTooLate = timing > 0.316667f; - var sensorState = _noteManager.GetSensorStateInThisFrame(_sensorPos); - - if (isTooLate) - { - _judgeResult = JudgeGrade.Miss; - _isJudged = true; - } + if (!_ioManager.IsIdle(arg)) + return; else + _ioManager.SetBusy(arg); + Judge(_gpManager.ThisFrameSec); + + if (_isJudged) { - Check(sensorState, ref _noteManager.IsSensorUsedInThisFrame(_sensorPos)); - if(!_isJudged) + if (GroupInfo is not null) { - if (GroupInfo is not null) - { - if (GroupInfo.Percent > 0.5f && GroupInfo.JudgeResult != null) - { - _isJudged = true; - _judgeResult = (JudgeGrade)GroupInfo.JudgeResult; - _judgeDiff = GroupInfo.JudgeDiff; - } - } + GroupInfo.RegisterResult(_judgeResult); + GroupInfo.JudgeDiff = _judgeDiff; + GroupInfo.JudgeResult = _judgeResult; } - } - if (_isJudged) - { + _ioManager.UnbindSensor(Check, _sensorPos); _noteManager.NextTouch(QueueInfo); } } - void Check(in InputEventArgs args, ref bool isUsedInThisFrame) - { - if (_isJudged) - return; - else if (!args.IsClick) - return; - else if (isUsedInThisFrame) - return; - - isUsedInThisFrame = true; - - Judge(ThisFrameSec); - } - void BodyCheck() - { - if (!_isJudged) - return; - - var remainingTime = GetRemainingTime(); - var timing = GetTimeSpanToJudgeTiming(); - - if (remainingTime == 0) - { - End(); - return; - } - - if (timing <= 0.25f) // 忽略头部15帧 - return; - else if (remainingTime <= 0.2f) // 忽略尾部12帧 - return; - else if (!_gpManager.IsStart) // 忽略暂停 - return; - - var on = _noteManager.CheckSensorStateInThisFrame(_sensorPos, SensorStatus.On); - if (on || _gpManager.IsAutoplay) - { - PlayHoldEffect(); - } - else - { - _playerIdleTime += Time.fixedDeltaTime; - StopHoldEffect(); - } - } protected override void LoadSkin() { var skin = MajInstances.SkinManager.GetTouchHoldSkin(); @@ -386,15 +335,12 @@ protected override void Judge(float currentSec) } public override void ComponentFixedUpdate() { - + BodyCheck(); } public override void ComponentUpdate() { var timing = GetTimeSpanToArriveTiming(); - Check(); - BodyCheck(); - switch(State) { case NoteStatus.Initialized: @@ -450,7 +396,38 @@ public override void ComponentUpdate() return; } } + void BodyCheck() + { + if (!_isJudged) + return; + var remainingTime = GetRemainingTime(); + var timing = GetTimeSpanToJudgeTiming(); + + if (remainingTime == 0) + { + End(); + return; + } + + if (timing <= 0.25f) // 忽略头部15帧 + return; + else if (remainingTime <= 0.2f) // 忽略尾部12帧 + return; + else if (!_gpManager.IsStart) // 忽略暂停 + return; + + var on = _ioManager.CheckSensorStatus(_sensorPos, SensorStatus.On); + if (on || _gpManager.IsAutoplay) + { + PlayHoldEffect(); + } + else + { + _playerIdleTime += Time.deltaTime; + StopHoldEffect(); + } + } public override void SetActive(bool state) { if (Active == state) @@ -593,11 +570,11 @@ void SetFansMaterial(Material material) } void SubscribeEvent() { - //_ioManager.BindSensor(_noteChecker, _sensorPos); + _ioManager.BindSensor(_noteChecker, _sensorPos); } void UnsubscribeEvent() { - //_ioManager.UnbindSensor(_noteChecker, _sensorPos); + _ioManager.UnbindSensor(_noteChecker, _sensorPos); } protected override void PlaySFX() { diff --git a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs index 4abd4c51..804e1347 100644 --- a/Assets/Script/Scenes/Game/Notes/WifiDrop.cs +++ b/Assets/Script/Scenes/Game/Notes/WifiDrop.cs @@ -214,7 +214,7 @@ void Check(ref Memory queueMemory) var fAreas = first.IncludedAreas; foreach (var t in fAreas) { - var sensorState = _noteManager.CheckSensorStateInThisFrame(t, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; + var sensorState = _ioManager.CheckSensorStatus(t, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; first.Check(t, sensorState); } @@ -226,7 +226,7 @@ void Check(ref Memory queueMemory) var sAreas = second.IncludedAreas; foreach (var t in sAreas) { - var sensorState = _noteManager.CheckSensorStateInThisFrame(t, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; + var sensorState = _ioManager.CheckSensorStatus(t, SensorStatus.On) ? SensorStatus.On : SensorStatus.Off; second.Check(t, sensorState); } diff --git a/Assets/Script/Scenes/Game/Types/GameInputDevice.cs b/Assets/Script/Scenes/Game/Types/GameInputDevice.cs deleted file mode 100644 index 4190c9f3..00000000 --- a/Assets/Script/Scenes/Game/Types/GameInputDevice.cs +++ /dev/null @@ -1,16 +0,0 @@ -using MajdataPlay.Types; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -#nullable enable -namespace MajdataPlay.Game.Types -{ - public class GameInputDevice - { - public SensorType Area { get; init; } = SensorType.A1; - public SensorStatus State { get; set; } = SensorStatus.Off; - public bool IsUsedInThisFrame { get; set; } = false; - } -}