Merge branch 'eesast:dev' into dev

Author: manfred-z6

interface/AvaloniaUI/Converters/TeamIdToColorConverter.cs

@@ -16,10 +16,10 @@ public object Convert(object? value, Type targetType, object? parameter, Culture
             {
                 return teamId switch
                 {
-                    0 => new SolidColorBrush(Colors.Red),
-                    1 => new SolidColorBrush(Colors.Blue),
-                    2 => new SolidColorBrush(Colors.Green),
-                    3 => new SolidColorBrush(Colors.Orange),
+                    1 => new SolidColorBrush(Colors.Red),
+                    2 => new SolidColorBrush(Colors.Blue),
+                    3 => new SolidColorBrush(Colors.Green),
+                    4 => new SolidColorBrush(Colors.Orange),
                     _ => new SolidColorBrush(Colors.Gray)
                 };
             }

interface/AvaloniaUI/Models/MapOverlayItem.cs

@@ -0,0 +1,49 @@
+using Avalonia.Media;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace THUAI9_Avalonia.Models
+{
+    public enum MapOverlayKind
+    {
+        Factory,
+        Resource,
+        ComputeCenter,
+        Market
+    }
+
+    /// <summary>
+    /// 动态地图覆盖物。底图只保留静态地形，建筑/资源/据点状态以覆盖层形式渲染。
+    /// </summary>
+    public partial class MapOverlayItem : ObservableObject
+    {
+        [ObservableProperty]
+        private string key = string.Empty;
+
+        [ObservableProperty]
+        private int cellX;
+
+        [ObservableProperty]
+        private int cellY;
+
+        [ObservableProperty]
+        private string label = string.Empty;
+
+        [ObservableProperty]
+        private string tooltip = string.Empty;
+
+        [ObservableProperty]
+        private IBrush background = Brushes.Gray;
+
+        [ObservableProperty]
+        private IBrush foreground = Brushes.White;
+
+        [ObservableProperty]
+        private IBrush borderBrush = Brushes.White;
+
+        [ObservableProperty]
+        private double opacity = 0.88;
+
+        [ObservableProperty]
+        private MapOverlayKind kind;
+    }
+}

interface/AvaloniaUI/Models/PlaybackConstant.cs

@@ -14,7 +14,7 @@ public static class Constants
 public class FileFormatNotLegalException(string fileName) : Exception
 {
     public string FileName { get; } = fileName;
-    public override string Message { get; } = $"The file: {fileName} is not a legal playback file for THUAI{Constants.Version}.";
+    public override string Message { get; } = $"文件 {fileName} 不是适用于 THUAI{Constants.Version} 的合法回放文件。";
 }
 
 public static class Utils

interface/AvaloniaUI/Models/TeamOverviewItem.cs

@@ -0,0 +1,35 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace THUAI9_Avalonia.Models
+{
+    /// <summary>
+    /// 顶层摘要区中的队伍概览。
+    /// </summary>
+    public partial class TeamOverviewItem : ObservableObject
+    {
+        [ObservableProperty]
+        private int teamId;
+
+        [ObservableProperty]
+        private int score;
+
+        [ObservableProperty]
+        private int material;
+
+        [ObservableProperty]
+        private int computePower;
+
+        [ObservableProperty]
+        private int factoryHp;
+
+        public string Header => $"队伍 {TeamId}";
+
+        public string SummaryText => $"得分 {Score} · 原料 {Material} · 算力 {ComputePower} · 工厂血量 {FactoryHp}";
+
+        partial void OnTeamIdChanged(int value) => OnPropertyChanged(nameof(Header));
+        partial void OnScoreChanged(int value) => OnPropertyChanged(nameof(SummaryText));
+        partial void OnMaterialChanged(int value) => OnPropertyChanged(nameof(SummaryText));
+        partial void OnComputePowerChanged(int value) => OnPropertyChanged(nameof(SummaryText));
+        partial void OnFactoryHpChanged(int value) => OnPropertyChanged(nameof(SummaryText));
+    }
+}

interface/AvaloniaUI/THUAI9_Avalonia.csproj

@@ -6,6 +6,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+    <DefaultItemExcludes>$(DefaultItemExcludes);$(MSBuildProjectDirectory)\bin\**;$(MSBuildProjectDirectory)\obj\**;$(MSBuildProjectDirectory)\temp_build_verify\**;$(MSBuildProjectDirectory)\interface\AvaloniaUI\temp_build_verify\**</DefaultItemExcludes>
   </PropertyGroup>
 
   <ItemGroup>

interface/AvaloniaUI/ViewModels/CharacterViewModel.cs

@@ -9,47 +9,51 @@ namespace THUAI9_Avalonia.ViewModels
     public partial class CharacterViewModel : ViewModelBase
     {
         [ObservableProperty]
-        private long guid; // 全局唯一 ID
+        private long guid;
 
         [ObservableProperty]
-        private long characterId; // 玩家 ID
+        private long characterId;
 
         [ObservableProperty]
-        private int teamId; // 队伍 ID
+        private int teamId;
 
         [ObservableProperty]
-        private string name = string.Empty; // 角色名称
+        private string name = string.Empty;
 
         [ObservableProperty]
-        private int hp; // 当前生命值
+        private int hp;
 
         [ObservableProperty]
-        private int maxHp; // 最大生命值
+        private int maxHp;
 
         [ObservableProperty]
-        private int posX; // X 坐标（游戏坐标）
+        private int posX;
 
         [ObservableProperty]
-        private int posY; // Y 坐标（游戏坐标）
+        private int posY;
 
         [ObservableProperty]
-        private string activeState = string.Empty; // 当前状态
+        private string activeState = string.Empty;
 
         [ObservableProperty]
-        private CharacterType characterType; // 角色类型
+        private CharacterType characterType;
 
-        /// <summary>
-        /// 网格坐标显示文本。
-        /// </summary>
-        public string Coordinates => $"({PosX / 1000},{PosY / 1000})";
+        public string Coordinates => $"坐标 ({PosX / 1000},{PosY / 1000})";
+
+        public string HealthText => $"生命值 {Hp}";
+
+        public string PlayerText => $"玩家 P{CharacterId}";
 
-        /// <summary>
-        /// 仅在角色存活时显示坐标。
-        /// </summary>
         public bool ShowCoordinates => Hp > 0;
 
         partial void OnPosXChanged(int value) => OnPropertyChanged(nameof(Coordinates));
         partial void OnPosYChanged(int value) => OnPropertyChanged(nameof(Coordinates));
-        partial void OnHpChanged(int value) => OnPropertyChanged(nameof(ShowCoordinates));
+        partial void OnHpChanged(int value)
+        {
+            OnPropertyChanged(nameof(ShowCoordinates));
+            OnPropertyChanged(nameof(HealthText));
+        }
+        partial void OnMaxHpChanged(int value) => OnPropertyChanged(nameof(HealthText));
+        partial void OnCharacterIdChanged(long value) => OnPropertyChanged(nameof(PlayerText));
     }
 }