Merge branch 'master' of https://github.com/hyb-oyqq/FRAISEMOE-Addons-Installer-NEXT

为多个按钮的文本样式表中增加了 `color: #333333` 配置，
以统一界面文字颜色显示效果。涉及的按钮包括：
- 开始安装按钮
- 禁/启用补丁按钮
- 卸载补丁按钮
- 退出程序按钮

.github/workflows/build-release.yml

@@ -1,65 +0,0 @@
-name: Build and Release
-
-on:
-  push:
-    tags:
-      - '*'  # 任意 tag 都会触发构建
-
-jobs:
-  build:
-    runs-on: windows-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-          cache: 'pip'
-          cache-dependency-path: 'source/requirements.txt'
-      
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r source/requirements.txt
-      
-      - name: Get version from tag
-        id: get_version
-        run: |
-          $version = "${{ github.ref_name }}"
-          echo "VERSION=$version" >> $env:GITHUB_OUTPUT
-      
-      - name: Verify icon file
-        run: |
-          cd source
-          if (Test-Path "assets/images/ICO/icon.ico") {
-            Write-Host "Icon file found"
-            Get-Item "assets/images/ICO/icon.ico"
-          } else {
-            Write-Host "Icon file NOT found!"
-            exit 1
-          }
-      
-      - name: Build with PyInstaller
-        run: |
-          cd source
-          pyinstaller --noconfirm build.spec
-      
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-${{ steps.get_version.outputs.VERSION }}
-          path: source/dist/FRAISEMOE_Addons_Installer_NEXT.exe
-      
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          name: release-${{ steps.get_version.outputs.VERSION }}
-          files: source/dist/FRAISEMOE_Addons_Installer_NEXT.exe
-          draft: false
-          prerelease: false
-          generate_release_notes: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -31,7 +31,6 @@ MANIFEST
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
-!source/build.spec
 
 # Installer logs
 pip-log.txt

source/build.spec

@@ -1,73 +0,0 @@
-# -*- mode: python ; coding: utf-8 -*-
-
-import os
-import sys
-from PyInstaller.utils.hooks import collect_submodules, collect_data_files
-
-block_cipher = None
-
-
-
-# 收集所有子模块
-hiddenimports = []
-hiddenimports += collect_submodules('workers')
-hiddenimports += collect_submodules('core')
-hiddenimports += collect_submodules('core.managers')
-hiddenimports += collect_submodules('core.handlers')
-hiddenimports += collect_submodules('ui')
-hiddenimports += collect_submodules('ui.components')
-hiddenimports += collect_submodules('utils')
-hiddenimports += collect_submodules('config')
-
-# PySide6 相关隐藏导入
-hiddenimports += ['PySide6.QtCore', 'PySide6.QtGui', 'PySide6.QtWidgets']
-
-a = Analysis(
-    ['Main.py'],
-    pathex=['.'],
-    binaries=[],
-    datas=[
-        ('assets', 'assets'),
-        ('data', 'data'),
-        ('config', 'config'),
-        ('bin', 'bin'),
-        ('ui', 'ui'),
-        ('workers', 'workers'),
-        ('core', 'core'),
-        ('utils', 'utils'),
-    ],
-    hiddenimports=hiddenimports,
-    hookspath=[],
-    hooksconfig={},
-    runtime_hooks=[],
-    excludes=[],
-    win_no_prefer_redirects=False,
-    win_private_assemblies=False,
-    cipher=block_cipher,
-    noarchive=False,
-)
-
-pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
-
-exe = EXE(
-    pyz,
-    a.scripts,
-    a.binaries,
-    a.zipfiles,
-    a.datas,
-    [],
-    name='FRAISEMOE_Addons_Installer_NEXT',
-    debug=False,
-    bootloader_ignore_signals=False,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    runtime_tmpdir=None,
-    console=False,
-    disable_windowed_traceback=False,
-    argv_emulation=False,
-    target_arch=None,
-    codesign_identity=None,
-    entitlements_file=None,
-    icon=os.path.join('assets', 'images', 'ICO', 'icon.ico'),
-)

source/config/config.py

@@ -4,12 +4,12 @@ import datetime
 
 # 配置信息
 app_data = {
-    "APP_VERSION": "1.4.2",
+    "APP_VERSION": "1.4.0",
     "APP_NAME": "FRAISEMOE Addons Installer NEXT",
     "TEMP": "TEMP",
     "CACHE": "FRAISEMOE",
     "PLUGIN": "PLUGIN",
-    "CONFIG_URL": "aHR0cHM6Ly9uZWtvcGFyYS1hcGkub3ZvZmlzaC5jb20vYXBpL291eWFuZ3FpcWkvbmVrb3BhcmEvZG93bmxvYWRfdXJsLmpzb24=",
+    "CONFIG_URL": "aHR0cHM6Ly9hcGkuMncyLnRvcC9hcGkvb3V5YW5ncWlxaS9uZWtvcGFyYS9kb3dubG9hZF91cmwuanNvbg==",
     "UA_TEMPLATE": "Mozilla/5.0 (Linux debian12 FraiseMoe2-Accept-Next) Gecko/20100101 Firefox/114.0 FraiseMoe2/{}",
     "game_info": {
         "NEKOPARA Vol.1": {

source/ui/Ui_install.py

@@ -410,7 +410,7 @@ class Ui_MainWindows(object):
         self.start_install_text.setText("开始安装")
         self.start_install_text.setFont(self.custom_font)
         self.start_install_text.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.start_install_text.setStyleSheet("color: #333333; letter-spacing: 1px;")
+        self.start_install_text.setStyleSheet("letter-spacing: 1px; color: #333333;")
 
         # 点击区域透明按钮
         self.start_install_btn = QPushButton(self.button_container)
@@ -444,7 +444,7 @@ class Ui_MainWindows(object):
         self.toggle_patch_text.setText("禁/启用补丁")
         self.toggle_patch_text.setFont(self.custom_font)
         self.toggle_patch_text.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.toggle_patch_text.setStyleSheet("color: #333333; letter-spacing: 1px;")
+        self.toggle_patch_text.setStyleSheet("letter-spacing: 1px; color: #333333;")
 
         # 点击区域透明按钮
         self.toggle_patch_btn = QPushButton(self.toggle_patch_container)
@@ -478,7 +478,7 @@ class Ui_MainWindows(object):
         self.uninstall_text.setText("卸载补丁")
         self.uninstall_text.setFont(self.custom_font)
         self.uninstall_text.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.uninstall_text.setStyleSheet("color: #333333; letter-spacing: 1px;")
+        self.uninstall_text.setStyleSheet("letter-spacing: 1px; color: #333333;")
 
         # 点击区域透明按钮
         self.uninstall_btn = QPushButton(self.uninstall_container)
@@ -513,7 +513,7 @@ class Ui_MainWindows(object):
         self.exit_text.setText("退出程序")
         self.exit_text.setFont(self.custom_font)
         self.exit_text.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        self.exit_text.setStyleSheet("color: #333333; letter-spacing: 1px;")
+        self.exit_text.setStyleSheet("letter-spacing: 1px; color: #333333;")
         
         # 点击区域透明按钮
         self.exit_btn = QPushButton(self.exit_container)

source/workers/extraction_thread.py

@@ -105,9 +105,7 @@ class ExtractionThread(QThread):
                 debug_logger.debug(f"压缩包内容分析:")
                 debug_logger.debug(f"- 文件总数: {len(file_list)}")
                 for i, f in enumerate(file_list):
-                    is_folder = f.endswith('/') or f.endswith('\\')
-                    file_type = '文件夹' if is_folder else '文件'
-                    debug_logger.debug(f"  {i+1}. {f} - 类型: {file_type}")
+                    debug_logger.debug(f"  {i+1}. {f} - 类型: {'文件夹' if f.endswith('/') or f.endswith('\\') else '文件'}")
 
                 update_progress(20, f"正在分析 {self.game_version} 的补丁文件...")