From 760c81e0ae9a3e442948a915fae48b704d0c06f1 Mon Sep 17 00:00:00 2001 From: milimoe Date: Mon, 27 Nov 2023 21:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0LoadGameModes=E5=92=8C?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/RunTimeController.cs | 58 +++++++++++++++---- FunGame.Desktop/Library/Other/Config.cs | 6 +- FunGame.Desktop/Model/RunTime.cs | 1 + FunGame.Desktop/UI/Main/Main.cs | 55 ++++++++++-------- 4 files changed, 81 insertions(+), 39 deletions(-) diff --git a/FunGame.Desktop/Controller/RunTimeController.cs b/FunGame.Desktop/Controller/RunTimeController.cs index 6820f1c..dfebea0 100644 --- a/FunGame.Desktop/Controller/RunTimeController.cs +++ b/FunGame.Desktop/Controller/RunTimeController.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Api.Transmittal; +using System.Collections; +using Milimoe.FunGame.Core.Api.Transmittal; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Event; @@ -34,7 +35,27 @@ namespace Milimoe.FunGame.Desktop.Controller RunTime.Session, RunTime.Config); foreach (string name in RunTime.PluginLoader.Plugins.Keys) { - Main.GetMessage("[ PluginLoader ] Load: " + name); + Main.GetMessage("[ Plugin ] Loaded: " + name); + } + } + catch (Exception e) + { + Main.GetMessage(e.GetErrorInfo(), TimeType.None); + } + } + + public void LoadGameModes() + { + try + { + RunTime.GameModeLoader = GameModeLoader.LoadGameModes( + new Action(WritelnSystemInfo), + new Func(NewDataRequest), + new Func(NewLongRunningDataRequest), + RunTime.Session, RunTime.Config); + foreach (string name in RunTime.GameModeLoader.Modes.Keys) + { + Main.GetMessage("[ GameMode ] Loaded: " + name); } } catch (Exception e) @@ -57,13 +78,20 @@ namespace Milimoe.FunGame.Desktop.Controller Close(); } - public override bool BeforeConnect(ref string ip, ref int port) + public override bool BeforeConnect(ref string ip, ref int port, ArrayList ConnectArgs) { if (Config.FunGame_isRetrying) { Main.GetMessage("正在连接服务器，请耐心等待。"); return false; } + string[] gamemodes = []; + if (RunTime.GameModeLoader != null) + { + gamemodes = RunTime.GameModeLoader.Modes.Keys.ToArray(); + } + ConnectArgs.Add(gamemodes); // 服务器检查是否拥有需要的模组 + ConnectArgs.Add(FunGameInfo.FunGame_DebugMode); // 是否开启了debug模式 if (!Config.FunGame_isConnected) { Main.CurrentRetryTimes++; @@ -91,19 +119,27 @@ namespace Milimoe.FunGame.Desktop.Controller } } - public override void AfterConnect(object[] ConnectArgs) + public override void AfterConnect(ArrayList ConnectArgs) { Config.FunGame_isRetrying = false; - ConnectResult result = (ConnectResult)ConnectArgs[0]; - string msg = (string)ConnectArgs[1]; - string servername = (string)ConnectArgs[2]; - string notice = (string)ConnectArgs[3]; + ConnectResult result = (ConnectResult?)ConnectArgs[0] ?? ConnectResult.FindServerFailed; + string msg = (string?)ConnectArgs[1] ?? ""; + string servername = (string?)ConnectArgs[2] ?? ""; + string notice = (string?)ConnectArgs[3] ?? ""; if (msg != "") { Main.GetMessage(msg); - if (result != ConnectResult.Success) Main.ShowMessage(ShowMessageType.Error, msg); + if (result != ConnectResult.Success) + { + // 有弹窗会关闭自动重连。 + Config.FunGame_isAutoRetry = false; + if (Main.ShowMessage(ShowMessageType.RetryCancel, msg, "连接服务器失败") == MessageResult.Retry) + { + Config.FunGame_isAutoRetry = true; + } + } } if (result == ConnectResult.Success) @@ -230,7 +266,7 @@ namespace Milimoe.FunGame.Desktop.Controller if (ServerMessage.Length > 1) users = ServerMessage.GetParam>(1) ?? users; Main.UpdateUI(MainInvokeType.StartGame, room, users); } - + protected override void SocketHandler_EndGame(SocketObject ServerMessage) { Room room = General.HallInstance; @@ -242,7 +278,7 @@ namespace Milimoe.FunGame.Desktop.Controller protected override void SocketHandler_Gaming(SocketObject ServerMessage) { - + } } } diff --git a/FunGame.Desktop/Library/Other/Config.cs b/FunGame.Desktop/Library/Other/Config.cs index 9698989..d837053 100644 --- a/FunGame.Desktop/Library/Other/Config.cs +++ b/FunGame.Desktop/Library/Other/Config.cs @@ -70,10 +70,10 @@ namespace Milimoe.FunGame.Desktop.Library /// /// 当前游戏模式 /// - public static string FunGame_GameMode + public static string FunGame_RoomType { - get => RunTime.Config.FunGame_GameMode; - set => RunTime.Config.FunGame_GameMode = value; + get => RunTime.Config.FunGame_RoomType; + set => RunTime.Config.FunGame_RoomType = value; } /// diff --git a/FunGame.Desktop/Model/RunTime.cs b/FunGame.Desktop/Model/RunTime.cs index bab2271..4a8f7c5 100644 --- a/FunGame.Desktop/Model/RunTime.cs +++ b/FunGame.Desktop/Model/RunTime.cs @@ -12,6 +12,7 @@ namespace Milimoe.FunGame.Desktop.Model public static Core.Model.Session Session { get; } = new(); public static Core.Model.FunGameConfig Config { get; } = new(); public static Core.Api.Utility.PluginLoader? PluginLoader { get; set; } = null; + public static Core.Api.Utility.GameModeLoader? GameModeLoader { get; set; } = null; public static Core.Library.Common.Network.Socket? Socket { get; set; } = null; public static Controller.RunTimeController? Controller { get; set; } = null; public static UI.Main? Main { get; set; } = null; diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs index b21bcc4..f3c34ba 100644 --- a/FunGame.Desktop/UI/Main/Main.cs +++ b/FunGame.Desktop/UI/Main/Main.cs @@ -60,6 +60,8 @@ namespace Milimoe.FunGame.Desktop.UI break; } } + // 加载模组 + RunTime.Controller.LoadGameModes(); // 加载插件 RunTime.Controller.LoadPlugins(); // 自动连接服务器 @@ -261,7 +263,7 @@ namespace Milimoe.FunGame.Desktop.UI StartGame(room, users); } break; - + case MainInvokeType.EndGame: if (objs != null && objs.Length > 0) { @@ -477,10 +479,10 @@ namespace Milimoe.FunGame.Desktop.UI int PlayerCount = users.Count; for (int i = 10; i > 0; i--) { - WritelnGameInfo("房间 [ " + room.Roomid + " (" + PlayerCount + "人" + GameMode.GetTypeString(room.RoomType) + ") ] 的游戏将在" + i + "秒后开始..."); + WritelnGameInfo("房间 [ " + room.Roomid + " (" + PlayerCount + "人" + RoomSet.GetTypeString(room.RoomType) + ") ] 的游戏将在" + i + "秒后开始..."); await Task.Delay(1000); } - WritelnGameInfo("房间 [ " + room.Roomid + " (" + PlayerCount + "人" + GameMode.GetTypeString(room.RoomType) + ") ] 的游戏正式开始！"); + WritelnGameInfo("房间 [ " + room.Roomid + " (" + PlayerCount + "人" + RoomSet.GetTypeString(room.RoomType) + ") ] 的游戏正式开始！"); }); SetButtonEnableIfLogon(false, ClientState.InRoom); } @@ -643,7 +645,7 @@ namespace Milimoe.FunGame.Desktop.UI TaskUtility.NewTask(async () => { Config.FunGame_isMatching = true; - if (await MainController.MatchRoomAsync(Config.FunGame_GameMode)) + if (await MainController.MatchRoomAsync(Config.FunGame_RoomType)) { // 开始匹配 while (Config.FunGame_isMatching) @@ -656,7 +658,7 @@ namespace Milimoe.FunGame.Desktop.UI continue; } // 达到60秒时 - if (Config.FunGame_isMatching && await MainController.MatchRoomAsync(Config.FunGame_GameMode, true)) + if (Config.FunGame_isMatching && await MainController.MatchRoomAsync(Config.FunGame_RoomType, true)) { // 取消匹配 UpdateUI(MainInvokeType.MatchRoom, StartMatchState.Success, General.HallInstance); @@ -783,7 +785,7 @@ namespace Milimoe.FunGame.Desktop.UI { TaskUtility.NewTask(async () => { - if (MainController != null && await MainController.MatchRoomAsync(Config.FunGame_GameMode, true)) + if (MainController != null && await MainController.MatchRoomAsync(Config.FunGame_RoomType, true)) { UpdateUI(MainInvokeType.MatchRoom, StartMatchState.Cancel); } @@ -999,7 +1001,7 @@ namespace Milimoe.FunGame.Desktop.UI WritelnGameInfo(DateTimeUtility.GetNowShortTime() + " 开始匹配"); WritelnGameInfo("[ " + Usercfg.LoginUserName + " ] 开始匹配"); WriteGameInfo(">> 匹配参数："); - WritelnGameInfo(Config.FunGame_GameMode); + WritelnGameInfo(Config.FunGame_RoomType); // 显示停止匹配按钮 StartMatch.Visible = false; StopMatch.Visible = true; @@ -1031,12 +1033,12 @@ namespace Milimoe.FunGame.Desktop.UI return; } } - if (Config.FunGame_GameMode.Equals("")) + if (Config.FunGame_RoomType.Equals("")) { ShowMessage(ShowMessageType.Warning, "请勾选你要创建的房间类型！"); return; } - TaskUtility.NewTask(() => CreateRoom_Handler(Config.FunGame_GameMode, password)); + TaskUtility.NewTask(() => CreateRoom_Handler(Config.FunGame_RoomType, password)); } /// @@ -1169,13 +1171,13 @@ namespace Milimoe.FunGame.Desktop.UI bool IsMix = CheckMix.Checked; bool IsTeam = CheckTeam.Checked; bool IsHasPass = CheckHasPass.Checked; - if (IsMix && IsTeam && !IsHasPass) Config.FunGame_GameMode = GameMode.All; - else if (IsMix && IsTeam && IsHasPass) Config.FunGame_GameMode = GameMode.AllHasPass; - else if (IsMix && !IsTeam && !IsHasPass) Config.FunGame_GameMode = GameMode.Mix; - else if (IsMix && !IsTeam && IsHasPass) Config.FunGame_GameMode = GameMode.MixHasPass; - else if (!IsMix && IsTeam && !IsHasPass) Config.FunGame_GameMode = GameMode.Team; - else if (!IsMix && IsTeam && IsHasPass) Config.FunGame_GameMode = GameMode.TeamHasPass; - else Config.FunGame_GameMode = GameMode.All; + if (IsMix && IsTeam && !IsHasPass) Config.FunGame_RoomType = RoomSet.All; + else if (IsMix && IsTeam && IsHasPass) Config.FunGame_RoomType = RoomSet.All; + else if (IsMix && !IsTeam && !IsHasPass) Config.FunGame_RoomType = RoomSet.Mix; + else if (IsMix && !IsTeam && IsHasPass) Config.FunGame_RoomType = RoomSet.Mix; + else if (!IsMix && IsTeam && !IsHasPass) Config.FunGame_RoomType = RoomSet.Team; + else if (!IsMix && IsTeam && IsHasPass) Config.FunGame_RoomType = RoomSet.Team; + else Config.FunGame_RoomType = RoomSet.All; } /// @@ -1342,16 +1344,19 @@ namespace Milimoe.FunGame.Desktop.UI public void FailedConnectEvent(object sender, GeneralEventArgs e) { // 自动重连 - if (Config.FunGame_isConnected && Config.FunGame_isAutoRetry && CurrentRetryTimes <= MaxRetryTimes) + if (!Config.FunGame_isConnected) { - Task.Run(() => + if (Config.FunGame_isAutoRetry && CurrentRetryTimes <= MaxRetryTimes) { - Thread.Sleep(5000); - if (Config.FunGame_isConnected && Config.FunGame_isAutoRetry) InvokeController_Connect(); // 再次判断是否开启自动重连 - }); - GetMessage("连接服务器失败，5秒后自动尝试重连。"); + Task.Run(() => + { + Thread.Sleep(5000); + if (!Config.FunGame_isConnected && Config.FunGame_isAutoRetry) InvokeController_Connect(); // 再次判断是否开启自动重连 + }); + GetMessage("连接服务器失败，5秒后自动尝试重连。"); + } + else GetMessage("无法连接至服务器，请稍后再试。"); } - else GetMessage("无法连接至服务器，请检查你的网络连接。"); } /// @@ -1469,14 +1474,14 @@ namespace Milimoe.FunGame.Desktop.UI case Constant.FunGame_CreateMix: if (Usercfg.InRoom.Roomid == "-1") { - TaskUtility.NewTask(() => CreateRoom_Handler(GameMode.Mix)); + TaskUtility.NewTask(() => CreateRoom_Handler(RoomSet.Mix)); } else WritelnGameInfo(">> 先退出当前房间才可以创建房间。"); break; case Constant.FunGame_CreateTeam: if (Usercfg.InRoom.Roomid == "-1") { - TaskUtility.NewTask(() => CreateRoom_Handler(GameMode.Team)); + TaskUtility.NewTask(() => CreateRoom_Handler(RoomSet.Team)); } else WritelnGameInfo(">> 先退出当前房间才可以创建房间。"); break;