RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-01-19 21:37:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

added create-account button and other ui cleanup

Browse Source
This commit is contained in:
Eric Froemling 2024-12-28 21:10:55 -08:00
parent b4ba0cbffc
commit 368d63b851
No known key found for this signature in database
3 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.efrocachemap generated
View File

@ -430,7 +430,7 @@
"build/assets/ba_data/data/languages/czech.json": "d18b7d1c6bf51fc81af4084ef0e69e3e",
"build/assets/ba_data/data/languages/danish.json": "8e57db30c5250df2abff14a822f83ea7",
"build/assets/ba_data/data/languages/dutch.json": "f4e1e8e9231cda9d1bcc7e87a7f8821e",
"build/assets/ba_data/data/languages/english.json": "b5917c3b975155e35fedb655dbd7568c",
"build/assets/ba_data/data/languages/english.json": "131508c56b563b9552bee5535f107b5a",
"build/assets/ba_data/data/languages/esperanto.json": "0e397cfa5f3fb8cef5f4a64f21cda880",
"build/assets/ba_data/data/languages/filipino.json": "3d9269a90a2fee164d0a7513c4f130a3",
"build/assets/ba_data/data/languages/french.json": "6d20655730b1017ef187fd828b91d43c",
@ -4111,14 +4111,14 @@
"build/prefab/full/linux_x86_64_gui/release/ballisticakit": "523946201fa68a8761abd8012888a1ee",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "1e164a6146131c57bdd80650c7cd01eb",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "547282ad972d2659c7adf3cdcc0fe38c",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "44c56db83e60d16785b1cdbb8e60521d",
"build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f8f206e99e6515d857d03a6756432916",
"build/prefab/full/mac_arm64_gui/release/ballisticakit": "1948fefc1a65e0c09229229058d7a398",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "f73efac9c0a05d4ba1b7d37143f2b733",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "397cdcd79c10c35f13bda51cbf0431b8",
"build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c1a395b445754161e96040c0a3432471",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "50f05349c800f56b644610450ddab899",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "a4d24feb248d43185eba5cdd474968c1",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "fce31035ff71e41eaf8ae0b9467d4d75",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "1e5f7db55ae28b0871dd4a3488a2e2a7",
"build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "1c4e960c1b621d4376c3ca0f8e876aad",
"build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "60eea6534bc325bef60f2de3de497ebb",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "67e01108249a1ae8ec6ae106c684febf",
"build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "2dbf2871814d9ae25d38ad0ed8c44dc5",
"build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "33a0ae6f1ea5a0b0c60055ce01478488",
"build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "aad882eaf2230b89973e2cf4f13c9759",
"build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "33a0ae6f1ea5a0b0c60055ce01478488",
@ -4131,14 +4131,14 @@
"build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "ae4e3f563892f6b9311c4b7284f28c11",
"build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "01dab862a43d9e7c4ee4e49212442d42",
"build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "ae4e3f563892f6b9311c4b7284f28c11",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "f8d1d57c73f20f4081f889a9a3bc9681",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "df0a93565a8d0489dcef9536412aa15a",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "de9b3162ef787667bc42efff1803ee42",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "a1d921636875ab480111793b6d50f98c",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "7b505efb0ca3e2b13f972978e877321d",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "241b1122f915dcc0c44e9056396c2305",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "9363c18806b04d38a32b7fdc89a791ba",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "8180744e97e91abae2afaca510e219f0",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "d24d48e0b6d35d91350b707b74dd95f5",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "c946a1405b62469889c1d596b2021753",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "92431ded412435040f3c0be770753060",
"build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "72e4f88ff70048a2a49c907680c34121",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0a68d461e96190865ce3457ec7c38e22",
"build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "f8182ea0ad5537d4cf968a0b07594cff",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "996197f97e10bcea0bed1e88e8e75bdd",
"build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "42461cf73d82008266892bf79f0634df",
"src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
"src/assets/ba_data/python/babase/_mgen/enums.py": "794d258d59fd17a61752843a9a0551ad",
"src/ballistica/base/mgen/pyembed/binding_base.inc": "06042d31df0ff9af96b99477162e2a91",

12
src/assets/ba_data/python/baclassic/_appmode.py
View File

@ -197,13 +197,13 @@ class ClassicAppMode(babase.AppMode):
if account is None:
self._account_data_sub = None
_baclassic.set_root_ui_account_values(
tickets_text='-',
tokens_text='-',
league_rank_text='-',
tickets_text='',
tokens_text='',
league_rank_text='',
league_type='',
achievements_percent_text='-',
level_text='-',
xp_text='-',
achievements_percent_text='',
level_text='',
xp_text='',
inbox_count_text='',
gold_pass=False,
chest_0_appearance='',

30
src/assets/ba_data/python/bauiv1lib/account/settings.py
View File

@ -350,6 +350,9 @@ class AccountSettingsWindow(bui.MainWindow):
show_manage_account_button = primary_v2_account is not None
manage_account_button_space = 70.0
show_create_account_button = show_v2_proxy_sign_in_button
create_account_button_space = 70.0
# Apple asks us to make a delete-account button directly
# available in the UI. Currently disabling this elsewhere
# however as I feel that poking 'Manage Account' and scrolling
@ -426,6 +429,8 @@ class AccountSettingsWindow(bui.MainWindow):
self._sub_height += sign_in_benefits_space
if show_manage_account_button:
self._sub_height += manage_account_button_space
if show_create_account_button:
self._sub_height += create_account_button_space
if show_link_accounts_button:
self._sub_height += link_accounts_button_space
if show_v1_obsolete_note:
@ -837,6 +842,28 @@ class AccountSettingsWindow(bui.MainWindow):
)
bui.widget(edit=btn, left_widget=bbtn)
if show_create_account_button:
button_width = 300
v -= create_account_button_space
self._create_button = btn = bui.buttonwidget(
parent=self._subcontainer,
position=((self._sub_width - button_width) * 0.5, v - 30),
autoselect=True,
size=(button_width, 60),
# label=bui.Lstr(resource=f'{self._r}.createAccountText'),
label='Create an Account',
color=(0.55, 0.5, 0.6),
# icon=bui.gettexture('settingsIcon'),
textcolor=(0.75, 0.7, 0.8),
on_activate_call=bui.WeakCall(self._on_create_account_press),
)
if first_selectable is None:
first_selectable = btn
bui.widget(
edit=btn, right_widget=bui.get_special_widget('squad_button')
)
bui.widget(edit=btn, left_widget=bbtn)
# the button to go to OS-Specific leaderboards/high-score-lists/etc.
if show_game_service_button:
button_width = 300
@ -1193,6 +1220,9 @@ class AccountSettingsWindow(bui.MainWindow):
def _on_manage_account_press(self) -> None:
self._do_manage_account_press(WebLocation.ACCOUNT_EDITOR)
def _on_create_account_press(self) -> None:
bui.open_url('https://ballistica.net/createaccount')
def _on_delete_account_press(self) -> None:
self._do_manage_account_press(WebLocation.ACCOUNT_DELETE_SECTION)