diff --git a/FunGame.Testing.sln b/FunGame.Testing.sln index 5e9805f..d6a53fa 100644 --- a/FunGame.Testing.sln +++ b/FunGame.Testing.sln @@ -47,6 +47,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OshimaServers", "..\OshimaG EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OshimaMaps", "..\OshimaGameModule\OshimaMaps\OshimaMaps.csproj", "{CDA0BCC1-0097-4D52-9895-A706D0523FBF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OshimaWebAPI", "..\OshimaGameModule\OshimaWebAPI\OshimaWebAPI.csproj", "{F82AF14E-9E06-442B-9407-86398B314DA9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -93,6 +95,10 @@ Global {CDA0BCC1-0097-4D52-9895-A706D0523FBF}.Debug|Any CPU.Build.0 = Debug|Any CPU {CDA0BCC1-0097-4D52-9895-A706D0523FBF}.Release|Any CPU.ActiveCfg = Release|Any CPU {CDA0BCC1-0097-4D52-9895-A706D0523FBF}.Release|Any CPU.Build.0 = Release|Any CPU + {F82AF14E-9E06-442B-9407-86398B314DA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F82AF14E-9E06-442B-9407-86398B314DA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F82AF14E-9E06-442B-9407-86398B314DA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F82AF14E-9E06-442B-9407-86398B314DA9}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Library/FunGame.Testing.csproj b/Library/FunGame.Testing.csproj index 940f099..a53c0f2 100644 --- a/Library/FunGame.Testing.csproj +++ b/Library/FunGame.Testing.csproj @@ -31,6 +31,8 @@ + + diff --git a/Library/Main.cs b/Library/Main.cs index 23bebd4..d9efe41 100644 --- a/Library/Main.cs +++ b/Library/Main.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; using Milimoe.FunGame.Core.Api.Utility; -using Oshima.Core.Controllers; +using Oshima.FunGame.WebAPI.Controllers; using Oshima.FunGame.OshimaModules; using Oshima.FunGame.OshimaServers.Service; diff --git a/Library/Tests/WebSocketTest.cs b/Library/Tests/WebSocketTest.cs index c3d5005..93a64b5 100644 --- a/Library/Tests/WebSocketTest.cs +++ b/Library/Tests/WebSocketTest.cs @@ -58,6 +58,14 @@ namespace Milimoe.FunGame.Testing.Tests { await HTTPClient.Send(SocketMessageType.AnonymousGameServer, OshimaGameModuleConstant.Anonymous); } + if (str == "scadd") + { + Dictionary data = []; + data.Add("command", "scadd"); + data.Add("qq", 1); + data.Add("sc", 1); + await HTTPClient.Send(SocketMessageType.AnonymousGameServer, OshimaGameModuleConstant.Anonymous, data); + } if (str == "wsclose") { await HTTPClient.Send(SocketMessageType.EndGame); @@ -243,7 +251,7 @@ namespace Milimoe.FunGame.Testing.Tests }); } - public override void WritelnSystemInfo(string msg) + public override void WritelnSystemInfo(string msg, LogLevel level, bool useLevel) { Console.WriteLine(msg); }