Skip to content

Commit

Permalink
Scores and stars tuning (#311)
Browse files Browse the repository at this point in the history
commit 9c49bd1
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Mon May 15 16:06:56 2023 -0400

    Merge fixes

commit 532a398
Merge: bfd1c2a 3897e28
Author: EliteAsian <29520859+EliteAsian123@users.noreply.github.com>
Date:   Mon May 15 16:02:34 2023 -0400

    Merge branch 'dev' into score-tuning-ch-scale

commit bfd1c2a
Merge: 8a514e3 5c95258
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 22:12:22 2023 -0700

    Merge remote-tracking branch 'upstream/dev' into score-tuning-ch-scale

commit 8a514e3
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 17:35:29 2023 -0700

    reword WIP score notice

commit 4fc7428
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 17:29:04 2023 -0700

    add WIP score system notice at PlayResult

commit 1182bd4
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 16:51:19 2023 -0700

    Squashed commit of the following:

    commit bd3be26
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Sat May 13 13:31:03 2023 -0400

        ACTUALLY GOOD TRACK SCALING (MATH MOMENT)

    commit 3279990
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Sat May 13 12:18:45 2023 -0400

        Formatting

    commit 96dbca3
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Sat May 13 12:04:23 2023 -0400

        Fixed error

    commit e513a6a
    Author: TheFatBastid <tfb@sof.ws>
    Date:   Sat May 13 12:01:37 2023 -0400

        Try/catch added to con reading to prevent crashing (#312)

        * Updated Readme to remove duplicate

        The merge part was duplicated

        * Added Mogg filename error output

        Change the error struct to add a file name. Added to when a con error is scanned, "" gets added for .ini songs

        * Added a try/catch to con reading

        Without this, when an "access denied" folder is scanned, it will throw an IO error and end the scanning, and thus no cache is created.

        * Fixed small error when scrolling past limits

        While things still worked fine, we shouldn't have errors being generated.

        * Added Json support for currentSong

        Note: There is no GUI button for this yet!

        Also, added a toast to updateChecker

        * Update SongScanThread.cs

        fixed spacing

    commit 1a09596
    Author: muskit <15199219+muskit@users.noreply.github.com>
    Date:   Sat May 13 08:50:23 2023 -0700

        New play result screen (#317)

        * migration from bad branch

        * finish the PlayResult migration

    commit 574018e
    Author: LocalH <41028672+LocalH@users.noreply.github.com>
    Date:   Sat May 13 11:10:14 2023 -0400

        Track speed to two decimals (#318)

    commit 1d22dce
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Fri May 12 22:55:57 2023 -0400

        Fixed scrolling bug & argument exception not using _selectedIndex variable (#316)

    commit 7984581
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Fri May 12 18:14:34 2023 -0400

        Fixed score bug

    commit 2034903
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Fri May 12 17:53:59 2023 -0400

        Fixed album art text click

    commit b866dd9
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Fri May 12 17:32:30 2023 -0400

        Area behind buttons in settings now allow scroll

    commit 9a74da3
    Author: Paulo Cardoso <50218490+nevespt@users.noreply.github.com>
    Date:   Fri May 12 22:03:56 2023 +0100

        Dev Watermark (#292)

        * Dev Watermark

        [Added]
        - a script to check if is beta version or not

        [Changed]
        - Elements at persistant Scene

        * Getting a better condition

        from
        `Constants.VERSION_TAG.ToString().EndsWith("b")`
        to
        `Constants.VERSION_TAG.beta`

        * Fix following styling

    commit 9767c8d
    Author: grishhung <93692315+grishhung@users.noreply.github.com>
    Date:   Fri May 12 17:03:10 2023 -0400

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

        * Hot start, bass groove, and strong finish

        * Corrected issue with STRONG FINISH

        Fixed an issue where STRONG FINISH could be achieved despite not actually hitting the last note

        * Added a X00-NOTE STREAK counter

        We most likely want to have this disabled by default. A lot of players have mentioned that it gives them anxiety lol

        * Prevent performance text from appearing during a solo

        * Made the cutoffs public variables for easy tweaking

        * Fix STRONG FINISH bug by using Chart.Count

        * Implemented FULL COMBO text

        * Change FULL COMBO text to trump STRONG FINISH

        Also left justified vocal performance text

        * Removed bold from vocal performance text for consistency

        * Labeled a variable that's not used but may be later on

        * Added a toggle to check whether or not FC text trumps STRONG FINISH or not

        * Added lots of toggles

        * fixed a bug with custom note intervals

        * Added support for X/2-NOTE COMBO notifs for all non-bass instruments

        * Added OVERDRIVE READY notif (really think this should be off by default)

        * Updated an incorrect comment

        * Oops, forgot to make BASS GROOVE work for Pro Bass too

        * Removed check for BASS GROOVE and simply made BASS GROOVE trump NOTE STREAK

        * converting ToLower() is unnecessary

        * Reordered update functions to make them actually function as intended

        * Explained PerformanceTextFontSize()

    commit 2886324
    Author: rjkiv <76180273+rjkiv@users.noreply.github.com>
    Date:   Fri May 12 17:02:49 2023 -0400

        Song update functionality (#304)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * song metadata updates

        * image updates

        * mogg dta updates

        * midi updates implemented

        * mogg updates implemented

        * attempted cleanup of update code

        * remove debug statements and fix con updating

        * remove debug statement

        * fix song scanner not reading midi preparser properly

    commit 016bbb6
    Author: TheFatBastid <tfb@sof.ws>
    Date:   Fri May 12 16:57:25 2023 -0400

        Updated Readme to remove duplicate (#307)

        * Updated Readme to remove duplicate

        The merge part was duplicated

        * Added Mogg filename error output

        Change the error struct to add a file name. Added to when a con error is scanned, "" gets added for .ini songs

    commit e6c317f
    Author: rjkiv <76180273+rjkiv@users.noreply.github.com>
    Date:   Fri May 12 16:56:20 2023 -0400

        fixed/cleaned up Xbox image parsing (#308)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * Update Credits.txt

        * cleaned up DXT block parsing for xbox images

        * move Texture2D declaration

        ---------

        Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

    commit 8058f94
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Fri May 12 13:55:47 2023 -0700

        Highway Fadeout Shader (#309)

        * Ignore Folder

        * Highway Fade Shader

    commit 361cb9f
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Fri May 12 16:55:17 2023 -0400

        Handle Song Selection Errors When No Songs to Select (#310)

        * Fix argument exception when no songs to select

        * Reset selected song variable if removed after scan

    commit 4a11900
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:42:28 2023 -0400

        Patch time!

    commit e54c2e2
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:30:14 2023 -0400

        Forgot to assign field

    commit 5532222
    Merge: 28a1f97 6932320
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:18:27 2023 -0400

        Merge branch 'JayDiddyThaGOAT-post-song-goes-to-song-selection' into dev

    commit 6932320
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 21:17:00 2023 -0400

        Fixed merge issues

    commit efd7122
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Thu May 11 20:42:09 2023 -0400

        Song Selection goes back to Last Song Played

    commit 466640b
    Author: Jalen Jackson <jalenjacksoncs@gmail.com>
    Date:   Thu May 11 17:41:03 2023 -0400

        PostSong goes to Song Selection

    commit 98e7348
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Thu May 11 23:46:26 2023 +0100

        Handle some exceptions with chart preparsing (#302)

    commit 28a1f97
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 18:45:36 2023 -0400

        Bruh

    commit 5356f66
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 18:27:30 2023 -0400

        Fixed Discord and Twitch (and added tag stripping)

    commit 1165d59
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 17:45:08 2023 -0400

        Only show "Sit Out" if more than one player

    commit e53e65d
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 17:23:15 2023 -0400

        Added `.webm`, `.mov`, `.jpg` support for backgrounds

    commit 3f1b51e
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 16:47:10 2023 -0400

        Clean up for backgrounds

    commit e2131ac
    Merge: e098a5d 7c02feb
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 16:04:11 2023 -0400

        Merge branch 'NyxTheShield-master' into dev

    commit 7c02feb
    Merge: e098a5d 64fb0ff
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Thu May 11 16:03:57 2023 -0400

        Merge branch 'master' of https://github.com/NyxTheShield/YARG into NyxTheShield-master

    commit e098a5d
    Author: Nathan <nathanhurst03@gmail.com>
    Date:   Thu May 11 13:30:36 2023 -0600

        Update PlasticBand-Unity to v0.2.3 (#301)

        Fixes 4-lane drumkits not mapping correctly

    commit 64fb0ff
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 23:22:12 2023 -0400

        FIxed wrong imports for build

    commit 7603328
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 23:16:23 2023 -0400

        Support for VIdeo, PNG and Custom YARGrounds (Trombone Champ Style AssetBundles for customizable 3D BGs)

    commit aa67dc2
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Wed May 10 22:03:40 2023 -0400

        Fixed "Graphics" tab in settings

    commit 5af2d05
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 18:56:34 2023 -0700

        Custom Post Processing Shader to Enable Transparency on Render Textures (#298)

        * Updated Readme (#291)

        * Update README.md

        Changed the URL from personal to YARC

        * Update README.md

        Changed the URL from personal to YARC

        * Custom Post Processing Shader to Enable Transparency on Render Textures

        ---------

        Co-authored-by: TheFatBastid <tfb@sof.ws>
        Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

    commit 4ea9b28
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 21:36:50 2023 -0400

        Custom Background Testing

    commit bd04472
    Author: NyxTheShield <felipe.montero.13@sansano.usm.cl>
    Date:   Wed May 10 21:31:44 2023 -0400

        Custom Post Processing Shader to Enable Transparency on Render Textures

    commit 26ced71
    Merge: b6a14f0 20736b6
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 21:39:01 2023 -0400

        Merge branch 'dev' for v0.10.1

    commit 20736b6
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 21:30:49 2023 -0400

        UPDATE TIME

    commit b1dc6cd
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 21:18:48 2023 -0400

        Fixed multiple issues

    commit c8075ed
    Author: PixelatedPope <Pixelated_Pope@hotmail.com>
    Date:   Tue May 9 18:35:21 2023 -0600

        Update song count text on folder after pressing refresh. (#294)

        Co-authored-by: Jonathan Peterson <jonathan.peterson@hexagon.com>

    commit 16a2f56
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 18:31:10 2023 -0400

        Category text

    commit 92b51f9
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 18:19:10 2023 -0400

        Added artist name clicking back

    commit 9826116
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 17:58:05 2023 -0400

        Album cover optimizations and fixes

    commit ce94cee
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:56:01 2023 -0400

        I forgot that song packs existed

    commit 9cc8679
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:46:47 2023 -0400

        Speeded up standard song scanning

    commit bd68d2f
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:17:03 2023 -0400

        Added metadata back (Hugh L)

    commit b8f9ad3
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Tue May 9 15:08:19 2023 -0400

        Update DESIGNING.md

    commit 0888e0b
    Author: rjkiv <76180273+rjkiv@users.noreply.github.com>
    Date:   Tue May 9 15:06:50 2023 -0400

        CON file native integration (#286)

        * i hate you riley

        * lazy midi file stream implementation

        * i think CONs work now?

        * only validate CON songs if any were found

        * account for potentially different path name schemes

        * removed unused file

        * rebase with current YARG dev branch

    commit 0b355d5
    Author: grishhung <93692315+grishhung@users.noreply.github.com>
    Date:   Tue May 9 15:06:36 2023 -0400

        Refactored performance text sizing code (#287)

    commit 247bb08
    Author: Paulo Cardoso <50218490+nevespt@users.noreply.github.com>
    Date:   Tue May 9 20:06:10 2023 +0100

        FPS Counter (#290)

        [Added]
        - FPS_Circle Asset
        - An option at Setting to enable the counter
        - FpsCounter Script
        - Entry in Localization

        [Changed]
        - Elements at persistant Scene

    commit b6a14f0
    Author: TheFatBastid <tfb@sof.ws>
    Date:   Tue May 9 15:01:54 2023 -0400

        Updated Readme (#291)

        * Update README.md

        Changed the URL from personal to YARC

        * Update README.md

        Changed the URL from personal to YARC

    commit bba5010
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Mon May 8 18:17:43 2023 -0400

        New music library code

    commit 52553c5
    Author: muskit <15199219+muskit@users.noreply.github.com>
    Date:   Mon May 8 13:02:18 2023 -0700

        adjust alpha of gold star progress' top bar (#278)

    commit a5e12c6
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Mon May 8 21:02:03 2023 +0100

        Change mogg loading stuff (#283)

    commit 1930fa6
    Author: EliteAsian <lavasnakegaming@gmail.com>
    Date:   Mon May 8 15:45:49 2023 -0400

        Excon stuff (#282)

        * Expanded upon ExtractedCONSongEntry class (#265)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * expand ExtractedCONSongEntry class

        * improved dta parsing (#267)

        * add hopo_threshold support to please jnack

        * fix DXT3 image byte parsing

        * DXT3 loop cleanup

        * hopo threshold fix

        * actually reference hopo_threshold this time

        * small RB fixes

        * expand ExtractedCONSongEntry class

        * Fixed icons

        * "Reset Camera Settings" button

        * Did someone say UPDATE?

        * improve dta parsing

        ---------

        Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

        * (maybe) fix issue with dta files containing brackets in symbols (#268)

        * ExtractedCONSongEntry full integration (#275)

        * modify ExtractedCONSongEntry to not use Xbox classes

        * remove XboxSong scanner

        * remove unused Xbox classes

        * add notes for songs.dta members

        * Fixed hopo threshold bug (#280)

        * modify ExtractedCONSongEntry to not use Xbox classes

        * remove XboxSong scanner

        * remove unused Xbox classes

        * add notes for songs.dta members

        * begin con integration with CONSongEntry class and CON file detection

        * begin creating ConSongEntry

        * CON scanning now returns a List of ConSongEntry objects

        * CONSongEntry validator implemented

        * clean up mogg BASS function, fix hopo threshold bug

        * edit mogg and png_xbox loaders to accept byte arrays

        ---------

        Co-authored-by: rjkiv <76180273+rjkiv@users.noreply.github.com>
        Co-authored-by: Emma <webmaster@invoxiplaygames.uk>

    commit dbcdc26
    Author: Kadu Waengertner <87105274+kaduwaengertner@users.noreply.github.com>
    Date:   Mon May 8 16:41:45 2023 -0300

        Fixed Gold Star Texture (#281)

        + Something wrong when exported, two shines didn't had proper blending mode applied

    commit 70ba2e3
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Mon May 8 20:40:08 2023 +0100

        Fix caches not being scanned in parallel on error (#279)

    commit 280009e
    Author: Cisco <PikminGuts92@users.noreply.github.com>
    Date:   Sun May 7 21:42:28 2023 -0400

        Clear phrase after ending for generic vox (#276)

        * Parse phrase length from midi and clear phrase when complete for generic vox

        * Ignore percussion phrases when parsing midi for generic vox

    commit c29e3f4
    Author: RileyTheFox <jacobchambers@hotmail.co.uk>
    Date:   Mon May 8 00:03:51 2023 +0100

        Add preview audio loading code (#274)

        * Set bass channel position

        * Load preview audio and fade functions

        * Try fix volume slide

        * Adjust play function for fade

commit b5a75af
Author: muskit <15199219+muskit@users.noreply.github.com>
Date:   Sat May 13 16:39:46 2023 -0700

    remove 5.5% non-solo base score bump

commit 2cad203
Merge: d912fe0 ab7ab5a
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:58:05 2023 -0700

    Merge branch 'score-tuning-solo-base' into score-tuning-ch-scale

commit ab7ab5a
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:57:01 2023 -0700

    boost StarScoreKeeper.BaseScore when there's no solo

commit d912fe0
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:35:29 2023 -0700

    double solo bonus points too, remove 5% solo bonus

commit 684f38d
Merge: eb4a974 f55cab3
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:22:04 2023 -0700

    Merge branch 'score-tuning-solo-base' into score-tuning-ch-scale

commit f55cab3
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 19:21:01 2023 -0700

    make StarScoreKeeper.BaseScore's solo notes be double pts

commit eb4a974
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 18:29:13 2023 -0700

    double ALL the points

commit 87e2348
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 17:22:14 2023 -0700

    Add bonus solo points to StarScoreKeeper.BaseScore

commit c90bc46
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 17:15:57 2023 -0700

    fix score thresholds using RB4DX reference

commit 49306ea
Author: msk <15199219+muskit@users.noreply.github.com>
Date:   Sun May 7 15:26:14 2023 -0700

    refactor StarScoreKeeper for easier adjustments
  • Loading branch information
EliteAsian123 committed May 15, 2023
1 parent 3897e28 commit 281a2d0
Show file tree
Hide file tree
Showing 10 changed files with 248 additions and 65 deletions.
183 changes: 162 additions & 21 deletions Assets/Prefabs/UI/PlayResultScreen/PlayResultScreen.prefab
Original file line number Diff line number Diff line change
@@ -1,5 +1,144 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2158101557756457678
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 593572179698199281}
- component: {fileID: 2481007977002337565}
- component: {fileID: 6640033541102545540}
m_Layer: 5
m_Name: Score WIP Notice
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &593572179698199281
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2158101557756457678}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8264468827415930220}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.87500006}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2481007977002337565
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2158101557756457678}
m_CullTransparentMesh: 1
--- !u!114 &6640033541102545540
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2158101557756457678}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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: 'SCORE AND STARS SYSTEM ARE SUBJECT TO CHANGE AND ARE NOT FINAL.
<b>SCORES
MAY BE WIPED BETWEEN UPDATES DURING DEVELOPMENT.'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 2df099280d0df81438dd6cd8bc6b2766, type: 2}
m_sharedMaterial: {fileID: -4356099095613367612, guid: 2df099280d0df81438dd6cd8bc6b2766,
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: 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_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 27.25
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 0
m_fontSizeMax: 999
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 256
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
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: 1
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, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &2318137390385720136
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -241,7 +380,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 39.4
m_fontSize: 48.3
m_fontSizeBase: 40
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -683,7 +822,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 19.7
m_fontSize: 24.15
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -839,7 +978,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 32.6
m_fontSize: 39.95
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand Down Expand Up @@ -951,6 +1090,7 @@ MonoBehaviour:
marginContainerRT: {fileID: 2622748020820660481}
helpBarRT: {fileID: 1770877436458841397}
playerCardsContainer: {fileID: 5192816751450639872}
scoreWIPNotice: {fileID: 6640033541102545540}
--- !u!1 &2622748021320471148
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1058,10 +1198,10 @@ RectTransform:
m_Children:
- {fileID: 4706769500185451813}
m_Father: {fileID: 8264468827415930220}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0.9}
m_AnchorMax: {x: 1, y: 0.75}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
Expand Down Expand Up @@ -1119,6 +1259,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 593572179698199281}
- {fileID: 2993275657788534953}
m_Father: {fileID: 2622748020820660481}
m_RootOrder: 0
Expand Down Expand Up @@ -1517,7 +1658,7 @@ PrefabInstance:
- target: {fileID: 3011040150514529251, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
propertyPath: m_SizeDelta.x
value: 54.255917
value: 66.476776
objectReference: {fileID: 0}
- target: {fileID: 3011040150514529251, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
Expand All @@ -1532,7 +1673,7 @@ PrefabInstance:
- target: {fileID: 4570336199446443965, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
propertyPath: m_fontSize
value: 17.35
value: 21.3
objectReference: {fileID: 0}
- target: {fileID: 6015766815798681171, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
Expand Down Expand Up @@ -1726,7 +1867,7 @@ PrefabInstance:
- target: {fileID: 3011040150514529251, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
propertyPath: m_SizeDelta.x
value: 54.255917
value: 66.476776
objectReference: {fileID: 0}
- target: {fileID: 3011040150514529251, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
Expand All @@ -1746,7 +1887,7 @@ PrefabInstance:
- target: {fileID: 4570336199446443965, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
propertyPath: m_fontSize
value: 17.35
value: 21.3
objectReference: {fileID: 0}
- target: {fileID: 6015766815798681171, guid: bf4101105cbc9af4abd83b117ec835be,
type: 3}
Expand Down Expand Up @@ -2533,17 +2674,17 @@ PrefabInstance:
- target: {fileID: 1194046009032460958, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 14.45
value: 14.75
objectReference: {fileID: 0}
- target: {fileID: 1266162281580313134, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 14.45
value: 14.75
objectReference: {fileID: 0}
- target: {fileID: 1619932211422409174, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 28.55
value: 29.15
objectReference: {fileID: 0}
- target: {fileID: 2044582496420157559, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -2578,12 +2719,12 @@ PrefabInstance:
- target: {fileID: 2115190651333479625, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 14.45
value: 14.75
objectReference: {fileID: 0}
- target: {fileID: 2127037780535138637, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 27.35
value: 27.9
objectReference: {fileID: 0}
- target: {fileID: 2278683627010739094, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -2653,7 +2794,7 @@ PrefabInstance:
- target: {fileID: 2555765053582587274, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 14.45
value: 14.75
objectReference: {fileID: 0}
- target: {fileID: 2621259071427413874, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -2858,7 +2999,7 @@ PrefabInstance:
- target: {fileID: 3563853899743806951, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 14.45
value: 14.75
objectReference: {fileID: 0}
- target: {fileID: 3642272724672605703, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -3153,7 +3294,7 @@ PrefabInstance:
- target: {fileID: 4506782558550738543, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 60.55
value: 61.8
objectReference: {fileID: 0}
- target: {fileID: 4994320818034838144, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -3188,7 +3329,7 @@ PrefabInstance:
- target: {fileID: 5169645697017489166, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 20.15
value: 20.6
objectReference: {fileID: 0}
- target: {fileID: 5371834738989781616, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -3313,7 +3454,7 @@ PrefabInstance:
- target: {fileID: 5999799324668889936, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 14.45
value: 14.75
objectReference: {fileID: 0}
- target: {fileID: 6197817577866305028, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -3498,7 +3639,7 @@ PrefabInstance:
- target: {fileID: 8653733435553734207, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 62.25
value: 63.55
objectReference: {fileID: 0}
- target: {fileID: 8684313221566951526, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down Expand Up @@ -3553,7 +3694,7 @@ PrefabInstance:
- target: {fileID: 9106554932078669887, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
propertyPath: m_fontSize
value: 32.2
value: 32.9
objectReference: {fileID: 0}
- target: {fileID: 9149902261495578651, guid: db32e91337da4084f85c3e2fd8b2ced0,
type: 3}
Expand Down
1 change: 0 additions & 1 deletion Assets/Script/PlayMode/CommonTrack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public sealed class CommonTrack : MonoBehaviour {
public bool strongFinishNotifsEnabled;
public bool overdriveReadyNotifsEnabled;
public bool fullComboTrumpsStrongFinish;

[Space]
// Numeric performance text settings
public int hotStartCutoff;
Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/PlayMode/DrumsTrack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected override void StartTrack() {
kickFretInside.material.SetColor("_EmissionColor", commonTrack.FretColor(kickIndex) * 2);

// initialize scoring variables
ptsPerNote = proInst.Contains(player.chosenInstrument) ? 30 : 25;
ptsPerNote = proInst.Contains(player.chosenInstrument) ? 60 : 50;
starsKeeper = new(Chart, scoreKeeper,
player.chosenInstrument,
ptsPerNote);
Expand Down
4 changes: 2 additions & 2 deletions Assets/Script/PlayMode/FiveFretTrack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public class FiveFretTrack : AbstractTrack {
private int[] allowedChordGhosts = new int[] { -1, -1, -1, -1, -1 }; // -1 = not a chord; 0 = ghosted; 1 = ghost allowed

// https://www.reddit.com/r/Rockband/comments/51t3c0/exactly_how_many_points_are_sustains_worth/
private const double SUSTAIN_PTS_PER_BEAT = 12.0;
private const int PTS_PER_NOTE = 25;
private const double SUSTAIN_PTS_PER_BEAT = 25.0;
private const int PTS_PER_NOTE = 50;
private int noteCount = -1;
protected override void StartTrack() {
notePool.player = player;
Expand Down
2 changes: 1 addition & 1 deletion Assets/Script/PlayMode/MicPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ private string EndPhraseName {
// easy, medium, hard, expert
// https://rockband.scorehero.com/forum/viewtopic.php?t=4545
// max harmony pts = 10% of main points per extra mic
private readonly int[] MAX_POINTS = { 200, 400, 800, 1000, 1000 };
private readonly int[] MAX_POINTS = { 400, 800, 1600, 2000, 2000 };
private StarScoreKeeper starsKeeper;
private int ptsPerPhrase; // pts per phrase, set depending on difficulty

Expand Down
Loading

0 comments on commit 281a2d0

Please sign in to comment.