diff --git a/Desktop/GameMapTesting/GameMapTesting.cs b/Desktop/GameMapTesting/GameMapTesting.cs index 2aa0ce5..6c74374 100644 --- a/Desktop/GameMapTesting/GameMapTesting.cs +++ b/Desktop/GameMapTesting/GameMapTesting.cs @@ -60,6 +60,12 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting c.Level = clevel; c.NormalAttack.Level = mlevel; FunGameService.AddCharacterSkills(c, 1, slevel, slevel); + //Skill test = new 钻石星尘 + //{ + // Character = c, + // Level = 8 + //}; + //c.Skills.Add(test); foreach (Skill skillLoop in FunGameConstant.Skills) { Skill skill = skillLoop.Copy(); @@ -74,6 +80,7 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting passive.Level = 1; c.Skills.Add(passive); } + c.EP = 100; characters.Add(c); } @@ -346,7 +353,16 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting if (currentGrid != null) _gamingQueue.CustomData["currentGrid"] = currentGrid; } - bool isGameEnd = await _gamingQueue.ProcessTurnAsync(characterToAct); + bool isGameEnd = false; + + try + { + isGameEnd = await _gamingQueue.ProcessTurnAsync(characterToAct); + } + catch (Exception e) + { + await Controller.WriteLine(e.ToString()); + } if (isGameEnd) { diff --git a/Desktop/GameMapTesting/TestMap.cs b/Desktop/GameMapTesting/TestMap.cs index 5867832..7cc50f7 100644 --- a/Desktop/GameMapTesting/TestMap.cs +++ b/Desktop/GameMapTesting/TestMap.cs @@ -34,10 +34,5 @@ namespace Milimoe.FunGame.Testing.Desktop.GameMapTesting return map; } - - protected override void AfterTimeElapsed(ref double timeToReduce) - { - - } } } diff --git a/Library/Main.cs b/Library/Main.cs index f87fd38..5f1238a 100644 --- a/Library/Main.cs +++ b/Library/Main.cs @@ -51,11 +51,12 @@ foreach (Skill s in FunGameConstant.Skills) s.Level = 6; Console.WriteLine(s.GetInfo()); } -//foreach (Skill m in FunGameConstant.Magics) -//{ -// m.Level = 1; -// Console.WriteLine(m.GetInfo()); -//} +foreach (Skill m in FunGameConstant.Magics) +{ + m.GamingQueue = queue; + m.Level = 8; + Console.WriteLine(m.GetInfo()); +} //foreach (Character c in FunGameConstant.Characters) //{ // Character character = c.Copy();