版本推进

添加少许魔法
框架跟进
2022-04-04 05:29:54 +08:00 · 2022-04-04 05:25:42 +08:00 · 2022-04-04 04:57:20 +08:00 · 2022-04-04 04:53:02 +08:00 · 2022-04-03 02:41:49 +08:00 · 2022-04-03 00:40:21 +08:00
49 changed files with 164 additions and 165 deletions
--- a/2
+++ b/2
--- a/legals.md
+++ b/legals.md
@@ -10,8 +10,6 @@ Powered by LÖVE, © 2006–2022 LÖVE Development Team.

 Lua is free software distributed under the terms of the MIT license. Copyright © 1994–2022 by Lua.org, PUC-Rio.

-SIMPLE LOVE LIGHTS is under a MIT License. Created by Dylan Hunn.
-
 json.lua is copyrighted by rxi. © 2022 rxi.

 IBM Plex is copyrighted by the International Business Machines Corporation. IBM and IBM Plex are trademarks of IBM Corp, registered in many jurisdictions worldwide. IBM Plex is licensed under the SIL Open Font License, Version 1.1.
--- a/main.lua
+++ b/main.lua
@@ -180,7 +180,7 @@ Z.setOnFnKeys({
            end
        end
    end,
-    function()print(WIDGET.getSelected()or"no widget selected")end,
+    function()print(BG.locked)end,
    function()for k,v in next,_G do print(k,v)end end,
    function()if love['_openConsole']then love['_openConsole']()end end,
 })
@@ -190,9 +190,6 @@ Z.setDebugInfo{
    {"Voices",VOC.getQueueCount},
    {"Audios",love.audio.getSourceCount},
 }
-Z.setOnResize(function(w,_)
-    SHADER.warning:send('w',w*SCR.dpi)
-end)
 do--Z.setOnFocus
    local function task_autoSoundOff()
        while true do
@@ -288,6 +285,15 @@ IMG.init{
    xiaoyaCH='media/image/characters/xiaoya.png',
    xiaoyaOmino='media/image/characters/xiaoya_Omino.png',
    mikuCH='media/image/characters/miku.png',
+    z={
+        character='media/image/characters/z_character.png',
+        screen1='media/image/characters/z_screen1.png',
+        screen2='media/image/characters/z_screen2.png',
+        particle1='media/image/characters/z_particle1.png',
+        particle2='media/image/characters/z_particle2.png',
+        particle3='media/image/characters/z_particle3.png',
+        particle4='media/image/characters/z_particle4.png',
+    },
    electric='media/image/characters/electric.png',
    hbm='media/image/characters/hbm.png',

--- a/media/image/characters/z_character.png
+++ b/media/image/characters/z_character.png
--- a/media/image/characters/z_particle1.png
+++ b/media/image/characters/z_particle1.png
--- a/media/image/characters/z_particle2.png
+++ b/media/image/characters/z_particle2.png
--- a/media/image/characters/z_particle3.png
+++ b/media/image/characters/z_particle3.png
--- a/media/image/characters/z_particle4.png
+++ b/media/image/characters/z_particle4.png
--- a/media/image/characters/z_screen1.png
+++ b/media/image/characters/z_screen1.png
--- a/media/image/characters/z_screen2.png
+++ b/media/image/characters/z_screen2.png
--- a/parts/backgrounds/aura.lua
+++ b/parts/backgrounds/aura.lua
@@ -5,19 +5,15 @@ local shader=SHADER.aura
 local t

 function back.init()
-    t=math.random()*2600
+    t=math.random()*260
    BG.resize(SCR.w,SCR.h)
 end
-function back.resize(_,h)
-    shader:send('w',SCR.W)
-    shader:send('h',h*SCR.dpi)
-end
 function back.update(dt)
-    t=t+dt
+    t=(t+dt)%2600
 end
 function back.draw()
    gc.clear(.08,.08,.084)
-    shader:send('t',t)
+    shader:send('phase',t)
    gc.setShader(shader)
    gc.rectangle('fill',0,0,SCR.w,SCR.h)
    gc.setShader()
--- a/parts/backgrounds/bg1.lua
+++ b/parts/backgrounds/bg1.lua
@@ -5,18 +5,14 @@ local shader=SHADER.grad1

 local t
 function back.init()
-    t=math.random()*2600
-    back.resize()
-end
-function back.resize()
-    shader:send('w',SCR.W)
+    t=math.random()*260
 end
 function back.update(dt)
-    t=t+dt
+    t=(t+dt)%2600
 end
 function back.draw()
    gc.clear(.08,.08,.084)
-    shader:send('t',t)
+    shader:send('phase',t)
    gc.setShader(shader)
    gc.rectangle('fill',0,0,SCR.w,SCR.h)
    gc.setShader()
--- a/parts/backgrounds/bg2.lua
+++ b/parts/backgrounds/bg2.lua
@@ -5,18 +5,15 @@ local shader=SHADER.grad2

 local t
 function back.init()
-    t=math.random()*2600
+    t=math.random()*260
    BG.resize(nil,SCR.h)
 end
-function back.resize(_,h)
-    shader:send('h',h*SCR.dpi)
-end
 function back.update(dt)
-    t=t+dt
+    t=(t+dt)%2600
 end
 function back.draw()
    gc.clear(.08,.08,.084)
-    shader:send('t',t)
+    shader:send('phase',t)
    gc.setShader(shader)
    gc.rectangle('fill',0,0,SCR.w,SCR.h)
    gc.setShader()
--- a/parts/backgrounds/rainbow.lua
+++ b/parts/backgrounds/rainbow.lua
@@ -5,19 +5,15 @@ local shader=SHADER.rgb1

 local t
 function back.init()
-    t=math.random()*2600
+    t=math.random()*260
    BG.resize(SCR.w,SCR.h)
 end
-function back.resize(_,h)
-    shader:send('w',SCR.W)
-    shader:send('h',h*SCR.dpi)
-end
 function back.update(dt)
-    t=t+dt
+    t=(t+dt)%2600
 end
 function back.draw()
    gc.clear(.08,.08,.084)
-    shader:send('t',t)
+    shader:send('phase',t)
    gc.setShader(shader)
    gc.rectangle('fill',0,0,SCR.w,SCR.h)
    gc.setShader()
--- a/parts/backgrounds/rainbow2.lua
+++ b/parts/backgrounds/rainbow2.lua
@@ -5,19 +5,15 @@ local shader=SHADER.rgb2

 local t
 function back.init()
-    t=math.random()*2600
+    t=math.random()*260
    BG.resize(SCR.w,SCR.h)
 end
-function back.resize(_,h)
-    shader:send('w',SCR.W)
-    shader:send('h',h*SCR.dpi)
-end
 function back.update(dt)
-    t=t+dt
+    t=(t+dt)%2600
 end
 function back.draw()
    gc.clear(.08,.08,.084)
-    shader:send('t',t)
+    shader:send('phase',t)
    gc.setShader(shader)
    gc.rectangle('fill',0,0,SCR.w,SCR.h)
    gc.setShader()
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -165,17 +165,15 @@ do--function applySettings()
            BG.set()
        elseif SETTING.bg=='off'then
            BG.unlock()
-            BG.set('fixColor')
-            BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)
+            BG.set('fixColor',SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)
            BG.lock()
        elseif SETTING.bg=='custom'then
            if love.filesystem.getInfo('conf/customBG')then
                local res,image=pcall(gc.newImage,love.filesystem.newFile('conf/customBG'))
                if res then
                    BG.unlock()
-                    BG.set('custom')
                    gc.setDefaultFilter('linear','linear')
-                    BG.send(SETTING.bgAlpha,image)
+                    BG.set('custom',SETTING.bgAlpha,image)
                    gc.setDefaultFilter('nearest','nearest')
                    BG.lock()
                else
@@ -184,8 +182,7 @@ do--function applySettings()
            else--Switch off when custom BG not found
                SETTING.bg='off'
                BG.unlock()
-                BG.set('fixColor')
-                BG.send(SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)
+                BG.set('fixColor',SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)
                BG.lock()
            end
        end
--- a/parts/language/dict_en.lua
+++ b/parts/language/dict_en.lua
@@ -785,6 +785,11 @@ return{
        "term",
        "Soft Drop Factor\n\nA way to define soft drop speed as a multiple of natural falling speed. In guideline games, the soft drop is usually 20x the speed of natural falling, i.e., it has an SDF of 20. Techmino does not use SDF to define soft drop speed.",
    },
+    {"Shape & Names",
+        "mino",
+        "term",
+        "Z"..CHAR.mino.Z.."  S"..CHAR.mino.S.."  J"..CHAR.mino.J.."  L"..CHAR.mino.L.."  T"..CHAR.mino.T.."  O"..CHAR.mino.O.."  I"..CHAR.mino.I.."  Z5"..CHAR.mino.Z5.."  S5"..CHAR.mino.S5.."  P"..CHAR.mino.P.."  Q"..CHAR.mino.Q.."  F"..CHAR.mino.F.."  E"..CHAR.mino.E.."  T5"..CHAR.mino.T5.."  U"..CHAR.mino.U.."  V"..CHAR.mino.V.."  W"..CHAR.mino.W.."  X"..CHAR.mino.X.."  J5"..CHAR.mino.J5.."  L5"..CHAR.mino.L5.."  R"..CHAR.mino.R.."  Y"..CHAR.mino.Y.."  N"..CHAR.mino.N.."  H"..CHAR.mino.H.."  I5"..CHAR.mino.I5.."  I3"..CHAR.mino.I3.."  C"..CHAR.mino.C.."  I2"..CHAR.mino.I2.."  O1"..CHAR.mino.O1,
+    },
    {"Bag7 generator",
        "bag7bag randomgenerator",
        "term",
@@ -1099,11 +1104,11 @@ return{
        "Go to console, type “rm -s replay“ and then press enter/return.\nTake effect immediately.",
    },
    {"Delete cache",
-    "delete cache",
+        "delete cache",
        "command",
        "Go to console, type “rm -s cache” and then press enter/return.\nTake effect immediately.",
    },
-    
+
    --English
    {"SFX",
        "soundeffects",
--- a/parts/language/dict_ja.lua
+++ b/parts/language/dict_ja.lua
@@ -785,6 +785,11 @@ return{
        "term",
        "Soft Drop Factor\n\nA way to define soft drop speed as a multiple of natural falling speed. In guideline games, the soft drop is usually 20x the speed of natural falling, i.e. it has an SDF of 20. Techmino does not use SDF to define soft drop speed.",
    },
+    {"Shape & Names",
+        "mino",
+        "term",
+        "Z"..CHAR.mino.Z.."  S"..CHAR.mino.S.."  J"..CHAR.mino.J.."  L"..CHAR.mino.L.."  T"..CHAR.mino.T.."  O"..CHAR.mino.O.."  I"..CHAR.mino.I.."  Z5"..CHAR.mino.Z5.."  S5"..CHAR.mino.S5.."  P"..CHAR.mino.P.."  Q"..CHAR.mino.Q.."  F"..CHAR.mino.F.."  E"..CHAR.mino.E.."  T5"..CHAR.mino.T5.."  U"..CHAR.mino.U.."  V"..CHAR.mino.V.."  W"..CHAR.mino.W.."  X"..CHAR.mino.X.."  J5"..CHAR.mino.J5.."  L5"..CHAR.mino.L5.."  R"..CHAR.mino.R.."  Y"..CHAR.mino.Y.."  N"..CHAR.mino.N.."  H"..CHAR.mino.H.."  I5"..CHAR.mino.I5.."  I3"..CHAR.mino.I3.."  C"..CHAR.mino.C.."  I2"..CHAR.mino.I2.."  O1"..CHAR.mino.O1,
+    },
    {"Bag7 generator",
        "bag7bag randomgenerator",
        "term",
--- a/parts/language/dict_zh.lua
+++ b/parts/language/dict_zh.lua
@@ -804,6 +804,11 @@ return{
        "term",
        "Soft Drop Factor，软降速度因子（倍率）\n部分游戏中的软降机制就是在按住软降键时方块受到的重力变为原来的若干倍，SDF就是这个变大的倍数。\n基本所有官块和TETR.IO使用这个机制，但本游戏不使用。",
    },
+    {"方块名称",
+        "mino",
+        "term",
+        "Z"..CHAR.mino.Z.."  S"..CHAR.mino.S.."  J"..CHAR.mino.J.."  L"..CHAR.mino.L.."  T"..CHAR.mino.T.."  O"..CHAR.mino.O.."  I"..CHAR.mino.I.."  Z5"..CHAR.mino.Z5.."  S5"..CHAR.mino.S5.."  P"..CHAR.mino.P.."  Q"..CHAR.mino.Q.."  F"..CHAR.mino.F.."  E"..CHAR.mino.E.."  T5"..CHAR.mino.T5.."  U"..CHAR.mino.U.."  V"..CHAR.mino.V.."  W"..CHAR.mino.W.."  X"..CHAR.mino.X.."  J5"..CHAR.mino.J5.."  L5"..CHAR.mino.L5.."  R"..CHAR.mino.R.."  Y"..CHAR.mino.Y.."  N"..CHAR.mino.N.."  H"..CHAR.mino.H.."  I5"..CHAR.mino.I5.."  I3"..CHAR.mino.I3.."  C"..CHAR.mino.C.."  I2"..CHAR.mino.I2.."  O1"..CHAR.mino.O1,
+    },
    {"Bag7出块",
        "bag出块 bag7bag",
        "term",
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -315,7 +315,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="Support the author",
    WidgetText={
--- a/parts/language/lang_es.lua
+++ b/parts/language/lang_es.lua
@@ -186,7 +186,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="Apoyen al Autor",
    WidgetText={
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -282,7 +282,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="Aider le créateur",
    WidgetText={
--- a/parts/language/lang_id.lua
+++ b/parts/language/lang_id.lua
@@ -317,7 +317,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="Dukung pencipta",
    WidgetText={
--- a/parts/language/lang_ja.lua
+++ b/parts/language/lang_ja.lua
@@ -317,7 +317,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="Support the Author",
    WidgetText={
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -304,7 +304,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="Support author",
    WidgetText={
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -316,7 +316,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="支持作者",
    WidgetText={
--- a/parts/language/lang_zh_grass.lua
+++ b/parts/language/lang_zh_grass.lua
@@ -314,7 +314,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="供养作者！",
    WidgetText={
--- a/parts/language/lang_zh_trad.lua
+++ b/parts/language/lang_zh_trad.lua
@@ -316,7 +316,6 @@ return{
        Cold_Clear [MinusKelvin]
        json.lua [rxi]
        profile.lua [itraykov]
-        simple-love-lights [dylhunn]
    ]],
    support="支持作者",
    WidgetText={
--- a/parts/language/manual_en.txt
+++ b/parts/language/manual_en.txt
@@ -39,7 +39,7 @@ Attack system:
        Combos (REN):
                The numbers of the combos are equal to (the numbers you clear lines consecutively –1). All damage above (except attack from PC/HPC) will be given a (combo ×25%) bonus, or (combo ×15%) for Single clear (capped at 12 combos), +1 more attack for 3 Combo or more.
        
-        Hemi Perfect Clear (a P.C. “with blocks left below.” If it’s an I clearing 1 line, the remaining blocks must not be player-placed):
+        Hemi Perfect Clear (a P.C. “with blocks left below.” If just one line cleared, the remaining blocks must not be player-placed):
                - Attack +4, Extra Blocking +2

        Perfect Clear (All Clear):
--- a/parts/language/manual_zh.txt
+++ b/parts/language/manual_zh.txt
@@ -37,7 +37,7 @@ Spin判定:
                (注:连击数为连续消除次数-1)
                把上述高级消除/低级消除的攻击直接乘以"连击倍率", 公式为 "连击倍率"=[连击数(上限12)]*[消一行以上25%,只消一行15%]
                如果消除>=3次时再额外加1攻击
-        半全消("下方有剩余方块"的全消,如果是I消1行则必须不剩余玩家放置的方块):
+        半全消("下方有剩余方块"的全消,如果只消了1行则必须不剩余玩家放置的方块):
                伤害+4,额外抵挡+2
        全消:
                伤害为8~16(本局内递增2),和上述其他伤害取大,+2额外抵挡
--- a/parts/modes/master_g.lua
+++ b/parts/modes/master_g.lua
@@ -20,15 +20,15 @@ return{
    getRank=function(P)
        local G=P.modeData.gradePts
        return
-            G>=39 and 5 or -- TM+
-            G>=31 and 4 or -- MM- - TM
-            G>=25 and 3 or -- m8 - MO
-            G>=18 and 2 or -- m1 - m7
-            G>=9 and 1 or  -- S1 - S9
+            G>=40 and 5 or -- TM+
+            G>=32 and 4 or -- MM- - TM
+            G>=26 and 3 or -- m8 - MO
+            G>=19 and 2 or -- m1 - m7
+            G>=10 and 1 or  -- S1 - S9
            0

            -- Table of grades vs values
            -- 9 8 7 6 5 4 3 2 1 S1 S2 S3 S4 S5 S6 S7 S8 S9 m1 m2 m3 m4 m5 m6 m7 m8 m9  M MK MV MO MM- MM MM+ GM- GM GM+ TM- TM TM+
-            -- 0 1 2 3 4 5 6 7 8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31  32 33  34  35 36  37  38 39
+            -- 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31  32 33  34  35 36  37  38 39  40
    end,
 }
--- a/parts/scenes/app_dtw.lua
+++ b/parts/scenes/app_dtw.lua
@@ -199,8 +199,7 @@ local scene={}

 function scene.sceneInit()
    reset()
-    BG.set('fixColor')
-    BG.send(.26,.26,.26)
+    BG.set('fixColor',.26,.26,.26)
    BGM.play(bgm)
 end

--- a/parts/scenes/app_mahjong.lua
+++ b/parts/scenes/app_mahjong.lua
@@ -106,8 +106,7 @@ end
 local scene={}

 function scene.sceneInit()
-    BG.set('fixColor')
-    BG.send(.26,.62,.26)
+    BG.set('fixColor',.26,.62,.26)
    _newGame()
    selected=false
 end
--- a/parts/scenes/app_stopwatch.lua
+++ b/parts/scenes/app_stopwatch.lua
@@ -35,6 +35,14 @@ end
 function scene.mouseUp()
    release()
 end
+function scene.touchDown()
+    press()
+end
+function scene.touchUp()
+    if #love.touch.getTouches()==0 then
+        release()
+    end
+end
 function scene.keyDown(key,isRep)
    if isRep then return end
    if key=='escape'then
--- a/parts/scenes/app_tap.lua
+++ b/parts/scenes/app_tap.lua
@@ -12,8 +12,7 @@ function scene.sceneInit()
    lastKey=nil
    speed=0
    keyTime={}for i=1,40 do keyTime[i]=-1e99 end
-    BG.set('fixColor')
-    BG.send(.26,.26,.26)
+    BG.set('fixColor',.26,.26,.26)
    BGM.play('push')
 end

--- a/parts/scenes/music.lua
+++ b/parts/scenes/music.lua
@@ -75,6 +75,21 @@ function scene.keyDown(key,isRep)
 end

 function scene.draw()
+    --Character
+    gc.push('transform')
+        local t=love.timer.getTime()
+        gc.setColor(1,1,1)
+        gc.translate(906,456)
+        gc.scale(.6)
+        GC.draw(IMG.z.character)
+        GC.draw(IMG.z.screen1, -91, -157+16*math.sin(t))
+        GC.draw(IMG.z.screen2, 120, -166+16*math.sin(t+1))
+        gc.setColor(1,1,1,.7+.3*math.sin(.6*t)) GC.draw(IMG.z.particle1, -50,                    42+6*math.sin(t*0.36))
+        gc.setColor(1,1,1,.7+.3*math.sin(.7*t)) GC.draw(IMG.z.particle2, 110+6*math.sin(t*0.92), 55)
+        gc.setColor(1,1,1,.7+.3*math.sin(.8*t)) GC.draw(IMG.z.particle3, -54+6*math.sin(t*0.48), -248)
+        gc.setColor(1,1,1,.7+.3*math.sin(.9*t)) GC.draw(IMG.z.particle4, 133,                    -305+6*math.sin(t*0.40))
+    gc.pop()
+
    gc_setColor(COLOR.Z)

    --Scroller
@@ -89,23 +104,25 @@ function scene.draw()
    if selected>2 then gc_print(bgmList[selected-2],322,350-50)end
    if selected<#bgmList-1 then gc_print(bgmList[selected+2],322,350+110)end

+    --Title
+    if BGM.nowPlay then
+        GC.draw(TEXTURE.title,562,180,nil,.42)
+        local a=-t%2.3/2.3
+        gc_setColor(1,1,1,math.min(a,1))
+        GC.draw(TEXTURE.title_color,562,180,nil,.42+.062-.062*a)
+    end
+
    --Music player
-    gc.draw(TEXTURE.title,840,220,nil,.5,nil,580,118)
    if BGM.nowPlay then
        local t=TIME()
        setFont(45)
+        GC.shadedPrint(BGM.nowPlay,710,508,'left',2)
        gc_setColor(sin(t*.5)*.2+.8,sin(t*.7)*.2+.8,sin(t)*.2+.8)
        gc_print(BGM.nowPlay,710,508)
        setFont(35)
        gc_setColor(1,sin(t*2.6)*.5+.5,sin(t*2.6)*.5+.5)
        gc_print(author[BGM.nowPlay]or"MrZ",670,465)

-        local a=-t%2.3/2
-        if a<1 then
-            gc_setColor(1,1,1,a)
-            gc.draw(TEXTURE.title_color,840,220,nil,.5+.062-.062*a,.5+.126-.126*a,580,118)
-        end
-
        setFont(20)
        gc_setColor(COLOR.Z)
        local cur=BGM.playing:tell()
--- a/parts/scenes/setting_video.lua
+++ b/parts/scenes/setting_video.lua
@@ -97,7 +97,14 @@ scene.widgetList={
        },
    WIDGET.newSlider{name='bgAlpha',      x=1020,y=1430,w=200,
        axis={0,.8},disp=SETval('bgAlpha'),
-        code=function(v)SETTING.bgAlpha=v BG.send(v,v,v)end,
+        code=function(v)
+            SETTING.bgAlpha=v
+            if BG.cur=='fixColor' then
+                BG.send(v,v,v)
+            else
+                BG.send(v)
+            end
+        end,
        hideF=function()return SETTING.bg=='on'end
        },

--- a/parts/shaders/alpha.glsl
+++ b/parts/shaders/alpha.glsl
@@ -1,4 +1,4 @@
-extern float a;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    return vec4(1.,1.,1.,sign(Texel(tex,tex_coords).a)*a);
+uniform float a;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    return vec4(1.,1.,1.,sign(texture2D(tex,texCoord).a)*a);
 }
--- a/parts/shaders/aura.glsl
+++ b/parts/shaders/aura.glsl
@@ -1,42 +1,14 @@
-#define PI 3.1415926535897932384626
-extern float w,h;
-extern float t;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    float x=scr_coords.x/w;
-    float y=scr_coords.y/h;
-    float dx,dy;
+uniform float phase;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    float x=scrCoord.x/love_ScreenSize.x;
+    float y=scrCoord.y/love_ScreenSize.y;
    vec3 V=vec3(0.);
+    V.r=V.r+smoothstep(1.26,0.,length(vec2(0.5+cos(phase*3.*0.26)*0.4-x,0.5-sin(phase*3.*0.62)*0.4-y)));
+    V.g=V.g+smoothstep(1.26,0.,length(vec2((0.5+cos(phase*3.*0.32)*0.4)-x,(0.5-sin(phase*3.*0.80)*0.4)-y)));
+    V.b=V.b+smoothstep(1.26,0.,length(vec2((0.5-cos(phase*3.*0.49)*0.4)-x,(0.5+sin(phase*3.*0.18)*0.4)-y)));
+    V.rg+=vec2(smoothstep(0.626,0.,length(vec2((0.5+cos(phase*0.53)*0.4)-x,(0.5-sin(phase*0.46)*0.4)-y))));
+    V.rb+=vec2(smoothstep(0.626,0.,length(vec2((0.5+cos(phase*0.98)*0.4)-x,(0.5+sin(phase*0.57)*0.4)-y))));
+    V.gb+=vec2(smoothstep(0.626,0.,length(vec2((0.5-cos(phase*0.86)*0.4)-x,(0.5-sin(phase*0.32)*0.4)-y))));

-    dx=0.5+cos(t*3.*0.26)*0.4-x;
-    dy=0.5-sin(t*3.*0.62)*0.4-y;
-    dx=sqrt(dx*dx+dy*dy);
-    V.r=V.r+smoothstep(1.26,0.,dx);
-
-    dx=(0.5+cos(t*3.*0.32)*0.4)-x;
-    dy=(0.5-sin(t*3.*0.80)*0.4)-y;
-    dx=sqrt(dx*dx+dy*dy);
-    V.g=V.g+smoothstep(1.26,0.,dx);
-
-    dx=(0.5-cos(t*3.*0.49)*0.4)-x;
-    dy=(0.5+sin(t*3.*0.18)*0.4)-y;
-    dx=sqrt(dx*dx+dy*dy);
-    V.b=V.b+smoothstep(1.26,0.,dx);
-
-    dx=(0.5+cos(t*0.53)*0.4)-x;
-    dy=(0.5-sin(t*0.46)*0.4)-y;
-    dx=sqrt(dx*dx+dy*dy);
-    V.rg+=vec2(smoothstep(0.626,0.,dx));
-
-    dx=(0.5+cos(t*0.98)*0.4)-x;
-    dy=(0.5+sin(t*0.57)*0.4)-y;
-    dx=sqrt(dx*dx+dy*dy);
-    V.rb+=vec2(smoothstep(0.626,0.,dx));
-
-    dx=(0.5-cos(t*0.86)*0.4)-x;
-    dy=(0.5-sin(t*0.32)*0.4)-y;
-    dx=sqrt(dx*dx+dy*dy);
-    V.gb+=vec2(smoothstep(0.626,0.,dx));
-
-    dx=1.626*max(max(V.r,V.g),V.b);
-    return vec4(V/dx,0.4);
+    return vec4(V/max(max(V.r,V.g),V.b)/1.626,0.4);
 }
--- a/parts/shaders/blockSatur.glsl
+++ b/parts/shaders/blockSatur.glsl
@@ -1,10 +1,10 @@
-extern float k,b;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    vec4 texcolor=Texel(tex,tex_coords);
+uniform float k,b;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    vec4 texcolor=texture2D(tex,texCoord);
    return vec4(
-        (b+texcolor.r*k)*color.r,
-        (b+texcolor.g*k)*color.g,
-        (b+texcolor.b*k)*color.b,
+        (texcolor.r*k+b)*color.r,
+        (texcolor.g*k+b)*color.g,
+        (texcolor.b*k+b)*color.b,
        texcolor.a*color.a
    );
 }
--- a/parts/shaders/fieldSatur.glsl
+++ b/parts/shaders/fieldSatur.glsl
@@ -1,10 +1,10 @@
-extern float k,b;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    vec4 texcolor=Texel(tex,tex_coords);
+uniform float k,b;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    vec4 texcolor=texture2D(tex,texCoord);
    return vec4(
-        (b+texcolor.r*k)*color.r,
-        (b+texcolor.g*k)*color.g,
-        (b+texcolor.b*k)*color.b,
+        (texcolor.r*k+b)*color.r,
+        (texcolor.g*k+b)*color.g,
+        (texcolor.b*k+b)*color.b,
        texcolor.a*color.a
    );
 }
--- a/parts/shaders/grad1.glsl
+++ b/parts/shaders/grad1.glsl
@@ -1,9 +1,9 @@
-extern float t,w;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    float x=scr_coords.x/w;
+uniform float phase;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    float x=scrCoord.x/love_ScreenSize.x;
    return vec4(
        .8-x*.6,
-        .3+.2*sin(t),
+        .3+.2*sin(phase),
        .15+x*.7,
        .4
    );
--- a/parts/shaders/grad2.glsl
+++ b/parts/shaders/grad2.glsl
@@ -1,10 +1,10 @@
-extern float t,h;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    float y=scr_coords.y/h;
+uniform float phase;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    float y=scrCoord.y/love_ScreenSize.y;
    return vec4(
        .8-y*.6,
        .2+y*.4,
-        .3+.1*sin(t),
+        .3+.1*sin(phase),
        .4
    );
 }
--- a/parts/shaders/lighter.glsl
+++ b/parts/shaders/lighter.glsl
@@ -1,5 +1,5 @@
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    vec4 texcolor=Texel(tex,tex_coords);
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    vec4 texcolor=texture2D(tex,texCoord);
    return vec4(
        pow(texcolor.r+.26,.7023),
        pow(texcolor.g+.26,.7023),
--- a/parts/shaders/rgb1.glsl
+++ b/parts/shaders/rgb1.glsl
@@ -1,11 +1,11 @@
-extern float t,w,h;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    float x=scr_coords.x/w;
-    float y=scr_coords.y/h;
+uniform float phase;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    float x=scrCoord.x/love_ScreenSize.x;
+    float y=scrCoord.y/love_ScreenSize.y;
    return vec4(
-        .8-y*.7+.2*sin(t/6.26),
-        .2+y*.5+.15*sin(t/4.),
-        .2+x*.6-.1*sin(t/2.83),
+        .8-y*.7+.2*sin(phase/6.26),
+        .2+y*.5+.15*sin(phase/4.),
+        .2+x*.6-.1*sin(phase/2.83),
        .4
    );
 }
--- a/parts/shaders/rgb2.glsl
+++ b/parts/shaders/rgb2.glsl
@@ -1,11 +1,11 @@
-extern float t,w,h;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    float x=scr_coords.x/w;
-    float y=scr_coords.y/h;
+uniform float phase;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    float x=scrCoord.x/love_ScreenSize.x;
+    float y=scrCoord.y/love_ScreenSize.y;
    return vec4(
-        .8-y*.8-.1*sin(t/6.26),
-        .4+.1*sin(t/4.)*(y+2.)/(y+5.),
-        abs(.7-x*1.4+y*.5*sin(t/16.)),
+        .8-y*.8-.1*sin(phase/6.26),
+        .4+.1*sin(phase/4.)*(y+2.)/(y+5.),
+        abs(.7-x*1.4+y*.5*sin(phase/16.)),
        .4
    );
 }
--- a/parts/shaders/warning.glsl
+++ b/parts/shaders/warning.glsl
@@ -1,6 +1,6 @@
-extern float w,level;
-vec4 effect(vec4 color,Image tex,vec2 tex_coords,vec2 scr_coords){
-    float dx=abs(scr_coords.x/w-0.5);
+uniform float level;
+vec4 effect(vec4 color,sampler2D tex,vec2 texCoord,vec2 scrCoord){
+    float dx=abs(scrCoord.x/love_ScreenSize.x-0.5);
    float a=(dx*2.6-.626)*level;
    return vec4(1.,0.,0.,a);
 }
--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -2,6 +2,16 @@ return[=[
 未来计划:
        R E M A K E

+0.17.3: 矿井 Mine
+        改动:
+                一点魔法
+        代码:
+                升级着色器相关(aura背景表现应该好多了)
+                移除一个没用到的库(虽然也没一点点大)
+        修复:
+                修复Master-G一些问题
+                一些背景相关的问题 #672
+
 0.17.2: 服务区 Service Area
        新增:
                把一些模式加入到大地图上(by NOT_A_ROBOT) #640
--- a/version.lua
+++ b/version.lua
@@ -1,7 +1,7 @@
 return{
-    ["apkCode"]=436,
-    ["code"]=1702,
-    ["string"]="V0.17.2",
+    ["apkCode"]=438,
+    ["code"]=1703,
+    ["string"]="V0.17.3",
    ["room"]="ver A-7",
-    ["name"]="0.17.2",
+    ["name"]="矿井 Mine",
 }
Author	SHA1	Message	Date
MrZ_26	373c8a8a5f	版本推进	2022-04-04 05:29:54 +08:00
MrZ_26	2207f7e414	添加少许魔法框架跟进	2022-04-04 05:25:42 +08:00
MrZ_26	984bb7d6a6	词典调整	2022-04-04 04:57:20 +08:00
Richard969	664afb0bb3	Added a mino list in Zictionary (#679 )	2022-04-04 04:53:02 +08:00
MrZ_26	716a08b31d	着色器技术飞跃框架跟进	2022-04-03 02:41:49 +08:00
MrZ_26	a6c63c41b6	限制着色器们输入的时间范围防止精度问题导致掉帧（略暴力，会导致一个背景连续40分钟左右后会闪烁一次）	2022-04-03 00:40:21 +08:00
MrZ_26	286e330077	版本推进	2022-03-31 17:04:29 +08:00
MrZ_26	5e8af423f2	修复一些背景相关问题，框架跟进	2022-03-31 17:04:29 +08:00
NOT_A_ROBOT	5f539a2d4f	Fixed off-by-one error in rank calculation in Master Graded (#678 )	2022-03-31 13:58:04 +08:00
MrZ_26	73f63cfd0a	修复秒表小程序不能用触屏	2022-03-27 00:35:28 +08:00
MrZ_26	11422bee5a	微调说明书里对于HPC的说明	2022-03-26 21:12:48 +08:00