diff --git a/GC-BOOT/FlutterShell.cs b/GC-BOOT/FlutterShell.cs new file mode 100644 index 0000000..352696d --- /dev/null +++ b/GC-BOOT/FlutterShell.cs @@ -0,0 +1,179 @@ +using System; +using System.Diagnostics; +using System.IO; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; + +namespace GC; + +/// +/// 新界面启动壳。 +/// +/// 发布包同时带 GC.UI.Server(本地 HTTP 后端 + 模型窗口宿主)和 +/// GC-UI(Flutter 前端)时,启动器只做三件事: +/// 1. 拉起后端并等 /api/health 就绪; +/// 2. 拉起 Flutter 窗口; +/// 3. 界面退出后关掉后端。 +/// +/// 两个产物缺任意一个就返回 false,由调用方回退到内置 Avalonia 界面—— +/// 这样 `dotnet run`、只编了启动器的开发场景、以及交叉编译缺前端产物的包都能正常打开。 +/// +internal static class FlutterShell +{ + /// 与 GC-UI/frontend 的默认 baseUrl 保持一致,前端不需要额外配置。 + private const int Port = 17890; + + private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(1.5) }; + private static Process? _backend; + + public static bool TryRun(string[] args) + { + var dir = AppContext.BaseDirectory; + var backendPath = FindBackend(dir); + var uiPath = FindUi(dir); + if (backendPath == null || uiPath == null) return false; + + // 用户可能重复启动:已有后端在跑就直接复用,退出时也不要关掉别人的进程。 + var reused = IsHealthy(); + if (!reused) + { + _backend = Start(backendPath, $"--port {Port}", dir); + if (_backend == null) return false; + + if (!WaitHealthy(TimeSpan.FromSeconds(25))) + { + Stop(_backend); + _backend = null; + return false; + } + } + + AppDomain.CurrentDomain.ProcessExit += (_, _) => Stop(_backend); + + var ui = Start(uiPath, null, dir); + if (ui == null) + { + Stop(_backend); + _backend = null; + return false; + } + + ui.WaitForExit(); + Stop(_backend); + _backend = null; + return true; + } + + // ---------------------------------------------------------------- 产物定位 + + private static string? FindBackend(string dir) + { + foreach (var name in OperatingSystem.IsWindows() + ? new[] { "GC.UI.Server.exe", "GC.UI.Server" } + : new[] { "GC.UI.Server", "GC.UI.Server.exe" }) + { + var path = Path.Combine(dir, name); + if (File.Exists(path)) return path; + } + return null; + } + + /// + /// Flutter 桌面产物。 + /// macOS 是 GC-UI.app/Contents/MacOS/GC-UI;Windows 是 GC-UI.exe; + /// Linux 是 GC-UI。 + /// + private static string? FindUi(string dir) + { + if (OperatingSystem.IsMacOS()) + { + var exe = Path.Combine(dir, "GC-UI.app", "Contents", "MacOS", "GC-UI"); + if (File.Exists(exe)) return exe; + } + + foreach (var name in OperatingSystem.IsWindows() ? new[] { "GC-UI.exe" } : new[] { "GC-UI" }) + { + var path = Path.Combine(dir, name); + if (File.Exists(path)) return path; + } + return null; + } + + // ---------------------------------------------------------------- 进程管理 + + private static Process? Start(string fileName, string? arguments, string workingDirectory) + { + try + { + var info = new ProcessStartInfo(fileName) + { + WorkingDirectory = workingDirectory, + UseShellExecute = false, + CreateNoWindow = true, + }; + if (!string.IsNullOrEmpty(arguments)) info.Arguments = arguments; + + // macOS .app 内的二进制也需要可执行位;发布包由 zip 解开时可能丢失。 + if (!OperatingSystem.IsWindows()) + { + try { File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute); } + catch { /* 权限不足时交给系统判断 */ } + } + + return Process.Start(info); + } + catch (Exception ex) + { + Console.Error.WriteLine($"[shell] 启动失败 {fileName}: {ex.Message}"); + return null; + } + } + + private static void Stop(Process? process) + { + if (process == null) return; + try + { + if (!process.HasExited) process.Kill(entireProcessTree: true); + } + catch (Exception ex) + { + Console.Error.WriteLine($"[shell] 关闭后端失败: {ex.Message}"); + } + finally + { + process.Dispose(); + } + } + + // ---------------------------------------------------------------- 健康检查 + + private static bool IsHealthy() + { + try + { + using var response = Http.GetAsync($"http://127.0.0.1:{Port}/api/health") + .GetAwaiter().GetResult(); + return response.IsSuccessStatusCode; + } + catch + { + return false; + } + } + + private static bool WaitHealthy(TimeSpan timeout) + { + var deadline = DateTime.UtcNow + timeout; + while (DateTime.UtcNow < deadline) + { + // 后端进程已经退出就没必要再等:端口被占、依赖缺失都会走这里。 + if (_backend is { HasExited: true }) return false; + + if (IsHealthy()) return true; + Thread.Sleep(250); + } + return false; + } +} diff --git a/GC-BOOT/Program.cs b/GC-BOOT/Program.cs index b0ffa5c..3c0099c 100644 --- a/GC-BOOT/Program.cs +++ b/GC-BOOT/Program.cs @@ -18,6 +18,9 @@ internal static class Program // 上次下载的启动器新版,到这次启动才应用 if (DownloadModuleHost.Factory.TryApplyPending(paths)) return; + // 发布包带 Flutter 前端时,界面交给它;没带则回退到内置 Avalonia 界面。 + if (FlutterShell.TryRun(args)) return; + BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); } diff --git a/GC-UI/frontend/macos/Runner/Configs/AppInfo.xcconfig b/GC-UI/frontend/macos/Runner/Configs/AppInfo.xcconfig index 8ee93c2..b75d33e 100644 --- a/GC-UI/frontend/macos/Runner/Configs/AppInfo.xcconfig +++ b/GC-UI/frontend/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = gc_ui +PRODUCT_NAME = GC-UI // The application's bundle identifier PRODUCT_BUNDLE_IDENTIFIER = com.morris.gc.gcUi // The copyright displayed in application information -PRODUCT_COPYRIGHT = Copyright © 2026 com.morris.gc. All rights reserved. +PRODUCT_COPYRIGHT = Copyright © 2026 Morris. All rights reserved. diff --git a/GC-UI/frontend/windows/CMakeLists.txt b/GC-UI/frontend/windows/CMakeLists.txt index 1b2f617..c740279 100644 --- a/GC-UI/frontend/windows/CMakeLists.txt +++ b/GC-UI/frontend/windows/CMakeLists.txt @@ -4,7 +4,7 @@ project(gc_ui LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "gc_ui") +set(BINARY_NAME "GC-UI") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/GC-UI/frontend/windows/runner/Runner.rc b/GC-UI/frontend/windows/runner/Runner.rc index 3be81a0..5f4ae22 100644 --- a/GC-UI/frontend/windows/runner/Runner.rc +++ b/GC-UI/frontend/windows/runner/Runner.rc @@ -89,13 +89,13 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "com.morris.gc" "\0" - VALUE "FileDescription", "gc_ui" "\0" + VALUE "CompanyName", "Morris" "\0" + VALUE "FileDescription", "GC UI" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "gc_ui" "\0" - VALUE "LegalCopyright", "Copyright (C) 2026 com.morris.gc. All rights reserved." "\0" - VALUE "OriginalFilename", "gc_ui.exe" "\0" - VALUE "ProductName", "gc_ui" "\0" + VALUE "InternalName", "GC-UI" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 Morris. All rights reserved." "\0" + VALUE "OriginalFilename", "GC-UI.exe" "\0" + VALUE "ProductName", "Morris GC" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/GC-UI/frontend/windows/runner/main.cpp b/GC-UI/frontend/windows/runner/main.cpp index f34302f..21e6874 100644 --- a/GC-UI/frontend/windows/runner/main.cpp +++ b/GC-UI/frontend/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"gc_ui", origin, size)) { + if (!window.Create(L"Morris GC", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/buildsh/build.sh b/buildsh/build.sh index ba17674..61f87e1 100644 --- a/buildsh/build.sh +++ b/buildsh/build.sh @@ -39,12 +39,31 @@ bs_build() { progress_step "编译 Mac" _run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1 + publish_backend "osx-arm64" "dist/mac-arm64" || return 1 + # Flutter 的 macOS 产物只能在 macOS 上编;交叉构建时跳过,包内回退内置界面 + if [ "$(uname -s)" = "Darwin" ]; then + build_flutter_ui macos "dist/mac-arm64" || return 1 + fi progress_step "编译 Win-x64" _run_publish winx64 70 publish_rid "win-x64" "dist/win-amd64" true || return 1 + publish_backend "win-x64" "dist/win-amd64" || return 1 progress_step "编译 Win-arm64" _run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1 + publish_backend "win-arm64" "dist/win-arm64" || return 1 + + # Windows 版 Flutter 只能在 Windows 上编;x64 产物同时放进两个 Windows 包 + # (ARM64 上由系统模拟 x64 进程运行前端)。 + case "$(uname -s)" in + MINGW*|MSYS*|CYGWIN*) + build_flutter_ui windows "dist/win-flutter" || return 1 + for label in win-amd64 win-arm64; do + cp -R "$ROOT_DIR/dist/win-flutter/." "$ROOT_DIR/dist/$label/" + done + rm -rf "$ROOT_DIR/dist/win-flutter" + ;; + esac progress_step "运行骨架"; progress_tick 100 package_mac_app diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index a6b0e55..7932f78 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -174,32 +174,85 @@ pack_models() { # macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip, # 这样 macOS 双击会用归档工具解压出可运行的 .app。 # 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。 +# 发布本地 UI 后端(GC.UI.Server)。启动器会拉起它并等待 /api/health, +# 模型窗口也由它承载,所以必须和启动器放在同一目录。 +publish_backend() { + RID="$1"; OUT="$2" + echo "==> 编译 UI 后端 (${RID}) -> ${OUT}" + dotnet publish "$ROOT_DIR/GC-UI/backend/GC.UI.Server/GC.UI.Server.csproj" \ + -c Release \ + -r "$RID" \ + --self-contained true \ + -p:Version="$VERSION" \ + -p:DebugType=none \ + -p:PublishSingleFile=false \ + -p:PublishTrimmed=false \ + -o "$ROOT_DIR/$OUT" || return 1 +} + +# 构建 Flutter 前端并把桌面产物放进平台目录。 +# Flutter 桌面只能在对应宿主平台上构建:Windows 产物必须在 Windows 上编, +# macOS 产物必须在 macOS 上编。交叉构建时这里只警告,包内不含前端, +# 启动器会自动回退到内置 Avalonia 界面。 +build_flutter_ui() { + PLAT="$1"; DEST="$2" + UI_SRC="$ROOT_DIR/GC-UI/frontend" + [ -d "$UI_SRC" ] || return 0 + + FLUTTER_BIN="${FLUTTER_BIN:-flutter}" + if ! command -v "$FLUTTER_BIN" >/dev/null 2>&1; then + echo "!! 未找到 flutter(可用 FLUTTER_BIN=<路径> 指定),本次包内不含 Flutter 界面" + return 0 + fi + + echo "==> 构建 Flutter 前端 (${PLAT})" + ( cd "$UI_SRC" && "$FLUTTER_BIN" pub get && "$FLUTTER_BIN" build "$PLAT" --release ) || return 1 + + mkdir -p "$ROOT_DIR/$DEST" + case "$PLAT" in + windows) + # Release/ 里含 GC-UI.exe、flutter_windows.dll 和 data/ + cp -R "$UI_SRC/build/windows/x64/runner/Release/." "$ROOT_DIR/$DEST/" + ;; + macos) + rm -rf "$ROOT_DIR/$DEST/GC-UI.app" + cp -R "$UI_SRC/build/macos/Build/Products/Release/GC-UI.app" "$ROOT_DIR/$DEST/" + ;; + esac + echo " -> $DEST(Flutter ${PLAT})" +} + pack_launcher() { echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)" - # --- Windows:exe 单文件(连同 GC-SAVEDOG.exe 一起打进 zip)--- + # --- Windows:启动器 + 守护进程 + UI 后端 + Flutter 前端,整目录打包 --- for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do RID="${pair%%:*}"; LABEL="${pair##*:}" SRC="$ROOT_DIR/dist/$LABEL" [ -d "$SRC" ] || SRC="$ROOT_DIR/dist/$RID" # 兼容旧布局 [ -d "$SRC" ] || continue - # 注意排除守护进程:GC-SAVEDOG.exe 在字典序里排在 GC.exe 前面 - EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG' | head -1) + + # 启动器固定是 GC.exe;后端与前端是可选的随包产物,不能当成启动器。 + EXE="$SRC/GC.exe" + [ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1) [ -n "$EXE" ] || continue TMP="$ROOT_DIR/dist/.winpkg-$LABEL" rm -rf "$TMP"; mkdir -p "$TMP" - cp "$EXE" "$TMP/GC-${VERSION}-${LABEL}.exe" + cp -R "$SRC"/. "$TMP"/ + rm -f "$TMP"/*.zip + mv "$TMP/$(basename "$EXE")" "$TMP/GC-${VERSION}-${LABEL}.exe" chmod +x "$TMP/GC-${VERSION}-${LABEL}.exe" 2>/dev/null || true - if [ -f "$SRC/GC-SAVEDOG.exe" ]; then - cp "$SRC/GC-SAVEDOG.exe" "$TMP/GC-SAVEDOG.exe" - else + if [ ! -f "$TMP/GC-SAVEDOG.exe" ]; then echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新" fi + if [ ! -f "$TMP/GC-UI.exe" ]; then + echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面" + fi ZIP="$ROOT_DIR/dist/$LABEL/GC-${VERSION}-${LABEL}.zip" rm -f "$ZIP" - ( cd "$TMP" && zip -q "$ZIP" ./* ) + ( cd "$TMP" && zip -qr "$ZIP" . ) rm -rf "$TMP" echo " -> dist/$LABEL/GC-${VERSION}-${LABEL}.zip" done diff --git a/model/contour-map/contour-map.json b/model/contour-map/contour-map.json index f440f5e..19f41ed 100644 --- a/model/contour-map/contour-map.json +++ b/model/contour-map/contour-map.json @@ -17,7 +17,7 @@ ], "assembly": "ContourMapModel.dll", "type": "GC.ContourMap.ContourMapFactory", - "version": "1.0", + "version": "1.1", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -25,6 +25,6 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "43dcb6dc63", - "updatedAt": "2026-11-17T22:53:52Z" + "build": "773ab2161d", + "updatedAt": "2026-11-18T04:35:15Z" } diff --git a/model/earth-geography/earth-geography.json b/model/earth-geography/earth-geography.json index eaaa86c..4b2f52d 100644 --- a/model/earth-geography/earth-geography.json +++ b/model/earth-geography/earth-geography.json @@ -17,7 +17,7 @@ "atlas" ], "dataDir": "earth-geography.model", - "version": "1.8", + "version": "1.9", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -25,6 +25,6 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "16eaf4110f", - "updatedAt": "2026-11-17T22:53:52Z" + "build": "cc68b8863b", + "updatedAt": "2026-11-18T04:35:15Z" } diff --git a/model/earth-revolution/earth-revolution.json b/model/earth-revolution/earth-revolution.json index 6be1e48..9524da0 100644 --- a/model/earth-revolution/earth-revolution.json +++ b/model/earth-revolution/earth-revolution.json @@ -23,7 +23,7 @@ "type": "GC.EarthModels.RevolutionModelFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.6", + "version": "1.7", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -31,6 +31,6 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "bd57e6ed67", - "updatedAt": "2026-11-17T22:53:52Z" + "build": "53b7a0fbc3", + "updatedAt": "2026-11-18T04:35:15Z" } diff --git a/model/earth-rotation/earth-rotation.json b/model/earth-rotation/earth-rotation.json index f11d3c0..6df0b46 100644 --- a/model/earth-rotation/earth-rotation.json +++ b/model/earth-rotation/earth-rotation.json @@ -23,7 +23,7 @@ "type": "GC.EarthModels.RotationModelFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.6", + "version": "1.7", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -31,6 +31,6 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "a79f660ec2", - "updatedAt": "2026-11-17T22:53:52Z" + "build": "ecd52665f9", + "updatedAt": "2026-11-18T04:35:15Z" } diff --git a/model/scale-calculator/scale-calculator.json b/model/scale-calculator/scale-calculator.json index 72d82fb..82c4275 100644 --- a/model/scale-calculator/scale-calculator.json +++ b/model/scale-calculator/scale-calculator.json @@ -24,7 +24,7 @@ "type": "GC.ScaleCalculator.ScaleCalculatorFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.5", + "version": "1.6", "chrome": { "titleBar": "#FFFFFF", "titleBorder": "#E3E8F3", @@ -32,6 +32,6 @@ "button": "#5B6A86", "frame": "#F4F6FB" }, - "build": "ec6119e3f4", - "updatedAt": "2026-11-17T22:53:52Z" + "build": "105653737d", + "updatedAt": "2026-11-18T04:35:15Z" } diff --git a/model/version.json b/model/version.json index a697283..3376b22 100644 --- a/model/version.json +++ b/model/version.json @@ -1,6 +1,6 @@ { "schema": 1, - "generated": "2026-11-17T22:53:52Z", + "generated": "2026-11-18T04:35:15Z", "repository": "https://gitcode.com/Morris_1/GC", "branch": "main", "modelDir": "model", @@ -13,24 +13,24 @@ "dir": "dist/win-amd64", "name": "GC-1.0.7-win-amd64.zip", "url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-amd64.zip", - "sha256": "f90ff51ac6b041ae238cbeb4672622b0d029142a9d8b0705f08e654336512308", - "size": 46363183 + "sha256": "e9e0794206c6a0dfb8449ac30390ed788da72a5661d362af9f9a6e489cad0aad", + "size": 102382195 }, "win-arm64": { "path": "dist/win-arm64/GC-1.0.7-win-arm64.zip", "dir": "dist/win-arm64", "name": "GC-1.0.7-win-arm64.zip", "url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-arm64.zip", - "sha256": "0b2bab2c3ac7e6223d8dd0b0faf9a0994319fa5ad13826addf7b402619b812e0", - "size": 44390354 + "sha256": "11dd6aea480b7eb9d5d0e40c6e8ac7733b83756e37ec924cb98f5e46a531def1", + "size": 98435968 }, "osx-arm64": { "path": "dist/mac-arm64/GC-1.0.7-mac-arm64.zip", "dir": "dist/mac-arm64", "name": "GC-1.0.7-mac-arm64.zip", "url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-arm64.zip", - "sha256": "e5fd355bace68dc0794eb3e049cbef63c952a60a765ab3806adaf1199e1b09ab", - "size": 9178314 + "sha256": "b085ffabf764ab57cc69a0192b47069479170f9494fb9f447230e74028794982", + "size": 60065859 }, "osx-x64": { "path": "dist/mac-x64/GC-1.0.7-mac-x64.zip", @@ -49,45 +49,45 @@ "models": [ { "id": "contour-map", - "version": "1.0", - "build": "43dcb6dc63", - "manifestSha256": "f7896a85d5f9e9f10e021c07931dee51f0ef86151a6a89e2ed39e37cb7f996a6", + "version": "1.1", + "build": "773ab2161d", + "manifestSha256": "c71ea15b519feb47a4fd33288fb92f2dcd40202fb2ce0a771fa408f9b4fbaf41", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" }, { "id": "earth-geography", - "version": "1.8", - "build": "16eaf4110f", - "manifestSha256": "0b8dd41e8535284576873956ed1db8755097649fe801d887b65ca5ac369f267c", + "version": "1.9", + "build": "cc68b8863b", + "manifestSha256": "ae64033c7b46c51eb9c5f3dfb70a5491068c6cd608dec953eb34311cb8045d60", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" }, { "id": "earth-revolution", - "version": "1.6", - "build": "bd57e6ed67", - "manifestSha256": "2d05234ea0d4de5ac55b7a076085ccfbb94ed107cce2b2d40e56d45bc3b37f3e", + "version": "1.7", + "build": "53b7a0fbc3", + "manifestSha256": "88e6f2f1bd2f7654d169745b96fa85aaea37671b6cdf8ed4fc05f7f259ae90bc", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" }, { "id": "earth-rotation", - "version": "1.6", - "build": "a79f660ec2", - "manifestSha256": "cb4ec5f310e7f05235042180dfdb1d8904c37b2d67b06a174f55589eed1652b9", + "version": "1.7", + "build": "ecd52665f9", + "manifestSha256": "9ac0050f65eedc833dd8daa8eb3b18400540269fd1a4b764ef771a357fb1cf0a", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" }, { "id": "scale-calculator", - "version": "1.5", - "build": "ec6119e3f4", - "manifestSha256": "54cf496553d11b704abfa06588ffccfed3f881a3b919d0e2304c18e157fd1f0a", + "version": "1.6", + "build": "105653737d", + "manifestSha256": "05dcb4ec0a4a0cda66dbb633b8ea58e4f4f2de47b5c9557799ac317de874f2af", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator" diff --git a/version.json b/version.json index a697283..3376b22 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "schema": 1, - "generated": "2026-11-17T22:53:52Z", + "generated": "2026-11-18T04:35:15Z", "repository": "https://gitcode.com/Morris_1/GC", "branch": "main", "modelDir": "model", @@ -13,24 +13,24 @@ "dir": "dist/win-amd64", "name": "GC-1.0.7-win-amd64.zip", "url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-amd64.zip", - "sha256": "f90ff51ac6b041ae238cbeb4672622b0d029142a9d8b0705f08e654336512308", - "size": 46363183 + "sha256": "e9e0794206c6a0dfb8449ac30390ed788da72a5661d362af9f9a6e489cad0aad", + "size": 102382195 }, "win-arm64": { "path": "dist/win-arm64/GC-1.0.7-win-arm64.zip", "dir": "dist/win-arm64", "name": "GC-1.0.7-win-arm64.zip", "url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-win-arm64.zip", - "sha256": "0b2bab2c3ac7e6223d8dd0b0faf9a0994319fa5ad13826addf7b402619b812e0", - "size": 44390354 + "sha256": "11dd6aea480b7eb9d5d0e40c6e8ac7733b83756e37ec924cb98f5e46a531def1", + "size": 98435968 }, "osx-arm64": { "path": "dist/mac-arm64/GC-1.0.7-mac-arm64.zip", "dir": "dist/mac-arm64", "name": "GC-1.0.7-mac-arm64.zip", "url": "https://gitcode.com/Morris_1/GC/releases/download/v1.0.7/GC-1.0.7-mac-arm64.zip", - "sha256": "e5fd355bace68dc0794eb3e049cbef63c952a60a765ab3806adaf1199e1b09ab", - "size": 9178314 + "sha256": "b085ffabf764ab57cc69a0192b47069479170f9494fb9f447230e74028794982", + "size": 60065859 }, "osx-x64": { "path": "dist/mac-x64/GC-1.0.7-mac-x64.zip", @@ -49,45 +49,45 @@ "models": [ { "id": "contour-map", - "version": "1.0", - "build": "43dcb6dc63", - "manifestSha256": "f7896a85d5f9e9f10e021c07931dee51f0ef86151a6a89e2ed39e37cb7f996a6", + "version": "1.1", + "build": "773ab2161d", + "manifestSha256": "c71ea15b519feb47a4fd33288fb92f2dcd40202fb2ce0a771fa408f9b4fbaf41", "filesSha256": "a6bdf9b4273aabee50c3c94ceab4d0abee15f0df1af90c58bdbb796e0d2d5699", "files": 5, "dir": "model/contour-map" }, { "id": "earth-geography", - "version": "1.8", - "build": "16eaf4110f", - "manifestSha256": "0b8dd41e8535284576873956ed1db8755097649fe801d887b65ca5ac369f267c", + "version": "1.9", + "build": "cc68b8863b", + "manifestSha256": "ae64033c7b46c51eb9c5f3dfb70a5491068c6cd608dec953eb34311cb8045d60", "filesSha256": "c018ba481831e23d3183a38ac47251f19754c7464baa5d85b47cea7a49fcfa95", "files": 11, "dir": "model/earth-geography" }, { "id": "earth-revolution", - "version": "1.6", - "build": "bd57e6ed67", - "manifestSha256": "2d05234ea0d4de5ac55b7a076085ccfbb94ed107cce2b2d40e56d45bc3b37f3e", + "version": "1.7", + "build": "53b7a0fbc3", + "manifestSha256": "88e6f2f1bd2f7654d169745b96fa85aaea37671b6cdf8ed4fc05f7f259ae90bc", "filesSha256": "4cd45b0324a77574a0da3a939c2a6faebc785c5a24cb50136d62a78a6ea2e9b1", "files": 7, "dir": "model/earth-revolution" }, { "id": "earth-rotation", - "version": "1.6", - "build": "a79f660ec2", - "manifestSha256": "cb4ec5f310e7f05235042180dfdb1d8904c37b2d67b06a174f55589eed1652b9", + "version": "1.7", + "build": "ecd52665f9", + "manifestSha256": "9ac0050f65eedc833dd8daa8eb3b18400540269fd1a4b764ef771a357fb1cf0a", "filesSha256": "594b005a6a9f36cd0b5d4e4a7a0b1ab42d53c8032832545b71c3915493d56c8e", "files": 7, "dir": "model/earth-rotation" }, { "id": "scale-calculator", - "version": "1.5", - "build": "ec6119e3f4", - "manifestSha256": "54cf496553d11b704abfa06588ffccfed3f881a3b919d0e2304c18e157fd1f0a", + "version": "1.6", + "build": "105653737d", + "manifestSha256": "05dcb4ec0a4a0cda66dbb633b8ea58e4f4f2de47b5c9557799ac317de874f2af", "filesSha256": "732dd26406e0f1e836970499d7ea644def332ce909d7f8aa0a403bbe7337e604", "files": 6, "dir": "model/scale-calculator"