Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abstract Track Performance Text (BASS GROOVE, HOT START, etc.) #295

Merged
merged 21 commits into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7666057
Hot start, bass groove, and strong finish
grishhung May 10, 2023
0c51047
Corrected issue with STRONG FINISH
grishhung May 10, 2023
01f258b
Added a X00-NOTE STREAK counter
grishhung May 10, 2023
94e915f
Prevent performance text from appearing during a solo
grishhung May 10, 2023
2a58cd9
Made the cutoffs public variables for easy tweaking
grishhung May 10, 2023
5c29643
Fix STRONG FINISH bug by using Chart.Count
grishhung May 10, 2023
ff0fa67
Implemented FULL COMBO text
grishhung May 10, 2023
67da104
Change FULL COMBO text to trump STRONG FINISH
grishhung May 10, 2023
5c9334f
Removed bold from vocal performance text for consistency
grishhung May 10, 2023
0f35c75
Labeled a variable that's not used but may be later on
grishhung May 10, 2023
9622c1a
Added a toggle to check whether or not FC text trumps STRONG FINISH o…
grishhung May 11, 2023
2d9f63c
Added lots of toggles
grishhung May 11, 2023
b7c5b9b
fixed a bug with custom note intervals
grishhung May 11, 2023
12b9149
Added support for X/2-NOTE COMBO notifs for all non-bass instruments
grishhung May 11, 2023
550a274
Added OVERDRIVE READY notif (really think this should be off by default)
grishhung May 11, 2023
a0c37e2
Updated an incorrect comment
grishhung May 11, 2023
d2cc047
Oops, forgot to make BASS GROOVE work for Pro Bass too
grishhung May 11, 2023
8a0cdcb
Removed check for BASS GROOVE and simply made BASS GROOVE trump NOTE …
grishhung May 11, 2023
a97847b
converting ToLower() is unnecessary
grishhung May 11, 2023
5e3f422
Reordered update functions to make them actually function as intended
grishhung May 12, 2023
5508c1b
Explained PerformanceTextFontSize()
grishhung May 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 175 additions & 44 deletions Assets/Art/Fonts/Barlow/Barlow-Bold.asset

Large diffs are not rendered by default.

187 changes: 187 additions & 0 deletions Assets/Prefabs/AbstractTrack.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,19 @@ MonoBehaviour:
soloMessySprite: {fileID: 21300000, guid: 229a7b90eb98f3845ac0c87daa9fe207, type: 3}
soloPerfectSprite: {fileID: 21300000, guid: d366b747c8f99cb458e8ff931d4f2003, type: 3}
soloDefaultSprite: {fileID: 21300000, guid: cecf11e1b10fd7d4aba2b460a1ed8c1a, type: 3}
performanceText: {fileID: 6350537460123684463}
perfTextFontSize: 16
perfTextAnimLen: 3
hotStartNotifsEnabled: 1
bassGrooveNotifsEnabled: 1
noteStreakNotifsEnabled: 1
strongFinishNotifsEnabled: 1
overdriveReadyNotifsEnabled: 1
fullComboTrumpsStrongFinish: 0
hotStartCutoff: 25
strongFinishCutoff: 25
bufferPeriod: 0.05
noteStreakInterval: 100
fretColors:
- {r: 0.32941177, g: 0.59607846, b: 0.011764707, a: 1}
- {r: 1, g: 0, b: 0.025974274, a: 1}
Expand Down Expand Up @@ -197,6 +210,7 @@ Transform:
- {fileID: 4635928239938576893}
- {fileID: 9174819987387209115}
- {fileID: 8692672526880560946}
- {fileID: 5840520207283730503}
m_Father: {fileID: 90376540996421698}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: -20.319, y: 0, z: 0}
Expand Down Expand Up @@ -285,6 +299,179 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1124482116704503614
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5840520207283730503}
- component: {fileID: 8851222925597077065}
- component: {fileID: 6350537460123684463}
m_Layer: 6
m_Name: PerformanceText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5840520207283730503
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1124482116704503614}
m_LocalRotation: {x: 0.3168081, y: -0, z: -0, w: 0.9484897}
m_LocalPosition: {x: 0, y: 0, z: -0.07220991}
m_LocalScale: {x: 0.09189025, y: 0.088359304, z: 0.08482449}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1994927837893870314}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 36.94, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.0066294996, y: 1}
m_SizeDelta: {x: 9.75, y: 4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &8851222925597077065
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1124482116704503614}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 1536850694454096710, guid: d9dd031fb1c2f2f4fabb34137edfa885, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &6350537460123684463
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1124482116704503614}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d9dd031fb1c2f2f4fabb34137edfa885, type: 2}
m_sharedMaterial: {fileID: 1536850694454096710, guid: d9dd031fb1c2f2f4fabb34137edfa885,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 2
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1}
bottomRight: {r: 0.2924528, g: 0.2924528, b: 0.2924528, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 16
m_fontSizeBase: 16
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 8
m_fontSizeMax: 20
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 50
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0.70436, y: 1.0490943, z: 0.85456705, w: -0.35918033}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
_SortingLayer: 0
_SortingLayerID: 0
_SortingOrder: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 8851222925597077065}
m_maskType: 0
--- !u!1 &1145611341549646492
GameObject:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/Scenes/PlayScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -2609,7 +2609,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_text: PLACEHOLDER
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d9dd031fb1c2f2f4fabb34137edfa885, type: 2}
m_sharedMaterial: {fileID: 1536850694454096710, guid: d9dd031fb1c2f2f4fabb34137edfa885,
Expand Down Expand Up @@ -2643,7 +2643,7 @@ MonoBehaviour:
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 512
m_textAlignment: 65535
Expand Down
Loading