Compare commits

..

4 Commits

Author SHA1 Message Date
Kei-Luna
589f7d6340 Update version.txt 2026-05-23 20:02:23 +09:00
Kei-Luna
196b03718c TowerLevel_LevelSettlement ClimbTowerLogic_RecordProgres 2026-05-23 20:00:15 +09:00
Kei-Luna
b916ab5dfc ExtendFightDynamicLog ExtendFightLog 2026-05-23 19:51:16 +09:00
Kei-Luna
1dca65f91a ClimbTowerLogic_CheckCycleLevel TowerLevel_EnterLevel 2026-05-23 19:03:52 +09:00
11 changed files with 662 additions and 1 deletions

View File

@@ -0,0 +1,57 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Globalization;
namespace MikuSB.Data.Excel;
[ResourceEntity("challenge/climbtower/climb_tower_time.json")]
public class ClimbTowerTimeExcel : ExcelResource
{
[JsonProperty("ID")] public uint ID { get; set; }
[JsonProperty("StartTime")] public string StartTime { get; set; } = "";
[JsonProperty("EndTime")] public string EndTime { get; set; } = "";
[JsonProperty("Level1")] public List<List<uint>> Level1 { get; set; } = [];
[JsonProperty("Level2")] public JToken? Level2Raw { get; set; }
public override uint GetId() => ID;
public override void Loaded()
{
GameData.ClimbTowerTimeData[ID] = this;
}
public IReadOnlyList<IReadOnlyList<uint>> GetLevelGroups(int type)
{
if (type == 1)
return Level1;
if (Level2Raw == null)
return [];
if (Level2Raw.Type == JTokenType.Array)
{
return Level2Raw
.Children()
.OfType<JArray>()
.Select(x => (IReadOnlyList<uint>)x.Values<uint>().ToList())
.ToList();
}
if (Level2Raw.Type == JTokenType.Object)
{
return Level2Raw
.Children<JProperty>()
.Select(x => new
{
Key = uint.TryParse(x.Name, CultureInfo.InvariantCulture, out var key) ? key : 0u,
Value = x.Value.Type == JTokenType.Integer ? x.Value.Value<uint>() : 0u
})
.Where(x => x.Key > 0 && x.Value > 0)
.OrderBy(x => x.Key)
.Select(x => (IReadOnlyList<uint>)new List<uint> { x.Key, x.Value })
.ToList();
}
return [];
}
}

View File

@@ -0,0 +1,20 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("challenge/climbtower/level.json")]
public class TowerLevelExcel : 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.TowerLevelData[ID] = this;
}
}

View File

@@ -33,6 +33,8 @@ public static class GameData
public static Dictionary<uint, BossPvpBossChallengeExcel> BossPvpBossChallengeData { get; private set; } = [];
public static Dictionary<uint, BossPvpBossExcel> BossPvpBossData { get; private set; } = [];
public static Dictionary<uint, BossPvpNumExcel> BossPvpNumData { get; private set; } = [];
public static Dictionary<uint, ClimbTowerTimeExcel> ClimbTowerTimeData { get; private set; } = [];
public static Dictionary<uint, TowerLevelExcel> TowerLevelData { get; private set; } = [];
public static Dictionary<uint, ProfileExcel> ProfileData { get; private set; } = [];
public static Dictionary<uint, CardSkinPartsExcel> CardSkinPartsData { get; private set; } = [];
public static Dictionary<uint, CallItemExcel> CallItemData { get; private set; } = [];

View File

@@ -3,6 +3,7 @@ using System.Text.Json.Nodes;
using System.Text.Json.Serialization;
using MikuSB.GameServer.Game.BossPvp;
using MikuSB.Proto;
using MikuSB.GameServer.Server.CallGS.Handlers.Tower;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Chapter;
@@ -56,6 +57,13 @@ public class Chapter_DealLevelSettlement : ICallGSHandler
return response;
}
if (string.Equals(sCmd, "TowerLevel_LevelSettlement", StringComparison.Ordinal))
{
var (response, sync) = TowerLevel_LevelSettlement.HandleSettlement(connection.Player!, tbParam);
extraSync = sync;
return response;
}
return tbParam?.DeepClone() ?? new JsonObject();
}
}

View File

@@ -0,0 +1,10 @@
namespace MikuSB.GameServer.Server.CallGS.Handlers.Misc;
[CallGSApi("ExtendFightDynamicLog")]
public class ExtendFightDynamicLog : ICallGSHandler
{
public Task Handle(Connection connection, string param, ushort seqNo)
{
return Task.CompletedTask;
}
}

View File

@@ -0,0 +1,10 @@
namespace MikuSB.GameServer.Server.CallGS.Handlers.Misc;
[CallGSApi("ExtendFightLog")]
public class ExtendFightLog : ICallGSHandler
{
public Task Handle(Connection connection, string param, ushort seqNo)
{
return Task.CompletedTask;
}
}

View File

@@ -0,0 +1,118 @@
using MikuSB.Data;
using MikuSB.Data.Excel;
using MikuSB.Database;
using MikuSB.Database.Player;
using MikuSB.GameServer.Game.Player;
using MikuSB.Proto;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Tower;
[CallGSApi("ClimbTowerLogic_CheckCycleLevel")]
public class ClimbTowerLogic_CheckCycleLevel : ICallGSHandler
{
private const uint TowerGroupId = 3;
private const uint TimeSubId = 1;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var current = ResolveCurrentCycle(GameData.ClimbTowerTimeData.Values, DateTime.Now);
if (current == null)
{
await CallGSRouter.SendScript(connection, "ClimbTowerLogic_CheckCycleLevel", "{}");
return;
}
var currentTimeId = GetAttr(player.Data, TowerGroupId, TimeSubId);
var sync = new NtfSyncPlayer();
if (currentTimeId != current.ID)
{
ResetTowerAttrs(player, sync);
SetAttr(player.Data, TowerGroupId, TimeSubId, current.ID, sync, player);
DatabaseHelper.SaveDatabaseType(player.Data);
}
await CallGSRouter.SendScript(connection, "ClimbTowerLogic_CheckCycleLevel", $$"""{"timeID":{{current.ID}}}""", sync);
}
private static ClimbTowerTimeExcel? ResolveCurrentCycle(IEnumerable<ClimbTowerTimeExcel> configs, DateTime now)
{
var parsed = configs
.Select(x => new
{
Config = x,
Start = ParseConfigTime(x.StartTime),
End = ParseConfigTime(x.EndTime)
})
.Where(x => x.Start.HasValue && x.End.HasValue)
.OrderBy(x => x.Start)
.ToList();
var current = parsed.FirstOrDefault(x => x.Start <= now && now < x.End);
if (current != null)
return current.Config;
var latestStarted = parsed.LastOrDefault(x => x.Start <= now);
if (latestStarted != null)
return latestStarted.Config;
return parsed.FirstOrDefault()?.Config;
}
private static DateTime? ParseConfigTime(string? raw)
{
if (string.IsNullOrWhiteSpace(raw))
return null;
var normalized = raw.Trim().Trim('[', ']');
if (normalized.Length != 12)
return null;
return DateTime.TryParseExact(
normalized,
"yyyyMMddHHmm",
System.Globalization.CultureInfo.InvariantCulture,
System.Globalization.DateTimeStyles.None,
out var value)
? value
: null;
}
private static uint GetAttr(PlayerGameData data, uint gid, uint sid)
{
return data.Attrs.FirstOrDefault(x => x.Gid == gid && x.Sid == sid)?.Val ?? 0;
}
private static void ResetTowerAttrs(PlayerInstance player, NtfSyncPlayer sync)
{
var towerAttrs = player.Data.Attrs
.Where(x => x.Gid == TowerGroupId)
.ToList();
foreach (var attr in towerAttrs)
{
sync.Custom[player.ToPackedAttrKey(attr.Gid, attr.Sid)] = 0;
sync.Custom[player.ToShiftedAttrKey(attr.Gid, attr.Sid)] = 0;
}
player.Data.Attrs.RemoveAll(x => x.Gid == TowerGroupId);
}
private static void SetAttr(PlayerGameData data, uint gid, uint sid, uint value, NtfSyncPlayer sync, PlayerInstance player)
{
var attr = data.Attrs.FirstOrDefault(x => x.Gid == gid && x.Sid == sid);
if (attr == null)
{
attr = new PlayerAttr
{
Gid = gid,
Sid = sid
};
data.Attrs.Add(attr);
}
attr.Val = value;
sync.Custom[player.ToPackedAttrKey(gid, sid)] = value;
sync.Custom[player.ToShiftedAttrKey(gid, sid)] = value;
}
}

View File

@@ -0,0 +1,219 @@
using MikuSB.Data;
using MikuSB.Data.Excel;
using MikuSB.Database;
using MikuSB.Database.Player;
using MikuSB.GameServer.Game.Player;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Tower;
[CallGSApi("ClimbTowerLogic_RecordProgres")]
public class ClimbTowerLogic_RecordProgres : ICallGSHandler
{
private const uint TowerGroupId = 3;
private const uint BasicProgressSid = 2;
private const uint AdvancedProgressSid = 3;
private const uint LevelStateSidBase = 10000;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<ClimbTowerRecordProgressParam>(param);
if (req == null || req.LevelId == 0 || req.Area <= 0)
{
await CallGSRouter.SendScript(connection, "ClimbTowerLogic_RecordProgres", "{\"sErr\":\"error.BadParam\"}");
return;
}
var cycle = ResolveCurrentCycle(GameData.ClimbTowerTimeData.Values, DateTime.Now);
if (cycle == null)
{
await CallGSRouter.SendScript(connection, "ClimbTowerLogic_RecordProgres", "{\"sErr\":\"error.BadParam\"}");
return;
}
var towerType = ResolveTowerType(cycle, (uint)req.LevelId);
if (towerType == 0)
{
await CallGSRouter.SendScript(connection, "ClimbTowerLogic_RecordProgres", "{\"sErr\":\"error.BadParam\"}");
return;
}
var sync = new NtfSyncPlayer();
var levelStateSid = LevelStateSidBase + (uint)req.LevelId;
var levelState = GetOrCreateAttr(player.Data, TowerGroupId, levelStateSid);
levelState.Val = MergeAreaStars(levelState.Val, req.Area, req.StarMask);
SyncAttr(sync, player, levelState);
var progressSid = towerType == 1 ? BasicProgressSid : AdvancedProgressSid;
var progressAttr = GetOrCreateAttr(player.Data, TowerGroupId, progressSid);
progressAttr.Val = req.Area >= 3 ? 0u : PackProgress((uint)req.LevelId, (uint)(req.Area + 1));
SyncAttr(sync, player, progressAttr);
if (req.RoleHP.Count > 0 || req.TeamEnergy.HasValue)
{
SaveRoleState(player, sync, towerType, req.RoleHP, req.TeamEnergy.GetValueOrDefault());
}
DatabaseHelper.SaveDatabaseType(player.Data);
await CallGSRouter.SendScript(connection, "ClimbTowerLogic_RecordProgres", "{}", sync);
}
private static void SaveRoleState(
PlayerInstance player,
NtfSyncPlayer sync,
int towerType,
List<List<int>> roleHp,
int teamEnergy)
{
var slotStart = towerType == 2 ? 4u : 1u;
for (var slot = slotStart; slot < slotStart + 3; slot++)
{
var templateAttr = GetOrCreateAttr(player.Data, TowerGroupId, slot * 10);
var hpAttr = GetOrCreateAttr(player.Data, TowerGroupId, slot * 10 + 1);
templateAttr.Val = 0;
hpAttr.Val = 0;
SyncAttr(sync, player, templateAttr);
SyncAttr(sync, player, hpAttr);
}
for (var i = 0; i < Math.Min(roleHp.Count, 3); i++)
{
var row = roleHp[i];
if (row == null || row.Count < 2)
continue;
var slot = slotStart + (uint)i;
var templateAttr = GetOrCreateAttr(player.Data, TowerGroupId, slot * 10);
var hpAttr = GetOrCreateAttr(player.Data, TowerGroupId, slot * 10 + 1);
templateAttr.Val = (uint)Math.Max(0, row[0]);
hpAttr.Val = (uint)Math.Max(0, row[1]);
SyncAttr(sync, player, templateAttr);
SyncAttr(sync, player, hpAttr);
}
var energyAttr = GetOrCreateAttr(player.Data, TowerGroupId, slotStart * 10 + 2);
energyAttr.Val = (uint)Math.Max(0, teamEnergy);
SyncAttr(sync, player, energyAttr);
}
private static uint MergeAreaStars(uint currentValue, int area, int starMask)
{
var areaIndex = Math.Clamp(area, 1, 3) - 1;
var result = currentValue;
for (var i = 0; i < 3; i++)
{
if (((starMask >> i) & 1) == 0)
continue;
var bitIndex = areaIndex * 3 + i;
result |= 1u << bitIndex;
}
return result;
}
private static uint PackProgress(uint levelId, uint area) => (area << 24) | (levelId & 0x00FF_FFFF);
private static int ResolveTowerType(ClimbTowerTimeExcel cycle, uint levelId)
{
if (ContainsLevel(cycle.GetLevelGroups(1), levelId))
return 1;
if (ContainsLevel(cycle.GetLevelGroups(2), levelId))
return 2;
return 0;
}
private static bool ContainsLevel(IEnumerable<IReadOnlyList<uint>> groups, uint levelId)
{
return groups.Any(group => group.Any(id => id == levelId));
}
private static ClimbTowerTimeExcel? ResolveCurrentCycle(IEnumerable<ClimbTowerTimeExcel> configs, DateTime now)
{
var parsed = configs
.Select(x => new
{
Config = x,
Start = ParseConfigTime(x.StartTime),
End = ParseConfigTime(x.EndTime)
})
.Where(x => x.Start.HasValue && x.End.HasValue)
.OrderBy(x => x.Start)
.ToList();
var current = parsed.FirstOrDefault(x => x.Start <= now && now < x.End);
if (current != null)
return current.Config;
var latestStarted = parsed.LastOrDefault(x => x.Start <= now);
if (latestStarted != null)
return latestStarted.Config;
return parsed.FirstOrDefault()?.Config;
}
private static DateTime? ParseConfigTime(string? raw)
{
if (string.IsNullOrWhiteSpace(raw))
return null;
var normalized = raw.Trim().Trim('[', ']');
if (normalized.Length != 12)
return null;
return DateTime.TryParseExact(
normalized,
"yyyyMMddHHmm",
System.Globalization.CultureInfo.InvariantCulture,
System.Globalization.DateTimeStyles.None,
out var value)
? value
: null;
}
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 ClimbTowerRecordProgressParam
{
[JsonPropertyName("nID")]
public int LevelId { get; set; }
[JsonPropertyName("nArea")]
public int Area { get; set; }
[JsonPropertyName("nStar")]
public int StarMask { get; set; }
[JsonPropertyName("tbRoleHP")]
public List<List<int>> RoleHP { get; set; } = [];
[JsonPropertyName("nTeamEnergy")]
public int? TeamEnergy { get; set; }
}

View File

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

View File

@@ -0,0 +1,178 @@
using MikuSB.Data;
using MikuSB.Data.Excel;
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("TowerLevel_LevelSettlement")]
public class TowerLevel_LevelSettlement : ICallGSHandler
{
private static readonly Logger Logger = new("Tower");
private const uint TowerGroupId = 3;
private const uint LaunchPassGroupId = 22;
private const uint BasicProgressSid = 2;
private const uint AdvancedProgressSid = 3;
private const uint LevelStateSidBase = 10000;
private const int FinalArea = 3;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var (response, sync) = HandleSettlement(connection.Player!, JsonNode.Parse(param));
await CallGSRouter.SendScript(connection, "TowerLevel_LevelSettlement", response.ToJsonString(), sync);
}
public static (JsonNode Response, NtfSyncPlayer Sync) HandleSettlement(PlayerInstance player, JsonNode? tbParam)
{
var req = tbParam?.Deserialize<TowerLevelSettlementParam>();
if (req == null || req.TowerId == 0 || req.LevelId == 0)
{
Logger.Error($"Invalid tower settlement payload: {tbParam?.ToJsonString() ?? "null"}");
return (new JsonObject { ["sErr"] = "error.BadParam" }, new NtfSyncPlayer());
}
var cycle = ResolveCurrentCycle(GameData.ClimbTowerTimeData.Values, DateTime.Now);
if (cycle == null)
return (new JsonObject { ["sErr"] = "error.BadParam" }, new NtfSyncPlayer());
var towerType = ResolveTowerType(cycle, (uint)req.TowerId);
if (towerType == 0)
return (new JsonObject { ["sErr"] = "error.BadParam" }, new NtfSyncPlayer());
var sync = new NtfSyncPlayer();
var levelStateSid = LevelStateSidBase + (uint)req.TowerId;
var levelState = GetOrCreateAttr(player.Data, TowerGroupId, levelStateSid);
levelState.Val = MergeAreaStars(levelState.Val, FinalArea, req.StarMask);
SyncAttr(sync, player, levelState);
var progressSid = towerType == 1 ? BasicProgressSid : AdvancedProgressSid;
var progressAttr = GetOrCreateAttr(player.Data, TowerGroupId, progressSid);
progressAttr.Val = 0;
SyncAttr(sync, player, progressAttr);
var passAttr = GetOrCreateAttr(player.Data, LaunchPassGroupId, (uint)req.LevelId);
passAttr.Val = Math.Max(1u, passAttr.Val + 1);
SyncAttr(sync, player, passAttr);
Logger.Info(
$"Tower settlement saved. uid={player.Uid} towerId={req.TowerId} levelId={req.LevelId} starMask={req.StarMask} " +
$"towerStateSid={levelStateSid} towerStateVal={levelState.Val} progressSid={progressSid} passVal={passAttr.Val}");
DatabaseHelper.SaveDatabaseType(player.Data);
return (new JsonObject(), sync);
}
private static uint MergeAreaStars(uint currentValue, int area, int starMask)
{
var areaIndex = Math.Clamp(area, 1, 3) - 1;
var result = currentValue;
for (var i = 0; i < 3; i++)
{
if (((starMask >> i) & 1) == 0)
continue;
var bitIndex = areaIndex * 3 + i;
result |= 1u << bitIndex;
}
return result;
}
private static int ResolveTowerType(ClimbTowerTimeExcel cycle, uint levelId)
{
if (ContainsLevel(cycle.GetLevelGroups(1), levelId))
return 1;
if (ContainsLevel(cycle.GetLevelGroups(2), levelId))
return 2;
return 0;
}
private static bool ContainsLevel(IEnumerable<IReadOnlyList<uint>> groups, uint levelId)
{
return groups.Any(group => group.Any(id => id == levelId));
}
private static ClimbTowerTimeExcel? ResolveCurrentCycle(IEnumerable<ClimbTowerTimeExcel> configs, DateTime now)
{
var parsed = configs
.Select(x => new
{
Config = x,
Start = ParseConfigTime(x.StartTime),
End = ParseConfigTime(x.EndTime)
})
.Where(x => x.Start.HasValue && x.End.HasValue)
.OrderBy(x => x.Start)
.ToList();
var current = parsed.FirstOrDefault(x => x.Start <= now && now < x.End);
if (current != null)
return current.Config;
var latestStarted = parsed.LastOrDefault(x => x.Start <= now);
if (latestStarted != null)
return latestStarted.Config;
return parsed.FirstOrDefault()?.Config;
}
private static DateTime? ParseConfigTime(string? raw)
{
if (string.IsNullOrWhiteSpace(raw))
return null;
var normalized = raw.Trim().Trim('[', ']');
if (normalized.Length != 12)
return null;
return DateTime.TryParseExact(
normalized,
"yyyyMMddHHmm",
System.Globalization.CultureInfo.InvariantCulture,
System.Globalization.DateTimeStyles.None,
out var value)
? value
: null;
}
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(MikuSB.Proto.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 TowerLevelSettlementParam
{
[JsonPropertyName("nID")]
public int LevelId { get; set; }
[JsonPropertyName("nTowerID")]
public int TowerId { get; set; }
[JsonPropertyName("nStar")]
public int StarMask { get; set; }
}

View File

@@ -1 +1 @@
v=3.9
v=4.0