From c9f824023416ecc60c7a21fbeb87fc195b92dc1e Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Fri, 10 Dec 2021 13:22:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=BC=8F=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=9A=84=E5=B8=AE=E5=8A=A9=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/lang_en.lua | 3 ++- parts/language/lang_es.lua | 3 ++- parts/language/lang_fr.lua | 3 ++- parts/language/lang_id.lua | 3 ++- parts/language/lang_pt.lua | 3 ++- parts/language/lang_zh.lua | 3 ++- parts/language/lang_zh_grass.lua | 3 ++- parts/language/lang_zh_trad.lua | 3 ++- parts/scenes/mode.lua | 24 ++++++++++++++++++------ parts/scenes/setting_key.lua | 2 +- 10 files changed, 35 insertions(+), 15 deletions(-) diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index df8d0402..d0781e4c 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -137,7 +137,8 @@ return{ chatStart="------Beginning of log------", chatHistory="------New messages below------", - keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", + searchModeHelp="Type to search", + keySettingHelp="Press to bind key\nescape: cancel\nbackspace: delete", customBGhelp="Drop image file here to apply custom background", customBGloadFailed="Unsupport image format for custom background", diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index a6737f1d..7141b600 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -127,7 +127,8 @@ return{ chatStart="------Comienzo del historial------", chatHistory="------Nuevos mensajes------", - -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", + -- searchModeHelp="Type to search", + -- keySettingHelp="Press to bind key\nescape: cancel\nbackspace: delete", -- customBGhelp="Drop image file here to apply custom background", -- customBGloadFailed="Unsupport image format for custom background", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index ae9141d9..0f6d0a90 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -128,7 +128,8 @@ return{ chatStart="--------Début des logs--------", chatHistory="-Nouveaux messages en dessous-", - -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", + -- searchModeHelp="Type to search", + -- keySettingHelp="Press to bind key\nescape: cancel\nbackspace: delete", -- customBGhelp="Drop image file here to apply custom background", -- customBGloadFailed="Unsupport image format for custom background", diff --git a/parts/language/lang_id.lua b/parts/language/lang_id.lua index 36105f0a..f4f91bbe 100644 --- a/parts/language/lang_id.lua +++ b/parts/language/lang_id.lua @@ -137,7 +137,8 @@ return{ chatStart="------Awal percakapan------", chatHistory="------Pesan-pesan baru di bawah ini------", - keySettingInstruction="Tekan untuk menghubung tombol ke aksi tertentu\nescape: batal\nbackspace: hapus", + -- searchModeHelp="Type to search", + keySettingHelp="Tekan untuk menghubung tombol ke aksi tertentu\nescape: batal\nbackspace: hapus", customBGhelp="Seret file gambar di sini untuk memasangkan background", customBGloadFailed="Format file gambar tidak didukung untuk background", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 3ae6de3e..e0bd48af 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -126,7 +126,8 @@ return{ chatStart="------Começo do log------", chatHistory="------Novas mensagens abaixo------", - -- keySettingInstruction="Press to bind key\nescape: cancel\nbackspace: delete", + -- searchModeHelp="Type to search", + -- keySettingHelp="Press to bind key\nescape: cancel\nbackspace: delete", -- customBGhelp="Drop image file here to apply custom background", -- customBGloadFailed="Unsupport image format for custom background", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 788b2874..fe1bee65 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -137,7 +137,8 @@ return{ chatStart="------消息的开头------", chatHistory="------以上是历史消息------", - keySettingInstruction="点击添加键位绑定\nesc取消选中\n退格键清空选中", + searchModeHelp="直接输入关键词搜索", + keySettingHelp="点击添加键位绑定\nesc取消选中\n退格键清空选中", customBGhelp="把图片文件拖到这个窗口里使用自定义背景", customBGloadFailed="自定义背景的图片文件格式不支持", diff --git a/parts/language/lang_zh_grass.lua b/parts/language/lang_zh_grass.lua index 670c8a35..7cf7e9a8 100644 --- a/parts/language/lang_zh_grass.lua +++ b/parts/language/lang_zh_grass.lua @@ -135,7 +135,8 @@ return{ chatStart="------日志开始------", chatHistory="------下面是新消息------", - keySettingInstruction="按绑定键\n退出:取消\n退格:删除", + searchModeHelp="键入要搜索的内容", + keySettingHelp="按绑定键\n退出:取消\n退格:删除", customBGhelp="将图像文件拖放到此处以应用自定义背景", customBGloadFailed="不支持自定义背景的图像格式", diff --git a/parts/language/lang_zh_trad.lua b/parts/language/lang_zh_trad.lua index a9ed8ca7..8cbd070d 100644 --- a/parts/language/lang_zh_trad.lua +++ b/parts/language/lang_zh_trad.lua @@ -137,7 +137,8 @@ return{ chatStart="------訊息開始------", chatHistory="------以上為歷史訊息------", - keySettingInstruction="點擊來設置鍵位\n按esc來取消選中\n按退格鍵來清除選中", + searchModeHelp="直接輸入關鍵字搜索", + keySettingHelp="點擊來設置鍵位\n按esc來取消選中\n按退格鍵來清除選中", customBGhelp="把圖片檔案拖到這個視窗裏使用自定義背景", customBGloadFailed="自定義背景的圖片檔案格式不支持", diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index d8f98e1d..b6c387bc 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -216,11 +216,11 @@ function scene.keyDown(key,isRep) elseif key=='backspace'then if #searchText>0 then searchText=searchText:sub(1,-2) - searchTimer=.42 + searchTimer=.26 end elseif #key==1 and #searchText<12 then searchText=searchText..key - searchTimer=.42 + searchTimer=.26 end end @@ -250,7 +250,13 @@ local function _modePannelStencil() gc_rectangle('fill',0,0,810,610) end local _unknownModeText={'???','?','?????'} -local _rankName={[0]='','B','A','S','U','X'} +local _rankName={ + CHAR.icon.rankB, + CHAR.icon.rankA, + CHAR.icon.rankS, + CHAR.icon.rankU, + CHAR.icon.rankX, +} function scene.draw() --Gray background gc_setColor(COLOR.dX) @@ -271,7 +277,13 @@ function scene.draw() --SearchText gc_print(CHAR.key.right,800,40) - gc_print(searchText,840,40) + if searchText==""then + gc_setColor(COLOR.dH) + gc_print(text.searchModeHelp,840,40) + else + gc_setColor(COLOR.Z) + gc_print(searchText,840,40) + end --Items gc_push('transform') @@ -319,10 +331,10 @@ function scene.draw() if rank then local rankStr=_rankName[RANKS[item.name]] gc_setColor(0,0,0,item.alpha) - gc_print(rankStr,item.x-12+2,item.y-26+2) + gc_print(rankStr,item.x+item.w-30+2,item.y-26+2) local r,g,b=RANK_COLORS[rank][1],RANK_COLORS[rank][2],RANK_COLORS[rank][3] gc_setColor(r,g,b,item.alpha) - gc_print(rankStr,item.x-12,item.y-26) + gc_print(rankStr,item.x+item.w-30,item.y-26) end --Selecting glow diff --git a/parts/scenes/setting_key.lua b/parts/scenes/setting_key.lua index 1f657fda..c18b66e5 100644 --- a/parts/scenes/setting_key.lua +++ b/parts/scenes/setting_key.lua @@ -168,7 +168,7 @@ end function scene.draw() setFont(20) gc.setColor(COLOR.Z) - gc.printf(text.keySettingInstruction,526,620,500,'right') + gc.printf(text.keySettingHelp,526,620,500,'right') for i=0,20 do for j=1,#keyList[i]do