From 137e707c63e043a3bcb09162d262f3c7adac3ca1 Mon Sep 17 00:00:00 2001 From: MrZ_26 <1046101471@qq.com> Date: Thu, 8 Aug 2024 23:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4ffa=E6=8C=89=E9=92=AE=20tech?= =?UTF-8?q?=20league=E6=94=B9=E5=90=8Dgalaxim=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=81=94=E7=BD=91=E8=8F=9C=E5=8D=95=E6=96=87?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 7 +++---- parts/language/lang_es.lua | 7 +++---- parts/language/lang_fr.lua | 7 +++---- parts/language/lang_id.lua | 7 +++---- parts/language/lang_ja.lua | 7 +++---- parts/language/lang_pt.lua | 5 ++--- parts/language/lang_symbol.lua | 5 ++--- parts/language/lang_vi.lua | 7 +++---- parts/language/lang_zh.lua | 7 +++---- parts/language/lang_zh_code.lua | 7 +++---- parts/language/lang_zh_trad.lua | 7 +++---- parts/net.lua | 2 +- parts/scenes/{net_league.lua => net_galaxim.lua} | 4 ++-- parts/scenes/net_menu.lua | 9 ++++----- 14 files changed, 38 insertions(+), 50 deletions(-) rename parts/scenes/{net_league.lua => net_galaxim.lua} (91%) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 170ce840..7e9c3254 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -462,14 +462,13 @@ C. Gamepad tas="TAS (T)", }, net_menu={ - league="Tech League", - ffa="FFA", + galaxim="Galaxim", rooms="Rooms", resetPW="Reset password", logout="Log out", }, - net_league={ - match="Find Match", + net_galaxim={ + match="Enter Sim.", }, net_rooms={ password="Password", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 510e9ddf..6428b396 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -423,14 +423,13 @@ return { tas="TAS (T)", }, net_menu={ - league="Liga Tech", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="Salas", resetPW="Restabl. Contraseña", logout="Desconec.", }, - net_league={ - match="Buscar Match", + net_galaxim={ + -- match="Enter Sim.", -- Simulation }, net_rooms={ password="Contraseña", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index d6e87dad..8184b1eb 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -398,14 +398,13 @@ return { -- tas="TAS (T)", }, net_menu={ - -- league="Tech League", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="Salons", resetPW="Réinitialiser le mot de passe", logout="Se déconnecter", }, - net_league={ - match="Find Match", + net_galaxim={ + -- match="Enter Sim.", -- Simulation }, net_rooms={ password="Mot de passe", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 11d3c2a5..862e478d 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -424,14 +424,13 @@ return { tas="TAS (T)", }, net_menu={ - league="Tech League", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="Ruang-ruang", -- resetPW="Reset password", logout="Log out", }, - net_league={ - match="Cari Tandingan", + net_galaxim={ + -- match="Enter Sim.", -- Simulation }, net_rooms={ password="Password", diff --git a/parts/language/lang_ja.lua b/parts/language/lang_ja.lua index 30053429..3a09b177 100644 --- a/parts/language/lang_ja.lua +++ b/parts/language/lang_ja.lua @@ -468,14 +468,13 @@ C. ゲームパッド tas="TAS (T)", }, net_menu={ - league="テクリーグ", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="ルーム", resetPW="パスワード再設定", logout="ログアウト", }, - net_league={ - match="対戦相手を探す", + net_galaxim={ + -- match="Enter Sim.", -- Simulation }, net_rooms={ password="パスワード", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 469cd67b..4e9db3bc 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -412,13 +412,12 @@ return { -- tas="TAS (T)", }, net_menu={ - -- league="Tech League", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="Salas", -- resetPW="Reset password", -- logout="Log out", }, - net_league={ + net_galaxim={ -- match="Find Match", }, net_rooms={ diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 017c9219..3a1f1b4b 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -171,13 +171,12 @@ return { tas="#&; (T)", }, net_menu={ - league="TL", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="< >", resetPW="R ***", logout="@_@x", }, - net_league={ + net_galaxim={ match="!", }, net_rooms={ diff --git a/parts/language/lang_vi.lua b/parts/language/lang_vi.lua index 9f366b97..51149a87 100644 --- a/parts/language/lang_vi.lua +++ b/parts/language/lang_vi.lua @@ -457,14 +457,13 @@ C. Tay cầm chơi game (Gamepad): tas="TAS (T)", }, net_menu={ - league="Tech League", - ffa="FFA", + -- galaxim="Galaxim", -- Galaxy-Simulation rooms="Danh sách phòng", resetPW="Đặt lại mật khẩu", logout="Đăng xuất", }, - net_league={ - match="Tìm trận", + net_galaxim={ + -- match="Enter Sim.", -- Simulation }, net_rooms={ password="Mật khẩu", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 5d5054a4..d30cdfa1 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -453,14 +453,13 @@ return { tas="TAS (T)", }, net_menu={ - league="Tech League", - ffa="FFA", + galaxim="Galaxim", rooms="房间列表", resetPW="重置密码", logout="退出登录", }, - net_league={ - match="匹配对手", + net_galaxim={ + match="进入模拟", }, net_rooms={ password="密码", diff --git a/parts/language/lang_zh_code.lua b/parts/language/lang_zh_code.lua index ff401f1d..6b0b3f0b 100644 --- a/parts/language/lang_zh_code.lua +++ b/parts/language/lang_zh_code.lua @@ -372,14 +372,13 @@ return { tas="TAS(); (T)", }, net_menu={ - league="M.TechLeague();", - ffa="M.FFA", + galaxim="M.Galaxim();", rooms="M.Rooms();", resetPW="M.ResetPW", logout="M.Logout();", }, - net_league={ - match="TL.Match();", + net_galaxim={ + match="GX.Enter();", }, net_rooms={ password="Password=", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index 098b0bb3..8a80880e 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -424,14 +424,13 @@ return { tas="TAS (T)", }, net_menu={ - league="Tech League", - ffa="FFA", + galaxim="Galaxim", rooms="房間列表", resetPW="重設密碼", logout="登出", }, - net_league={ - match="匹配對手", + net_galaxim={ + match="进入模拟", }, net_rooms={ password="密碼", diff --git a/parts/net.lua b/parts/net.lua index 97e5027b..bb89358d 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -194,7 +194,7 @@ local noticeLang={ es='en_us', -- es_es id='en_us', -- id_id pt='en_us', -- pt_pt - symbol='en_us', -- ga_os + symbol='en_us', -- gl_os ja='en_us', -- ja_jp vi='en_us', -- vi_vn zh='zh_cn', diff --git a/parts/scenes/net_league.lua b/parts/scenes/net_galaxim.lua similarity index 91% rename from parts/scenes/net_league.lua rename to parts/scenes/net_galaxim.lua index d9c6837a..9cb97d1b 100644 --- a/parts/scenes/net_league.lua +++ b/parts/scenes/net_galaxim.lua @@ -3,14 +3,14 @@ local gc=love.graphics local scene={} function scene.enter() - BG.set('league') + BG.set('galaxy') BGM.play('exploration') end function scene.draw() gc.setColor(COLOR.Z) setFont(100) - GC.mStr("Tech League",640,120) + GC.mStr("Galaxim",640,120) drawSelfProfile() drawOnlinePlayerCount() end diff --git a/parts/scenes/net_menu.lua b/parts/scenes/net_menu.lua index ce29d6c3..5026b6a0 100644 --- a/parts/scenes/net_menu.lua +++ b/parts/scenes/net_menu.lua @@ -14,11 +14,10 @@ function scene.draw() end scene.widgetList={ - WIDGET.newKey{name='setting', x=1200,y=160,w=90, h=90,code=goScene'setting_game',font=60,fText=CHAR.icon.settings}, - WIDGET.newButton{name='league',x=640, y=180,w=350,h=120,font=40,color='D',code=goScene'net_league'}, - WIDGET.newButton{name='ffa', x=640, y=360,w=350,h=120,font=40,color='D',code=function() MES.new('warn',text.notFinished)--[[NET.enterRoom({name='ffa'})]] end}, - WIDGET.newButton{name='rooms', x=640, y=540,w=350,h=120,font=40,code=goScene'net_rooms'}, - WIDGET.newButton{name='logout',x=880, y=40,w=180, h=60,color='dR', + WIDGET.newKey{name='setting', x=1200,y=160,w=90, h=90,code=goScene'setting_game',font=60,fText=CHAR.icon.settings}, + WIDGET.newButton{name='galaxim',x=640, y=260,w=350,h=120,font=40,color='D',code=goScene'net_galaxim'}, + WIDGET.newButton{name='rooms', x=640, y=460,w=350,h=120,font=40,code=goScene'net_rooms'}, + WIDGET.newButton{name='logout', x=880, y=40,w=180, h=60,color='dR', code=function() if tryBack() then print('logout')