From d89a2f60a923725254951827148083829f61ef4f Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 12 Sep 2020 01:43:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0=E8=B6=85?= =?UTF-8?q?=E5=B1=8F=E8=A7=86=E9=87=8E=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 5 +++++ Zframework/widgetList.lua | 7 ++++--- parts/default_data.lua | 1 + parts/player.lua | 20 ++++++++++++-------- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index a0b08a9d..874d986e 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -302,6 +302,7 @@ local langList={ frame="绘制帧率", text="消行文本", warn="死亡预警", + highCam="超屏视野", fullscreen="全屏", bg="背景", power="电量显示", @@ -797,6 +798,7 @@ local langList={ frame="绘制帧率", text="消行文本", warn="死亡预警", + highCam="超屏视野", fullscreen="全屏", bg="背景", power="电量显示", @@ -1282,6 +1284,7 @@ local langList={ frame="Render Frame Rate", text="Action Text", warn="Death Alert", + highCam="Superhigh view", fullscreen="Full Screen", bg="Background", power="Power Info", @@ -1765,6 +1768,7 @@ local langList={ frame="|=|", text="ABC", warn="!↑↑↑!", + highCam="↑__↑", fullscreen="|←→|", bg="__?__", power="+.", @@ -2262,6 +2266,7 @@ local langList={ frame="绘制帧率", text="消行文本", warn="死亡预警", + highCam="超屏视野", fullscreen="全屏", bg="背景", power="电量显示", diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index d9e346d9..3eefe48e 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -279,8 +279,9 @@ local Widgets={ setting.frameMul=i<5 and 5*i+20 or 10*i end}), newSwitch({name="text", x=1050, y=180,font=35,disp=SETval("text"),code=SETrev("text")}), - newSwitch({name="warn", x=1050, y=260,font=35,disp=SETval("warn"),code=SETrev("warn")}), - newSwitch({name="fullscreen",x=1050,y=340,font=35,disp=SETval("fullscreen"), + newSwitch({name="warn", x=1050, y=240,font=35,disp=SETval("warn"),code=SETrev("warn")}), + newSwitch({name="highCam", x=1050, y=300,font=35,disp=SETval("highCam"),code=SETrev("highCam")}), + newSwitch({name="fullscreen",x=1050,y=360,font=35,disp=SETval("fullscreen"), code=function() setting.fullscreen=not setting.fullscreen love.window.setFullscreen(setting.fullscreen) @@ -292,7 +293,7 @@ local Widgets={ setting.bg=not setting.bg BG.set("space") end}), - newSwitch({name="power", x=1050, y=500,font=35,disp=SETval("powerInfo"), + newSwitch({name="power", x=1050, y=480,font=35,disp=SETval("powerInfo"), code=function() setting.powerInfo=not setting.powerInfo end}), diff --git a/parts/default_data.lua b/parts/default_data.lua index 65b3a2ab..98d0f9a5 100644 --- a/parts/default_data.lua +++ b/parts/default_data.lua @@ -30,6 +30,7 @@ setting={ text=true, warn=true, + highCam=false, fullscreen=false, bg=true, powerInfo=false, diff --git a/parts/player.lua b/parts/player.lua index 2a3f9184..ca378941 100644 --- a/parts/player.lua +++ b/parts/player.lua @@ -26,6 +26,8 @@ local gameEnv0={ clearFX=2, shakeFX=3, + highCam=false, + drop=60,lock=60, wait=0,fall=0, _20G=false,bone=false, @@ -184,14 +186,16 @@ local function updateLine(P,dt) P.fieldBeneath=max(y-P.gameEnv.pushSpeed,0) end - local f=P.fieldUp - if not P.alive then - y=0 - else - y=30*max(min(#P.field-19.5-P.fieldBeneath/30,P.imgY-17),0) - end - if f~=y then - P.fieldUp=f>y and max(f*.95+y*.05-2,y)or ceil(f*.97+y*.03+1,y) + if P.gameEnv.highCam then + local f=P.fieldUp + if not P.alive then + y=0 + else + y=30*max(min(#P.field-19.5-P.fieldBeneath/30,P.imgY-17),0) + end + if f~=y then + P.fieldUp=f>y and max(f*.95+y*.05-2,y)or ceil(f*.97+y*.03+1,y) + end end end local function updateFXs(P,dt)