diff --git a/lib/common/conf.dart b/lib/common/conf.dart index 2360b9a..0bb6acf 100644 --- a/lib/common/conf.dart +++ b/lib/common/conf.dart @@ -17,8 +17,8 @@ import 'package:window_manager/window_manager.dart'; import '../base/ui.dart'; class AppConf { - static const String appVersion = "2.9.15 Beta"; - static const int appVersionCode = 29; + static const String appVersion = "2.9.9 Beta"; + static const int appVersionCode = 26; static const String appVersionDate = "2023-11-11"; static const String gitlabHomeUrl = diff --git a/lib/common/win32/credentials.dart b/lib/common/win32/credentials.dart index 5bd3902..c1a9d97 100644 --- a/lib/common/win32/credentials.dart +++ b/lib/common/win32/credentials.dart @@ -6,7 +6,6 @@ import 'dart:convert'; import 'dart:ffi'; -import 'dart:typed_data'; import 'package:ffi/ffi.dart'; import 'package:win32/win32.dart'; @@ -18,7 +17,7 @@ class Win32Credentials { {required String credentialName, required String userName, required String password}) { - final examplePassword = utf8.encode(password) as Uint8List; + final examplePassword = utf8.encode(password); final blob = examplePassword.allocatePointer(); final credential = calloc() diff --git a/lib/ui/about/about_ui.dart b/lib/ui/about/about_ui.dart index fa1cf3a..0a92d3e 100644 --- a/lib/ui/about/about_ui.dart +++ b/lib/ui/about/about_ui.dart @@ -18,10 +18,16 @@ class AboutUI extends BaseUI { const SizedBox(height: 64), Image.asset("assets/app_logo.png", width: 64, height: 64), const SizedBox(height: 6), - const Text( - "星际公民盒子 V${AppConf.appVersion}", - style: TextStyle(fontSize: 21), - ), + if (AppConf.isMSE) + const Text( + "SCN公民盒子 V${AppConf.appVersion}", + style: TextStyle(fontSize: 18), + ) + else + const Text( + "星际公民盒子 V${AppConf.appVersion}", + style: TextStyle(fontSize: 18), + ), const SizedBox(height: 12), Button( onPressed: model.checkUpdate, diff --git a/lib/ui/home/home_ui.dart b/lib/ui/home/home_ui.dart index b76d953..2750dc6 100644 --- a/lib/ui/home/home_ui.dart +++ b/lib/ui/home/home_ui.dart @@ -587,8 +587,8 @@ class HomeUI extends BaseUI { "为注册表项添加 ForcedPhysicalSectorSizeInBytes 值 模拟旧设备。硬盘分区(${item.value})"), "eac_file_miss": const MapEntry("EasyAntiCheat 文件丢失", "未在 LIVE 文件夹找到 EasyAntiCheat 文件 或 文件不完整,请使用 RSI 启动器校验文件"), - "eac_not_install": const MapEntry("EasyAntiCheat 未安装", - "EasyAntiCheat 未安装,请点击修复为您一键安装。(在 EAC 完成首次启动前,本条目持续存在)"), + "eac_not_install": const MapEntry("EasyAntiCheat 未安装 或 未正常退出", + "EasyAntiCheat 未安装,请点击修复为您一键安装。(在游戏正常启动并结束前,该问题会一直出现,若您因为其他原因游戏闪退,可忽略此条目)"), "cn_user_name": const MapEntry("中文用户名!", "中文用户名可能会导致游戏启动/安装错误! 点击修复按钮查看修改教程!"), "cn_install_path": MapEntry("中文安装路径!", diff --git a/lib/ui/index_ui.dart b/lib/ui/index_ui.dart index a55280f..82dee07 100644 --- a/lib/ui/index_ui.dart +++ b/lib/ui/index_ui.dart @@ -27,8 +27,10 @@ class IndexUI extends BaseUI { children: [ Image.asset("assets/app_logo.png", width: 24, height: 24), const SizedBox(width: 12), - const Text( - "星际公民盒子 V${AppConf.appVersion}${AppConf.isMSE ? " MSE" : ""}"), + if (AppConf.isMSE) + const Text("SCN公民盒子 V${AppConf.appVersion}") + else + const Text("星际公民盒子 V${AppConf.appVersion}"), ], ), ), diff --git a/pubspec.yaml b/pubspec.yaml index 529013f..327daf2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -74,7 +74,7 @@ dev_dependencies: # rules and activating additional ones. flutter_lints: ^3.0.0 msix: ^3.16.4 - ffigen: ^9.0.1 + ffigen: ^10.0.0 build_runner: ^2.4.6 freezed: ^2.4.5 @@ -126,7 +126,7 @@ msix_config: publisher_display_name: xkeyC Studio identity_name: 56575xkeyC.MSE publisher: CN=B54C897B-C263-4680-B6AB-4913C603DF87 - msix_version: 2.9.15.0 + msix_version: 2.9.16.0 logo_path: ./assets/app_logo.png capabilities: internetClient,allowElevation languages: zh-cn diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index 930d207..903f489 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS