Update version.txt

Common/Data/Excel/TowerEventLevelExcel.cs

@@ -0,0 +1,20 @@
+using Newtonsoft.Json;
+
+namespace MikuSB.Data.Excel;
+
+[ResourceEntity("challenge/tower_event/level.json")]
+public class TowerEventLevelExcel : ExcelResource
+{
+    [JsonProperty("ID")] public uint ID { get; set; }
+    [JsonProperty("MapID")] public uint MapID { get; set; }
+    [JsonProperty("FightID")] public uint FightID { get; set; }
+    [JsonProperty("TaskPath")] public string TaskPath { get; set; } = "";
+    [JsonProperty("ConsumeVigor")] public List<int> ConsumeVigor { get; set; } = [];
+
+    public override uint GetId() => ID;
+
+    public override void Loaded()
+    {
+        GameData.TowerEventLevelData[ID] = this;
+    }
+}

Common/Data/GameData.cs

@@ -38,6 +38,7 @@ public static class GameData
     public static Dictionary<uint, Dictionary<int, ClimbTowerAwardExcel>> ClimbTowerAwardData { get; private set; } = [];
     public static Dictionary<uint, ClimbTowerLevelOrderExcel> ClimbTowerLevelOrderData { get; private set; } = [];
     public static Dictionary<uint, TowerLevelExcel> TowerLevelData { get; private set; } = [];
+    public static Dictionary<uint, TowerEventLevelExcel> TowerEventLevelData { get; private set; } = [];
     public static Dictionary<uint, OtherItemExcel> OtherItemData { get; private set; } = [];
     public static Dictionary<uint, ProfileExcel> ProfileData { get; private set; } = [];
     public static Dictionary<uint, CardSkinPartsExcel> CardSkinPartsData { get; private set; } = [];

GameServer/Server/CallGS/Handlers/Chapter/Chapter_DealLevelSettlement.cs

@@ -45,7 +45,8 @@ public class Chapter_DealLevelSettlement : ICallGSHandler
 
         if (string.Equals(sCmd, "BossPvpLogic_LevelSettlement", StringComparison.Ordinal))
         {
-            var (response, sync) = BossPvpService.HandleSettlement(connection.Player!, tbParam);
+            var normalized = NormalizeBossPvpSettlement(tbParam);
+            var (response, sync) = BossPvpService.HandleSettlement(connection.Player!, normalized);
             extraSync = sync;
             return response;
         }
@@ -64,8 +65,31 @@ public class Chapter_DealLevelSettlement : ICallGSHandler
             return response;
         }
 
+        if (string.Equals(sCmd, "TowerEventChapter_LevelSettlement", StringComparison.Ordinal))
+        {
+            var (response, sync) = TowerEventChapter_LevelSettlement.HandleSettlement(connection.Player!, tbParam);
+            extraSync = sync;
+            return response;
+        }
+
         return tbParam?.DeepClone() ?? new JsonObject();
     }
+
+    private static JsonNode? NormalizeBossPvpSettlement(JsonNode? tbParam)
+    {
+        if (tbParam is not JsonObject obj)
+            return tbParam;
+
+        var clone = obj.DeepClone() as JsonObject ?? obj;
+        if (clone.TryGetPropertyValue("ResidueTime", out var residueNode) &&
+            residueNode is JsonValue residueValue &&
+            residueValue.TryGetValue<double>(out var residueTime))
+        {
+            clone["ResidueTime"] = (int)Math.Max(0, Math.Round(residueTime, MidpointRounding.AwayFromZero));
+        }
+
+        return clone;
+    }
 }
 
 internal sealed class DealLevelSettlementParam

GameServer/Server/CallGS/Handlers/Lineup/Lineups_Update.cs

@@ -0,0 +1,43 @@
+using MikuSB.Database;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MikuSB.GameServer.Server.CallGS.Handlers.Lineup;
+
+[CallGSApi("Lineups_Update")]
+public class Lineups_Update : ICallGSHandler
+{
+    public async Task Handle(Connection connection, string param, ushort seqNo)
+    {
+        var req = JsonSerializer.Deserialize<List<LineupUpdateBatchParam>>(param);
+        if (req == null)
+        {
+            await CallGSRouter.SendScript(connection, "UpdateLineup", "{}");
+            return;
+        }
+
+        foreach (var lineup in req)
+        {
+            if (lineup == null)
+                continue;
+
+            await connection.Player!.LineupManager.UpdateLineup(
+                lineup.Index,
+                lineup.Member1,
+                lineup.Member2,
+                lineup.Member3);
+        }
+
+        DatabaseHelper.SaveDatabaseType(connection.Player!.LineupManager.LineupData);
+        await CallGSRouter.SendScript(connection, "UpdateLineup", "{}");
+    }
+}
+
+internal sealed class LineupUpdateBatchParam
+{
+    [JsonPropertyName("name")] public string Name { get; set; } = "";
+    [JsonPropertyName("index")] public int Index { get; set; }
+    [JsonPropertyName("member1")] public uint Member1 { get; set; }
+    [JsonPropertyName("member2")] public uint Member2 { get; set; }
+    [JsonPropertyName("member3")] public uint Member3 { get; set; }
+}

GameServer/Server/CallGS/Handlers/Tower/TowerEventChapter_EnterLevel.cs

@@ -0,0 +1,39 @@
+using MikuSB.Data;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MikuSB.GameServer.Server.CallGS.Handlers.Tower;
+
+[CallGSApi("TowerEventChapter_EnterLevel")]
+public class TowerEventChapter_EnterLevel : ICallGSHandler
+{
+    private static readonly Random Random = new();
+
+    public async Task Handle(Connection connection, string param, ushort seqNo)
+    {
+        var req = JsonSerializer.Deserialize<TowerEventEnterLevelParam>(param);
+        if (req == null || req.LevelId == 0 || req.TeamId <= 0)
+        {
+            await CallGSRouter.SendScript(connection, "TowerEventChapter_EnterLevel", "{\"sErr\":\"error.BadParam\"}");
+            return;
+        }
+
+        if (!GameData.TowerEventLevelData.ContainsKey((uint)req.LevelId))
+        {
+            await CallGSRouter.SendScript(connection, "TowerEventChapter_EnterLevel", "{\"sErr\":\"error.BadParam\"}");
+            return;
+        }
+
+        var rsp = $"{{\"nSeed\":{Random.Next(1, 1_000_000_000)}}}";
+        await CallGSRouter.SendScript(connection, "TowerEventChapter_EnterLevel", rsp);
+    }
+}
+
+internal sealed class TowerEventEnterLevelParam
+{
+    [JsonPropertyName("nID")]
+    public int LevelId { get; set; }
+
+    [JsonPropertyName("nTeamID")]
+    public int TeamId { get; set; }
+}

GameServer/Server/CallGS/Handlers/Tower/TowerEventChapter_LevelSettlement.cs

@@ -0,0 +1,82 @@
+using MikuSB.Database;
+using MikuSB.Database.Player;
+using MikuSB.GameServer.Game.Player;
+using MikuSB.Proto;
+using MikuSB.Util;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace MikuSB.GameServer.Server.CallGS.Handlers.Tower;
+
+[CallGSApi("TowerEventChapter_LevelSettlement")]
+public class TowerEventChapter_LevelSettlement : ICallGSHandler
+{
+    private const uint LevelStateGroupId = 21;
+    private const uint LaunchPassGroupId = 22;
+    private const uint PassedFlagMask = (1u << 8) | 0b111u;
+    private static readonly Logger Logger = new("TowerEvent");
+
+    public async Task Handle(Connection connection, string param, ushort seqNo)
+    {
+        var (response, sync) = HandleSettlement(connection.Player!, JsonNode.Parse(param));
+        await CallGSRouter.SendScript(connection, "TowerEventChapter_LevelSettlement", response.ToJsonString(), sync);
+    }
+
+    public static (JsonNode Response, NtfSyncPlayer Sync) HandleSettlement(PlayerInstance player, JsonNode? tbParam)
+    {
+        var req = tbParam?.Deserialize<TowerEventSettlementParam>();
+        if (req == null || req.LevelId == 0 || req.ChapterId == 0)
+        {
+            Logger.Error($"Invalid tower event settlement payload: {tbParam?.ToJsonString() ?? "null"}");
+            return (new JsonObject { ["sErr"] = "error.BadParam" }, new NtfSyncPlayer());
+        }
+
+        var sync = new NtfSyncPlayer();
+
+        var levelStateAttr = GetOrCreateAttr(player.Data, LevelStateGroupId, (uint)req.LevelId);
+        levelStateAttr.Val |= PassedFlagMask;
+        SyncAttr(sync, player, levelStateAttr);
+
+        var passAttr = GetOrCreateAttr(player.Data, LaunchPassGroupId, (uint)req.LevelId);
+        passAttr.Val = Math.Max(1u, passAttr.Val + 1);
+        SyncAttr(sync, player, passAttr);
+
+        Logger.Info(
+            $"TowerEvent settlement saved. uid={player.Uid} chapterId={req.ChapterId} levelId={req.LevelId} " +
+            $"levelStateVal={levelStateAttr.Val} passVal={passAttr.Val}");
+
+        DatabaseHelper.SaveDatabaseType(player.Data);
+        return (new JsonObject(), sync);
+    }
+
+    private static PlayerAttr GetOrCreateAttr(PlayerGameData data, uint gid, uint sid)
+    {
+        var attr = data.Attrs.FirstOrDefault(x => x.Gid == gid && x.Sid == sid);
+        if (attr != null)
+            return attr;
+
+        attr = new PlayerAttr
+        {
+            Gid = gid,
+            Sid = sid
+        };
+        data.Attrs.Add(attr);
+        return attr;
+    }
+
+    private static void SyncAttr(NtfSyncPlayer sync, PlayerInstance player, PlayerAttr attr)
+    {
+        sync.Custom[player.ToPackedAttrKey(attr.Gid, attr.Sid)] = attr.Val;
+        sync.Custom[player.ToShiftedAttrKey(attr.Gid, attr.Sid)] = attr.Val;
+    }
+}
+
+internal sealed class TowerEventSettlementParam
+{
+    [JsonPropertyName("nID")]
+    public int LevelId { get; set; }
+
+    [JsonPropertyName("nChapterID")]
+    public int ChapterId { get; set; }
+}

version.txt

@@ -1 +1 @@
-v=4.0
+v=4.1