DevilProMT/MikuSB
1
0
Fork 0
mirror of https://github.com/MikuLeaks/MikuSB.git synced 2026-06-04 04:03:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

small fix

Browse Source
This commit is contained in:
Kei-Luna
2026-05-19 17:46:53 +09:00
parent 125dadd224
commit a585232045
9 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpShared.cs → GameServer/Game/BossPvp/BossPvpService.cs
View File

@@ -2,16 +2,15 @@ using MikuSB.Data;
using MikuSB.Data.Excel; using MikuSB.Data.Excel;
using MikuSB.Database.Inventory; using MikuSB.Database.Inventory;
using MikuSB.GameServer.Game.Player; using MikuSB.GameServer.Game.Player;
using MikuSB.GameServer.Server.CallGS;
using MikuSB.Proto; using MikuSB.Proto;
using System.Globalization; using System.Globalization;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Game.BossPvp;
internal static class BossPvpShared internal static class BossPvpService
{ {
private const uint GroupId = 51; private const uint GroupId = 51;
private const uint ActivitySubId = 0; private const uint ActivitySubId = 0;
@@ -27,9 +26,8 @@ internal static class BossPvpShared
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
}; };
public static async ValueTask<(object Response, NtfSyncPlayer Sync)> HandleGetOpenIdAsync(Connection connection) public static async ValueTask<(object Response, NtfSyncPlayer Sync)> HandleGetOpenIdAsync(PlayerInstance player)
{ {
var player = connection.Player!;
await EnsureBossLineupsAsync(player); await EnsureBossLineupsAsync(player);
var sync = new NtfSyncPlayer(); var sync = new NtfSyncPlayer();

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_EnterLevel.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_EnterLevel")] [CallGSApi("BossPvpLogic_EnterLevel")]
@@ -5,7 +7,7 @@ public class BossPvpLogic_EnterLevel : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var response = BossPvpShared.HandleEnterLevel(param); var response = BossPvpService.HandleEnterLevel(param);
await CallGSRouter.SendScript(connection, "BossPvpLogic_EnterLevel", System.Text.Json.JsonSerializer.Serialize(response)); await CallGSRouter.SendScript(connection, "BossPvpLogic_EnterLevel", System.Text.Json.JsonSerializer.Serialize(response));
} }
} }

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_GetOpenID.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_GetOpenID")] [CallGSApi("BossPvpLogic_GetOpenID")]
@@ -5,7 +7,7 @@ public class BossPvpLogic_GetOpenID : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var (response, sync) = await BossPvpShared.HandleGetOpenIdAsync(connection); var (response, sync) = await BossPvpService.HandleGetOpenIdAsync(connection.Player!);
await CallGSRouter.SendScript(connection, "BossPvpLogic_GetOpenID", System.Text.Json.JsonSerializer.Serialize(response), sync); await CallGSRouter.SendScript(connection, "BossPvpLogic_GetOpenID", System.Text.Json.JsonSerializer.Serialize(response), sync);
} }
} }

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_GetReward.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_GetReward")] [CallGSApi("BossPvpLogic_GetReward")]
@@ -5,7 +7,7 @@ public class BossPvpLogic_GetReward : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var response = BossPvpShared.HandleGetReward(param); var response = BossPvpService.HandleGetReward(param);
await CallGSRouter.SendScript(connection, "BossPvpLogic_GetReward", System.Text.Json.JsonSerializer.Serialize(response)); await CallGSRouter.SendScript(connection, "BossPvpLogic_GetReward", System.Text.Json.JsonSerializer.Serialize(response));
} }
} }

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_LevelFail.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_LevelFail")] [CallGSApi("BossPvpLogic_LevelFail")]
@@ -6,7 +8,7 @@ public class BossPvpLogic_LevelFail : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var node = System.Text.Json.Nodes.JsonNode.Parse(param); var node = System.Text.Json.Nodes.JsonNode.Parse(param);
var (response, sync) = BossPvpShared.HandleFail(connection.Player!, node); var (response, sync) = BossPvpService.HandleFail(connection.Player!, node);
await CallGSRouter.SendScript(connection, "BossPvpLogic_LevelFail", response.ToJsonString(), sync); await CallGSRouter.SendScript(connection, "BossPvpLogic_LevelFail", response.ToJsonString(), sync);
} }
} }

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_LevelMopup.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_LevelMopup")] [CallGSApi("BossPvpLogic_LevelMopup")]
@@ -5,7 +7,7 @@ public class BossPvpLogic_LevelMopup : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var (response, sync) = BossPvpShared.HandleMopup(connection.Player!, param); var (response, sync) = BossPvpService.HandleMopup(connection.Player!, param);
await CallGSRouter.SendScript(connection, "BossPvpLogic_LevelMopup", System.Text.Json.JsonSerializer.Serialize(response), sync); await CallGSRouter.SendScript(connection, "BossPvpLogic_LevelMopup", System.Text.Json.JsonSerializer.Serialize(response), sync);
} }
} }

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_LevelSettlement.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_LevelSettlement")] [CallGSApi("BossPvpLogic_LevelSettlement")]
@@ -6,7 +8,7 @@ public class BossPvpLogic_LevelSettlement : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var node = System.Text.Json.Nodes.JsonNode.Parse(param); var node = System.Text.Json.Nodes.JsonNode.Parse(param);
var (response, sync) = BossPvpShared.HandleSettlement(connection.Player!, node); var (response, sync) = BossPvpService.HandleSettlement(connection.Player!, node);
await CallGSRouter.SendScript(connection, "BossPvpLogic_LevelSettlement", response.ToJsonString(), sync); await CallGSRouter.SendScript(connection, "BossPvpLogic_LevelSettlement", response.ToJsonString(), sync);
} }
} }

4
GameServer/Server/CallGS/Handlers/BossPvp/BossPvpLogic_Record.cs
View File

@@ -1,3 +1,5 @@
using MikuSB.GameServer.Game.BossPvp;
namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; namespace MikuSB.GameServer.Server.CallGS.Handlers.BossPvp;
[CallGSApi("BossPvpLogic_Record")] [CallGSApi("BossPvpLogic_Record")]
@@ -5,7 +7,7 @@ public class BossPvpLogic_Record : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var (response, sync) = BossPvpShared.HandleRecord(connection.Player!, param); var (response, sync) = BossPvpService.HandleRecord(connection.Player!, param);
await CallGSRouter.SendScript(connection, "BossPvpLogic_Record", System.Text.Json.JsonSerializer.Serialize(response), sync); await CallGSRouter.SendScript(connection, "BossPvpLogic_Record", System.Text.Json.JsonSerializer.Serialize(response), sync);
} }
} }

6
GameServer/Server/CallGS/Handlers/Chapter/Chapter_DealLevelSettlement.cs
View File

@@ -1,7 +1,7 @@
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using MikuSB.GameServer.Server.CallGS.Handlers.BossPvp; using MikuSB.GameServer.Game.BossPvp;
using MikuSB.Proto; using MikuSB.Proto;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Chapter; namespace MikuSB.GameServer.Server.CallGS.Handlers.Chapter;
@@ -44,14 +44,14 @@ public class Chapter_DealLevelSettlement : ICallGSHandler
if (string.Equals(sCmd, "BossPvpLogic_LevelSettlement", StringComparison.Ordinal)) if (string.Equals(sCmd, "BossPvpLogic_LevelSettlement", StringComparison.Ordinal))
{ {
var (response, sync) = BossPvpShared.HandleSettlement(connection.Player!, tbParam); var (response, sync) = BossPvpService.HandleSettlement(connection.Player!, tbParam);
extraSync = sync; extraSync = sync;
return response; return response;
} }
if (string.Equals(sCmd, "BossPvpLogic_LevelFail", StringComparison.Ordinal)) if (string.Equals(sCmd, "BossPvpLogic_LevelFail", StringComparison.Ordinal))
{ {
var (response, sync) = BossPvpShared.HandleFail(connection.Player!, tbParam); var (response, sync) = BossPvpService.HandleFail(connection.Player!, tbParam);
extraSync = sync; extraSync = sync;
return response; return response;
} }