Oshima-Studios/FunGame-Testing
3
0
Fork 0
mirror of https://github.com/milimoe/FunGame-Testing.git synced 2026-01-19 14:08:24 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

非指向性技能测试和添加更多技能

Browse Source
This commit is contained in:
milimoe 2026-01-06 02:01:04 +08:00
parent 7c8d404eb5
commit 8bcb95795b
Signed by: milimoe
GPG Key ID: 9554D37E4B8991D0
5 changed files with 414 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Desktop/GameMapTesting/GameMapController.cs
View File

@ -18,6 +18,7 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
private readonly UserInputRequester<Grid> _targetGridSelectionRequester = new();
private readonly UserInputRequester<CharacterActionType> _actionTypeRequester = new();
private readonly UserInputRequester<List<Character>> _targetSelectionRequester = new();
private readonly UserInputRequester<List<Grid>> _targetGridsSelectionRequester = new();
private readonly UserInputRequester<Skill> _skillSelectionRequester = new();
private readonly UserInputRequester<Item> _itemSelectionRequester = new();
private readonly UserInputRequester<bool> _continuePromptRequester = new(); // 用于“按任意键继续”提示
@ -109,6 +110,14 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
return [.. targets.Where(selectable.Contains)];
}
public async Task<List<Grid>> RequestTargetGridsSelection(Character character, Skill skill, List<Character> enemys, List<Character> teammates, Grid currentGrid, List<Grid> range)
{
await WriteLine($"请选择作用目标范围。");
return await _targetGridsSelectionRequester.RequestInput(
async (callback) => await UI.InvokeAsync(() => UI.ShowTargetGridsSelectionUI(character, skill, enemys, teammates, currentGrid, range, callback))
) ?? [];
}
public async Task<Skill?> RequestSkillSelection(Character character, List<Skill> availableSkills)
{
await WriteLine($"请为 {character.NickName} 选择一个技能。");
@ -170,6 +179,12 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
await UI.InvokeAsync(() => UI.HideTargetGridSelectionUI());
}
public async Task ResolveTargetGridsSelection(List<Grid> grids)
{
_targetGridsSelectionRequester.ResolveInput(grids);
await UI.InvokeAsync(() => UI.HideTargetGridsSelectionUI());
}
public async Task ResolveSkillSelection(Skill? skill)
{
_skillSelectionRequester.ResolveInput(skill);

35
Desktop/GameMapTesting/GameMapTesting.cs
View File

@ -1,6 +1,7 @@
using System.Text;
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Interface.Entity;
using Milimoe.FunGame.Core.Library.Common.Addon;
using Milimoe.FunGame.Core.Library.Constant;
using Milimoe.FunGame.Core.Model;
@ -226,6 +227,7 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
_gamingQueue.SelectNormalAttackTargets += GamingQueue_SelectNormalAttackTargets;
_gamingQueue.SelectSkill += GamingQueue_SelectSkill;
_gamingQueue.SelectSkillTargets += GamingQueue_SelectSkillTargets;
_gamingQueue.SelectNonDirectionalSkillTargets += GamingQueue_SelectNonDirectionalSkillTargets;
_gamingQueue.SelectItem += GamingQueue_SelectItem;
_gamingQueue.QueueUpdated += GamingQueue_QueueUpdated;
_gamingQueue.TurnEnd += GamingQueue_TurnEnd;
@ -605,6 +607,39 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
return selectedTargets ?? []; // 如果取消，返回空列表
}
private async Task<List<Grid>> GamingQueue_SelectNonDirectionalSkillTargets(GamingQueue queue, Character caster, Skill skill, List<Character> enemys, List<Character> teammates, List<Grid> castRange)
{
if (!IsPlayer_OnlyTest(queue, caster) || _gamingQueue is null || _gamingQueue.Map is null) return [];
List<Character> potentialTargets = [];
if (skill.CanSelectEnemy) potentialTargets.AddRange(enemys);
if (skill.CanSelectTeammate) potentialTargets.AddRange(teammates);
if (skill.CanSelectSelf) potentialTargets.Add(caster);
Grid current = Grid.Empty;
if (_gamingQueue.CustomData.TryGetValue("currentGrid", out object? currentGrid) && currentGrid is Grid grid)
{
current = grid;
}
if (current == Grid.Empty)
{
return [];
}
// 通过UI请求目标选择
List<Grid>? selectedTargets = await Controller.RequestTargetGridsSelection(
caster,
skill,
enemys,
teammates,
current,
castRange
);
await Controller.ResolveTargetGridsSelection(selectedTargets);
return selectedTargets ?? []; // 如果取消，返回空列表
}
private async Task<Skill?> GamingQueue_SelectSkill(GamingQueue queue, Character character, List<Skill> skills)
{
if (!IsPlayer_OnlyTest(queue, character)) return null;

48
Desktop/GameMapTesting/GameMapViewer.xaml
View File

@ -590,6 +590,54 @@
</StackPanel>
</Border>
<!-- 新增：非指向性格子选择确认面板 (Overlay) -->
<Border x:Name="TargetGridsSelectionOverlay"
Panel.ZIndex="200"
HorizontalAlignment="Right"
VerticalAlignment="Top"
Margin="10"
Width="250"
MaxHeight="300"
Background="#CCFFFFFF"
BorderBrush="DarkRed"
BorderThickness="1"
CornerRadius="5"
Padding="10"
Visibility="Collapsed">
<StackPanel>
<TextBlock x:Name="TargetGridsSelectionTitle" Text="选择目标格子" FontWeight="Bold" FontSize="14" Margin="0,0,0,5"/>
<ScrollViewer VerticalScrollBarVisibility="Auto" MaxHeight="200">
<ItemsControl x:Name="SelectedTargetGridsControl" ItemsSource="{Binding SelectedTargetGrid, RelativeSource={RelativeSource AncestorType=UserControl}}">
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border BorderBrush="LightGray" BorderThickness="0,0,0,1" Padding="2" Margin="0,2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
<!-- 用于 "X" 按钮 -->
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0">
<!-- 格子信息 -->
<TextBlock Text="{Binding}" FontWeight="SemiBold" Margin="0,0,5,0" FontSize="11"/>
</StackPanel>
<!-- 移除按钮 -->
<Button Grid.Column="1" Content="X" Margin="5,0,0,0" Tag="{Binding Id}" Click="RemoveTargetGrids_Click"
Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" VerticalAlignment="Center"/>
</Grid>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,0,0">
<Button Content="确认" Margin="0,0,5,0" Click="ConfirmTargetGrids_Click"/>
<Button Content="取消" Click="CancelTargetGridsSelection_Click"/>
</StackPanel>
</StackPanel>
</Border>
<!-- 新增：继续提示面板 (Overlay) -->
<Border x:Name="ContinuePromptOverlay"
Panel.ZIndex="200"

314
Desktop/GameMapTesting/GameMapViewer.xaml.cs
View File

@ -1,6 +1,5 @@
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Runtime.Intrinsics.Arm;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Documents;
@ -20,6 +19,7 @@ using Grid = Milimoe.FunGame.Core.Library.Common.Addon.Grid;
using MessageBox = System.Windows.MessageBox;
using MouseEventArgs = System.Windows.Input.MouseEventArgs;
using Panel = System.Windows.Controls.Panel;
using Point = System.Windows.Point;
using Rectangle = System.Windows.Shapes.Rectangle;
using RichTextBox = System.Windows.Controls.RichTextBox;
using UserControl = System.Windows.Controls.UserControl;
@ -49,6 +49,9 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
// 新增：用于移动目标选择UI的ObservableCollection
public ObservableCollection<Grid> SelectedTargetGrid { get; set; } = [];
// 新增：用于非指向性目标选择UI的ObservableCollection
public ObservableCollection<Grid> SelectedTargetGrids { get; set; } = [];
public DecisionPoints DP { get; set; } = new();
// 新增：倒计时相关的字段
@ -58,6 +61,7 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
// 回调Action，用于将UI选择结果传递给Controller
private Action<Character?>? _resolveCharacterSelection;
private Action<Grid?>? _resolveTargetGridSelection;
private Action<List<Grid>>? _resolveTargetGridsSelection;
private Action<CharacterActionType>? _resolveActionType;
private Action<List<Character>>? _resolveTargetSelection;
private Action<Skill?>? _resolveSkillSelection;
@ -80,6 +84,14 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
private Border? _highlightedSkillIcon;
private Border? _highlightedItemIcon;
// 新增：用于非指向性技能的鼠标移动高亮
private List<Grid> _mouseHoverHighlightedGrids = [];
private Skill? _currentNonDirectionalSkill = null;
private Grid? _hoveredGrid = null;
// 新增：非指向性技能选择的相关状态
private bool _isSelectingNonDirectionalGrids = false;
// 模式
private bool _isAutoMode = false;
private bool _isFastMode = false;
@ -935,6 +947,22 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
{
if (sender is Rectangle clickedRect && _uiElementToGrid.TryGetValue(clickedRect, out Grid? grid))
{
// 如果处于非指向性技能目标选择模式
if (_isSelectingNonDirectionalGrids)
{
await HandleNonDirectionalGridSelectionClick(grid);
e.Handled = true;
return;
}
// 如果处于普通目标格子选择模式
if (_isSelectingTargetGrid)
{
await HandleTargetGridSelectionClick(grid);
e.Handled = true;
return;
}
// 如果处于目标选择模式，点击格子目前不进行任何操作（因为目标是角色）
if (_isSelectingTargets) return;
@ -1024,7 +1052,23 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
{
if (sender is Border clickedBorder && _uiElementToCharacter.TryGetValue(clickedBorder, out Character? character))
{
if (_isSelectingTargets)
if (_isSelectingNonDirectionalGrids)
{
// 找到角色所在的格子
if (CurrentGameMap != null && CurrentGameMap.Characters.TryGetValue(character, out Grid? characterGrid))
{
// 尝试选择角色所在的格子
await HandleNonDirectionalGridSelectionClick(characterGrid);
}
}
else if (_isSelectingTargetGrid)
{
if (CurrentGameMap != null && CurrentGameMap.Characters.TryGetValue(character, out Grid? characterGrid))
{
await HandleTargetGridSelectionClick(characterGrid);
}
}
else if (_isSelectingTargets)
{
// 如果处于目标选择模式，则处理目标选择逻辑
await HandleTargetSelectionClick(character);
@ -1674,6 +1718,213 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
UpdateGridHighlights();
}
/// <summary>
/// 显示非指向性目标选择UI。
/// </summary>
/// <param name="character"></param>
/// <param name="skill"></param>
/// <param name="currentGrid"></param>
/// <param name="selectable"></param>
/// <param name="callback"></param>
public void ShowTargetGridsSelectionUI(Character character, Skill skill, List<Character> enemys, List<Character> teammates, Grid currentGrid, List<Grid> selectable, Action<List<Grid>> callback)
{
_resolveTargetGridsSelection = callback;
_actingCharacterForTargetSelection = character;
_actingCharacterCurrentGridForTargetSelection = currentGrid;
_potentialTargetGridForSelection = selectable;
_isSelectingTargetGrid = true;
_isSelectingNonDirectionalGrids = true;
_currentNonDirectionalSkill = skill;
SelectedTargetGrids.Clear(); // 清空之前的选择
TargetGridsSelectionOverlay.Visibility = Visibility.Visible;
// 更新标题，显示技能范围信息
string rangeType = GetSkillRangeTypeDisplayName(skill.SkillRangeType);
string rangeInfo = skill.CanSelectTargetRange == 0 ? "单格" : $"{rangeType} {skill.CanSelectTargetRange}格";
TargetGridsSelectionTitle.Text = $"选择 {skill.Name} 的目标区域 ({rangeInfo})";
// 为Canvas添加鼠标移动事件
GameMapCanvas.MouseMove += GameMapCanvas_MouseMoveForNonDirectional;
GameMapCanvas.MouseLeave += GameMapCanvas_MouseLeaveForNonDirectional;
// 更新地图上格子的高亮，以显示潜在目标和已选目标
UpdateGridHighlights();
}
/// <summary>
/// 非指向性技能选择时的鼠标移动事件
/// </summary>
private void GameMapCanvas_MouseMoveForNonDirectional(object sender, MouseEventArgs e)
{
if (!_isSelectingNonDirectionalGrids || _currentNonDirectionalSkill == null)
return;
// 获取鼠标位置对应的格子
Point mousePos = e.GetPosition(GameMapCanvas);
Grid? hoveredGrid = GetGridAtPosition(mousePos);
if (hoveredGrid == null || hoveredGrid == _hoveredGrid)
return;
_hoveredGrid = hoveredGrid;
// 清除之前的鼠标悬停高亮
ClearMouseHoverHighlights();
// 如果鼠标悬停的格子在可选范围内
if (_potentialTargetGridForSelection.Contains(hoveredGrid))
{
// 计算技能影响范围
_mouseHoverHighlightedGrids = _currentNonDirectionalSkill.SelectNonDirectionalTargets(
_actingCharacterForTargetSelection!, hoveredGrid, _currentNonDirectionalSkill.SelectIncludeCharacterGrid);
// 应用悬停高亮
foreach (Grid grid in _mouseHoverHighlightedGrids)
{
if (_gridIdToUiElement.TryGetValue(grid.Id, out Rectangle? rect))
{
// 如果这个格子已经被选中，跳过（保持选中高亮）
if (!_currentNonDirectionalSkill.SelectIncludeCharacterGrid && grid.Characters.Count > 0)
{
rect.Fill = Brushes.DarkGray;
}
else if (!SelectedTargetGrids.Contains(grid))
{
rect.Fill = Brushes.LightBlue; // 悬停高亮颜色
}
}
}
}
}
/// <summary>
/// 鼠标离开Canvas时清除悬停高亮
/// </summary>
private void GameMapCanvas_MouseLeaveForNonDirectional(object sender, MouseEventArgs e)
{
ClearMouseHoverHighlights();
_hoveredGrid = null;
}
/// <summary>
/// 根据位置获取格子
/// </summary>
private Grid? GetGridAtPosition(Point position)
{
if (CurrentGameMap == null)
return null;
int gridX = (int)(position.X / CurrentGameMap.Size);
int gridY = (int)(position.Y / CurrentGameMap.Size);
// 查找对应的格子
foreach (Grid grid in _uiElementToGrid.Values)
{
if (grid.X == gridX && grid.Y == gridY && grid.Z == 0)
return grid;
}
return null;
}
/// <summary>
/// 清除鼠标悬停高亮
/// </summary>
private void ClearMouseHoverHighlights()
{
foreach (Grid grid in _mouseHoverHighlightedGrids)
{
if (_gridIdToUiElement.TryGetValue(grid.Id, out Rectangle? rect))
{
if (SelectedTargetGrid.Contains(grid))
{
rect.Fill = Brushes.Red;
}
else if (SelectedTargetGrids.Contains(grid))
{
rect.Fill = Brushes.Red;
}
else if (!(_currentNonDirectionalSkill?.SelectIncludeCharacterGrid ?? true) && grid.Characters.Count > 0)
{
rect.Fill = Brushes.DarkGray;
}
else if (_potentialTargetGridForSelection.Contains(grid))
{
rect.Fill = Brushes.Yellow;
}
else
{
rect.Fill = DefaultGridBrush;
}
}
}
_mouseHoverHighlightedGrids.Clear();
}
/// <summary>
/// 获取技能范围类型的显示名称
/// </summary>
private static string GetSkillRangeTypeDisplayName(SkillRangeType rangeType)
{
return rangeType switch
{
SkillRangeType.Diamond => "菱形",
SkillRangeType.Circle => "圆形",
SkillRangeType.Square => "方形",
SkillRangeType.Line => "直线",
SkillRangeType.LinePass => "穿透直线",
SkillRangeType.Sector => "扇形",
_ => "菱形"
};
}
/// <summary>
/// 处理非指向性技能格子选择的点击逻辑
/// </summary>
private async Task HandleNonDirectionalGridSelectionClick(Grid clickedGrid)
{
if (_currentNonDirectionalSkill == null)
return;
// 检查是否是潜在目标
if (!_potentialTargetGridForSelection.Contains(clickedGrid))
{
await AppendDebugLog($"无法选择 {clickedGrid}：不在技能施放范围内。");
return;
}
if (!_currentNonDirectionalSkill.SelectIncludeCharacterGrid && clickedGrid.Characters.Count > 0)
{
await AppendDebugLog($"无法选择 {clickedGrid}：此技能不能选择有角色的格子。");
return;
}
// 清除之前的选择
SelectedTargetGrids.Clear();
ClearMouseHoverHighlights();
// 计算技能影响范围
List<Grid> affectedGrids = _currentNonDirectionalSkill.SelectNonDirectionalTargets(
_actingCharacterForTargetSelection!, clickedGrid, _currentNonDirectionalSkill.SelectIncludeCharacterGrid);
// 添加新选择
affectedGrids.ForEach(ag => SelectedTargetGrids.Add(ag));
// 移除可能存在的重复项
SelectedTargetGrids = [.. SelectedTargetGrids.Distinct()];
await AppendDebugLog($"选择了技能中心点: 坐标({clickedGrid.X}, {clickedGrid.Y})，影响{SelectedTargetGrids.Count}个格子");
// 更新地图上的高亮显示
UpdateGridHighlights();
// 清除鼠标悬停高亮
_mouseHoverHighlightedGrids.Clear();
_hoveredGrid = null;
}
/// <summary>
/// 处理在目标选择模式下点击角色图标的逻辑。
/// </summary>
@ -1797,9 +2048,21 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
Grid grid = _uiElementToGrid[rectangle];
if (SelectedTargetGrid.Contains(grid))
{
rectangle.Fill = Brushes.Red;
}
else if (SelectedTargetGrids.Contains(grid))
{
rectangle.Fill = Brushes.Red; // 已选目标颜色
}
else if (_mouseHoverHighlightedGrids.Contains(grid))
{
rectangle.Fill = Brushes.LightBlue; // 鼠标悬停高亮
}
else if (!(_currentNonDirectionalSkill?.SelectIncludeCharacterGrid ?? true) && grid.Characters.Count > 0)
{
rectangle.Fill = Brushes.DarkGray;
}
else if (_potentialTargetGridForSelection.Contains(grid))
{
rectangle.Fill = Brushes.Yellow;
@ -1843,6 +2106,15 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
}
}
/// <summary>
/// 移除所有已选的格子。
/// </summary>
private void RemoveTargetGrids_Click(object sender, RoutedEventArgs e)
{
SelectedTargetGrids.Clear();
UpdateGridHighlights();
}
/// <summary>
/// 确认目标选择的点击事件。
/// </summary>
@ -1876,6 +2148,22 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
_resolveTargetGridSelection?.Invoke(null); // 返回空表示取消
}
/// <summary>
/// 确认非指向性目标格子选择的点击事件。
/// </summary>
private void ConfirmTargetGrids_Click(object sender, RoutedEventArgs e)
{
_resolveTargetGridsSelection?.Invoke([.. SelectedTargetGrids]);
}
/// <summary>
/// 取消非指向性目标格子选择的点击事件。
/// </summary>
private void CancelTargetGridsSelection_Click(object sender, RoutedEventArgs e)
{
_resolveTargetGridsSelection?.Invoke([]); // 返回空表示取消
}
/// <summary>
/// 隐藏目标选择UI。
/// </summary>
@ -1907,6 +2195,28 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting
CloseGridInfoButton_Click(new(), new());
}
/// <summary>
/// 隐藏非指向性目标选择UI。
/// </summary>
public void HideTargetGridsSelectionUI()
{
TargetGridsSelectionOverlay.Visibility = Visibility.Collapsed;
SelectedTargetGrids.Clear();
_isSelectingTargetGrid = false;
_isSelectingNonDirectionalGrids = false;
_currentNonDirectionalSkill = null;
_actingCharacterCurrentGridForTargetSelection = null;
_potentialTargetGridForSelection = [];
_resolveTargetGridsSelection = null;
// 移除鼠标事件
GameMapCanvas.MouseMove -= GameMapCanvas_MouseMoveForNonDirectional;
GameMapCanvas.MouseLeave -= GameMapCanvas_MouseLeaveForNonDirectional;
// 清除所有高亮
ClearMouseHoverHighlights();
UpdateGridHighlights();
CloseGridInfoButton_Click(new(), new());
}
/// <summary>
/// 显示“继续”提示面板。
/// </summary>

8
Library/Tests/CharacterTest.cs
View File

@ -37,15 +37,15 @@ namespace Milimoe.FunGame.Testing.Tests
skill.GamingQueue = queue;
skill.Character = teammate;
skill.Level += 6;
skill.OnSkillCasted(queue, teammate, [character]);
skill.OnSkillCasted(queue, teammate, [character]);
await skill.OnSkillCasted(queue, teammate, [character], []);
await skill.OnSkillCasted(queue, teammate, [character], []);
Character enemy = new CustomCharacter(1, "敌人");
Console.ReadKey();
enemy.SetLevel(60);
skill = new 混沌烙印(enemy);
skill.GamingQueue = queue;
skill.Level += 8;
skill.OnSkillCasted(queue, enemy, [teammate]);
await skill.OnSkillCasted(queue, enemy, [teammate], []);
queue.CharacterStatistics[teammate] = new CharacterStatistics();
queue.AddCharacter(teammate, 10);
await queue.TimeLapse();
@ -53,7 +53,7 @@ namespace Milimoe.FunGame.Testing.Tests
skill = new 虚弱领域(enemy);
skill.GamingQueue = queue;
skill.Level += 8;
skill.OnSkillCasted(queue, enemy, [character]);
await skill.OnSkillCasted(queue, enemy, [character], []);
character.UnEquip(EquipSlotType.Armor);
Console.WriteLine(character.GetInfo());
Console.ReadKey();