From cf6f839ada4092e35ccf12884ca07ed601723d7d Mon Sep 17 00:00:00 2001 From: 2509_92447106 <2509_92447106@noreply.gitcode.com> Date: Sun, 8 Nov 2026 08:59:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B=E2=80=9C?= =?UTF-8?q?=E4=BA=94=E5=B8=A6=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/_engine/VersionStamp/Program.cs | 11 +- model/_engine/src/Geometry.cs | 110 +++++ model/earth-geography/earth-geography.json | 21 + .../EarthGeographyModel.dll | Bin 0 -> 32768 bytes .../earth-geography.model/borders.json | 1 + .../earth-geography.model/coastline.json | 1 + .../earth-geography.model/i18n/en.json | 7 + .../earth-geography.model/i18n/zh-CN.json | 7 + .../earth-geography.model/labels.json | 103 ++++ .../earth-geography.model/plates.json | 1 + .../earth-geography.model/scene.json | 88 ++++ .../src/EarthGeographyModel.csproj | 29 ++ model/earth-geography/src/GeoModels.cs | 79 +++ model/earth-geography/src/GeographyRuntime.cs | 238 +++++++++ model/earth-geography/src/GeographyView.cs | 464 ++++++++++++++++++ model/earth-revolution/earth-revolution.json | 2 +- model/earth-rotation/earth-rotation.json | 2 +- model/version.json | 26 +- .../Views/ConfirmWindow.axaml.cs | 16 + .../EarthModelStudio/Views/PlayerWindow.cs | 27 +- version.json | 26 +- 21 files changed, 1223 insertions(+), 36 deletions(-) create mode 100644 model/_engine/src/Geometry.cs create mode 100644 model/earth-geography/earth-geography.json create mode 100644 model/earth-geography/earth-geography.model/EarthGeographyModel.dll create mode 100644 model/earth-geography/earth-geography.model/borders.json create mode 100644 model/earth-geography/earth-geography.model/coastline.json create mode 100644 model/earth-geography/earth-geography.model/i18n/en.json create mode 100644 model/earth-geography/earth-geography.model/i18n/zh-CN.json create mode 100644 model/earth-geography/earth-geography.model/labels.json create mode 100644 model/earth-geography/earth-geography.model/plates.json create mode 100644 model/earth-geography/earth-geography.model/scene.json create mode 100644 model/earth-geography/src/EarthGeographyModel.csproj create mode 100644 model/earth-geography/src/GeoModels.cs create mode 100644 model/earth-geography/src/GeographyRuntime.cs create mode 100644 model/earth-geography/src/GeographyView.cs diff --git a/model/_engine/VersionStamp/Program.cs b/model/_engine/VersionStamp/Program.cs index 080be1d..c686690 100644 --- a/model/_engine/VersionStamp/Program.cs +++ b/model/_engine/VersionStamp/Program.cs @@ -9,6 +9,9 @@ using System.Text.Json.Nodes; // 输出:更新 model//.json 的 version / updatedAt,并生成 // 仓库根 version.json 与 model/version.json(内容相同,便于两种源地址读取)。 +// 仓库地址(编译产物的 Release 也发在这里):与启动器默认 updateRepository 保持一致。 +const string Repository = "https://gitcode.com/2509_92447106/GC"; + var root = args.Length > 0 ? Path.GetFullPath(args[0]) : Directory.GetCurrentDirectory(); var launcherVersion = args.Length > 1 && !string.IsNullOrWhiteSpace(args[1]) ? args[1] : "1.0.0"; var modelRoot = Path.Combine(root, "model"); @@ -111,12 +114,16 @@ if (Directory.Exists(srcRoot)) var launcherRevision = srcChunks.Count > 0 ? Fingerprint(srcChunks)[..10] : ""; var packages = new Dictionary>(); +// 启动器更新只访问「编译的产物」:gitcode Release 里发布的 dist/GC-.zip 附件。 +// 运行时若存在同名 Release,GitCodeReleaseRemote 会用附件真实直链覆盖下面的 url; +// 下面的地址是兜底(编译产物尚未发 Release 时也能指向正确的编译产物位置)。 +var releaseBase = $"{Repository}/releases/download/v{launcherVersion}"; foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-x64" }) { var entry = new Dictionary { ["path"] = $"dist/GC-{rid}.zip", - ["url"] = "" // 大文件建议填 Release 直链;留空则用仓库内 path + ["url"] = $"{releaseBase}/GC-{rid}.zip" }; // 已生成的启动器更新包:把校验值和体积写进清单,供下载端校验 var zipPath = Path.Combine(root, "dist", $"GC-{rid}.zip"); @@ -133,7 +140,7 @@ var versionDoc = new Dictionary { ["schema"] = 1, ["generated"] = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ"), - ["repository"] = "https://gitcode.com/2509_92447106/GC", + ["repository"] = Repository, ["branch"] = "main", ["modelDir"] = "model", ["launcher"] = new Dictionary diff --git a/model/_engine/src/Geometry.cs b/model/_engine/src/Geometry.cs new file mode 100644 index 0000000..5c0cbfa --- /dev/null +++ b/model/_engine/src/Geometry.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Numerics; + +namespace NeoRF.EarthModels; + +/// +/// 地理模型的球面几何工具:经纬度 ↔ 单位球坐标、正交投影到屏幕、 +/// 以及把一条经纬度折线投影成「可见弧段」(背面自动裁掉)。 +/// 纯 CPU、无依赖,供 GeographyView 画线稿用。 +/// +public static class Geometry +{ + public const float DegToRad = (float)(Math.PI / 180.0); + public const float RadToDeg = (float)(180.0 / Math.PI); + + /// 经纬度 → 单位球坐标(y 轴为地轴,lon 向东为正)。 + public static Vector3 LatLonToUnit(double latDeg, double lonDeg) + { + var lat = (float)(latDeg * Math.PI / 180.0); + var lon = (float)(lonDeg * Math.PI / 180.0); + var cosLat = (float)Math.Cos(lat); + return new Vector3(cosLat * (float)Math.Sin(lon), (float)Math.Sin(lat), cosLat * (float)Math.Cos(lon)); + } + + /// 把世界坐标旋转到相机空间(先用 planet 旋转地球,再用 cam 转到屏幕)。 + public static Vector3 ToCamera(Vector3 world, Matrix4x4 planet, Matrix4x4 cam) + => Vector3.Transform(Vector3.Transform(world, planet), cam); + + /// 相机空间的正交投影:球心在原点,半径 radius。 + public static Vector2 Project(Vector3 camPos, float radius, float centerX, float centerY) + => new(centerX + camPos.X * radius, centerY - camPos.Y * radius); + + /// 相机空间里该点是否朝向观察者(z>0 为正面)。 + public static bool IsVisible(Vector3 camPos, float threshold = 0f) => camPos.Z > threshold; + + /// + /// 把一条经纬度折线拆成若干段「可见」的屏幕折线。 + /// 跨越地平线的相邻两点用线性插值求出交点作为端点,保证线不会穿过球体背面。 + /// + public static List> ProjectPolyline( + IReadOnlyList latLonPoints, + Matrix4x4 planet, Matrix4x4 cam, + float radius, float centerX, float centerY, + bool closed = false) + { + var result = new List>(); + if (latLonPoints.Count < 2) return result; + + var count = latLonPoints.Count; + var total = closed ? count + 1 : count; + List? current = null; + + Vector3 prevCam = default; + var havePrev = false; + + for (var i = 0; i < total; i++) + { + var p = latLonPoints[i % count]; + if (p.Length < 2) { havePrev = false; continue; } + + var camPos = ToCamera(LatLonToUnit(p[1], p[0]), planet, cam); + var visible = camPos.Z > 0f; + + if (!havePrev) + { + if (visible) + { + current = new List(); + current.Add(Project(camPos, radius, centerX, centerY)); + } + prevCam = camPos; + havePrev = true; + continue; + } + + var prevVisible = prevCam.Z > 0f; + if (visible && prevVisible) + { + current ??= new List(); + current.Add(Project(camPos, radius, centerX, centerY)); + } + else if (visible != prevVisible) + { + // 求出与地平线(z=0)的交点 + var t = prevCam.Z / (prevCam.Z - camPos.Z); + var hit = Vector3.Lerp(prevCam, camPos, t); + hit.Z = 0f; + var hitScreen = Project(hit, radius, centerX, centerY); + + if (visible) + { + current = new List { hitScreen }; + current.Add(Project(camPos, radius, centerX, centerY)); + } + else + { + current?.Add(hitScreen); + if (current is { Count: > 1 }) result.Add(current); + current = null; + } + } + + prevCam = camPos; + } + + if (current is { Count: > 1 }) result.Add(current); + return result; + } +} diff --git a/model/earth-geography/earth-geography.json b/model/earth-geography/earth-geography.json new file mode 100644 index 0000000..1601847 --- /dev/null +++ b/model/earth-geography/earth-geography.json @@ -0,0 +1,21 @@ +{ + "id": "earth-geography", + "version": "1.0", + "nameI18n": { + "zh-CN": "地球地理", + "en": "Earth Geography" + }, + "descriptionI18n": { + "zh-CN": "五带划分、七大洲四大洋轮廓、六大板块与洲界,纯线稿教学图。", + "en": "Climate zones, continent/ocean outlines, plates and borders — clean line art." + }, + "assembly": "EarthGeographyModel.dll", + "type": "NeoRF.EarthModels.GeographyModelFactory", + "author": "Morris GC", + "tags": [ + "geography", + "earth", + "atlas" + ], + "dataDir": "earth-geography.model" +} \ No newline at end of file diff --git a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll new file mode 100644 index 0000000000000000000000000000000000000000..53442514395e9ab520b33a7fb50126cff11db394 GIT binary patch literal 32768 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 + + + net8.0 + enable + disable + NeoRF.EarthModels + EarthGeographyModel + true + false + + + + + + + + + + + + + + + false + + + + diff --git a/model/earth-geography/src/GeoModels.cs b/model/earth-geography/src/GeoModels.cs new file mode 100644 index 0000000..84d1a93 --- /dev/null +++ b/model/earth-geography/src/GeoModels.cs @@ -0,0 +1,79 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace NeoRF.EarthModels; + +/// 地球地理模型的数据文件:全部是经纬度折线,只有轮廓没有填色。 +public sealed class GeoData +{ + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); +} + +public sealed class PlateEntry +{ + [JsonPropertyName("id")] public string Id { get; set; } = ""; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); +} + +public sealed class PlateData +{ + [JsonPropertyName("plates")] public List Plates { get; set; } = new(); +} + +public sealed class BorderEntry +{ + /// 分界的两个大洲,如「亚洲-非洲」。 + [JsonPropertyName("between")] public string Between { get; set; } = ""; + /// 分界标志名称,如「苏伊士运河」。 + [JsonPropertyName("name")] public string Name { get; set; } = ""; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); +} + +public sealed class BorderData +{ + [JsonPropertyName("borders")] public List Borders { get; set; } = new(); +} + +/// 七大洲四大洋的标签位置(经纬度 + 名称)。 +public sealed class ZoneLabel +{ + [JsonPropertyName("lat")] public double Lat { get; set; } + [JsonPropertyName("lon")] public double Lon { get; set; } + [JsonPropertyName("kind")] public string Kind { get; set; } = "continent"; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } +} + +public sealed class LabelData +{ + [JsonPropertyName("labels")] public List Labels { get; set; } = new(); +} + +/// 五带:以纬度区间定义的五个温度带。 +public sealed class ClimateZone +{ + [JsonPropertyName("id")] public string Id { get; set; } = ""; + /// 南边界纬度(可为负)。 + [JsonPropertyName("latMin")] public double LatMin { get; set; } + /// 北边界纬度。 + [JsonPropertyName("latMax")] public double LatMax { get; set; } + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("descI18n")] public Dictionary? DescI18n { get; set; } +} + +/// 地理模型场景清单。 +public sealed class GeoScene +{ + [JsonPropertyName("schemaVersion")] public int SchemaVersion { get; set; } = 1; + [JsonPropertyName("type")] public string Type { get; set; } = "geography"; + [JsonPropertyName("defaultView")] public string DefaultView { get; set; } = "zones"; + [JsonPropertyName("views")] public List Views { get; set; } = new(); + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("descriptionI18n")] public Dictionary? DescriptionI18n { get; set; } + /// 黄赤交角 / 回归线纬度,教学里统一 23.5°。 + [JsonPropertyName("tropicDeg")] public double TropicDeg { get; set; } = 23.5; + [JsonPropertyName("axialTiltDeg")] public double AxialTiltDeg { get; set; } = 23.5; + [JsonPropertyName("oceanColor")] public string OceanColor { get; set; } = "#0E2A4A"; + [JsonPropertyName("zones")] public List Zones { get; set; } = new(); +} diff --git a/model/earth-geography/src/GeographyRuntime.cs b/model/earth-geography/src/GeographyRuntime.cs new file mode 100644 index 0000000..4e61464 --- /dev/null +++ b/model/earth-geography/src/GeographyRuntime.cs @@ -0,0 +1,238 @@ +using System; +using System.Collections.Generic; +using System.IO; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Layout; +using Avalonia.Media; +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// +/// 地球地理模型:五带划分 + 七大洲四大洋轮廓 + 六大板块与洲界,纯线稿。 +/// 数据全部来自模型数据目录,启动器不参与渲染。 +/// +public sealed class GeographyRuntime : IModelRuntime +{ + private readonly List _disposables = new(); + private GeoScene? _scene; + private GeoData? _coast; + private PlateData? _plates; + private BorderData? _borders; + private LabelData? _labels; + private GeographyView? _view; + + public void Prepare(IModelContext context) + { + var dir = context.DataDirectory; + context.ReportProgress(0.10, "读取地理数据"); + _scene = ModelJson.Read(Path.Combine(dir, "scene.json")) ?? new GeoScene(); + _coast = ModelJson.Read(Path.Combine(dir, "coastline.json")) ?? new GeoData(); + _plates = ModelJson.Read(Path.Combine(dir, "plates.json")) ?? new PlateData(); + _borders = ModelJson.Read(Path.Combine(dir, "borders.json")) ?? new BorderData(); + + context.ReportProgress(0.45, "加载名称标注"); + _labels = ModelJson.Read(Path.Combine(dir, "labels.json")) ?? new LabelData(); + + context.ReportProgress(0.72, "构建轮廓"); + context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,板块 {_plates.Plates.Count} 个,洲界 {_borders.Borders.Count} 条"); + } + + public Control CreateView(IModelContext context) + { + _scene ??= new GeoScene(); + _coast ??= new GeoData(); + _plates ??= new PlateData(); + _borders ??= new BorderData(); + _labels ??= new LabelData(); + + _view = new GeographyView(context, _scene, _coast, _plates, _borders, _labels); + context.ReportProgress(1.0, "准备就绪"); + return BuildLayout(_scene, _view, context); + } + + private Control BuildLayout(GeoScene scene, GeographyView view, IModelContext context) + { + var root = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto") }; + + // 顶栏:模型名 + 图层开关 + var top = new Border + { + Background = new SolidColorBrush(Color.Parse("#0C1828")), + Padding = new Thickness(16, 10), + Child = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") } + }; + var topGrid = (Grid)top.Child!; + + var titlePanel = new StackPanel { Spacing = 2, VerticalAlignment = VerticalAlignment.Center }; + titlePanel.Children.Add(new TextBlock + { + Text = Pick(scene.NameI18n, "地球地理"), + Foreground = new SolidColorBrush(Color.Parse("#EAF2FF")), + FontSize = 15, + FontWeight = FontWeight.SemiBold + }); + titlePanel.Children.Add(new TextBlock + { + Text = Pick(scene.DescriptionI18n, "五带划分 · 七大洲四大洋 · 六大板块与洲界"), + Foreground = new SolidColorBrush(Color.Parse("#7C93B5")), + FontSize = 10.5 + }); + topGrid.Children.Add(titlePanel); + + var actions = new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 8, + VerticalAlignment = VerticalAlignment.Center + }; + actions.Children.Add(MakeToggle("五带", view.ShowZones, on => view.ShowZones = on)); + actions.Children.Add(MakeToggle("大洲轮廓", view.ShowCoast, on => view.ShowCoast = on)); + actions.Children.Add(MakeToggle("板块", view.ShowPlates, on => view.ShowPlates = on)); + actions.Children.Add(MakeToggle("洲界", view.ShowBorders, on => view.ShowBorders = on)); + actions.Children.Add(MakeButton("复位", () => view.ResetView())); + Grid.SetColumn(actions, 2); + topGrid.Children.Add(actions); + + root.Children.Add(top); + + var stage = new Grid(); + stage.Children.Add(view); + stage.Children.Add(BuildLegend(scene)); + Grid.SetRow(stage, 1); + root.Children.Add(stage); + + // 底部:五带说明 + var bottom = new Border + { + Background = new SolidColorBrush(Color.Parse("#0A1524")), + Padding = new Thickness(16, 8), + Child = BuildZoneLegend(scene) + }; + Grid.SetRow(bottom, 2); + root.Children.Add(bottom); + + return root; + } + + /// 右上角图例:说明三种线型分别代表什么。 + private static Control BuildLegend(GeoScene scene) + { + var panel = new StackPanel { Spacing = 6 }; + panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#DEEEFF")), "大洲海岸线")); + panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FF8A5C")), "板块边界")); + panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFDC70")), "洲界 / 分界线")); + return new Border + { + Background = new SolidColorBrush(Color.FromArgb(190, 8, 18, 32)), + CornerRadius = new CornerRadius(10), + Padding = new Thickness(12, 10), + HorizontalAlignment = HorizontalAlignment.Right, + VerticalAlignment = VerticalAlignment.Top, + Margin = new Thickness(0, 14, 16, 0), + Child = panel + }; + } + + private static Control LegendRow(IBrush brush, string text) + { + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 }; + row.Children.Add(new Border { Width = 14, Height = 2, Background = brush, VerticalAlignment = VerticalAlignment.Center }); + row.Children.Add(new TextBlock { Text = text, Foreground = new SolidColorBrush(Color.Parse("#9FB4D4")), FontSize = 10.5 }); + return row; + } + + private static Control BuildZoneLegend(GeoScene scene) + { + var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 18 }; + foreach (var zone in scene.Zones) + { + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 }; + row.Children.Add(new Border + { + Width = 10, Height = 10, CornerRadius = new CornerRadius(2), + Background = ZoneBrush(zone.Id), VerticalAlignment = VerticalAlignment.Center + }); + row.Children.Add(new TextBlock + { + Text = Pick(zone.NameI18n, zone.Id), + Foreground = new SolidColorBrush(Color.Parse("#C2D4EC")), + FontSize = 11 + }); + panel.Children.Add(row); + } + return panel; + } + + private static IBrush ZoneBrush(string id) => id switch + { + "torrid-north" or "torrid-south" => new SolidColorBrush(Color.Parse("#FFA84C")), + "north-temperate" or "south-temperate" => new SolidColorBrush(Color.Parse("#6ED28C")), + _ => new SolidColorBrush(Color.Parse("#96C8FF")) + }; + + private static Button MakeButton(string text, Action onClick) + { + var b = new Button + { + Content = text, + FontSize = 12, + Padding = new Thickness(11, 5), + CornerRadius = new CornerRadius(8), + Background = new SolidColorBrush(Color.Parse("#16263C")), + Foreground = new SolidColorBrush(Color.Parse("#D6E4F8")), + BorderBrush = new SolidColorBrush(Color.Parse("#263A56")), + BorderThickness = new Thickness(1), + MinHeight = 30 + }; + b.Click += (_, _) => onClick(); + return b; + } + + private static Button MakeToggle(string text, bool initial, Action onChanged) + { + var state = initial; + var b = new Button + { + Content = text, + FontSize = 12, + Padding = new Thickness(11, 5), + CornerRadius = new CornerRadius(8), + BorderThickness = new Thickness(1), + MinHeight = 30 + }; + void Apply() + { + b.Background = new SolidColorBrush(Color.Parse(state ? "#1F5BD6" : "#16263C")); + b.BorderBrush = new SolidColorBrush(Color.Parse(state ? "#3B7BFF" : "#263A56")); + b.Foreground = new SolidColorBrush(Color.Parse(state ? "#FFFFFF" : "#9FB4D4")); + } + Apply(); + b.Click += (_, _) => { state = !state; Apply(); onChanged(state); }; + return b; + } + + private static string Pick(Dictionary? dict, string fallback) + { + if (dict == null || dict.Count == 0) return fallback; + foreach (var key in new[] { "zh-CN", "en" }) + if (dict.TryGetValue(key, out var v) && !string.IsNullOrWhiteSpace(v)) return v; + return fallback; + } + + public void Dispose() + { + foreach (var d in _disposables) d.Dispose(); + _disposables.Clear(); + _view = null; + GC.SuppressFinalize(this); + } +} + +/// 模型入口。 +public sealed class GeographyModelFactory : IModelFactory +{ + public int ApiVersion => 1; + public IModelRuntime Create() => new GeographyRuntime(); +} diff --git a/model/earth-geography/src/GeographyView.cs b/model/earth-geography/src/GeographyView.cs new file mode 100644 index 0000000..30ca0a6 --- /dev/null +++ b/model/earth-geography/src/GeographyView.cs @@ -0,0 +1,464 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Numerics; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using Avalonia.Threading; +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// +/// 地球地理模型画布:**纯线稿**球面,不填色。 +/// 三个图层可独立开关:五带 / 大洲大洋轮廓 / 板块与洲界。 +/// 拖拽转动视角,滚轮缩放。 +/// +public sealed class GeographyView : Control +{ + private readonly GeoScene _scene; + private readonly GeoData _coast; + private readonly PlateData _plates; + private readonly BorderData _borders; + private readonly LabelData _labels; + + // 视角 + private double _yawDeg = 10; + private double _pitchDeg = 18; + private double _zoom = 1.0; + private Point _lastPointer; + private bool _dragging; + + // 图层开关 + private bool _showZones = true; + private bool _showCoast = true; + private bool _showPlates; + private bool _showBorders; + private bool _showLabels = true; + + public event Action? StateChanged; + + public GeographyView(IModelContext context, GeoScene scene, GeoData coast, + PlateData plates, BorderData borders, LabelData labels) + { + _scene = scene; + _coast = coast; + _plates = plates; + _borders = borders; + _labels = labels; + ClipToBounds = true; + ClipToBounds = true; + Focusable = true; + } + + public string CurrentLayerName => _showZones ? "zones" + : _showPlates ? "plates" + : _showBorders ? "borders" + : "coast"; + + public bool ShowZones { get => _showZones; set { _showZones = value; InvalidateVisual(); StateChanged?.Invoke(); } } + public bool ShowCoast { get => _showCoast; set { _showCoast = value; InvalidateVisual(); StateChanged?.Invoke(); } } + public bool ShowPlates { get => _showPlates; set { _showPlates = value; InvalidateVisual(); StateChanged?.Invoke(); } } + public bool ShowBorders { get => _showBorders; set { _showBorders = value; InvalidateVisual(); StateChanged?.Invoke(); } } + public bool ShowLabels { get => _showLabels; set { _showLabels = value; InvalidateVisual(); StateChanged?.Invoke(); } } + + public void ResetView() + { + _yawDeg = 10; + _pitchDeg = 18; + _zoom = 1.0; + InvalidateVisual(); + StateChanged?.Invoke(); + } + + public void SetView(double yaw, double pitch, double zoom = 1.0) + { + _yawDeg = yaw; + _pitchDeg = pitch; + _zoom = zoom; + InvalidateVisual(); + StateChanged?.Invoke(); + } + + // ---------------------------------------------------------------- 交互 + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return; + _lastPointer = e.GetPosition(this); + _dragging = true; + e.Pointer.Capture(this); + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + if (!_dragging) return; + var p = e.GetPosition(this); + var dx = p.X - _lastPointer.X; + var dy = p.Y - _lastPointer.Y; + _lastPointer = p; + // 跟手拖动:像素位移换算成角度 + _yawDeg -= dx * 0.42; + _pitchDeg = Math.Clamp(_pitchDeg + dy * 0.42, -85, 85); + InvalidateVisual(); + StateChanged?.Invoke(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + _dragging = false; + e.Pointer.Capture(null); + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + _zoom = Math.Clamp(_zoom * (1 + e.Delta.Y * 0.12), 0.55, 4.0); + InvalidateVisual(); + StateChanged?.Invoke(); + e.Handled = true; + } + + // ---------------------------------------------------------------- 渲染 + public override void Render(DrawingContext ctx) + { + var size = Bounds.Size; + if (size.Width < 40 || size.Height < 40) return; + + DrawBackground(ctx, size); + + var cx = (float)(size.Width * 0.5); + var cy = (float)(size.Height * 0.52); + var radius = (float)(Math.Min(size.Width, size.Height) * 0.44 * _zoom); + if (radius < 8) return; + + // 相机:先按俯仰转 X,再按偏航转 Y + var cam = Matrix4x4.CreateRotationX((float)(-_pitchDeg * Math.PI / 180.0)); + var planet = Matrix4x4.CreateRotationY((float)(_yawDeg * Math.PI / 180.0)); + var combined = Matrix4x4.Multiply(planet, cam); + + DrawSphereDisc(ctx, cx, cy, radius); + + if (_showZones) DrawClimateZones(ctx, combined, cx, cy, radius); + if (_showCoast) DrawCoastlines(ctx, combined, cx, cy, radius); + if (_showPlates) DrawPlates(ctx, combined, cx, cy, radius); + if (_showBorders) DrawBorders(ctx, combined, cx, cy, radius); + if (_showLabels) DrawLabels(ctx, combined, cx, cy, radius); + + DrawCompoundSphereOutLine(ctx, cx, cy, radius); + DrawHint(ctx, size, combined, cx, cy, radius); + } + + private static readonly IBrush BgTop = new LinearGradientBrush + { + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#0B1726"), 0), + new GradientStop(Color.Parse("#060D18"), 1) + } + }; + + private void DrawBackground(DrawingContext ctx, Size size) + => ctx.FillRectangle(BgTop, new Rect(size)); + + /// 球体本身:极暗的海水底,只为了让白色轮廓看得清。 + private static void DrawSphereDisc(DrawingContext ctx, float cx, float cy, float r) + { + var disc = new RadialGradientBrush + { + Center = new RelativePoint(0.36, 0.32, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.36, 0.32, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.85, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.85, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#12314F"), 0), + new GradientStop(Color.Parse("#0A1E33"), 0.62), + new GradientStop(Color.Parse("#061120"), 1) + } + }; + ctx.DrawEllipse(disc, null, new Point(cx, cy), r, r); + } + + private static void DrawCompoundSphereOutLine(DrawingContext ctx, float cx, float cy, float r) + { + var pen = new Pen(new SolidColorBrush(Color.FromArgb(190, 150, 200, 255)), 1.4); + ctx.DrawEllipse(null, pen, new Point(cx, cy), r, r); + } + + // ---- 五带 ---- + private void DrawClimateZones(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + { + foreach (var zone in _scene.Zones) + { + // 每个带用半透明色带填充 + 边界纬线 + var color = ZoneFillColor(zone.Id); + FillLatBand(ctx, combined, cx, cy, r, zone.LatMin, zone.LatMax, color); + + foreach (var lat in new[] { zone.LatMin, zone.LatMax }) + { + var pen = Math.Abs(Math.Abs(lat) - _scene.TropicDeg) < 0.5 ? TropicPen + : Math.Abs(Math.Abs(lat) - (90 - _scene.TropicDeg)) < 0.5 ? PolarPen + : ZoneEdgePen; + DrawParallel(ctx, combined, cx, cy, r, lat, pen); + } + } + // 赤道独立强调 + var eqPen = new Pen(new SolidColorBrush(Color.FromArgb(235, 120, 220, 255)), 1.8, + new DashStyle(new double[] { 6, 4 }, 0)); + DrawParallel(ctx, combined, cx, cy, r, 0, eqPen); + } + + /// 把纬度带的球面片填成半透明色(只填可见半球)。 + private static void FillLatBand(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r, + double latMin, double latMax, IBrush brush) + { + // 用「纬线环」的投影轮廓近似填充:采样一圈点拼成多边形 + const int n = 96; + for (var band = 0; band < 2; band++) + { + var lat = band == 0 ? latMin : latMax; + var pts = new List(n); + for (var i = 0; i <= n; i++) + { + var lon = -180.0 + 360.0 * i / n; + var p = Geometry.ToCamera(Geometry.LatLonToUnit(lat, lon), + Matrix4x4.Identity, combined); + if (p.Z <= 0) continue; + pts.Add(Geometry.Project(p, r, cx, cy)); + } + if (pts.Count < 3) continue; + // 只画这段环带的两条边界,中间填充交给 DrawParallel 视觉上已足够 + } + + // 实际填充:沿经线密集采样形成条带多边形 + const int steps = 60; + var lons = new double[steps + 1]; + for (var i = 0; i <= steps; i++) lons[i] = -180.0 + 360.0 * i / steps; + + var top = new List(); + var bottom = new List(); + for (var i = 0; i <= steps; i++) + { + var pTop = Geometry.ToCamera(Geometry.LatLonToUnit(latMax, lons[i]), + Matrix4x4.Identity, combined); + var pBot = Geometry.ToCamera(Geometry.LatLonToUnit(latMin, lons[i]), + Matrix4x4.Identity, combined); + if (pTop.Z <= 0 || pBot.Z <= 0) continue; + top.Add(Geometry.Project(pTop, r, cx, cy)); + bottom.Add(Geometry.Project(pBot, r, cx, cy)); + } + if (top.Count < 3 || bottom.Count < 3) return; + + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + g.BeginFigure(Pt(top[0]), true); + for (var i = 1; i < top.Count; i++) g.LineTo(Pt(top[i])); + for (var i = bottom.Count - 1; i >= 0; i--) g.LineTo(Pt(bottom[i])); + g.EndFigure(true); + } + ctx.DrawGeometry(brush, null, geo); + } + + private static IBrush ZoneFillColor(string id) => id switch + { + "torrid-north" or "torrid-south" => new SolidColorBrush(Color.FromArgb(30, 255, 168, 76)), + "north-temperate" or "south-temperate" => new SolidColorBrush(Color.FromArgb(30, 110, 210, 140)), + _ => new SolidColorBrush(Color.FromArgb(34, 150, 200, 255)) + }; + + private static void DrawParallel(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r, + double lat, IPen pen) + { + var pts = new List(kParallelSamples); + for (var i = 0; i < kParallelSamples; i++) + pts.Add(new[] { -180.0 + 360.0 * i / (kParallelSamples - 1), lat }); + DrawGeoPolyline(ctx, pts, combined, cx, cy, r, pen, closed: false); + } + + private const int kParallelSamples = 145; + + // ---- 海岸线 ---- + private void DrawCoastlines(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + { + foreach (var line in _coast.Lines) + DrawGeoPolyline(ctx, line, combined, cx, cy, r, CoastPen, closed: true); + } + + // ---- 板块边界 ---- + private void DrawPlates(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + { + foreach (var plate in _plates.Plates) + foreach (var line in plate.Lines) + DrawGeoPolyline(ctx, line, combined, cx, cy, r, PlatePen, closed: true); + + if (!_showLabels) return; + foreach (var plate in _plates.Plates) + { + var center = Centroid(plate.Lines); + if (center == null) continue; + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), + Matrix4x4.Identity, combined); + if (cam.Z <= 0.18f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + var name = Pick(plate.NameI18n, plate.Id); + DrawText(ctx, name, pos.X, pos.Y, 11, PlateBrush, TextAlignment.Center); + } + } + + // ---- 洲界 ---- + private void DrawBorders(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + { + foreach (var b in _borders.Borders) + { + foreach (var line in b.Lines) + DrawGeoPolyline(ctx, line, combined, cx, cy, r, BorderPen, closed: false); + + // 标志点:取线中点 + if (b.Lines.Count == 0 || b.Lines[0].Count == 0) continue; + var mid = b.Lines[0][b.Lines[0].Count / 2]; + if (mid.Length < 2) continue; + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(mid[1], mid[0]), + Matrix4x4.Identity, combined); + if (cam.Z <= 0.05f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + DrawDot(ctx, pos, 3.2, BorderBrush); + if (_showLabels) + DrawText(ctx, Pick(b.NameI18n, b.Name), pos.X + 8, pos.Y - 6, 10.5, BorderBrush, TextAlignment.Left); + } + } + + // ---- 七大洲四大洋标签 ---- + private void DrawLabels(DrawingContext ctx, Matrix4x4 combined, float cx, float cy, float r) + { + foreach (var label in _labels.Labels) + { + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(label.Lat, label.Lon), + Matrix4x4.Identity, combined); + if (cam.Z <= 0.12f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + var isOcean = label.Kind == "ocean"; + var brush = isOcean ? OceanBrush : ContinentBrush; + DrawText(ctx, Pick(label.NameI18n, ""), pos.X, pos.Y, + isOcean ? 11.5 : 12.5, brush, TextAlignment.Center, + isOcean ? FontStyle.Italic : FontStyle.Normal); + } + } + + // ---- 通用:画一条经纬度折线(自动裁掉背面)---- + private static void DrawGeoPolyline(DrawingContext ctx, IReadOnlyList latLon, + Matrix4x4 combined, float cx, float cy, float r, IPen pen, bool closed) + { + var segments = Geometry.ProjectPolyline(latLon, Matrix4x4.Identity, combined, r, cx, cy, closed); + foreach (var seg in segments) + { + if (seg.Count < 2) continue; + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + g.BeginFigure(Pt(seg[0]), false); + for (var i = 1; i < seg.Count; i++) g.LineTo(Pt(seg[i])); + g.EndFigure(false); + } + ctx.DrawGeometry(null, pen, geo); + } + } + + // ---------------------------------------------------------------- 画笔 + private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75) + { LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round }; + + private static readonly IPen PlatePen = new Pen(new SolidColorBrush(Color.FromArgb(210, 255, 138, 92)), 1.5, + new DashStyle(new double[] { 7, 4 }, 0)); + + private static readonly IPen BorderPen = new Pen(new SolidColorBrush(Color.FromArgb(225, 255, 214, 110)), 1.35, + new DashStyle(new double[] { 3, 3 }, 0)); + + private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(215, 255, 190, 100)), 1.3); + private static readonly IPen PolarPen = new Pen(new SolidColorBrush(Color.FromArgb(205, 150, 205, 255)), 1.3); + private static readonly IPen ZoneEdgePen = new Pen(new SolidColorBrush(Color.FromArgb(120, 190, 220, 255)), 0.9); + + private static readonly IBrush ContinentBrush = new SolidColorBrush(Color.FromArgb(245, 232, 242, 255)); + private static readonly IBrush OceanBrush = new SolidColorBrush(Color.FromArgb(215, 130, 190, 245)); + private static readonly IBrush PlateBrush = new SolidColorBrush(Color.FromArgb(235, 255, 158, 118)); + private static readonly IBrush BorderBrush = new SolidColorBrush(Color.FromArgb(240, 255, 220, 128)); + + // ---------------------------------------------------------------- 文字 + private static void DrawText(DrawingContext ctx, string text, double x, double y, double size, + IBrush brush, TextAlignment align, FontStyle style = FontStyle.Normal) + { + if (string.IsNullOrWhiteSpace(text)) return; + var ft = new FormattedText(text, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, style, FontWeight.SemiBold), size, brush); + var px = align switch + { + TextAlignment.Center => x - ft.Width / 2, + TextAlignment.Right => x - ft.Width, + _ => x + }; + ctx.DrawText(ft, new Point(px, y)); + } + + private static Point Pt(Vector2 v) => new(v.X, v.Y); + + private static void DrawDot(DrawingContext ctx, Vector2 p, double radius, IBrush brush) + => ctx.DrawEllipse(brush, null, Pt(p), radius, radius); + + private void DrawHint(DrawingContext ctx, Size size, Matrix4x4 combined, float cx, float cy, float r) + { + // 左下角经纬读数 + var lat = _pitchDeg.ToString("0", CultureInfo.InvariantCulture); + var lon = NormalizeLon(_yawDeg).ToString("0", CultureInfo.InvariantCulture); + var text = $"视角 {lat}° / {lon}°"; + DrawText(ctx, text, 18, size.Height - 26, 11, + new SolidColorBrush(Color.FromArgb(140, 160, 190, 230)), TextAlignment.Left); + } + + private static double NormalizeLon(double deg) + { + var v = deg % 360; + if (v > 180) v -= 360; + if (v < -180) v += 360; + return v; + } + + private static string Pick(Dictionary? dict, string fallback) + { + if (dict == null || dict.Count == 0) return fallback; + foreach (var key in new[] { "zh-CN", "en" }) + if (dict.TryGetValue(key, out var v) && !string.IsNullOrWhiteSpace(v)) return v; + foreach (var kv in dict) + if (!string.IsNullOrWhiteSpace(kv.Value)) return kv.Value; + return fallback; + } + + private static double[]? Centroid(List> lines) + { + var pts = new List(); + foreach (var l in lines) + foreach (var p in l) + if (p.Length >= 2) pts.Add(p); + if (pts.Count == 0) return null; + + // 用球面平均避免经度跨越 ±180 出错 + double sx = 0, sy = 0, sz = 0; + foreach (var p in pts) + { + var v = Geometry.LatLonToUnit(p[1], p[0]); + sx += v.X; sy += v.Y; sz += v.Z; + } + var n = Math.Sqrt(sx * sx + sy * sy + sz * sz); + if (n < 1e-9) return null; + sy /= n; sx /= n; sz /= n; + var lat = Math.Asin(Math.Clamp(sy, -1, 1)) * 180.0 / Math.PI; + var lon = Math.Atan2(sx, sz) * 180.0 / Math.PI; + return new[] { lon, lat }; + } +} diff --git a/model/earth-revolution/earth-revolution.json b/model/earth-revolution/earth-revolution.json index 17c3daa..31c4e12 100644 --- a/model/earth-revolution/earth-revolution.json +++ b/model/earth-revolution/earth-revolution.json @@ -24,5 +24,5 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.0-7380e0cff3", - "updatedAt": "2026-11-07T12:37:08Z" + "updatedAt": "2026-11-07T12:47:48Z" } diff --git a/model/earth-rotation/earth-rotation.json b/model/earth-rotation/earth-rotation.json index c1265c7..77151ff 100644 --- a/model/earth-rotation/earth-rotation.json +++ b/model/earth-rotation/earth-rotation.json @@ -24,5 +24,5 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.0-c74907bbce", - "updatedAt": "2026-11-07T12:37:08Z" + "updatedAt": "2026-11-07T12:47:48Z" } diff --git a/model/version.json b/model/version.json index f062cdd..168b4ff 100644 --- a/model/version.json +++ b/model/version.json @@ -1,38 +1,38 @@ { "schema": 1, - "generated": "2026-11-07T12:37:08Z", + "generated": "2026-11-07T12:47:48Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { "version": "1.0.1", - "revision": "342aa82114", + "revision": "55f1c85a1c", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", - "url": "", - "sha256": "e965ac928e786ce7cda599f89acffbd801f5f9ebc56a9b105e57ab2650505038", - "size": 39378508 + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-win-x64.zip", + "sha256": "020ba381445561002ed65327369d980650950b6243b771264bd3cfddee345b1a", + "size": 39376610 }, "win-arm64": { "path": "dist/GC-win-arm64.zip", - "url": "", - "sha256": "cde265b004fb56f5bf8e8f61d443e2bec4c5690ece2f68b516d4d0cff4f721e2", - "size": 37684753 + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-win-arm64.zip", + "sha256": "b802b467de83a5669bb6e9e5f886f76bfd997ee4e0d400db3900e2da4aae4c8c", + "size": 37685056 }, "osx-arm64": { "path": "dist/GC-osx-arm64.zip", - "url": "", - "sha256": "1d8b412165a6bb0d27ac32b704a0d1baea4d593368d5605a3f054967dad4a991", - "size": 39853077 + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-osx-arm64.zip", + "sha256": "a0a68ec0cef59d0b940bc364dad16e69ee3b0a81862f8122392761e566f6f86d", + "size": 39855097 }, "osx-x64": { "path": "dist/GC-osx-x64.zip", - "url": "" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-osx-x64.zip" }, "linux-x64": { "path": "dist/GC-linux-x64.zip", - "url": "" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-linux-x64.zip" } } }, diff --git a/src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml.cs b/src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml.cs index 8755282..0b71203 100644 --- a/src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml.cs +++ b/src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml.cs @@ -1,6 +1,8 @@ +using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Markup.Xaml; +using Avalonia.Media; namespace EarthModelStudio.Views; @@ -11,6 +13,20 @@ public partial class ConfirmWindow : Window public ConfirmWindow(string message) { AvaloniaXamlLoader.Load(this); + + TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent }; + Background = Brushes.Transparent; + if (this.Content is Control content) + { + this.Content = new Border + { + CornerRadius = new CornerRadius(12), + Background = (this.FindResource("Surface") as IBrush) ?? Brushes.White, + ClipToBounds = true, + Child = content + }; + } + var text = this.FindControl("MessageText"); if (text != null) text.Text = message; } diff --git a/src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs b/src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs index 85f9935..862ff32 100644 --- a/src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs +++ b/src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs @@ -27,7 +27,8 @@ public sealed class PlayerWindow : Window Height = 820; MinWidth = 1000; MinHeight = 680; - Background = new SolidColorBrush(Color.Parse("#05070F")); + Background = Brushes.Transparent; + TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent }; WindowStartupLocation = WindowStartupLocation.CenterOwner; // 与启动器一致:去掉系统标题栏,自己做一个极简顶栏(否则 Esc 之外无法关闭) SystemDecorations = Avalonia.Controls.SystemDecorations.None; @@ -73,10 +74,18 @@ public sealed class PlayerWindow : Window foreach (var child in g.Children) if (child is Button b) b.Click += (_, _) => Close(); - Content = new DockPanel { LastChildFill = true }; + var dock = new DockPanel { LastChildFill = true }; DockPanel.SetDock(titleBar, Dock.Top); - ((DockPanel)Content).Children.Add(titleBar); - ((DockPanel)Content).Children.Add(model.View); + dock.Children.Add(titleBar); + dock.Children.Add(model.View); + + Content = new Border + { + CornerRadius = new CornerRadius(16), + Background = new SolidColorBrush(Color.Parse("#05070F")), + ClipToBounds = true, + Child = dock + }; KeyDown += OnKeyDown; Closed += OnClosed; @@ -121,7 +130,8 @@ public sealed class ModelErrorWindow : Window Title = title; Width = 560; Height = 340; - Background = new SolidColorBrush(Color.Parse("#0B1226")); + Background = Brushes.Transparent; + TransparencyLevelHint = new[] { WindowTransparencyLevel.Transparent }; WindowStartupLocation = WindowStartupLocation.CenterOwner; var lines = new List @@ -155,6 +165,11 @@ public sealed class ModelErrorWindow : Window }; foreach (var line in lines) panel.Children.Add(line); if (lines[^1] is Button ok) ok.Click += (_, _) => Close(); - Content = panel; + Content = new Border + { + CornerRadius = new CornerRadius(12), + Background = new SolidColorBrush(Color.Parse("#0B1226")), + Child = panel + }; } } diff --git a/version.json b/version.json index f062cdd..168b4ff 100644 --- a/version.json +++ b/version.json @@ -1,38 +1,38 @@ { "schema": 1, - "generated": "2026-11-07T12:37:08Z", + "generated": "2026-11-07T12:47:48Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { "version": "1.0.1", - "revision": "342aa82114", + "revision": "55f1c85a1c", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", - "url": "", - "sha256": "e965ac928e786ce7cda599f89acffbd801f5f9ebc56a9b105e57ab2650505038", - "size": 39378508 + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-win-x64.zip", + "sha256": "020ba381445561002ed65327369d980650950b6243b771264bd3cfddee345b1a", + "size": 39376610 }, "win-arm64": { "path": "dist/GC-win-arm64.zip", - "url": "", - "sha256": "cde265b004fb56f5bf8e8f61d443e2bec4c5690ece2f68b516d4d0cff4f721e2", - "size": 37684753 + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-win-arm64.zip", + "sha256": "b802b467de83a5669bb6e9e5f886f76bfd997ee4e0d400db3900e2da4aae4c8c", + "size": 37685056 }, "osx-arm64": { "path": "dist/GC-osx-arm64.zip", - "url": "", - "sha256": "1d8b412165a6bb0d27ac32b704a0d1baea4d593368d5605a3f054967dad4a991", - "size": 39853077 + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-osx-arm64.zip", + "sha256": "a0a68ec0cef59d0b940bc364dad16e69ee3b0a81862f8122392761e566f6f86d", + "size": 39855097 }, "osx-x64": { "path": "dist/GC-osx-x64.zip", - "url": "" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-osx-x64.zip" }, "linux-x64": { "path": "dist/GC-linux-x64.zip", - "url": "" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.1/GC-linux-x64.zip" } } },