修改安卓版本号

修复主菜单开关全屏会让快速开始按钮文本错误 close #566
cc techmino-alize (#579 )
2022-01-05 14:33:18 +08:00 · 2022-01-05 14:31:36 +08:00 · 2022-01-05 12:57:54 +08:00 · 2022-01-05 12:51:16 +08:00 · 2022-01-05 12:50:43 +08:00
11 changed files with 67 additions and 23 deletions
--- a/.github/actions/automatic-test/action.yml
+++ b/.github/actions/automatic-test/action.yml
@@ -4,7 +4,6 @@ description: 'Check for obvious errors.'
 runs:
  using: "composite"
  steps:
-  - uses: actions/checkout@v2
  - uses: ./.github/actions/build-love
    with:
      file-path: Techmino.love
@@ -21,4 +20,4 @@ runs:
    uses: GabrielBB/xvfb-action@v1
    with:
      run: |
-        ./dest/love Techmino.love --test
+        ./dest/love Techmino.love --test
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -31,6 +31,8 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/automatic-test

  build-windows:
@@ -38,6 +40,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -60,6 +64,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -78,6 +84,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -103,6 +111,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -131,6 +141,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -159,6 +171,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -192,6 +206,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
    - uses: ./.github/actions/build-love
      with:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,6 +41,8 @@ jobs:
    needs: get-info
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
      - uses: ./.github/actions/update-version
      - uses: ./.github/actions/build-windows
        with:
@@ -62,6 +64,8 @@ jobs:
    needs: get-info
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
      - uses: ./.github/actions/update-version
      - uses: ./.github/actions/build-windows
        with:
@@ -83,6 +87,8 @@ jobs:
    needs: get-info
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
      - uses: ./.github/actions/update-version
      - uses: ./.github/actions/build-linux
        with:
@@ -99,6 +105,8 @@ jobs:
    needs: get-info
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
      - uses: ./.github/actions/update-version
      - uses: ./.github/actions/build-android
        with:
@@ -121,6 +129,8 @@ jobs:
    needs: get-info
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
      - uses: ./.github/actions/update-version
      - uses: ./.github/actions/build-macos
        with:
@@ -148,6 +158,8 @@ jobs:
    needs: get-info
    steps:
      - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
      - uses: ./.github/actions/update-version
      - uses: ./.github/actions/build-ios
        with:
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,6 +33,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -55,6 +57,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -73,6 +77,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -98,6 +104,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
@@ -125,6 +133,8 @@ jobs:
    needs: get-info
    steps:
    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
    - uses: ./.github/actions/update-version
      with:
        commit: ${{ needs.get-info.outputs.commit }}
--- a/parts/bot/bot_cc.lua
+++ b/parts/bot/bot_cc.lua
@@ -58,6 +58,8 @@ function bot_cc:thread()
                local m=rem(move,1)
                if m<4 then
                    ins(keys,m+1)
+                elseif m==5 then
+                    ins(keys, 5)
                elseif not self.data._20G then
                    ins(keys,13)
                end
--- a/parts/bot/init.lua
+++ b/parts/bot/init.lua
@@ -83,7 +83,7 @@ end
 function BOT.new(P,data)
    local bot={P=P,data=data}
    if data.type=="CC"then
-        P:setRS('SRS')
+        P:setRS('TRS')
        bot.keys={}
        bot.bufferedNexts={}
        bot.delay=data.delay
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -119,6 +119,18 @@ do--function applySettings()
        color={-.2,1.2},
    }
    function applySettings()
+        --Apply language
+        text=LANG.get(SETTING.locale)
+        WIDGET.setLang(text.WidgetText)
+        for k,v in next,TEXTOBJ do
+            if rawget(text,k)then
+                v:set(text[k])
+            end
+        end
+
+        --Apply cursor
+        love.mouse.setVisible(SETTING.sysCursor)
+
        --Apply fullscreen
        love.window.setFullscreen(SETTING.fullscreen)
        love.resize(gc.getWidth(),gc.getHeight())
@@ -147,18 +159,6 @@ do--function applySettings()
        SHADER.fieldSatur:send('b',m[1])
        SHADER.fieldSatur:send('k',m[2])

-        --Apply language
-        text=LANG.get(SETTING.locale)
-        WIDGET.setLang(text.WidgetText)
-        for k,v in next,TEXTOBJ do
-            if rawget(text,k)then
-                v:set(text[k])
-            end
-        end
-
-        --Apply cursor
-        love.mouse.setVisible(SETTING.sysCursor)
-
        --Apply BG
        if SETTING.bg=='on'then
            BG.unlock()
--- a/parts/scenes/app_console.lua
+++ b/parts/scenes/app_console.lua
@@ -124,7 +124,7 @@ local commands={}do
                    tree(path..name.."/",subName,depth+1)
                end
            else
-                log("Unkown item type: %s (%s)"):format(name,info.type)
+                log("Unknown item type: %s (%s)"):format(name,info.type)
            end
        end
        commands.tree={
@@ -181,7 +181,7 @@ local commands={}do
                        elseif info.type=='directory'then
                            recursiveDelDir(path)
                        else
-                            log("Unkown item type: %s (%s)"):format(name,info.type)
+                            log("Unknown item type: %s (%s)"):format(name,info.type)
                        end
                    end
                end
@@ -207,7 +207,7 @@ local commands={}do
                        elseif info.type=='directory'then
                            (recursive and recursiveDelDir or delDir)(name)
                        else
-                            log("Unkown item type: %s (%s)"):format(name,info.type)
+                            log("Unknown item type: %s (%s)"):format(name,info.type)
                        end
                    else
                        log{C.R,("No file called '%s'"):format(name)}
@@ -745,7 +745,7 @@ local commands={}do
            elseif code=="7126"then
                sumode=true
                log{C.Y,"* SU MODE ON - DO NOT RUN ANY CODES IF YOU DO NOT KNOW WHAT THEY DO *"}
-                log{C.Y,"* Use function _SCLOG(message) to print message here *"}
+                log{C.Y,"* Use the _SCLOG(message) function to print into this console *"}
                log{C.Y,"* 最高权限模式开启, 请不要执行任何自己不懂确切含义的代码 *"}
                log{C.Y,"* 使用_SCLOG(信息)函数在控制台打印信息 *"}
            else
@@ -1122,7 +1122,7 @@ function scene.keyDown(key)
            end

            if #res>1 then
-                log(">Commands start with '"..str.."' :")
+                log(">Commands that start with '"..str.."' :")
                table.sort(res)
                for i=1,#res do log{COLOR.lH,res[i]}end
            elseif #res==1 then
--- a/parts/scenes/main.lua
+++ b/parts/scenes/main.lua
@@ -27,8 +27,7 @@ function scene.sceneInit()
    scrollX=tipLength

    --Set quick-play-button text
-    local qpModeName=text.modes[STAT.lastPlay]and text.modes[STAT.lastPlay][1]or"["..STAT.lastPlay.."]"
-    scene.widgetList[2]:setObject(text.WidgetText.main.qplay..": "..qpModeName)
+    scene.resize()

    --Create demo player
    destroyPlayers()
@@ -38,6 +37,11 @@ function scene.sceneInit()
    PLAYERS[1]:setPosition(520,140,.8)
 end

+function scene.resize()
+    local qpModeName=text.modes[STAT.lastPlay]and text.modes[STAT.lastPlay][1]or"["..STAT.lastPlay.."]"
+    scene.widgetList[2]:setObject(text.WidgetText.main.qplay..": "..qpModeName)
+end
+
 function scene.mouseDown(x,y)
    if x>=400 and x<=880 and y>=10 and y<=110 then
        enterConsole()
--- a/parts/updateLog.lua
+++ b/parts/updateLog.lua
@@ -47,6 +47,7 @@ return[=[
        修复:
                BGM模块资源管理问题导致的一些音频bug #557
                自定义场地界面按超过第三个的鼠标键会报错
+                主菜单开关全屏会让快速开始按钮文本错误 #566
                经典模式h和u难度没有干旱计数器 #546
                自定义场地16号色的方块名位置显示错误
                联网对战结算的l'pm公式错写成lpm的
--- a/version.lua
+++ b/version.lua
@@ -1,5 +1,5 @@
 return{
-    ["apkCode"]=425,
+    ["apkCode"]=426,
    ["code"]=1701,
    ["string"]="V0.17.1",
    ["room"]="ver A-3",
Author	SHA1	Message	Date
MrZ626	a0596acfde	修改安卓版本号	2022-01-05 14:33:18 +08:00
MrZ626	6954ed06a6	修复主菜单开关全屏会让快速开始按钮文本错误 close #566	2022-01-05 14:31:36 +08:00
Imple Lee	00919c1067	cc techmino-alize (#579 ) this should only be used with imple/techmino-alize branch on 26F-Studio/cold_clear_ai_love2d_wrapper	2022-01-05 12:57:54 +08:00
NOT_A_ROBOT	ceb77e46c3	Fix some spelling/grammar mistakes on Console app (#576 )	2022-01-05 12:51:16 +08:00
Trebor Huang	ae15281db0	Allow Zframework to be checked out (#580 ) * Allow checkout Zframework * Propagate changes to all workflows * Fix indentation * Decide to be `recursive` * Remove unnecessary checkouts * Remove unnecessary recursive checkouts	2022-01-05 12:50:43 +08:00