Skip to content

Commit

Permalink
Reimplement, reorganize, and fix a number of solo handling things (YA…
Browse files Browse the repository at this point in the history
…RC-Official#446)

* Pre-calculate note counts of solos

* Ignore SP phrases that have no notes

* Don't count chords in phrases as single notes on drums

* Separate solo updating out into its own method

* Move solo box text formatting to TrackView

* absolutely baffling control flow decision lol

* Re-enable solo score bonus

* Re-implement solo box coloring
The color gradients are assets now, so they can be used in other text boxes

* Remove commented-out and unused solo box code from AbstractTrack
Obsolete now that it's been fully re-implemented

* Factor in the current note when checking if a solo is active

* Add easter egg for anyone who manages to break solos lol
  • Loading branch information
TheNathannator authored Jun 9, 2023
1 parent 4f7224f commit 731b252
Show file tree
Hide file tree
Showing 10 changed files with 225 additions and 135 deletions.
19 changes: 19 additions & 0 deletions Assets/Art/UI/TextGradient_Gold.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 54d21f6ece3b46479f0c328f8c6007e0, type: 3}
m_Name: TextGradient_Gold
m_EditorClassIdentifier:
colorMode: 3
topLeft: {r: 1, g: 0.619472, b: 0, a: 1}
topRight: {r: 1, g: 0.619472, b: 0, a: 1}
bottomLeft: {r: 0.5377358, g: 0.2550798, b: 0, a: 1}
bottomRight: {r: 0.5377358, g: 0.2550798, b: 0, a: 1}
8 changes: 8 additions & 0 deletions Assets/Art/UI/TextGradient_Gold.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Art/UI/TextGradient_Red.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 54d21f6ece3b46479f0c328f8c6007e0, type: 3}
m_Name: TextGradient_Red
m_EditorClassIdentifier:
colorMode: 3
topLeft: {r: 1, g: 0.1933962, b: 0.1933962, a: 1}
topRight: {r: 1, g: 0.1933962, b: 0.1933962, a: 1}
bottomLeft: {r: 1, g: 0.1332366, b: 0.06132078, a: 1}
bottomRight: {r: 1, g: 0.1332366, b: 0.06132078, a: 1}
8 changes: 8 additions & 0 deletions Assets/Art/UI/TextGradient_Red.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Art/UI/TextGradient_Silver.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 54d21f6ece3b46479f0c328f8c6007e0, type: 3}
m_Name: TextGradient_Silver
m_EditorClassIdentifier:
colorMode: 3
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 0.1320755, g: 0.1320755, b: 0.1320755, a: 1}
bottomRight: {r: 0.1320755, g: 0.1320755, b: 0.1320755, a: 1}
8 changes: 8 additions & 0 deletions Assets/Art/UI/TextGradient_Silver.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 17 additions & 7 deletions Assets/Prefabs/UI/TrackView.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,14 @@ MonoBehaviour:
_soloFullText: {fileID: 1690064270221596410}
_soloBoxCanvasGroup: {fileID: 4653678781618251725}
_soloBox: {fileID: 1298843830327042085}
_normalSoloBox: {fileID: 21300000, guid: cecf11e1b10fd7d4aba2b460a1ed8c1a, type: 3}
_soloSpriteNormal: {fileID: 21300000, guid: cecf11e1b10fd7d4aba2b460a1ed8c1a, type: 3}
_soloSpritePerfect: {fileID: 21300000, guid: d366b747c8f99cb458e8ff931d4f2003, type: 3}
_soloSpriteMessy: {fileID: 21300000, guid: 229a7b90eb98f3845ac0c87daa9fe207, type: 3}
_soloGradientNormal: {fileID: 11400000, guid: 132f88818a8eedb488c1ffe3e9b3b56d,
type: 2}
_soloGradientPerfect: {fileID: 11400000, guid: abc1f28caa461884799e14ec182504e8,
type: 2}
_soloGradientMessy: {fileID: 11400000, guid: 0ec55dfdb30cdb349bfb21ff2285f6b0, type: 2}
--- !u!1 &547032022231682811
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -455,14 +462,15 @@ MonoBehaviour:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_enableVertexGradient: 1
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_fontColorGradientPreset: {fileID: 11400000, guid: 132f88818a8eedb488c1ffe3e9b3b56d,
type: 2}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
Expand Down Expand Up @@ -591,14 +599,15 @@ MonoBehaviour:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_enableVertexGradient: 1
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_fontColorGradientPreset: {fileID: 11400000, guid: 132f88818a8eedb488c1ffe3e9b3b56d,
type: 2}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
Expand Down Expand Up @@ -727,14 +736,15 @@ MonoBehaviour:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_enableVertexGradient: 1
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_fontColorGradientPreset: {fileID: 11400000, guid: 132f88818a8eedb488c1ffe3e9b3b56d,
type: 2}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
Expand Down
Loading

0 comments on commit 731b252

Please sign in to comment.