yeziuku/FunGame-Core
1
0
Fork 0
forked from project-redbud/FunGame-Core
Code Pull Requests Activity

添加Hashtable中Json对象的反序列化工具方法 (#36)

Browse Source 
* 添加Hashtable中Json对象的反序列化工具方法

* ErrorType -> ErrorIPAddressType

* 新增房间状态：Matching
This commit is contained in:
milimoe 2023-06-28 00:58:52 +08:00 committed by GitHub
parent ae4f8aa7aa
commit 5a63b97341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Api/Utility/General.cs
View File

@ -1,4 +1,5 @@
using System.Net.NetworkInformation; using System.Collections;
using System.Net.NetworkInformation;
using System.Security.Cryptography; using System.Security.Cryptography;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Library.Constant;
@ -56,7 +57,7 @@ namespace Milimoe.FunGame.Core.Api.Utility
/// </summary> /// </summary>
/// <param name="str"></param> /// <param name="str"></param>
/// <returns></returns> /// <returns></returns>
public static ErrorType IsServerAddress(string str) public static ErrorIPAddressType IsServerAddress(string str)
{ {
string[] strs = str.Split(':'); string[] strs = str.Split(':');
string ip; string ip;
@ -71,11 +72,11 @@ namespace Milimoe.FunGame.Core.Api.Utility
ip = strs[0]; ip = strs[0];
port = Convert.ToInt32(strs[1]); port = Convert.ToInt32(strs[1]);
} }
else return ErrorType.WrongFormat; else return ErrorIPAddressType.WrongFormat;
if (IsIP(ip) && port > 0 && port < 65536) return ErrorType.None; if (IsIP(ip) && port > 0 && port < 65536) return ErrorIPAddressType.None;
else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorType.IsNotIP; else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorIPAddressType.IsNotIP;
else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorType.IsNotPort; else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorIPAddressType.IsNotPort;
else return ErrorType.WrongFormat; else return ErrorIPAddressType.WrongFormat;
} }
/// <summary> /// <summary>
@ -84,12 +85,12 @@ namespace Milimoe.FunGame.Core.Api.Utility
/// <param name="ip"></param> /// <param name="ip"></param>
/// <param name="port"></param> /// <param name="port"></param>
/// <returns></returns> /// <returns></returns>
public static ErrorType IsServerAddress(string ip, int port) public static ErrorIPAddressType IsServerAddress(string ip, int port)
{ {
if (IsIP(ip) && port > 0 && port < 65536) return ErrorType.None; if (IsIP(ip) && port > 0 && port < 65536) return ErrorIPAddressType.None;
else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorType.IsNotIP; else if (!IsIP(ip) && port > 0 && port < 65536) return ErrorIPAddressType.IsNotIP;
else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorType.IsNotPort; else if (IsIP(ip) && (port <= 0 || port >= 65536)) return ErrorIPAddressType.IsNotPort;
else return ErrorType.WrongFormat; else return ErrorIPAddressType.WrongFormat;
} }
/// <summary> /// <summary>
@ -136,6 +137,18 @@ namespace Milimoe.FunGame.Core.Api.Utility
{ {
return Service.JsonManager.GetObject<T>(json); return Service.JsonManager.GetObject<T>(json);
} }
/// <summary>
/// 反序列化Hashtable中的Json对象
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="hashtable"></param>
/// <param name="key"></param>
/// <returns></returns>
public static T? JsonDeserializeFromHashtable<T>(Hashtable hashtable, string key)
{
return Service.JsonManager.GetObject<T>(hashtable, key);
}
} }
#endregion #endregion

3
Library/Constant/StateEnum.cs
View File

@ -11,8 +11,9 @@
public enum RoomState public enum RoomState
{ {
Created, Created,
Closed,
Matching,
Gaming, Gaming,
Close,
Complete Complete
} }

2
Library/Constant/TypeEnum.cs
View File

@ -95,7 +95,7 @@
Server Server
} }
public enum ErrorType public enum ErrorIPAddressType
{ {
None, None,
IsNotIP, IsNotIP,