From 9354cb5c59b45c05a5e13ab272f78aec0273be2f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Thu, 28 Jan 2021 16:55:12 +0800 Subject: [PATCH] =?UTF-8?q?3D=E6=96=B9=E5=9D=97=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/globalTables.lua | 1 + 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/player/draw.lua | 15 +++++++++++++-- parts/player/gameEnv0.lua | 3 ++- parts/scenes/setting_video.lua | 25 +++++++++++++------------ 10 files changed, 41 insertions(+), 15 deletions(-) diff --git a/parts/globalTables.lua b/parts/globalTables.lua index 5e86357c..02e060b5 100644 --- a/parts/globalTables.lua +++ b/parts/globalTables.lua @@ -277,6 +277,7 @@ SETTING={--Settings --Graphic block=true,ghost=.3,center=1, smooth=true,grid=.16, + upEdge=true, bagLine=false, lockFX=2, dropFX=2, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 27cccd1b..26ba0406 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -277,6 +277,7 @@ return{ smooth="Smooth Drop", grid="Grid", + upEdge="3D Block", bagLine="Bag Line", lockFX="Lock FX Level", @@ -413,6 +414,7 @@ return{ block="Draw Block", ghost="Ghost", center="Center", + upEdge="3D Block", bagLine="Bag Line", highCam="Birds-eye View", nextPos="Next Preview", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index 2ded2897..e8c25445 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -253,6 +253,7 @@ return{ block="Dessiner le bloc", smooth="Chute fluide", + upEdge="3D bloc", bagLine="Ligne du Sac", ghost="Pièce fantôme", @@ -393,6 +394,7 @@ return{ block="Dessiner le bloc", ghost="Pièce fantôme", center="Centre", + upEdge="3D bloc", bagLine="Ligne du Sac", highCam="Vue d'oiseau", nextPos="Prévisualisation de position", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 42f88745..49832ee0 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -276,6 +276,7 @@ return{ smooth="Queda suave", grid="Rede", + upEdge="3D bloco", bagLine="Linha da bolsa", lockFX="Nível FX Trava", @@ -412,6 +413,7 @@ return{ block="Mostrar bloco", ghost="Fantasma", center="Centro", + upEdge="3D bloco", bagLine="Linha De Bolsa", highCam="Vista Olho-De-Pássaro", nextPos="Próxima pos.", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 94082bdc..b4c16e9a 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -253,6 +253,7 @@ return{ block="Dibujar Bloques", smooth="Caída Fluida", + upEdge="3D Bloques", bagLine="Línea de Bag de Pzas.", ghost="Fantasma", @@ -389,6 +390,7 @@ return{ block="Dibujar Bloques", ghost="Fantasma", center="Centrar", + upEdge="3D Bloques", bagLine="Línea de Bag de Pzas.", highCam="Vista Aérea", nextPos="Nro. de Pzas. Siguientes", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 40b51f07..4c778d41 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -145,6 +145,7 @@ return{ block="==↓==", smooth="~~↓~~", + upEdge="[]`", bagLine="123|123", ghost="__↓__", @@ -282,6 +283,7 @@ return{ block="==↓==", ghost="__↓__", center="+", + upEdge="[]`", bagLine="123|123", highCam="↑__↑", nextPos="???←", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 50d1172b..1bfe65e9 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -274,6 +274,7 @@ return{ block="方块可见", smooth="平滑下落", + upEdge="3D方块", bagLine="包分界线", ghost="阴影透明度", @@ -413,6 +414,7 @@ return{ block="方块可见", ghost="阴影透明度", center="中心透明度", + upEdge="3D方块", bagLine="包分界线", highCam="超屏视野", nextPos="生成预览", diff --git a/parts/player/draw.lua b/parts/player/draw.lua index dd746641..71f4b19e 100644 --- a/parts/player/draw.lua +++ b/parts/player/draw.lua @@ -34,6 +34,7 @@ end local function drawField(P) local V,F=P.visTime,P.field local start=int((P.fieldBeneath+P.fieldUp)/30+1) + local edge=P.gameEnv.upEdge local rep=GAME.replaying local texture=SKIN.curText if P.falling==-1 then--Blocks only @@ -42,8 +43,13 @@ local function drawField(P) for i=1,10 do if F[j][i]>0 then if V[j][i]>0 then - gc_setColor(1,1,1,min(V[j][i]*.05,1)) + gc_setColor(1,1,1,V[j][i]*.05) gc_draw(texture[F[j][i]],30*i-30,-30*j)-- drawCell(j,i,F[j][i]) + if edge and(not F[j+1]or F[j+1][i]<=0)then + local r,g,b=unpack(SKIN.libColor[F[j][i]]) + gc_setColor((r+2)/3,(g+2)/3,(b+2)/3,V[j][i]*.05) + gc_rectangle("fill",30*i-30,-30*j,30,-4) + end elseif rep then gc_setColor(1,1,1,.3+.08*sin(.5*(j-i)+t)) gc_rectangle("fill",30*i-30,-30*j,30,30) @@ -67,8 +73,13 @@ local function drawField(P) for i=1,10 do if F[j][i]>0 then if V[j][i]>0 then - gc_setColor(1,1,1,min(V[j][i]*.05,1)) + gc_setColor(1,1,1,V[j][i]*.05) gc_draw(texture[F[j][i]],30*i-30,-30*j)-- drawCell(j,i,F[j][i]) + if edge and(not F[j+1]or F[j+1][i]<=0)then + local r,g,b=unpack(SKIN.libColor[F[j][i]]) + gc_setColor((r+2)/3,(g+2)/3,(b+2)/3,V[j][i]*.05) + gc_rectangle("fill",30*i-30,-30*j,30,-4) + end elseif rep then gc_setColor(1,1,1,.2) gc_rectangle("fill",30*i-30,-30*j,30,30) diff --git a/parts/player/gameEnv0.lua b/parts/player/gameEnv0.lua index 95dace87..33df5630 100644 --- a/parts/player/gameEnv0.lua +++ b/parts/player/gameEnv0.lua @@ -11,7 +11,8 @@ return{ ghost=.3,center=1, smooth=false,grid=.16, - bagLine=false, + upEdge=true, + bagLine=true, text=true, score=true, lockFX=2, diff --git a/parts/scenes/setting_video.lua b/parts/scenes/setting_video.lua index 7a444231..4e82f890 100644 --- a/parts/scenes/setting_video.lua +++ b/parts/scenes/setting_video.lua @@ -13,22 +13,23 @@ scene.widgetList={ WIDGET.newButton{name="sound", x=200, y=80,w=240,h=80,color="lCyan",font=35,code=swapScene"setting_sound","swipeR"}, WIDGET.newButton{name="game", x=1080, y=80,w=240,h=80,color="lCyan",font=35,code=swapScene"setting_game","swipeL"}, - WIDGET.newSwitch{name="block", x=340, y=180, disp=lnk_SETval("block"), code=lnk_SETrev("block")}, - WIDGET.newSwitch{name="smooth", x=340, y=240, disp=lnk_SETval("smooth"), code=lnk_SETrev("smooth")}, - WIDGET.newSwitch{name="bagLine", x=340, y=300, disp=lnk_SETval("bagLine"), code=lnk_SETrev("bagLine")}, + WIDGET.newSwitch{name="block", x=340, y=150, disp=lnk_SETval("block"), code=lnk_SETrev("block")}, + WIDGET.newSwitch{name="smooth", x=340, y=210, disp=lnk_SETval("smooth"), code=lnk_SETrev("smooth")}, + WIDGET.newSwitch{name="upEdge", x=340, y=270, disp=lnk_SETval("upEdge"), code=lnk_SETrev("upEdge")}, + WIDGET.newSwitch{name="bagLine", x=340, y=330, disp=lnk_SETval("bagLine"), code=lnk_SETrev("bagLine")}, - WIDGET.newSlider{name="ghost", x=630, y=180,w=200,unit=.6,disp=lnk_SETval("ghost"),show="percent", code=lnk_SETsto("ghost")}, + WIDGET.newSlider{name="ghost", x=630, y=180,w=200,unit=.6,disp=lnk_SETval("ghost"),show="percent",code=lnk_SETsto("ghost")}, WIDGET.newSlider{name="grid", x=630, y=240,w=200,unit=.4,disp=lnk_SETval("grid"),show="percent", code=lnk_SETsto("grid")}, WIDGET.newSlider{name="center", x=630, y=300,w=200,unit=1, disp=lnk_SETval("center"), code=lnk_SETsto("center")}, - WIDGET.newSlider{name="lockFX", x=350, y=365,w=373,unit=5, disp=lnk_SETval("lockFX"), code=lnk_SETsto("lockFX")}, - WIDGET.newSlider{name="dropFX", x=350, y=410,w=373,unit=5, disp=lnk_SETval("dropFX"), code=lnk_SETsto("dropFX")}, - WIDGET.newSlider{name="moveFX", x=350, y=455,w=373,unit=5, disp=lnk_SETval("moveFX"), code=lnk_SETsto("moveFX")}, - WIDGET.newSlider{name="clearFX", x=350, y=500,w=373,unit=5, disp=lnk_SETval("clearFX"), code=lnk_SETsto("clearFX")}, - WIDGET.newSlider{name="splashFX", x=350, y=545,w=373,unit=5, disp=lnk_SETval("splashFX"), code=lnk_SETsto("splashFX")}, - WIDGET.newSlider{name="shakeFX", x=350, y=590,w=373,unit=5, disp=lnk_SETval("shakeFX"), code=lnk_SETsto("shakeFX")}, - WIDGET.newSlider{name="atkFX", x=350, y=635,w=373,unit=5, disp=lnk_SETval("atkFX"), code=lnk_SETsto("atkFX")}, - WIDGET.newSlider{name="frame", x=350, y=680,w=373,unit=10, + WIDGET.newSlider{name="lockFX", x=350, y=375,w=373,unit=5, disp=lnk_SETval("lockFX"), code=lnk_SETsto("lockFX")}, + WIDGET.newSlider{name="dropFX", x=350, y=420,w=373,unit=5, disp=lnk_SETval("dropFX"), code=lnk_SETsto("dropFX")}, + WIDGET.newSlider{name="moveFX", x=350, y=465,w=373,unit=5, disp=lnk_SETval("moveFX"), code=lnk_SETsto("moveFX")}, + WIDGET.newSlider{name="clearFX", x=350, y=510,w=373,unit=5, disp=lnk_SETval("clearFX"), code=lnk_SETsto("clearFX")}, + WIDGET.newSlider{name="splashFX", x=350, y=555,w=373,unit=5, disp=lnk_SETval("splashFX"),code=lnk_SETsto("splashFX")}, + WIDGET.newSlider{name="shakeFX", x=350, y=600,w=373,unit=5, disp=lnk_SETval("shakeFX"), code=lnk_SETsto("shakeFX")}, + WIDGET.newSlider{name="atkFX", x=350, y=645,w=373,unit=5, disp=lnk_SETval("atkFX"), code=lnk_SETsto("atkFX")}, + WIDGET.newSlider{name="frame", x=350, y=690,w=373,unit=10, disp=function() return SETTING.frameMul>35 and SETTING.frameMul/10 or SETTING.frameMul/5-4 end,