From 160d852cd23e1df16c537566fbd86c40be0a0a09 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Wed, 10 Feb 2021 20:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=90=88=E5=88=B010=E5=B0=8F?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/language/dict_en.lua | 2 +- parts/language/dict_zh.lua | 2 +- parts/language/lang_en.lua | 2 +- parts/language/lang_fr.lua | 2 +- parts/language/lang_pt.lua | 2 +- parts/language/lang_sp.lua | 2 +- parts/language/lang_symbol.lua | 2 +- parts/language/lang_zh.lua | 2 +- parts/scenes/dict.lua | 3 +-- parts/scenes/{mg_get10.lua => mg_jgt.lua} | 29 ++++++++++------------- 10 files changed, 21 insertions(+), 27 deletions(-) rename parts/scenes/{mg_get10.lua => mg_jgt.lua} (92%) diff --git a/parts/language/dict_en.lua b/parts/language/dict_en.lua index 4c8edb38..6a7791bf 100644 --- a/parts/language/dict_en.lua +++ b/parts/language/dict_en.lua @@ -759,7 +759,7 @@ return{ {"Minigame", "minigame", "other", - "Type the following codes in the search bar of this dictionary for some fun minigames!\n\n15-Puzzle: 15p\nSchulte Grid: sltg\nPong: pong\nAtoZ: atoz\nUltimate Tic-tac-toe: uttt\ncubefield: cbf\n2048: 2048\nGet the ten: gtt", + "Type the following codes in the search bar of this dictionary for some fun minigames!\n\n15-Puzzle: 15p\nSchulte Grid: sltg\nPong: pong\nAtoZ: atoz\nUltimate Tic-tac-toe: uttt\ncubefield: cbf\n2048: 2048\nJust get ten: jgt", }, --English diff --git a/parts/language/dict_zh.lua b/parts/language/dict_zh.lua index b82e2f33..a5ebc78b 100644 --- a/parts/language/dict_zh.lua +++ b/parts/language/dict_zh.lua @@ -765,7 +765,7 @@ return{ {"小游戏", "minigame xiaoyouxi", "other", - "输入以下词语，小游戏免费玩!\n\n15-Puzzle: 15p\nSchulte Grid: sltg\nPong: pong\nAtoZ: atoz\nUltimate Tic-tac-toe: uttt\ncubefield: cbf\n2048: 2048\nGet the ten: gtt", + "输入以下词语，小游戏免费玩!\n\n15-Puzzle: 15p\nSchulte Grid: sltg\nPong: pong\nAtoZ: atoz\nUltimate Tic-tac-toe: uttt\ncubefield: cbf\n2048: 2048\nJust get ten: jgt", }, --英文 diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 60f9fb80..1becd4b4 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -639,7 +639,7 @@ return{ replay1="P", replay2="P", }, - mg_get10={ + mg_jgt={ reset="Reset", blind="Blind", }, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 130525c5..68b52f49 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -550,7 +550,7 @@ return{ -- tapControl="Tap control", -- skip="Skip Round", }, - mg_get10={ + mg_jgt={ reset="Réinitialiser", blind="Aveugler", }, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index ae697a38..8ded656e 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -635,7 +635,7 @@ return{ -- tapControl="Tap control", -- skip="Skip Round", }, - mg_get10={ + mg_jgt={ reset="Resetar", blind="Cego", }, diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 080da8fe..fca2214f 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -552,7 +552,7 @@ return{ -- tapControl="Tap control", -- skip="Skip Round", }, - mg_get10={ + mg_jgt={ reset="Reiniciar", blind="A ciegas", }, diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 3b587049..b461a058 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -483,7 +483,7 @@ return{ tapControl="_↓", skip=">>", }, - mg_get10={ + mg_jgt={ reset="R", blind="???", }, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 51acb693..3fe6c437 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -641,7 +641,7 @@ return{ replay1="P", replay2="P", }, - mg_get10={ + mg_jgt={ reset="重置", blind="盲打", }, diff --git a/parts/scenes/dict.lua b/parts/scenes/dict.lua index 816f2ce7..7cbd2010 100644 --- a/parts/scenes/dict.lua +++ b/parts/scenes/dict.lua @@ -45,8 +45,7 @@ local eggInput={ uttt=goScene"mg_UTTT", cbf=goScene"mg_cubefield", ["2048"]=goScene"mg_2048", - gtt=goScene"mg_get10", - get10="gtt", + jgt=goScene"mg_jgt", flag=function() BG.setDefault("none") BGM.setDefault(false) diff --git a/parts/scenes/mg_get10.lua b/parts/scenes/mg_jgt.lua similarity index 92% rename from parts/scenes/mg_get10.lua rename to parts/scenes/mg_jgt.lua index fe35f874..1bbbcba0 100644 --- a/parts/scenes/mg_get10.lua +++ b/parts/scenes/mg_jgt.lua @@ -22,12 +22,8 @@ local tileColor={ {.78, .31, .00}, {.78, .55, .04}, {.12, .12, .51}, - {.78, .78, .78}, - {.40, .40, .40}, - {.20, .20, .20}, - {.00, .00, .00}, } -local newTile={0,2,2,2,3,3,3,3,4,4,4,5,5} +local newTile={0,2,2,2,3,3,3,3,4,4,4,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5} local board,cx,cy local startTime,time @@ -147,15 +143,9 @@ function scene.mouseDown(x,y) merge() end -function scene.touchDown(x,y) - scene.mouseMove(x,y) -end -function scene.touchMove(x,y) - scene.mouseMove(x,y) -end -function scene.touchClick(x,y) - scene.mouseDown(x,y) -end +scene.touchDown=scene.mouseMove +scene.touchMove=scene.mouseMove +scene.touchClick=scene.mouseDown function scene.update() if state==1 then @@ -215,17 +205,22 @@ function scene.draw() gc.setLineWidth(4) setFont(70) + local hide=blind and state==1 for i=1,5 do for j=1,5 do local N=board[i][j] if N>0 then - if blind and state==1 and N>newTile[maxTile]then + if hide and N>newTile[maxTile]then setColor(COLOR.dGrey) rectangle("fill",320+j*128-128,40+i*128-128,128,128) setColor(1,1,1,.3) mStr("?",j*128+256,i*128-75) else - setColor(tileColor[N]) + if N<=13 then + setColor(tileColor[N]) + else + setColor(COLOR.rainbow(4*TIME()-i-j)) + end rectangle("fill",320+j*128-128,40+i*128-128,128,128) setColor(1,1,1,.9) mStr(N,j*128+256,i*128-75) @@ -240,7 +235,7 @@ function scene.draw() end setFont(50) setColor(1,1,1) - mStr("Just Get 10",160,580) + mStr("Just Get Ten",160,580) end scene.widgetList={