diff --git a/.gitignore b/.gitignore index bcf2cce..b63da7a 100644 --- a/.gitignore +++ b/.gitignore @@ -363,4 +363,4 @@ MigrationBackup/ FodyWeavers.xsd # FunGame Implement -FunGame.Core/Implement/*.cs \ No newline at end of file +FunGame.Implement/Implement/*.cs \ No newline at end of file diff --git a/FunGame.Console/FunGame.Console.csproj b/FunGame.Console/FunGame.Console.csproj new file mode 100644 index 0000000..d472074 --- /dev/null +++ b/FunGame.Console/FunGame.Console.csproj @@ -0,0 +1,29 @@ + + + + Exe + net6.0 + enable + enable + Milimoe + Milimoe + FunGame + FunGame.Console + images\logo.ico + ..\bin\ + FunGame + + + + embedded + + + + embedded + + + + + + + diff --git a/FunGame.Console/Main.cs b/FunGame.Console/Main.cs new file mode 100644 index 0000000..0794a3d --- /dev/null +++ b/FunGame.Console/Main.cs @@ -0,0 +1,2 @@ +Console.WriteLine("Hello, FunGame's Console!"); +Console.ReadKey(); diff --git a/FunGame.Console/images/logo.ico b/FunGame.Console/images/logo.ico new file mode 100644 index 0000000..4082874 Binary files /dev/null and b/FunGame.Console/images/logo.ico differ diff --git a/FunGame.Core.Api/Interface/Events.cs b/FunGame.Core.Api/Interface/Events.cs deleted file mode 100644 index 5e16b94..0000000 --- a/FunGame.Core.Api/Interface/Events.cs +++ /dev/null @@ -1,223 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FunGame.Core.Api.Interface -{ - public interface FunGameEvent - { - - } - - public interface BeforeConnectEvent : FunGameEvent - { - - } - - public interface AfterConnectEvent : FunGameEvent - { - - } - - public interface BeforeDisconnectEvent : FunGameEvent - { - - } - - public interface AfterDisconnectEvent : FunGameEvent - { - - } - - public interface BeforeLoginEvent : FunGameEvent - { - - } - - public interface AfterLoginEvent : FunGameEvent - { - - } - - public interface BeforeLogoutEvent : FunGameEvent - { - - } - - public interface AfterLogoutEvent : FunGameEvent - { - - } - - public interface BeforeRegEvent : FunGameEvent - { - - } - - public interface AfterRegEvent : FunGameEvent - { - - } - - public interface BeforeIntoRoomEvent : FunGameEvent - { - - } - - public interface AfterIntoRoomEvent : FunGameEvent - { - - } - - public interface BeforeSendTalkEvent : FunGameEvent - { - - } - - public interface AfterSendTalkEvent : FunGameEvent - { - - } - - public interface BeforeCreateRoomEvent : FunGameEvent - { - - } - - public interface AfterCreateRoomEvent : FunGameEvent - { - - } - - public interface BeforeQuitRoomEvent : FunGameEvent - { - - } - - public interface AfterQuitRoomEvent : FunGameEvent - { - - } - - public interface BeforeChangeRoomSettingEvent : FunGameEvent - { - - } - - public interface AfterChangeRoomSettingEvent : FunGameEvent - { - - } - - public interface BeforeStartMatchEvent : FunGameEvent - { - - } - - public interface AfterStartMatchEvent : FunGameEvent - { - - } - - public interface BeforeStartGameEvent : FunGameEvent - { - - } - - public interface AfterStartGameEvent : FunGameEvent - { - - } - - public interface BeforeChangeProfileEvent : FunGameEvent - { - - } - - public interface AfterChangeProfileEvent : FunGameEvent - { - - } - - public interface BeforeChangeAccountSettingEvent : FunGameEvent - { - - } - - public interface AfterChangeAccountSettingEvent : FunGameEvent - { - - } - - public interface BeforeOpenStockEvent : FunGameEvent - { - - } - - public interface AfterOpenStockEvent : FunGameEvent - { - - } - - public interface BeforeSignInEvent : FunGameEvent - { - - } - - public interface AfterSignInEvent : FunGameEvent - { - - } - - public interface BeforeOpenStoreEvent : FunGameEvent - { - - } - - public interface AfterOpenStoreEvent : FunGameEvent - { - - } - - public interface BeforeBuyItemEvent : FunGameEvent - { - - } - - public interface AfterBuyItemEvent : FunGameEvent - { - - } - - public interface BeforeShowRankingEvent : FunGameEvent - { - - } - - public interface AfterShowRankingEvent : FunGameEvent - { - - } - - public interface BeforeUseItemEvent : FunGameEvent - { - - } - - public interface AfterUseItemEvent : FunGameEvent - { - - } - - public interface BeforeEndGameEvent : FunGameEvent - { - - } - - public interface AfterEndGameEvent : FunGameEvent - { - - } -} diff --git a/FunGame.Core.Api/Interface/Interface.cs b/FunGame.Core.Api/Interface/Interface.cs deleted file mode 100644 index 573eec7..0000000 --- a/FunGame.Core.Api/Interface/Interface.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace FunGame.Core.Api.Interface -{ - /** - * 接口需要在FunGame.Core项目中Implement文件夹创建新的类实现 - * 参考： - * using FunGame.Core.Interface; - - namespace FunGame.Core.Implement - { - public class ClientConnectInterfaceImpl : ClientConnectInterface - { - public string RemoteServerIP() - { - // 此处修改连接远程服务器IP - string serverIP = "127.0.0.1"; - string serverPort = "22222"; - return serverIP + ":" + serverPort; - } - } - } - */ - - public interface ClientConnectInterface - { - public string RemoteServerIP(); - } - - public interface ServerInterface - { - - } -} diff --git a/FunGame.Core.Api/Util/Utility.cs b/FunGame.Core.Api/Util/Utility.cs deleted file mode 100644 index 24a1bd3..0000000 --- a/FunGame.Core.Api/Util/Utility.cs +++ /dev/null @@ -1,323 +0,0 @@ -using FunGame.Core.Api.Model.Enum; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; - -namespace FunGame.Core.Api.Util -{ - #region 通用工具类 - - /// - /// 通用工具类，客户端和服务器端都可以直接调用的工具方法都可以写在这里 - /// - public class Utility - { - /// - /// 判断字符串是否是IP地址 - /// - /// - /// - public static bool IsIP(string str) - { - //判断是否为IP - return Regex.IsMatch(str, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"); - } - - /// - /// 判断字符串是否为邮箱地址 - /// - /// - /// - public static bool IsEmail(string str) - { - //判断是否为Email - return Regex.IsMatch(str, @"^(\w)+(\.\w)*@(\w)+((\.\w+)+)$"); - } - - /// - /// 判断字符串是否是一个FunGame可接受的服务器地址 - /// - /// - /// - public static ErrorType IsServerAddress(string str) - { - string[] strs = str.Split(':'); - string ip; - int port; - if (strs.Length < 2) - { - ip = strs[0]; - port = 22222; - } - else if (strs.Length < 3) - { - ip = strs[0]; - port = Convert.ToInt32(strs[1]); - } - else return ErrorType.WrongFormat; - if (IsIP(ip) && port > 0 && port < 65536) return ErrorType.None; - else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorType.IsNotIP; - else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorType.IsNotPort; - else return ErrorType.WrongFormat; - } - - /// - /// 判断参数是否是一个FunGame可接受的服务器地址 - /// - /// - /// - /// - public static ErrorType IsServerAddress(string ip, int port) - { - if (IsIP(ip) && port > 0 && port < 65536) return ErrorType.None; - else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorType.IsNotIP; - else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorType.IsNotPort; - else return ErrorType.WrongFormat; - } - } - - #endregion - - #region 读写INI文件工具类 - - public class INIHelper - { - /* - * 声明API函数 - */ - [DllImport("kernel32", CharSet = CharSet.Unicode)] - private static extern long WritePrivateProfileString(string section, string key, string val, string filePath); - [DllImport("kernel32", CharSet = CharSet.Unicode)] - private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath); - - /// - /// 写入ini文件 - /// - /// Section - /// 键 - /// 值 - /// 文件名，缺省为FunGame.ini - public static void WriteINI(string Section, string Key, string Value, string FileName = @"FunGame.ini") - { - WritePrivateProfileString(Section, Key, Value, System.Environment.CurrentDirectory.ToString() + @"\" + FileName); - } - - /// - /// 读取ini文件 - /// - /// Section - /// 键 - /// 文件名，缺省为FunGame.ini - /// 读取到的值 - public static string ReadINI(string Section, string Key, string FileName = @"FunGame.ini") - { - StringBuilder str = new(256); - _ = GetPrivateProfileString(Section, Key, "", str, 256, System.Environment.CurrentDirectory.ToString() + @"\" + FileName); - return str.ToString(); - } - - /// - /// 查询ini文件是否存在 - /// - /// 文件名，缺省为FunGame.ini - /// 是否存在 - public static bool ExistINIFile(string FileName = @"FunGame.ini") - { - return File.Exists(System.Environment.CurrentDirectory.ToString() + @"\" + FileName); - } - - /// - /// 初始化ini模板文件 - /// - public static void Init(FunGameEnums.FunGame FunGameType) - { - switch(FunGameType) - { - case FunGameEnums.FunGame.FunGame_Core: - case FunGameEnums.FunGame.FunGame_Core_Api: - case FunGameEnums.FunGame.FunGame_Console: - case FunGameEnums.FunGame.FunGame_Desktop: - /** - * Config - */ - WriteINI("Config", "AutoConnect", "true"); - WriteINI("Config", "AutoLogin", "false"); - /** - * Account - */ - WriteINI("Account", "UserName", ""); - WriteINI("Account", "Password", ""); - WriteINI("Account", "AutoKey", ""); - break; - case FunGameEnums.FunGame.FunGame_Server: - /** - * Server - */ - WriteINI("Server", "Name", "FunGame Server"); - WriteINI("Server", "Password", ""); - WriteINI("Server", "Describe", "Just Another FunGame Server."); - WriteINI("Server", "Notice", "This is the FunGame Server's Notice."); - WriteINI("Server", "Key", ""); - WriteINI("Server", "Status", "1"); - /** - * Socket - */ - WriteINI("Socket", "Port", "22222"); - WriteINI("Socket", "MaxPlayer", "20"); - WriteINI("Socket", "MaxConnectFailed", "0"); - /** - * MySQL - */ - WriteINI("MySQL", "DBServer", "localhost"); - WriteINI("MySQL", "DBPort", "3306"); - WriteINI("MySQL", "DBName", "fungame"); - WriteINI("MySQL", "DBUser", "root"); - WriteINI("MySQL", "DBPassword", "pass"); - break; - } - } - } - - #endregion - - #region 接口反射工具类 - - /// - /// 在FunGame.Core.Api中添加新接口和新实现时，需要： - /// 在FunGame.Core.Api.Model.Enum.CommonEnums里同步添加InterfaceType、InterfaceMethod - /// - public class ReflectionHelper - { - /** - * 定义需要反射的DLL - */ - public const string FUNGAME_CORE = "FunGame.Core"; - - /** - * 无需二次修改的 - */ - public static string EXEDocPath = System.Environment.CurrentDirectory.ToString() + "\\"; // 程序目录 - public static string PluginDocPath = System.Environment.CurrentDirectory.ToString() + "\\plugins\\"; // 插件目录 - - //////////////////////////////////////////////////////////////////// - /////////////// * 下 面 是 工 具 类 实 现 * //////////////// - /////////////////////////////////////////////////////////////////// - - /** - * 定义反射变量 - */ - private Assembly? Assembly; - private Type? Type; - private MethodInfo? Method; - private object? Instance; - - /// - /// 获取FunGame.Core.dll中接口的实现方法 - /// - /// 接口代号 - /// - private Type? GetFunGameCoreImplement(int Interface) - { - // 通过类名获取获取命名空间+类名称 - string ClassName = EnumHelper.GetImplementClassName(Interface); - List? Classes = null; - if (Assembly != null) - { - Classes = Assembly.GetTypes().Where(w => - w.Namespace == "FunGame.Core.Implement" && - w.Name.Contains(ClassName) - ).ToList(); - if (Classes != null && Classes.Count > 0) - return Classes[0]; - else return null; - } - else return null; - } - - /// - /// 公开方法：获取FUNGAME.CORE.DLL中指定方法的返回值 - /// - /// 接口代号 - /// 方法代号 - /// - public object? GetFunGameCoreValue(int Interface, int Method) - { - Assembly = Assembly.LoadFile(EXEDocPath + @FUNGAME_CORE + ".dll"); - Type = GetFunGameCoreImplement(Interface); // 通过类名获取获取命名空间+类名称 - string MethodName = EnumHelper.GetImplementMethodName(Method); // 获取方法名 - if (Assembly != null && Type != null) this.Method = Type.GetMethod(MethodName); // 从Type中查找方法名 - else return null; - Instance = Assembly.CreateInstance(Type.Namespace + "." + Type.Name); - if (Instance != null && this.Method != null) - { - object? value = this.Method.Invoke(Instance, Array.Empty()); // 实例方法的调用 - if (value != null) - return value; - else return null; - } - else return null; - } - } - - #endregion - - #region 枚举反射工具类 - - public class EnumHelper - { - /// - /// 获取实现类类名 - /// - /// 接口代号 - /// - public static string GetImplementClassName(int Interface) - { - foreach (string str in System.Enum.GetNames(typeof(InterfaceType))) - { - InterfaceType temp = (InterfaceType)System.Enum.Parse(typeof(InterfaceType), Interface.ToString(), true); - if (temp.ToString() == str) - return temp + "Impl"; - } - return ""; - } - - /// - /// 获取实现类的方法名 - /// - /// 方法代号 - /// - public static string GetImplementMethodName(int Method) - { - foreach (string str in System.Enum.GetNames(typeof(InterfaceMethod))) - { - InterfaceMethod temp = (InterfaceMethod)System.Enum.Parse(typeof(InterfaceMethod), Method.ToString(), true); - if (temp.ToString() == str) - return temp.ToString(); - } - return ""; - } - - /// - /// 获取Socket枚举名 - /// - /// Socket枚举 - /// - public static string GetSocketTypeName(int SocketType) - { - foreach (string str in System.Enum.GetNames(typeof(SocketMessageType))) - { - SocketMessageType temp = (SocketMessageType)System.Enum.Parse(typeof(SocketMessageType), SocketType.ToString(), true); - if (temp.ToString() == str) - return temp.ToString(); - } - return ""; - } - } - - #endregion -} diff --git a/FunGame.Core/Api/Factory/CharacterFactory.cs b/FunGame.Core/Api/Factory/CharacterFactory.cs new file mode 100644 index 0000000..be958c2 --- /dev/null +++ b/FunGame.Core/Api/Factory/CharacterFactory.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Factory +{ + public class CharacterFactory + { + + } +} diff --git a/FunGame.Core/Api/Factory/ItemFactory.cs b/FunGame.Core/Api/Factory/ItemFactory.cs new file mode 100644 index 0000000..4f57517 --- /dev/null +++ b/FunGame.Core/Api/Factory/ItemFactory.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Factory +{ + public abstract class ItemFactory + { + + } +} diff --git a/FunGame.Core/Api/Factory/RoomFactory.cs b/FunGame.Core/Api/Factory/RoomFactory.cs new file mode 100644 index 0000000..9f9c774 --- /dev/null +++ b/FunGame.Core/Api/Factory/RoomFactory.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Security.Policy; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Factory +{ + public class RoomFactory + { + + } +} diff --git a/FunGame.Core/Api/Factory/SkillFactory.cs b/FunGame.Core/Api/Factory/SkillFactory.cs new file mode 100644 index 0000000..63a8e04 --- /dev/null +++ b/FunGame.Core/Api/Factory/SkillFactory.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Factory +{ + public abstract class SkillFactory + { + + } +} diff --git a/FunGame.Core/Api/Factory/StockFactory.cs b/FunGame.Core/Api/Factory/StockFactory.cs new file mode 100644 index 0000000..bee0ed8 --- /dev/null +++ b/FunGame.Core/Api/Factory/StockFactory.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Factory +{ + public class StockFactory + { + + } +} diff --git a/FunGame.Core/Api/Factory/UserFactory.cs b/FunGame.Core/Api/Factory/UserFactory.cs new file mode 100644 index 0000000..c793a3f --- /dev/null +++ b/FunGame.Core/Api/Factory/UserFactory.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Factory +{ + public class UserFactory + { + + } +} diff --git a/FunGame.Core/Api/Proxy/SQLProxy.cs b/FunGame.Core/Api/Proxy/SQLProxy.cs new file mode 100644 index 0000000..50f5109 --- /dev/null +++ b/FunGame.Core/Api/Proxy/SQLProxy.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Proxy +{ + public class SQLProxy + { + } +} diff --git a/FunGame.Core/Api/Utility/EnumHelper.cs b/FunGame.Core/Api/Utility/EnumHelper.cs new file mode 100644 index 0000000..18c5a27 --- /dev/null +++ b/FunGame.Core/Api/Utility/EnumHelper.cs @@ -0,0 +1,60 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Milimoe.FunGame.Core.Entity.Enum; + +namespace Milimoe.FunGame.Core.Api.Utility +{ + public class EnumHelper + { + /// + /// 获取实现类类名 + /// + /// 接口代号 + /// + public static string GetImplementClassName(int Interface) + { + foreach (string str in Enum.GetNames(typeof(InterfaceType))) + { + InterfaceType temp = (InterfaceType)Enum.Parse(typeof(InterfaceType), Interface.ToString(), true); + if (temp.ToString() == str) + return temp + "Impl"; + } + return ""; + } + + /// + /// 获取实现类的方法名 + /// + /// 方法代号 + /// + public static string GetImplementMethodName(int Method) + { + foreach (string str in Enum.GetNames(typeof(InterfaceMethod))) + { + InterfaceMethod temp = (InterfaceMethod)Enum.Parse(typeof(InterfaceMethod), Method.ToString(), true); + if (temp.ToString() == str) + return temp.ToString(); + } + return ""; + } + + /// + /// 获取Socket枚举名 + /// + /// Socket枚举 + /// + public static string GetSocketTypeName(int SocketType) + { + foreach (string str in Enum.GetNames(typeof(SocketMessageType))) + { + SocketMessageType temp = (SocketMessageType)Enum.Parse(typeof(SocketMessageType), SocketType.ToString(), true); + if (temp.ToString() == str) + return temp.ToString(); + } + return ""; + } + } +} diff --git a/FunGame.Core/Api/Utility/General.cs b/FunGame.Core/Api/Utility/General.cs new file mode 100644 index 0000000..34bc1c0 --- /dev/null +++ b/FunGame.Core/Api/Utility/General.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using Milimoe.FunGame.Core.Entity.Enum; + +namespace Milimoe.FunGame.Core.Api.Utility +{ + /// + /// 通用工具类，客户端和服务器端都可以直接调用的工具方法都可以写在这里 + /// + public class Utility + { + /// + /// 判断字符串是否是IP地址 + /// + /// + /// + public static bool IsIP(string str) + { + //判断是否为IP + return Regex.IsMatch(str, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"); + } + + /// + /// 判断字符串是否为邮箱地址 + /// + /// + /// + public static bool IsEmail(string str) + { + //判断是否为Email + return Regex.IsMatch(str, @"^(\w)+(\.\w)*@(\w)+((\.\w+)+)$"); + } + + /// + /// 判断字符串是否是一个FunGame可接受的服务器地址 + /// + /// + /// + public static ErrorType IsServerAddress(string str) + { + string[] strs = str.Split(':'); + string ip; + int port; + if (strs.Length < 2) + { + ip = strs[0]; + port = 22222; + } + else if (strs.Length < 3) + { + ip = strs[0]; + port = Convert.ToInt32(strs[1]); + } + else return ErrorType.WrongFormat; + if (IsIP(ip) && port > 0 && port < 65536) return ErrorType.None; + else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorType.IsNotIP; + else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorType.IsNotPort; + else return ErrorType.WrongFormat; + } + + /// + /// 判断参数是否是一个FunGame可接受的服务器地址 + /// + /// + /// + /// + public static ErrorType IsServerAddress(string ip, int port) + { + if (IsIP(ip) && port > 0 && port < 65536) return ErrorType.None; + else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorType.IsNotIP; + else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorType.IsNotPort; + else return ErrorType.WrongFormat; + } + } +} diff --git a/FunGame.Core/Api/Utility/INIHelper.cs b/FunGame.Core/Api/Utility/INIHelper.cs new file mode 100644 index 0000000..fc578d0 --- /dev/null +++ b/FunGame.Core/Api/Utility/INIHelper.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; +using Milimoe.FunGame.Core.Entity.Enum; + +namespace Milimoe.FunGame.Core.Api.Utility +{ + public class INIHelper + { + /* + * 声明API函数 + */ + [DllImport("kernel32", CharSet = CharSet.Unicode)] + private static extern long WritePrivateProfileString(string section, string key, string val, string filePath); + [DllImport("kernel32", CharSet = CharSet.Unicode)] + private static extern int GetPrivateProfileString(string section, string key, string def, StringBuilder retVal, int size, string filePath); + + /// + /// 写入ini文件 + /// + /// Section + /// 键 + /// 值 + /// 文件名，缺省为FunGame.ini + public static void WriteINI(string Section, string Key, string Value, string FileName = @"FunGame.ini") + { + WritePrivateProfileString(Section, Key, Value, Environment.CurrentDirectory.ToString() + @"\" + FileName); + } + + /// + /// 读取ini文件 + /// + /// Section + /// 键 + /// 文件名，缺省为FunGame.ini + /// 读取到的值 + public static string ReadINI(string Section, string Key, string FileName = @"FunGame.ini") + { + StringBuilder str = new(256); + _ = GetPrivateProfileString(Section, Key, "", str, 256, Environment.CurrentDirectory.ToString() + @"\" + FileName); + return str.ToString(); + } + + /// + /// 查询ini文件是否存在 + /// + /// 文件名，缺省为FunGame.ini + /// 是否存在 + public static bool ExistINIFile(string FileName = @"FunGame.ini") + { + return File.Exists(Environment.CurrentDirectory.ToString() + @"\" + FileName); + } + + /// + /// 初始化ini模板文件 + /// + public static void Init(FunGameEnums.FunGame FunGameType) + { + switch (FunGameType) + { + case FunGameEnums.FunGame.FunGame_Core: + case FunGameEnums.FunGame.FunGame_Core_Api: + case FunGameEnums.FunGame.FunGame_Console: + case FunGameEnums.FunGame.FunGame_Desktop: + /** + * Config + */ + WriteINI("Config", "AutoConnect", "true"); + WriteINI("Config", "AutoLogin", "false"); + /** + * Account + */ + WriteINI("Account", "UserName", ""); + WriteINI("Account", "Password", ""); + WriteINI("Account", "AutoKey", ""); + break; + case FunGameEnums.FunGame.FunGame_Server: + /** + * Server + */ + WriteINI("Server", "Name", "FunGame Server"); + WriteINI("Server", "Password", ""); + WriteINI("Server", "Describe", "Just Another FunGame Server."); + WriteINI("Server", "Notice", "This is the FunGame Server's Notice."); + WriteINI("Server", "Key", ""); + WriteINI("Server", "Status", "1"); + /** + * Socket + */ + WriteINI("Socket", "Port", "22222"); + WriteINI("Socket", "MaxPlayer", "20"); + WriteINI("Socket", "MaxConnectFailed", "0"); + /** + * MySQL + */ + WriteINI("MySQL", "DBServer", "localhost"); + WriteINI("MySQL", "DBPort", "3306"); + WriteINI("MySQL", "DBName", "fungame"); + WriteINI("MySQL", "DBUser", "root"); + WriteINI("MySQL", "DBPassword", "pass"); + break; + } + } + } +} diff --git a/FunGame.Core/Api/Utility/ReflectionHelper.cs b/FunGame.Core/Api/Utility/ReflectionHelper.cs new file mode 100644 index 0000000..c25d4a4 --- /dev/null +++ b/FunGame.Core/Api/Utility/ReflectionHelper.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Api.Utility +{ + /// + /// 在FunGame.Core.Interface中添加新接口和新实现时，需要： + /// 在FunGame.Core.Entity.Enum.CommonEnums里同步添加InterfaceType、InterfaceMethod + /// + public class ReflectionHelper + { + /** + * 定义需要反射的DLL + */ + public const string FUNGAME_IMPL = "FunGame.Implement"; + + /** + * 无需二次修改的 + */ + public static string EXEDocPath = Environment.CurrentDirectory.ToString() + "\\"; // 程序目录 + public static string PluginDocPath = Environment.CurrentDirectory.ToString() + "\\plugins\\"; // 插件目录 + + //////////////////////////////////////////////////////////////////// + /////////////// * 下 面 是 工 具 类 实 现 * //////////////// + /////////////////////////////////////////////////////////////////// + + /** + * 定义反射变量 + */ + private Assembly? Assembly; + private Type? Type; + private MethodInfo? Method; + private object? Instance; + + /// + /// 获取FunGame.Implement.dll中接口的实现方法 + /// + /// 接口代号 + /// + private Type? GetFunGameImplementType(int Interface) + { + // 通过类名获取获取命名空间+类名称 + string ClassName = EnumHelper.GetImplementClassName(Interface); + List? Classes = null; + if (Assembly != null) + { + Classes = Assembly.GetTypes().Where(w => + w.Namespace == "Milimoe.FunGame.Core.Implement" && + w.Name.Contains(ClassName) + ).ToList(); + if (Classes != null && Classes.Count > 0) + return Classes[0]; + else return null; + } + else return null; + } + + /// + /// 公开方法：获取FunGame.Implement.DLL中指定方法的返回值 + /// + /// 接口代号 + /// 方法代号 + /// + public object? GetFunGameImplValue(int Interface, int Method) + { + Assembly = Assembly.LoadFile(EXEDocPath + FUNGAME_IMPL + ".dll"); + Type = GetFunGameImplementType(Interface); // 通过类名获取获取命名空间+类名称 + string MethodName = EnumHelper.GetImplementMethodName(Method); // 获取方法名 + if (Assembly != null && Type != null) this.Method = Type.GetMethod(MethodName); // 从Type中查找方法名 + else return null; + Instance = Assembly.CreateInstance(Type.Namespace + "." + Type.Name); + if (Instance != null && this.Method != null) + { + object? value = this.Method.Invoke(Instance, Array.Empty()); // 实例方法的调用 + if (value != null) + return value; + else return null; + } + else return null; + } + } +} diff --git a/FunGame.Core.Api/Model/Enum/CommonEnums.cs b/FunGame.Core/Entity/Enum/CommonEnums.cs similarity index 91% rename from FunGame.Core.Api/Model/Enum/CommonEnums.cs rename to FunGame.Core/Entity/Enum/CommonEnums.cs index 4449135..a9fad2d 100644 --- a/FunGame.Core.Api/Model/Enum/CommonEnums.cs +++ b/FunGame.Core/Entity/Enum/CommonEnums.cs @@ -6,11 +6,11 @@ using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Enum +namespace Milimoe.FunGame.Core.Entity.Enum { /** * ſʵصState Type Result Method - * FunGame.Core.ApiӿںʵʱҪͬӣInterfaceTypeInterfaceMethod + * Milimoe.FunGame.Core.ApiӿںʵʱҪͬӣInterfaceTypeInterfaceMethod */ #region State @@ -76,8 +76,8 @@ namespace FunGame.Core.Api.Model.Enum public enum InterfaceType { - ClientConnectInterface, - ServerInterface + IClient, + IServer } public enum LightType diff --git a/FunGame.Core.Api/Model/Enum/FunGameEnums.cs b/FunGame.Core/Entity/Enum/FunGameEnums.cs similarity index 97% rename from FunGame.Core.Api/Model/Enum/FunGameEnums.cs rename to FunGame.Core/Entity/Enum/FunGameEnums.cs index 2211c18..177999b 100644 --- a/FunGame.Core.Api/Model/Enum/FunGameEnums.cs +++ b/FunGame.Core/Entity/Enum/FunGameEnums.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Enum +namespace Milimoe.FunGame.Core.Entity.Enum { public static class FunGameEnums { diff --git a/FunGame.Core/Entity/Event/GeneralEventHandler.cs b/FunGame.Core/Entity/Event/GeneralEventHandler.cs new file mode 100644 index 0000000..a3a9945 --- /dev/null +++ b/FunGame.Core/Entity/Event/GeneralEventHandler.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Entity.Event +{ + public class GeneralEventHandler + { + + } +} diff --git a/FunGame.Core.Api/Model/Entity/ActiveItem.cs b/FunGame.Core/Entity/General/ActiveItem.cs similarity index 86% rename from FunGame.Core.Api/Model/Entity/ActiveItem.cs rename to FunGame.Core/Entity/General/ActiveItem.cs index 7f9be78..5d38234 100644 --- a/FunGame.Core.Api/Model/Entity/ActiveItem.cs +++ b/FunGame.Core/Entity/General/ActiveItem.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class ActiveItem : Item { diff --git a/FunGame.Core.Api/Model/Entity/ActiveSkill.cs b/FunGame.Core/Entity/General/ActiveSkill.cs similarity index 94% rename from FunGame.Core.Api/Model/Entity/ActiveSkill.cs rename to FunGame.Core/Entity/General/ActiveSkill.cs index f3e3f65..fc8c5a8 100644 --- a/FunGame.Core.Api/Model/Entity/ActiveSkill.cs +++ b/FunGame.Core/Entity/General/ActiveSkill.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class ActiveSkill : Skill { diff --git a/FunGame.Core.Api/Model/Entity/Character.cs b/FunGame.Core/Entity/General/Character.cs similarity index 96% rename from FunGame.Core.Api/Model/Entity/Character.cs rename to FunGame.Core/Entity/General/Character.cs index 7d9f74c..a9e3da2 100644 --- a/FunGame.Core.Api/Model/Entity/Character.cs +++ b/FunGame.Core/Entity/General/Character.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class Character { diff --git a/FunGame.Core.Api/Model/Entity/CharacterStatistics.cs b/FunGame.Core/Entity/General/CharacterStatistics.cs similarity index 96% rename from FunGame.Core.Api/Model/Entity/CharacterStatistics.cs rename to FunGame.Core/Entity/General/CharacterStatistics.cs index eddaaf8..08f1ccf 100644 --- a/FunGame.Core.Api/Model/Entity/CharacterStatistics.cs +++ b/FunGame.Core/Entity/General/CharacterStatistics.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class CharacterStatistics { diff --git a/FunGame.Core.Api/Model/Entity/GameStatistics.cs b/FunGame.Core/Entity/General/GameStatistics.cs similarity index 96% rename from FunGame.Core.Api/Model/Entity/GameStatistics.cs rename to FunGame.Core/Entity/General/GameStatistics.cs index b4f7aac..94617e5 100644 --- a/FunGame.Core.Api/Model/Entity/GameStatistics.cs +++ b/FunGame.Core/Entity/General/GameStatistics.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class GameStatistics { diff --git a/FunGame.Core.Api/Model/Entity/Item.cs b/FunGame.Core/Entity/General/Item.cs similarity index 91% rename from FunGame.Core.Api/Model/Entity/Item.cs rename to FunGame.Core/Entity/General/Item.cs index 71a8645..6ed09d5 100644 --- a/FunGame.Core.Api/Model/Entity/Item.cs +++ b/FunGame.Core/Entity/General/Item.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public abstract class Item { diff --git a/FunGame.Core.Api/Model/Entity/PassiveItem.cs b/FunGame.Core/Entity/General/PassiveItem.cs similarity index 86% rename from FunGame.Core.Api/Model/Entity/PassiveItem.cs rename to FunGame.Core/Entity/General/PassiveItem.cs index 24e72e5..433a719 100644 --- a/FunGame.Core.Api/Model/Entity/PassiveItem.cs +++ b/FunGame.Core/Entity/General/PassiveItem.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class PassiveItem : Item { diff --git a/FunGame.Core.Api/Model/Entity/PassiveSkill.cs b/FunGame.Core/Entity/General/PassiveSkill.cs similarity index 94% rename from FunGame.Core.Api/Model/Entity/PassiveSkill.cs rename to FunGame.Core/Entity/General/PassiveSkill.cs index edf6d99..9abf712 100644 --- a/FunGame.Core.Api/Model/Entity/PassiveSkill.cs +++ b/FunGame.Core/Entity/General/PassiveSkill.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class PassiveSkill : Skill { diff --git a/FunGame.Core.Api/Model/Entity/Room.cs b/FunGame.Core/Entity/General/Room.cs similarity index 95% rename from FunGame.Core.Api/Model/Entity/Room.cs rename to FunGame.Core/Entity/General/Room.cs index 43f78ff..85df72a 100644 --- a/FunGame.Core.Api/Model/Entity/Room.cs +++ b/FunGame.Core/Entity/General/Room.cs @@ -6,7 +6,7 @@ using System.Security.Policy; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class Room { diff --git a/FunGame.Core.Api/Model/Entity/Skill.cs b/FunGame.Core/Entity/General/Skill.cs similarity index 90% rename from FunGame.Core.Api/Model/Entity/Skill.cs rename to FunGame.Core/Entity/General/Skill.cs index 05a3691..2a6bc72 100644 --- a/FunGame.Core.Api/Model/Entity/Skill.cs +++ b/FunGame.Core/Entity/General/Skill.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public abstract class Skill { diff --git a/FunGame.Core.Api/Model/Entity/Stock.cs b/FunGame.Core/Entity/General/Stock.cs similarity index 91% rename from FunGame.Core.Api/Model/Entity/Stock.cs rename to FunGame.Core/Entity/General/Stock.cs index 0a33623..1210d62 100644 --- a/FunGame.Core.Api/Model/Entity/Stock.cs +++ b/FunGame.Core/Entity/General/Stock.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class Stock { diff --git a/FunGame.Core.Api/Model/Entity/User.cs b/FunGame.Core/Entity/General/User.cs similarity index 96% rename from FunGame.Core.Api/Model/Entity/User.cs rename to FunGame.Core/Entity/General/User.cs index 13a7c77..dbe0685 100644 --- a/FunGame.Core.Api/Model/Entity/User.cs +++ b/FunGame.Core/Entity/General/User.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class User { diff --git a/FunGame.Core.Api/Model/Entity/UserStatistics.cs b/FunGame.Core/Entity/General/UserStatistics.cs similarity index 96% rename from FunGame.Core.Api/Model/Entity/UserStatistics.cs rename to FunGame.Core/Entity/General/UserStatistics.cs index 43aa107..006923a 100644 --- a/FunGame.Core.Api/Model/Entity/UserStatistics.cs +++ b/FunGame.Core/Entity/General/UserStatistics.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Core.Api.Model.Entity +namespace Milimoe.FunGame.Core.Entity.General { public class UserStatistics { diff --git a/FunGame.Core/FunGame.Core.csproj b/FunGame.Core/FunGame.Core.csproj index 8ee0f18..dcc5c29 100644 --- a/FunGame.Core/FunGame.Core.csproj +++ b/FunGame.Core/FunGame.Core.csproj @@ -4,13 +4,13 @@ net6.0 enable enable - Milimoe ..\bin + Milimoe Milimoe - FunGame - ..\bin 1.0 1.0 + ..\bin + FunGame.Core @@ -21,11 +21,4 @@ embedded - - - False - True - - - diff --git a/FunGame.Core/Interface/Event/Events.cs b/FunGame.Core/Interface/Event/Events.cs new file mode 100644 index 0000000..736bba7 --- /dev/null +++ b/FunGame.Core/Interface/Event/Events.cs @@ -0,0 +1,118 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Interface +{ + public interface IEvent + { + + } + + public interface IConnectEvent : IEvent + { + + } + + public interface IDisconnectEvent : IEvent + { + + } + + public interface ILoginEvent : IEvent + { + + } + + public interface ILogoutEvent : IEvent + { + + } + + public interface IRegEvent : IEvent + { + + } + + public interface IIntoRoomEvent : IEvent + { + + } + + public interface ISendTalkEvent : IEvent + { + + } + + public interface ICreateRoomEvent : IEvent + { + + } + + public interface IQuitRoomEvent : IEvent + { + + } + + public interface IChangeRoomSettingEvent : IEvent + { + + } + + public interface IStartMatchEvent : IEvent + { + + } + + public interface IStartGameEvent : IEvent + { + + } + + public interface IChangeProfileEvent : IEvent + { + + } + + public interface IChangeAccountSettingEvent : IEvent + { + + } + + public interface IOpenStockEvent : IEvent + { + + } + + public interface ISignInEvent : IEvent + { + + } + + public interface IOpenStoreEvent : IEvent + { + + } + + public interface IBuyItemEvent : IEvent + { + + } + + public interface IShowRankingEvent : IEvent + { + + } + + public interface IUseItemEvent : IEvent + { + + } + + public interface IEndGameEvent : IEvent + { + + } +} diff --git a/FunGame.Core/Interface/Example.cs b/FunGame.Core/Interface/Example.cs new file mode 100644 index 0000000..7d167e7 --- /dev/null +++ b/FunGame.Core/Interface/Example.cs @@ -0,0 +1,22 @@ +namespace Milimoe.FunGame.Core.Interface +{ + /** + * 接口需要在FunGame.Core项目中Implement文件夹创建新的类实现 + * 参考： + * using Milimoe.FunGame.Core.Interface; + + namespace Milimoe.FunGame.Core.Implement + { + public class IClientImpl : IClient + { + public string RemoteServerIP() + { + // 此处修改连接远程服务器IP + string serverIP = "127.0.0.1"; + string serverPort = "22222"; + return serverIP + ":" + serverPort; + } + } + } + */ +} diff --git a/FunGame.Core/Interface/General/IClient.cs b/FunGame.Core/Interface/General/IClient.cs new file mode 100644 index 0000000..b8c1008 --- /dev/null +++ b/FunGame.Core/Interface/General/IClient.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Interface +{ + public interface IClient + { + public string RemoteServerIP(); + } +} diff --git a/FunGame.Core/Interface/General/IServer.cs b/FunGame.Core/Interface/General/IServer.cs new file mode 100644 index 0000000..1e29b04 --- /dev/null +++ b/FunGame.Core/Interface/General/IServer.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Interface +{ + public interface IServer + { + + } +} diff --git a/FunGame.Core/Others/Config/Config.cs b/FunGame.Core/Others/Config/Config.cs new file mode 100644 index 0000000..e49014f --- /dev/null +++ b/FunGame.Core/Others/Config/Config.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Others +{ + public class Config + { + + } +} diff --git a/FunGame.Core/Service/MySQLManager.cs b/FunGame.Core/Service/MySQLManager.cs new file mode 100644 index 0000000..8687e1d --- /dev/null +++ b/FunGame.Core/Service/MySQLManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Service +{ + public class MySQLManager + { + } +} diff --git a/FunGame.Core/Service/PluginManager.cs b/FunGame.Core/Service/PluginManager.cs new file mode 100644 index 0000000..6941e62 --- /dev/null +++ b/FunGame.Core/Service/PluginManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Service +{ + public class PluginManager + { + } +} diff --git a/FunGame.Core/Service/RedisManager.cs b/FunGame.Core/Service/RedisManager.cs new file mode 100644 index 0000000..438def3 --- /dev/null +++ b/FunGame.Core/Service/RedisManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Service +{ + public class RedisManager + { + } +} diff --git a/FunGame.Core/Service/ResourceManager.cs b/FunGame.Core/Service/ResourceManager.cs new file mode 100644 index 0000000..c1973c2 --- /dev/null +++ b/FunGame.Core/Service/ResourceManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Service +{ + public class ResourceManager + { + } +} diff --git a/FunGame.Core/Service/SocketManager.cs b/FunGame.Core/Service/SocketManager.cs new file mode 100644 index 0000000..474d0a9 --- /dev/null +++ b/FunGame.Core/Service/SocketManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Service +{ + public class SocketManager + { + } +} diff --git a/FunGame.Core/Service/ThreadManager.cs b/FunGame.Core/Service/ThreadManager.cs new file mode 100644 index 0000000..7bedeee --- /dev/null +++ b/FunGame.Core/Service/ThreadManager.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Milimoe.FunGame.Core.Service +{ + public class ThreadManager + { + } +} diff --git a/FunGame.Desktop/Models/Component/ExitButton.Designer.cs b/FunGame.Desktop/Entities/Component/ExitButton.Designer.cs similarity index 94% rename from FunGame.Desktop/Models/Component/ExitButton.Designer.cs rename to FunGame.Desktop/Entities/Component/ExitButton.Designer.cs index 353a71f..92f30cb 100644 --- a/FunGame.Desktop/Models/Component/ExitButton.Designer.cs +++ b/FunGame.Desktop/Entities/Component/ExitButton.Designer.cs @@ -1,4 +1,4 @@ -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { partial class ExitButton { diff --git a/FunGame.Desktop/Models/Component/ExitButton.cs b/FunGame.Desktop/Entities/Component/ExitButton.cs similarity index 91% rename from FunGame.Desktop/Models/Component/ExitButton.cs rename to FunGame.Desktop/Entities/Component/ExitButton.cs index e26ec76..1e62000 100644 --- a/FunGame.Desktop/Models/Component/ExitButton.cs +++ b/FunGame.Desktop/Entities/Component/ExitButton.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { public partial class ExitButton : Button { @@ -15,7 +15,7 @@ namespace FunGame.Desktop.Models.Component InitializeComponent(); Anchor = System.Windows.Forms.AnchorStyles.None; BackColor = System.Drawing.Color.White; - BackgroundImage = global::FunGame.Desktop.Properties.Resources.exit; + BackgroundImage = global::Milimoe.FunGame.Desktop.Properties.Resources.exit; FlatAppearance.BorderColor = System.Drawing.Color.White; FlatAppearance.BorderSize = 0; FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); @@ -35,7 +35,7 @@ namespace FunGame.Desktop.Models.Component InitializeComponent(); Anchor = System.Windows.Forms.AnchorStyles.None; BackColor = System.Drawing.Color.White; - BackgroundImage = global::FunGame.Desktop.Properties.Resources.exit; + BackgroundImage = global::Milimoe.FunGame.Desktop.Properties.Resources.exit; FlatAppearance.BorderColor = System.Drawing.Color.White; FlatAppearance.BorderSize = 0; FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); diff --git a/FunGame.Desktop/Models/Component/ShowMessage.Designer.cs b/FunGame.Desktop/Entities/Component/ShowMessage.Designer.cs similarity index 97% rename from FunGame.Desktop/Models/Component/ShowMessage.Designer.cs rename to FunGame.Desktop/Entities/Component/ShowMessage.Designer.cs index 5718bf6..a024b6e 100644 --- a/FunGame.Desktop/Models/Component/ShowMessage.Designer.cs +++ b/FunGame.Desktop/Entities/Component/ShowMessage.Designer.cs @@ -1,4 +1,4 @@ -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { partial class ShowMessage { @@ -32,11 +32,11 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShowMessage)); this.MsgText = new System.Windows.Forms.Label(); this.LeftButton = new System.Windows.Forms.Button(); - this.Exit = new FunGame.Desktop.Models.Component.ExitButton(this.components); + this.Exit = new FunGame.Desktop.Entity.Component.ExitButton(this.components); this.RightButton = new System.Windows.Forms.Button(); this.MidButton = new System.Windows.Forms.Button(); this.Title = new System.Windows.Forms.Label(); - this.TransparentRect = new FunGame.Desktop.Models.Component.TransparentRect(); + this.TransparentRect = new FunGame.Desktop.Entity.Component.TransparentRect(); this.InputButton = new System.Windows.Forms.Button(); this.InputText = new System.Windows.Forms.TextBox(); this.TransparentRect.SuspendLayout(); @@ -133,7 +133,7 @@ this.TransparentRect.Name = "TransparentRect"; this.TransparentRect.Opacity = 125; this.TransparentRect.Radius = 20; - this.TransparentRect.ShapeBorderStyle = FunGame.Desktop.Models.Component.TransparentRect.ShapeBorderStyles.ShapeBSNone; + this.TransparentRect.ShapeBorderStyle = FunGame.Desktop.Entity.Component.TransparentRect.ShapeBorderStyles.ShapeBSNone; this.TransparentRect.Size = new System.Drawing.Size(235, 170); this.TransparentRect.TabIndex = 103; this.TransparentRect.TabStop = false; diff --git a/FunGame.Desktop/Models/Component/ShowMessage.cs b/FunGame.Desktop/Entities/Component/ShowMessage.cs similarity index 99% rename from FunGame.Desktop/Models/Component/ShowMessage.cs rename to FunGame.Desktop/Entities/Component/ShowMessage.cs index 0c34c13..ae06f3c 100644 --- a/FunGame.Desktop/Models/Component/ShowMessage.cs +++ b/FunGame.Desktop/Entities/Component/ShowMessage.cs @@ -7,9 +7,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using FunGame.Core.Api.Model.Enum; +using Milimoe.FunGame.Core.Entity.Enum; -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { public partial class ShowMessage : Form { diff --git a/FunGame.Desktop/Models/Component/ShowMessage.resx b/FunGame.Desktop/Entities/Component/ShowMessage.resx similarity index 100% rename from FunGame.Desktop/Models/Component/ShowMessage.resx rename to FunGame.Desktop/Entities/Component/ShowMessage.resx diff --git a/FunGame.Desktop/Models/Component/TextArea.Designer.cs b/FunGame.Desktop/Entities/Component/TextArea.Designer.cs similarity index 96% rename from FunGame.Desktop/Models/Component/TextArea.Designer.cs rename to FunGame.Desktop/Entities/Component/TextArea.Designer.cs index 9d5da02..407c314 100644 --- a/FunGame.Desktop/Models/Component/TextArea.Designer.cs +++ b/FunGame.Desktop/Entities/Component/TextArea.Designer.cs @@ -1,6 +1,6 @@ namespace FunGame.Desktop.Models.Component { - partial class TextArea + partial class TextArea : RichTextBox { /// /// 必需的设计器变量。 diff --git a/FunGame.Desktop/Models/Component/TextArea.cs b/FunGame.Desktop/Entities/Component/TextArea.cs similarity index 98% rename from FunGame.Desktop/Models/Component/TextArea.cs rename to FunGame.Desktop/Entities/Component/TextArea.cs index 0836bb6..a9bfe1a 100644 --- a/FunGame.Desktop/Models/Component/TextArea.cs +++ b/FunGame.Desktop/Entities/Component/TextArea.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { [ToolboxBitmap(typeof(TextBox))] partial class TextArea : RichTextBox diff --git a/FunGame.Desktop/Models/Component/TextArea.resx b/FunGame.Desktop/Entities/Component/TextArea.resx similarity index 100% rename from FunGame.Desktop/Models/Component/TextArea.resx rename to FunGame.Desktop/Entities/Component/TextArea.resx diff --git a/FunGame.Desktop/Models/Component/TransparentRect.Designer.cs b/FunGame.Desktop/Entities/Component/TransparentRect.Designer.cs similarity index 95% rename from FunGame.Desktop/Models/Component/TransparentRect.Designer.cs rename to FunGame.Desktop/Entities/Component/TransparentRect.Designer.cs index 371ccee..0c9168c 100644 --- a/FunGame.Desktop/Models/Component/TransparentRect.Designer.cs +++ b/FunGame.Desktop/Entities/Component/TransparentRect.Designer.cs @@ -1,4 +1,4 @@ -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { partial class TransparentRect { diff --git a/FunGame.Desktop/Models/Component/TransparentRect.cs b/FunGame.Desktop/Entities/Component/TransparentRect.cs similarity index 98% rename from FunGame.Desktop/Models/Component/TransparentRect.cs rename to FunGame.Desktop/Entities/Component/TransparentRect.cs index d335e48..23fd3a7 100644 --- a/FunGame.Desktop/Models/Component/TransparentRect.cs +++ b/FunGame.Desktop/Entities/Component/TransparentRect.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace FunGame.Desktop.Models.Component +namespace Milimoe.FunGame.Desktop.Entity.Component { partial class TransparentRect : GroupBox { diff --git a/FunGame.Desktop/FunGame.Desktop.csproj b/FunGame.Desktop/FunGame.Desktop.csproj index 31897a5..0fed6ba 100644 --- a/FunGame.Desktop/FunGame.Desktop.csproj +++ b/FunGame.Desktop/FunGame.Desktop.csproj @@ -1,4 +1,4 @@ - + WinExe @@ -15,7 +15,7 @@ False Milimoe FunGame - FunGame + FunGame.Desktop ..\bin 1.0 1.0 @@ -49,6 +49,7 @@ + @@ -58,10 +59,10 @@ - + True - + True diff --git a/FunGame.Desktop/Images/favicon.ico b/FunGame.Desktop/Images/favicon.ico deleted file mode 100644 index 25a4c90..0000000 Binary files a/FunGame.Desktop/Images/favicon.ico and /dev/null differ diff --git a/FunGame.Desktop/Models/Config/Config.cs b/FunGame.Desktop/Others/Config/Config.cs similarity index 97% rename from FunGame.Desktop/Models/Config/Config.cs rename to FunGame.Desktop/Others/Config/Config.cs index 1d90d48..83f12ad 100644 --- a/FunGame.Desktop/Models/Config/Config.cs +++ b/FunGame.Desktop/Others/Config/Config.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Security.AccessControl; using System.Text; using System.Threading.Tasks; -using FunGame.Core.Api.Model.Enum; -using FunGame.Core.Api.Util; +using Milimoe.FunGame.Core.Entity.Enum; +using Milimoe.FunGame.Core.Api.Utility; -namespace FunGame.Desktop.Models.Config +namespace Milimoe.FunGame.Desktop.Others { public static class Config { diff --git a/FunGame.Desktop/Models/Config/Usercfg.cs b/FunGame.Desktop/Others/Config/Usercfg.cs similarity index 76% rename from FunGame.Desktop/Models/Config/Usercfg.cs rename to FunGame.Desktop/Others/Config/Usercfg.cs index 012443b..2585df9 100644 --- a/FunGame.Desktop/Models/Config/Usercfg.cs +++ b/FunGame.Desktop/Others/Config/Usercfg.cs @@ -1,11 +1,11 @@ -using FunGame.Core.Api.Model.Entity; -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Milimoe.FunGame.Core.Entity.General; -namespace FunGame.Desktop.Models.Config +namespace Milimoe.FunGame.Desktop.Others { public class Usercfg { diff --git a/FunGame.Desktop/Properties/Resources.Designer.cs b/FunGame.Desktop/Properties/Resources.Designer.cs index 1644e18..beb7615 100644 --- a/FunGame.Desktop/Properties/Resources.Designer.cs +++ b/FunGame.Desktop/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace FunGame.Desktop.Properties { +namespace Milimoe.FunGame.Desktop.Properties { using System; @@ -80,16 +80,6 @@ namespace FunGame.Desktop.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap favicon { - get { - object obj = ResourceManager.GetObject("favicon", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/FunGame.Desktop/Properties/Resources.resx b/FunGame.Desktop/Properties/Resources.resx index 6000db2..9abaf8d 100644 --- a/FunGame.Desktop/Properties/Resources.resx +++ b/FunGame.Desktop/Properties/Resources.resx @@ -133,9 +133,6 @@ ..\images\back.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Images\favicon.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\images\min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/FunGame.Desktop/UI/Main/Main.Designer.cs b/FunGame.Desktop/UI/Main/Main.Designer.cs index a6e1750..4c45e6b 100644 --- a/FunGame.Desktop/UI/Main/Main.Designer.cs +++ b/FunGame.Desktop/UI/Main/Main.Designer.cs @@ -1,7 +1,7 @@ -using FunGame.Desktop.Models.Component; -using FunGame.Desktop.Models.Config; +using Milimoe.FunGame.Desktop.Entity.Component; +using Milimoe.FunGame.Desktop.Others; -namespace FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { partial class Main { @@ -33,7 +33,7 @@ namespace FunGame.Desktop.UI { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main)); - this.Exit = new FunGame.Desktop.Models.Component.ExitButton(this.components); + this.Exit = new FunGame.Desktop.Entity.Component.ExitButton(this.components); this.Title = new System.Windows.Forms.Label(); this.MinForm = new System.Windows.Forms.Button(); this.Connection = new System.Windows.Forms.Label(); @@ -55,10 +55,10 @@ namespace FunGame.Desktop.UI this.QueryRoom = new System.Windows.Forms.Button(); this.RoomList = new System.Windows.Forms.ListBox(); this.Notice = new System.Windows.Forms.GroupBox(); - this.NoticeText = new FunGame.Desktop.Models.Component.TextArea(); + this.NoticeText = new FunGame.Desktop.Entity.Component.TextArea(); this.InfoBox = new System.Windows.Forms.GroupBox(); - this.TransparentRectControl = new FunGame.Desktop.Models.Component.TransparentRect(); - this.GameInfo = new FunGame.Desktop.Models.Component.TextArea(); + this.TransparentRectControl = new FunGame.Desktop.Entity.Component.TransparentRect(); + this.GameInfo = new FunGame.Desktop.Entity.Component.TextArea(); this.QuitRoom = new System.Windows.Forms.Button(); this.CreateRoom = new System.Windows.Forms.Button(); this.Logout = new System.Windows.Forms.Button(); @@ -77,7 +77,7 @@ namespace FunGame.Desktop.UI // this.Exit.Anchor = System.Windows.Forms.AnchorStyles.None; this.Exit.BackColor = System.Drawing.Color.White; - this.Exit.BackgroundImage = global::FunGame.Desktop.Properties.Resources.exit; + this.Exit.BackgroundImage = global::Milimoe.FunGame.Desktop.Properties.Resources.exit; this.Exit.FlatAppearance.BorderColor = System.Drawing.Color.White; this.Exit.FlatAppearance.BorderSize = 0; this.Exit.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))); @@ -110,7 +110,7 @@ namespace FunGame.Desktop.UI // this.MinForm.Anchor = System.Windows.Forms.AnchorStyles.None; this.MinForm.BackColor = System.Drawing.Color.White; - this.MinForm.BackgroundImage = global::FunGame.Desktop.Properties.Resources.min; + this.MinForm.BackgroundImage = global::Milimoe.FunGame.Desktop.Properties.Resources.min; this.MinForm.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.MinForm.FlatAppearance.BorderColor = System.Drawing.Color.LightGray; this.MinForm.FlatAppearance.BorderSize = 0; @@ -142,7 +142,7 @@ namespace FunGame.Desktop.UI // Light // this.Light.BackColor = System.Drawing.Color.Transparent; - this.Light.Image = global::FunGame.Desktop.Properties.Resources.yellow; + this.Light.Image = global::Milimoe.FunGame.Desktop.Properties.Resources.yellow; this.Light.Location = new System.Drawing.Point(777, 426); this.Light.Name = "Light"; this.Light.Size = new System.Drawing.Size(18, 18); @@ -152,7 +152,7 @@ namespace FunGame.Desktop.UI // this.SendTalkText.Anchor = System.Windows.Forms.AnchorStyles.None; this.SendTalkText.BackColor = System.Drawing.Color.Transparent; - this.SendTalkText.BackgroundImage = global::FunGame.Desktop.Properties.Resources.send; + this.SendTalkText.BackgroundImage = global::Milimoe.FunGame.Desktop.Properties.Resources.send; this.SendTalkText.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.SendTalkText.FlatAppearance.BorderSize = 0; this.SendTalkText.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Teal; @@ -433,7 +433,7 @@ namespace FunGame.Desktop.UI this.TransparentRectControl.Name = "TransparentRectControl"; this.TransparentRectControl.Opacity = 125; this.TransparentRectControl.Radius = 20; - this.TransparentRectControl.ShapeBorderStyle = FunGame.Desktop.Models.Component.TransparentRect.ShapeBorderStyles.ShapeBSNone; + this.TransparentRectControl.ShapeBorderStyle = Milimoe.FunGame.Desktop.Entity.Component.TransparentRect.ShapeBorderStyles.ShapeBSNone; this.TransparentRectControl.Size = new System.Drawing.Size(464, 343); this.TransparentRectControl.TabIndex = 2; this.TransparentRectControl.TabStop = false; @@ -559,7 +559,7 @@ namespace FunGame.Desktop.UI // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackgroundImage = global::FunGame.Desktop.Properties.Resources.back; + this.BackgroundImage = global::Milimoe.FunGame.Desktop.Properties.Resources.back; this.ClientSize = new System.Drawing.Size(800, 450); this.Controls.Add(this.StopMatch); this.Controls.Add(this.Copyright); @@ -637,8 +637,8 @@ namespace FunGame.Desktop.UI private Button Store; private LinkLabel Copyright; private Button StopMatch; - private Models.Component.TextArea GameInfo; - private Models.Component.TextArea NoticeText; - private Models.Component.TransparentRect TransparentRectControl; + private Entity.Component.TextArea GameInfo; + private Entity.Component.TextArea NoticeText; + private Entity.Component.TransparentRect TransparentRectControl; } } \ No newline at end of file diff --git a/FunGame.Desktop/UI/Main/Main.cs b/FunGame.Desktop/UI/Main/Main.cs index c771801..23fc1fe 100644 --- a/FunGame.Desktop/UI/Main/Main.cs +++ b/FunGame.Desktop/UI/Main/Main.cs @@ -1,17 +1,17 @@ -using FunGame.Desktop.Models.Component; using System.Diagnostics; using System.Net.Sockets; using System.Net; using System.Windows.Forms; using System.Net.NetworkInformation; using System.Text; -using FunGame.Core.Api.Model.Entity; -using FunGame.Desktop.Models.Config; -using FunGame.Desktop.Utils; -using FunGame.Core.Api.Model.Enum; -using FunGame.Core.Api.Util; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity.General; +using Milimoe.FunGame.Core.Entity.Enum; +using Milimoe.FunGame.Desktop.Entity.Component; +using Milimoe.FunGame.Desktop.Others; +using Milimoe.FunGame.Desktop.Utils; -namespace FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { public partial class Main : Form { @@ -291,7 +291,7 @@ namespace FunGame.Desktop.UI { try { - string? ipaddress = (string?)Config.ReflectionHelper.GetFunGameCoreValue((int)InterfaceType.ClientConnectInterface, (int)InterfaceMethod.RemoteServerIP); // 获取服务器IP + string? ipaddress = (string?)Config.ReflectionHelper.GetFunGameImplValue((int)InterfaceType.IClient, (int)InterfaceMethod.RemoteServerIP); // 获取服务器IP if (ipaddress != null) { string[] s = ipaddress.Split(':'); diff --git a/FunGame.Desktop/UI/Start.cs b/FunGame.Desktop/UI/Start.cs index 31a6a28..dfbc124 100644 --- a/FunGame.Desktop/UI/Start.cs +++ b/FunGame.Desktop/UI/Start.cs @@ -1,4 +1,4 @@ -namespace FunGame.Desktop.UI +namespace Milimoe.FunGame.Desktop.UI { internal static class Start { diff --git a/FunGame.Desktop/Utils/SocketHelper.cs b/FunGame.Desktop/Utils/SocketHelper.cs index 4ece43b..a67d831 100644 --- a/FunGame.Desktop/Utils/SocketHelper.cs +++ b/FunGame.Desktop/Utils/SocketHelper.cs @@ -8,13 +8,13 @@ using System.Threading.Tasks; using FunGame.Desktop.Models.Component; using System.ComponentModel.DataAnnotations; using System.Net.NetworkInformation; -using FunGame.Core.Api.Model.Entity; -using FunGame.Core.Api.Model.Enum; -using FunGame.Core.Api.Util; -using FunGame.Desktop.Models.Config; -using FunGame.Desktop.UI; +using Milimoe.FunGame.Core.Entity.General; +using Milimoe.FunGame.Core.Entity.Enum; +using Milimoe.FunGame.Desktop.Others; +using Milimoe.FunGame.Desktop.UI; +using Milimoe.FunGame.Core.Api.Utility; -namespace FunGame.Desktop.Utils +namespace Milimoe.FunGame.Desktop.Utils { public class SocketHelper { diff --git a/FunGame.Core.Api/FunGame.Core.Api.csproj b/FunGame.Implement/FunGame.Implement.csproj similarity index 69% rename from FunGame.Core.Api/FunGame.Core.Api.csproj rename to FunGame.Implement/FunGame.Implement.csproj index ac6b656..0253be4 100644 --- a/FunGame.Core.Api/FunGame.Core.Api.csproj +++ b/FunGame.Implement/FunGame.Implement.csproj @@ -1,16 +1,16 @@ - + net6.0 enable enable - ..\bin Milimoe + ..\bin Milimoe + FunGame.Implement + ..\bin 1.0 1.0 - ..\bin - FunGame @@ -21,4 +21,11 @@ embedded + + + False + True + + + diff --git a/FunGame.Plugin/FunGame.Plugin.csproj b/FunGame.Plugin/FunGame.Plugin.csproj index 9dc8a9b..1124976 100644 --- a/FunGame.Plugin/FunGame.Plugin.csproj +++ b/FunGame.Plugin/FunGame.Plugin.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,7 +7,7 @@ ..\bin\ Milimoe Milimoe - FunGame + FunGameSDK 1.0 1.0 ..\bin\plugin @@ -21,4 +21,8 @@ embedded + + + + diff --git a/FunGame.sln b/FunGame.sln index 4f487f1..3eb428f 100644 --- a/FunGame.sln +++ b/FunGame.sln @@ -8,16 +8,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame.Desktop", "FunGame. {CC6C83C6-5818-4565-8873-67587FED1D0A} = {CC6C83C6-5818-4565-8873-67587FED1D0A} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame.Core", "FunGame.Core\FunGame.Core.csproj", "{CC6C83C6-5818-4565-8873-67587FED1D0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame.Implement", "FunGame.Implement\FunGame.Implement.csproj", "{CC6C83C6-5818-4565-8873-67587FED1D0A}" ProjectSection(ProjectDependencies) = postProject {842BB22E-4309-4ADD-93CD-A981CE10C30E} = {842BB22E-4309-4ADD-93CD-A981CE10C30E} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame.Core.Api", "FunGame.Core.Api\FunGame.Core.Api.csproj", "{842BB22E-4309-4ADD-93CD-A981CE10C30E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame.Core", "FunGame.Core\FunGame.Core.csproj", "{842BB22E-4309-4ADD-93CD-A981CE10C30E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunGame.Plugin", "FunGame.Plugin\FunGame.Plugin.csproj", "{A1132284-47F3-4C2D-89DB-C34B2354D9BB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunGame.Plugin", "FunGame.Plugin\FunGame.Plugin.csproj", "{A1132284-47F3-4C2D-89DB-C34B2354D9BB}" ProjectSection(ProjectDependencies) = postProject {842BB22E-4309-4ADD-93CD-A981CE10C30E} = {842BB22E-4309-4ADD-93CD-A981CE10C30E} + {CC6C83C6-5818-4565-8873-67587FED1D0A} = {CC6C83C6-5818-4565-8873-67587FED1D0A} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunGame.Console", "FunGame.Console\FunGame.Console.csproj", "{1DB30EB0-5434-453B-949B-2164B6809291}" + ProjectSection(ProjectDependencies) = postProject + {842BB22E-4309-4ADD-93CD-A981CE10C30E} = {842BB22E-4309-4ADD-93CD-A981CE10C30E} + {CC6C83C6-5818-4565-8873-67587FED1D0A} = {CC6C83C6-5818-4565-8873-67587FED1D0A} EndProjectSection EndProject Global @@ -42,6 +49,10 @@ Global {A1132284-47F3-4C2D-89DB-C34B2354D9BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1132284-47F3-4C2D-89DB-C34B2354D9BB}.Release|Any CPU.ActiveCfg = Release|Any CPU {A1132284-47F3-4C2D-89DB-C34B2354D9BB}.Release|Any CPU.Build.0 = Release|Any CPU + {1DB30EB0-5434-453B-949B-2164B6809291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1DB30EB0-5434-453B-949B-2164B6809291}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1DB30EB0-5434-453B-949B-2164B6809291}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1DB30EB0-5434-453B-949B-2164B6809291}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE