版本推进

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,
 })

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

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):

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额外抵挡

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,
 }

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
 

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

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

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
 

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
         },
 

parts/updateLog.lua

@@ -2,6 +2,11 @@ return[=[
 未来计划:
         R E M A K E
 
+0.17.3: 矿井 Mine
+        修复:
+                修复Master-G一些问题
+                一些背景相关的问题 #672
+
 0.17.2: 服务区 Service Area
         新增:
                 把一些模式加入到大地图上(by NOT_A_ROBOT) #640

version.lua

@@ -1,7 +1,7 @@
 return{
-    ["apkCode"]=436,
-    ["code"]=1702,
-    ["string"]="V0.17.2",
+    ["apkCode"]=437,
+    ["code"]=1703,
+    ["string"]="V0.17.3",
     ["room"]="ver A-7",
-    ["name"]="0.17.2",
+    ["name"]="矿井 Mine",
 }