diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index cb8e60f5..8a61dca9 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -21,9 +21,9 @@ jobs: #- name: Setup Debug Session # uses: csexton/debugger-action@master - - name: Install swig, flex, bison + - name: Install swig run: | - sudo apt-get install -y swig flex bison + sudo apt-get install -y swig - name: Install Qt for Host uses: jurplel/install-qt-action@v3 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 052ab74c..762083ab 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -17,10 +17,10 @@ jobs: with: submodules: true - - name: Install swig, winflexbison3 + - name: Install swig uses: crazy-max/ghaction-chocolatey@v1 with: - args: install winflexbison3 swig -y + args: install swig -y - name: Install Qt uses: jurplel/install-qt-action@v3 @@ -32,7 +32,6 @@ jobs: target: 'desktop' arch: 'win64_mingw' modules: 'qtmultimedia qt5compat qtshadertools' - tools: 'tools_openssl_x64' - name: Disable PCH shell: bash @@ -47,7 +46,7 @@ jobs: working-directory: ${{github.workspace}} env: CMAKE_PREFIX_PATH: ${{env.Qt6_Dir}} - OPENSSL_ROOT_DIR: ${{github.workspace}}/../Qt/tools/OpenSSL/Win_x64 + OPENSSL_ROOT_DIR: /c/Program Files/OpenSSL run: | cmake -DCMAKE_BUILD_TYPE=MinSizeRel -G "MinGW Makefiles" -B ${{github.workspace}}/build @@ -100,7 +99,7 @@ jobs: with: fallback: 0.0.1 - - name: Download APK from build + - name: Download zip from build uses: actions/download-artifact@v3 with: name: zip @@ -110,7 +109,7 @@ jobs: run: | mv zip/FreeKill-release.7z zip/FreeKill-${{ steps.previoustag.outputs.tag }}.7z - - name: Upload Release APK + - name: Upload Release uses: softprops/action-gh-release@v1 with: token: ${{ secrets.MY_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 753aec16..27c9cf49 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) -project(FreeKill VERSION 0.3.5) +project(FreeKill VERSION 0.3.6) add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\") find_package(Qt6 REQUIRED COMPONENTS diff --git a/Fk/RoomElement/PlayerCardBox.qml b/Fk/RoomElement/PlayerCardBox.qml index 833e7999..1a32ec9b 100644 --- a/Fk/RoomElement/PlayerCardBox.qml +++ b/Fk/RoomElement/PlayerCardBox.qml @@ -79,8 +79,10 @@ GraphicsBox { onSelectedChanged: { if (selected) { virt_name = "$Selected"; + root.selected_ids.push(cid); } else { virt_name = ""; + root.selected_ids.splice(root.selected_ids.indexOf(cid), 1); } root.selected_ids = root.selected_ids; } diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 2fbe4e86..750fb605 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -3,8 +3,8 @@ + android:versionCode="306" + android:versionName="0.3.6"> diff --git a/lua/client/i18n/zh_CN.lua b/lua/client/i18n/zh_CN.lua index c0b7c38e..683b0afb 100644 --- a/lua/client/i18n/zh_CN.lua +++ b/lua/client/i18n/zh_CN.lua @@ -284,9 +284,9 @@ FreeKill使用的是libgit2的C API,与此同时使用Git完成拓展包的下 ["Resume"] = "继续", ["Bulletin Info"] = [==[ - ## v0.3.4 + ## v0.3.6 - 0.3.4版本,修复bug,手机不会息屏。 + 0.3.6版本,修复bug,手机不会息屏。 优化谋徐盛。 ]==],