版本推进

Zframework/init.lua

@@ -107,17 +107,16 @@ local function updatePowerInfo()
     gc_clear(0,0,0,.25)
     if state~='unknown'then
         gc_setLineWidth(4)
-        local charging=state=='charging'
         if state=='nobattery'then
             gc_setColor(1,1,1)
             gc_setLineWidth(2)
-            gc_line(74,SCR.safeX+5,100,22)
+            gc_line(74,5,100,22)
         elseif pow then
-            if charging then    gc_setColor(0,1,0)
-            elseif pow>50 then  gc_setColor(1,1,1)
-            elseif pow>26 then  gc_setColor(1,1,0)
-            elseif pow==26 then gc_setColor(.5,0,1)
-            else                gc_setColor(1,0,0)
+            if state=='charging'then gc_setColor(0,1,0)
+            elseif pow>50 then       gc_setColor(1,1,1)
+            elseif pow>26 then       gc_setColor(1,1,0)
+            elseif pow==26 then      gc_setColor(.5,0,1)
+            else                     gc_setColor(1,0,0)
             end
             gc.rectangle('fill',76,6,pow*.22,14)
             if pow<100 then
@@ -249,13 +248,13 @@ function love.touchpressed(id,x,y)
     x,y=ITP(xOy,x,y)
     lastX,lastY=x,y
     WIDGET.cursorMove(x,y)
-    if SCN.touchDown then SCN.touchDown(x,y)end
+    if SCN.touchDown then SCN.touchDown(x,y,id)end
     if kb.hasTextInput()then kb.setTextInput(false)end
 end
-function love.touchmoved(_,x,y,dx,dy)
+function love.touchmoved(id,x,y,dx,dy)
     if SCN.swapping then return end
     x,y=ITP(xOy,x,y)
-    if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k)end
+    if SCN.touchMove then SCN.touchMove(x,y,dx/SCR.k,dy/SCR.k,id)end
     WIDGET.drag(x,y,dx/SCR.k,dy/SCR.k)
 end
 function love.touchreleased(id,x,y)
@@ -268,7 +267,7 @@ function love.touchreleased(id,x,y)
         WIDGET.unFocus()
         SCN.mainTouchID=false
     end
-    if SCN.touchUp then SCN.touchUp(x,y)end
+    if SCN.touchUp then SCN.touchUp(x,y,id)end
     if(x-lastX)^2+(y-lastY)^2<62 then
         if SCN.touchClick then SCN.touchClick(x,y)end
         if showClickFX then SYSFX.newTap(3,x,y)end
@@ -492,6 +491,8 @@ function love.lowmemory()
         MES.new('check',"[auto GC] low MEM 设备内存过低")
     end
 end
+
+local onResize=NULL
 function love.resize(w,h)
     if SCR.w==w and SCR.h==h then return end
     SCR.resize(w,h)
@@ -499,8 +500,7 @@ function love.resize(w,h)
     if SCN.resize then SCN.resize(w,h)end
     WIDGET.resize(w,h)
     FONT.reset()
-
-    SHADER.warning:send('w',w*SCR.dpi)
+    onResize(w,h)
 end
 
 local onFocus=NULL
@@ -706,7 +706,6 @@ function love.run()
             if FCT>=100 then
                 FCT=FCT-100
 
-                local safeX=SCR.safeX
                 gc_replaceTransform(SCR.origin)
                     gc_setColor(1,1,1)
                     BG.draw()
@@ -717,16 +716,14 @@ function love.run()
                     TEXT_draw()
 
                     --Draw cursor
-                    if mouseShow then
-                        drawCursor(time,mx,my)
-                    end
-                gc_replaceTransform(SCR.xOy_ul)
-                    MES_draw()
+                    if mouseShow then drawCursor(time,mx,my)end
                 gc_replaceTransform(SCR.origin)
+                    MES_draw()
+
                     --Draw power info.
                     if showPowerInfo then
                         gc_setColor(1,1,1)
-                        gc_draw(infoCanvas,safeX,0,0,SCR.k)
+                        gc_draw(infoCanvas,SCR.safeX,0,0,SCR.k)
                     end
 
                     --Draw scene swapping animation
@@ -741,6 +738,8 @@ function love.run()
                     FONT.set(20)
                     mStr(VERSION.string,0,-30)
                 gc_replaceTransform(SCR.xOy_dl)
+                    local safeX=SCR.safeX/SCR.k
+
                     --Draw FPS
                     FONT.set(15)
                     gc_setColor(1,1,1)
@@ -823,7 +822,7 @@ function love.run()
         end
 
         _=timer()-lastFrame
-        if _<sleepInterval*.9626 then WAIT(.0162-sleepInterval*.9626)end
+        if _<sleepInterval*.9626 then WAIT(sleepInterval*.9626-_)end
         while timer()-lastFrame<sleepInterval do end
     end
 end
@@ -858,6 +857,8 @@ end
 
 function Z.setOnFocus(func)onFocus=assert(type(func)=='function'and func,"Z.setOnFocus(func): func must be a function")end
 
+function Z.setOnResize(func)onResize=assert(type(func)=='function'and func,"Z.setOnResize(func): func must be a function")end
+
 function Z.setOnQuit(func)onQuit=assert(type(func)=='function'and func,"Z.setOnQuit(func): func must be a function")end
 
 return Z

Zframework/mathExtend.lua

@@ -30,4 +30,8 @@ function MATH.interval(v,low,high)
     end
 end
 
+function MATH.expApproach(a,b,k)
+    return b+(a-b)*2.718281828459045^-k
+end
+
 return MATH

Zframework/sfx.lua

@@ -1,5 +1,6 @@
 local type,rem=type,table.remove
 local int,rnd=math.floor,math.random
+local interval=MATH.interval
 
 local sfxList={}
 local packSetting={}
@@ -140,7 +141,7 @@ local function _play(name,vol,pos,pitch)
     S=S[n]--AU_SRC
     if S:getChannelCount()==1 then
         if pos then
-            pos=pos*stereo
+            pos=interval(pos,-1,1)*stereo
             S:setPosition(pos,1-pos^2,0)
         else
             S:setPosition(0,0,0)

Zframework/widget.lua

@@ -19,6 +19,7 @@ local sub,ins,rem=string.sub,table.insert,table.remove
 local xOy=SCR.xOy
 local FONT=FONT
 local mStr=GC.mStr
+local approach=MATH.expApproach
 
 local downArrowIcon=GC.DO{40,25,{'fPoly',0,0,20,25,40,0}}
 local upArrowIcon=GC.DO{40,25,{'fPoly',0,25,20,0,40,25}}
@@ -542,7 +543,7 @@ function slider:update(dt)
         if ATV>0 then self.ATV=max(ATV-dt*30,0)end
     end
     if not self.hide then
-        self.pos=self.pos*.7+self.disp()*.3
+        self.pos=approach(self.pos,self.disp(),dt*26)
     end
 end
 function slider:draw()

main.lua

@@ -184,6 +184,9 @@ Z.setOnFnKeys({
     function()for k,v in next,_G do print(k,v)end end,
     function()if love['_openConsole']then love['_openConsole']()end end,
 })
+Z.setOnResize(function(w,_)
+    SHADER.warning:send('w',w*SCR.dpi)
+end)
 do--Z.setOnFocus
     local function task_autoSoundOff()
         while true do

parts/gameFuncs.lua

@@ -7,6 +7,7 @@ local gc_draw,gc_rectangle,gc_line,gc_printf=gc.draw,gc.rectangle,gc.line,gc.pri
 
 local ins,rem=table.insert,table.remove
 local int,rnd=math.floor,math.random
+local approach=MATH.expApproach
 
 local SETTING,GAME,SCR=SETTING,GAME,SCR
 local PLAYERS=PLAYERS
@@ -797,7 +798,7 @@ do--function resetGameData(args)
 end
 do--function checkWarning()
     local max=math.max
-    function checkWarning()
+    function checkWarning(dt)
         local P1=PLAYERS[1]
         if P1.alive then
             if P1.frameRun%26==0 then
@@ -817,7 +818,7 @@ do--function checkWarning()
             end
             local _=GAME.warnLVL
             if _<GAME.warnLVL0 then
-                _=_*.95+GAME.warnLVL0*.05
+                _=approach(_,GAME.warnLVL0,dt*6)
             elseif _>0 then
                 _=max(_-.026,0)
             end

parts/netPlayer.lua

@@ -7,6 +7,7 @@ local rnd,min=math.random,math.min
 local sin,cos=math.sin,math.cos
 local ins,rem=table.insert,table.remove
 local setFont=FONT.set
+local approach=MATH.expApproach
 
 local posLists={
     --1~5
@@ -168,7 +169,7 @@ function NETPLY.setConnect(uid)PLYmap[uid].connected=true end
 function NETPLY.setPlace(uid,place)PLYmap[uid].place=place end
 function NETPLY.setStat(uid,S)
     PLYmap[uid].stat={
-        lpm=("%.1f %s"):format(S.row/S.time*60,text.radarData[5]),
+        lpm=("%.1f %s"):format(S.piece/S.time*24,text.radarData[5]),
         apm=("%.1f %s"):format(S.atk/S.time*60,text.radarData[3]),
         adpm=("%.1f %s"):format((S.atk+S.dig)/S.time*60,text.radarData[2]),
     }
@@ -193,14 +194,15 @@ function NETPLY.mouseMove(x,y)
     end
 end
 
-function NETPLY.update()
+function NETPLY.update(dt)
     for i=1,#PLYlist do
         local p=PLYlist[i]
         local t=posList[i]
-        p.x=p.x*.9+t.x*.1
-        p.y=p.y*.9+t.y*.1
-        p.w=p.w*.9+t.w*.1
-        p.h=p.h*.9+t.h*.1
+        local d=dt*12
+        p.x=approach(p.x,t.x,d)
+        p.y=approach(p.y,t.y,d)
+        p.w=approach(p.w,t.w,d)
+        p.h=approach(p.h,t.h,d)
     end
 end
 

parts/player/draw.lua

@@ -904,10 +904,10 @@ function draw.norm(P,repMode)
         setFont(25)
         local tm=STRING.time(P.stat.time)
         gc_setColor(0,0,0,.3)
-        gc_print(P.score1,18,509)
+        gc_print(ceil(P.score1),18,509)
         gc_print(tm,18,539)
         gc_setColor(.97,.97,.92)
-        gc_print(P.score1,20,510)
+        gc_print(ceil(P.score1),20,510)
         gc_setColor(.85,.9,.97)
         gc_print(tm,20,540)
 

parts/player/player.lua

@@ -8,6 +8,7 @@ local int,ceil,rnd=math.floor,math.ceil,math.random
 local max,min,abs,modf=math.max,math.min,math.abs,math.modf
 local assert,ins,rem=assert,table.insert,table.remove
 local resume,yield,status=coroutine.resume,coroutine.yield,coroutine.status
+local approach=MATH.expApproach
 
 local SFX,BGM,VOC,VIB,SYSFX=SFX,BGM,VOC,VIB,SYSFX
 local FREEROW,TABLE,TEXT,TASK=LINE,TABLE,TEXT,TASK
@@ -2166,7 +2167,7 @@ end
 --------------------------</Tick>--------------------------
 
 --------------------------<Event>--------------------------
-local function _updateMisc(P)
+local function _updateMisc(P,dt)
     --Finesse combo animation
     if P.finesseComboTime>0 then
         P.finesseComboTime=P.finesseComboTime-1
@@ -2216,7 +2217,7 @@ local function _updateMisc(P)
         end
         local f=P.fieldUp
         if f~=y then
-            P.fieldUp=f>y and max(f*.95+y*.05-2,y)or min(f*.97+y*.03+1,y)
+            P.fieldUp=f>y and max(approach(f,y,dt*6)-2,y)or min(approach(f,y,dt*3)+1,y)
         end
     end
 
@@ -2225,7 +2226,7 @@ local function _updateMisc(P)
         if P.stat.score-P.score1<10 then
             P.score1=P.score1+1
         else
-            P.score1=int(min(P.score1*.9+P.stat.score*.1+1))
+            P.score1=approach(P.score1,P.stat.score,dt*62)
         end
     end
 
@@ -2302,7 +2303,7 @@ local function _updateFX(P,dt)
         end
     end
 end
-local function update_alive(P)
+local function update_alive(P,dt)
     local ENV=P.gameEnv
 
     P.frameRun=P.frameRun+1
@@ -2332,11 +2333,11 @@ local function update_alive(P)
 
     if P.timing then P.stat.frame=P.stat.frame+1 end
 
-    --Calculate key speed
+    --Calculate drop speed
     do
         local v=0
         for i=2,10 do v=v+i*(i-1)*72/(P.frameRun-P.dropTime[i])end
-        P.dropSpeed=P.dropSpeed*.99+v*.01
+        P.dropSpeed=approach(P.dropSpeed,v,dt)
     end
 
     if P.gameEnv.layout=='royale'then
@@ -2532,14 +2533,15 @@ local function update_alive(P)
     ::THROW_stop::
 
     --B2B bar animation
-    if P.b2b1==P.b2b then
-    elseif P.b2b1<P.b2b then
-        P.b2b1=min(P.b2b1*.98+P.b2b*.02+.4,P.b2b)
-    else
-        P.b2b1=max(P.b2b1*.95+P.b2b*.05-.6,P.b2b)
+    if P.b2b1~=P.b2b then
+        if P.b2b1<P.b2b then
+            P.b2b1=min(approach(P.b2b1,P.b2b,dt*6)+.4,P.b2b)
+        else
+            P.b2b1=max(approach(P.b2b1,P.b2b,dt*12)-.6,P.b2b)
+        end
     end
 
-    _updateMisc(P)
+    _updateMisc(P,dt)
     --[[
         P:setPosition(
             640-150-(30*(P.curX+P.cur.sc[2])-15),
@@ -2590,11 +2592,11 @@ local function update_streaming(P)
         eventTime=P.stream[P.streamProgress]
     end
 end
-local function update_dead(P)
+local function update_dead(P,dt)
     local S=P.stat
 
     --Final average speed
-    P.dropSpeed=P.dropSpeed*.96+S.piece/S.frame*144
+    P.dropSpeed=approach(P.dropSpeed,S.piece/S.frame*3600,dt)
 
     if P.gameEnv.layout=='royale'then
         P.swappingAtkMode=min(P.swappingAtkMode+2,30)
@@ -2606,7 +2608,7 @@ local function update_dead(P)
     if P.b2b1>0 then
         P.b2b1=max(0,P.b2b1*.92-1)
     end
-    _updateMisc(P)
+    _updateMisc(P,dt)
 end
 function Player:_die()
     self.alive=false
@@ -2664,17 +2666,17 @@ function Player:update(dt)
                         20
                     do
                         update_streaming(self)
-                        update_alive(self)
+                        update_alive(self,dt)
                     end
                 end
             else
-                update_alive(self)
+                update_alive(self,dt)
             end
             self.trigFrame=self.trigFrame-1
         end
     else
         while self.trigFrame>=1 do
-            update_dead(self)
+            update_dead(self,dt)
             self.trigFrame=self.trigFrame-1
         end
     end

parts/scenes/app_cubefield.lua

@@ -174,7 +174,7 @@ function scene.update(dt)
         end
     end
 
-    life1=life1*.7+life*.3
+    life1=MATH.expApproach(life1,life,dt*16)
 
     if play then
         if inv>0 then

parts/scenes/app_dtw.lua

@@ -280,13 +280,13 @@ function scene.touchDown(x)
     end
 end
 
-function scene.update()
+function scene.update(dt)
     if state==1 then
         local t=TIME()
         time=t-startTime
         local v=0
         for i=2,20 do v=v+i*(i-1)*.3/(t-keyTime[i])end
-        speed=speed*.99+v*.01
+        speed=MATH.expApproach(speed,v,dt)
         if speed>maxSpeed then maxSpeed=speed end
 
         if arcade then

parts/scenes/app_tap.lua

@@ -31,11 +31,11 @@ function scene.keyDown(key,isRep)
     end
 end
 
-function scene.update()
+function scene.update(dt)
     local t=TIME()
     local v=0
     for i=2,40 do v=v+i*(i-1)*.075/(t-keyTime[i])end
-    speed=speed*.99+v*.01
+    speed=MATH.expApproach(speed,v,dt)
     if speed>maxSpeed then
         maxSpeed=speed
     end

parts/scenes/game.lua

@@ -298,7 +298,7 @@ local function _update_common(dt)
     end
 
     --Warning check
-    checkWarning()
+    checkWarning(dt)
 end
 function scene.update(dt)
     trigGameRate=trigGameRate+gameRate

parts/scenes/main.lua

@@ -134,7 +134,7 @@ function scene.update(dt)
     end
     local L=scene.widgetList
     for i=1,8 do
-        L[i].x=L[i].x*.9+(widgetX0[i]-400+(WIDGET.isFocus(L[i])and(i<5 and 100 or -100)or 0))*.1
+        L[i].x=MATH.expApproach(L[i].x,(widgetX0[i]-400+(WIDGET.isFocus(L[i])and(i<5 and 100 or -100)or 0)),dt*12)
     end
 end
 

parts/scenes/net_game.lua

@@ -246,7 +246,7 @@ function scene.update(dt)
         for p=1,#PLAYERS do PLAYERS[p]:update(dt)end
 
         --Warning check
-        checkWarning()
+        checkWarning(dt)
 
         --Upload stream
         if not NET.spectate and P1.frameRun-lastUpstreamTime>8 then
@@ -265,7 +265,7 @@ function scene.update(dt)
             lastUpstreamTime=PLAYERS[1].alive and P1.frameRun or 1e99
         end
     else
-        NETPLY.update()
+        NETPLY.update(dt)
     end
     if newMessageTimer>0 then
         newMessageTimer=newMessageTimer-1

parts/scenes/pause.lua

@@ -47,7 +47,7 @@ function scene.sceneInit()
         (S.atk+S.dig)/S.time*60,--ADPM
         S.atk/S.time*60,        --AtkPM
         S.send/S.time*60,       --SendPM
-        S.piece/S.time*24,      --LinePM
+        S.piece/S.time*24,      --Line'PM
         S.dig/S.time*60,        --DigPM
     }
     val={1/80,1/80,1/80,1/60,1/100,1/40}

parts/scenes/replays.lua

@@ -139,8 +139,8 @@ end
 
 scene.widgetList={
     listBox,
-    WIDGET.newButton{name='export',x=180,y=640,w=140,h=80,color='lG',code=pressKey'cC',font=50,fText=CHAR.icon.export},
-    WIDGET.newButton{name='import',x=350,y=640,w=140,h=80,color='lN',code=pressKey'cV',font=50,fText=CHAR.icon.import},
+    WIDGET.newButton{name='import',x=180,y=640,w=140,h=80,color='lB',code=pressKey'cV',font=50,fText=CHAR.icon.import},
+    WIDGET.newButton{name='export',x=350,y=640,w=140,h=80,color='lR',code=pressKey'cC',font=50,fText=CHAR.icon.export},
     WIDGET.newButton{name='play',  x=700,y=640,w=170,h=80,color='lY',code=pressKey'return',font=65,fText=CHAR.icon.play},
     WIDGET.newButton{name='delete',x=850,y=640,w=80,h=80,color='lR',code=pressKey'delete',font=50,fText=CHAR.icon.trash},
     WIDGET.newButton{name='back',  x=1140,y=640,w=170,h=80,sound='back',font=60,fText=CHAR.icon.back,code=backScene},

parts/scenes/setting_skin.lua

@@ -22,9 +22,9 @@ function scene.sceneInit()
     end
 end
 
-function scene.update()
+function scene.update(dt)
     for i=1,7 do
-        minoRot[i]=minoRot[i]*.8+minoRot0[i]*.2
+        minoRot[i]=MATH.expApproach(minoRot[i],minoRot0[i],dt*12)
     end
 end
 function scene.draw()

parts/theme.lua

@@ -2,8 +2,8 @@ local THEME={
     cur=false,--Current theme
 }
 local themeColor={
-    xmas={COLOR.R,COLOR.Z,COLOR.G},
-    sprfes={COLOR.R,COLOR.O,COLOR.Y},
+    xmas={COLOR.lR,COLOR.Z,COLOR.lG},
+    sprfes={COLOR.lR,COLOR.O,COLOR.lY},
 }
 
 function THEME.calculate(Y,M,D)

parts/updateLog.lua

@@ -31,13 +31,19 @@ return[=[
                 修改一行HPC的判定
                 前两个TSD增加一点重力
                 混战模式AI攻击目标稍微正常一些
+                两个有颜色的节日主题颜色浅一些
         代码:
                 调整帧率控制算法
                 BGM模块允许瞬启停
+                SFX模块立体声优化
+                升级主循环帧率控制
+                框架更加可独立
         修复:
                 自定义场地界面按超过第三个的鼠标键会报错
                 经典模式h和u难度没有干旱计数器 #546
                 自定义场地16号色的方块名位置显示错误
+                联网对战结算的l'pm公式错写成lpm的
+                录像界面导入导出按钮隐藏状态错误
                 登录界面读取本地账号密码数据错误
                 策略堆叠模式评级标准不当
                 云存档/读档的一处小问题

version.lua

@@ -1,5 +1,5 @@
 return{
-    ["apkCode"]=422,
+    ["apkCode"]=423,
     ["code"]=1701,
     ["string"]="V0.17.1",
     ["room"]="ver A-2",