Merge branch 'doc'

zyr17 · Feb 13, 2024 · d4e2085 · d4e2085
2 parents 04e1d4a + e8a4bc5
commit d4e2085
Show file tree

Hide file tree

Showing 11 changed files with 1,274 additions and 2,435 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,12 +25,15 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - name: Install mingw
+      run: choco install mingw --Version 8.1.0
     - name: npm
       run: |
         npm ci
         npm run-script package-win
     - name: cmake
       run: |
+        $env:Path = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;" + $env:Path
         git submodule update --init --recursive
         mkdir bin
         mkdir bin/release

diff --git a/.github/workflows/debugci.yml b/.github/workflows/debugci.yml
@@ -23,12 +23,15 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - name: Install mingw
+      run: choco install mingw --Version 8.1.0
     - name: npm
       run: |
         npm ci
         npm run-script package-win
     - name: cmake
       run: |
+        $env:Path = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;" + $env:Path
         git submodule update --init --recursive
         mkdir bin
         mkdir bin/debug

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -54,7 +54,16 @@ jobs:
     #     path: MajsoulPaipuAnalyzer-linux-x64.7z
     # - name: fake artifact
     #   run: mv result.html MajsoulPaipuAnalyzer-linux-x64.7z
+    - uses: actions/upload-artifact@v2
+      with:
+        name: MajsoulPaipuAnalyzer-linux-x64.7z
+        path: MajsoulPaipuAnalyzer-linux-x64.7z
+    - uses: actions/upload-artifact@v2
+      with:
+        name: PaipuAnalyzer
+        path: bin/release/PaipuAnalyzer
     - name: Upload to release
+      if: github.event_name != 'workflow_dispatch'
       run: |
         cp .github/asset.js .
         node asset.js ${{ secrets.ACCESS_TOKEN }} $GITHUB_EVENT_PATH $GITHUB_REPOSITORY MajsoulPaipuAnalyzer-linux-x64.7z application/octet_stream
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -50,7 +50,16 @@ jobs:
       run: |
         brew install p7zip
         7z a MajsoulPaipuAnalyzer-macos-x64.7z MajsoulPaipuAnalyzer-macos-x64 -m0=LZMA2 -mmt
+    - uses: actions/upload-artifact@v2
+      with:
+        name: MajsoulPaipuAnalyzer-macos-x64.7z
+        path: MajsoulPaipuAnalyzer-macos-x64.7z
+    - uses: actions/upload-artifact@v2
+      with:
+        name: PaipuAnalyzer
+        path: bin/release/PaipuAnalyzer
     - name: Upload to release
+      if: github.event_name != 'workflow_dispatch'
       run: |
         cp .github/asset.js .
         node asset.js ${{ secrets.ACCESS_TOKEN }} $GITHUB_EVENT_PATH $GITHUB_REPOSITORY MajsoulPaipuAnalyzer-macos-x64.7z application/octet_stream
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,12 +23,15 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - name: Install mingw
+      run: choco install mingw --Version 8.1.0
     - name: npm
       run: |
         npm ci
         npm run-script package-win
     - name: cmake
       run: |
+        $env:Path = "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin;" + $env:Path
         git submodule update --init --recursive
         mkdir bin
         mkdir bin/release
@@ -48,7 +51,16 @@ jobs:
         mv result MajsoulPaipuAnalyzer-win-x64
     - name: archive
       run: 7z a MajsoulPaipuAnalyzer-win-x64.7z MajsoulPaipuAnalyzer-win-x64 -m0=LZMA2 -mmt
+    - uses: actions/upload-artifact@v2
+      with:
+        name: MajsoulPaipuAnalyzer-win-x64.7z
+        path: MajsoulPaipuAnalyzer-win-x64.7z
+    - uses: actions/upload-artifact@v2
+      with:
+        name: PaipuAnalyzer
+        path: bin/release/PaipuAnalyzer.exe
     - name: Upload to release
+      if: github.event_name != 'workflow_dispatch'
       run: |
         echo $GITHUB_EVENT_PATH $GITHUB_REPOSITORY
         echo $env:GITHUB_EVENT_PATH $env:GITHUB_REPOSITORY

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,11 +7,12 @@ set (CMAKE_C_COMPILER g++)
 aux_source_directory(./src DIR_MAIN)
 aux_source_directory(./src/CJsonObject DIR_LIB)
 add_executable(PaipuAnalyzer ${DIR_MAIN} ${DIR_LIB})
-SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -std=c++11 -O0 -Wall -g -ggdb -D DEBUG")
 IF(APPLE)
     SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -std=c++11 -O3")
+    SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -std=c++11 -O0 -Wall -g -ggdb -D DEBUG")
 ELSE()
     SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -std=c++11 -O3 -static")
+    SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -std=c++11 -O0 -Wall -g -ggdb -D DEBUG -static")
 ENDIF()
 
 set(FAKE_TARGET fakeTarget)

diff --git a/SimpleMahjong/algorithm.js b/SimpleMahjong/algorithm.js
@@ -955,7 +955,7 @@ class Algo{
                 //console.log(get1, get2, num2maty[get1 % 10], num2maty[get2 % 10]);
                 if (num2maty[get2 % 10] - num2maty[get1 % 10] == 2)
                     fu += 2;
-                else if (get2 % 10 == 9 || get1 % 10 == 0)
+                else if (get1 != get2 && (get2 % 10 == 9 || get1 % 10 == 0))
                     fu += 2;
             }
             if (data.agari.length == 4){
@@ -1204,4 +1204,4 @@ setTimeout(function () {
     for (let i = 0; i < blablablalist.length; i ++ )
         Algo.makechinmap(blablablalist[i]);
     console.log('chinmap calc done.');
-}, 100);
+}, 100);
diff --git a/doc/release-notes.txt b/doc/release-notes.txt
@@ -1,3 +1,9 @@
+0.5.4
+1. 修复远古牌谱无法下载的问题。
+2. 修复算符的一个小bug。
+3. 修复部分情况网页生成出错的bug。
+4. 根据 @yuanhang0 建议调整算安定段位和置信区间算法。
+
 0.5.3
 1. 雀魂中文服新增备用网址，增加备用域名选项。
 2. 新增自行输入网址的功能，以便在未来出问题时能够手动对应。