diff --git a/Desktop/GameMapTesting/GameMapTesting.cs b/Desktop/GameMapTesting/GameMapTesting.cs index 804111e..f229bf9 100644 --- a/Desktop/GameMapTesting/GameMapTesting.cs +++ b/Desktop/GameMapTesting/GameMapTesting.cs @@ -723,7 +723,10 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting SyncAwaiter.Wait(Controller.UpdateCharacterPositionsOnMap()); InquiryResponse? response = SyncAwaiter.WaitResult(Controller.RequestInquiryResponseSelection(options)); SyncAwaiter.Wait(Controller.ResolveInquiryResponseSelection(response)); - return response ?? new(options); + return response ?? new(options) + { + Cancel = true + }; } return new(options); } diff --git a/Desktop/GameMapTesting/GameMapViewer.xaml.cs b/Desktop/GameMapTesting/GameMapViewer.xaml.cs index 4f147a9..5419805 100644 --- a/Desktop/GameMapTesting/GameMapViewer.xaml.cs +++ b/Desktop/GameMapTesting/GameMapViewer.xaml.cs @@ -1485,7 +1485,7 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting InquiryResponseSelectionItemsControl.ItemsSource = responses; SetRichTextBoxText(InquiryResponseDetailsRichTextBox, "将鼠标悬停在选项上以查看详情。"); InquiryResponseSelectionOverlay.Visibility = Visibility.Visible; - InquiryResponseCancel.Visibility = Visibility.Hidden; + InquiryResponseCancel.Visibility = options.CanCancel ? Visibility.Visible : Visibility.Hidden; break; } } diff --git a/Library/Main.cs b/Library/Main.cs index 5f2f8f0..bea2f39 100644 --- a/Library/Main.cs +++ b/Library/Main.cs @@ -56,15 +56,23 @@ queue.LoadGameMap(new FastAutoMap()); // Console.WriteLine(i.ToString(true, false)); //} -//foreach (Skill s in FunGameConstant.Skills) -//{ -// s.GamingQueue = queue; -// s.Level = 6; -// Console.WriteLine(s.GetInfo()); -//} +foreach (Skill s in FunGameConstant.Skills) +{ + s.GamingQueue = queue; + s.Level = 1; + Console.WriteLine(s.GetInfo()); + s.Level = 2; + Console.WriteLine(s.GetInfo()); + s.Level = 6; + Console.WriteLine(s.GetInfo()); +} foreach (Skill m in FunGameConstant.Magics) { m.GamingQueue = queue; + m.Level = 1; + Console.WriteLine(m.GetInfo()); + m.Level = 2; + Console.WriteLine(m.GetInfo()); m.Level = 8; Console.WriteLine(m.GetInfo()); } diff --git a/Library/Tests/FunGame.cs b/Library/Tests/FunGame.cs index 62ad218..f0b17c7 100644 --- a/Library/Tests/FunGame.cs +++ b/Library/Tests/FunGame.cs @@ -436,8 +436,8 @@ namespace Milimoe.FunGame.Testing.Tests Task.Run(() => { Console.WriteLine($"你的角色编号:{character.GetIdName()}"); - Console.WriteLine("【敌对角色列表】" + "\r\n" + string.Join("\r\n", enemys.Select(c => $"{c.GetIdName()}:{c.GetSimpleInBattleInfo(queue.HardnessTime[c])}"))); - Console.WriteLine("【友方角色列表】" + "\r\n" + string.Join("\r\n", teammates.Select(c => $"{c.GetIdName()}:{c.GetSimpleInBattleInfo(queue.HardnessTime[c])}"))); + Console.WriteLine("【敌对角色列表】" + "\r\n" + string.Join("\r\n", enemys.Select(c => $"{c.GetIdName()}:{c.GetInBattleInfo(queue.HardnessTime[c], true)}"))); + Console.WriteLine("【友方角色列表】" + "\r\n" + string.Join("\r\n", teammates.Select(c => $"{c.GetIdName()}:{c.GetInBattleInfo(queue.HardnessTime[c], true)}"))); while (true) { if (characters.Count > attack.CanSelectTargetCount) @@ -538,8 +538,8 @@ namespace Milimoe.FunGame.Testing.Tests Task.Run(() => { Console.WriteLine($"你的角色编号:{caster.GetIdName()}"); - Console.WriteLine("【敌对角色列表】" + "\r\n" + string.Join("\r\n", enemys.Select(c => $"{c.GetIdName()}:{c.GetSimpleInBattleInfo(queue.HardnessTime[c])}"))); - Console.WriteLine("【友方角色列表】" + "\r\n" + string.Join("\r\n", teammates.Select(c => $"{c.GetIdName()}:{c.GetSimpleInBattleInfo(queue.HardnessTime[c])}"))); + Console.WriteLine("【敌对角色列表】" + "\r\n" + string.Join("\r\n", enemys.Select(c => $"{c.GetIdName()}:{c.GetInBattleInfo(queue.HardnessTime[c], true)}"))); + Console.WriteLine("【友方角色列表】" + "\r\n" + string.Join("\r\n", teammates.Select(c => $"{c.GetIdName()}:{c.GetInBattleInfo(queue.HardnessTime[c], true)}"))); while (true) { if (characters.Count > skill.CanSelectTargetCount)