Compare commits

..

4 Commits

Author SHA1 Message Date
Kei-Luna
f7814b0537 Adds a dailybuff to Paradox. 2026-05-02 09:46:47 +09:00
Kei-Luna
2fdda3157f Unlock all of Paradox's talents 2026-05-02 09:13:04 +09:00
Kei-Luna
f07c5f77fd Unlock all difficulty levels of Paradox 2026-05-02 08:42:57 +09:00
Naruse
2883ac3d41 add weapon parts 2026-04-30 17:18:23 +08:00
19 changed files with 436 additions and 10 deletions

View File

@@ -0,0 +1,18 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("dailybuff.json")]
public class Rogue3DDailyBuffExcel : ExcelResource
{
[JsonProperty("ID")] public uint Id { get; set; }
[JsonProperty("GroupID")] public uint GroupId { get; set; }
[JsonProperty("ScoreBuffID")] public uint ScoreBuffId { get; set; }
public override uint GetId() => Id;
public override void Loaded()
{
GameData.Rogue3DDailyBuffData[Id] = this;
}
}

View File

@@ -0,0 +1,19 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("server_10_season.json")]
public class Rogue3DSeasonExcel : ExcelResource
{
[JsonProperty("SeasonID")] public uint SeasonId { get; set; }
[JsonProperty("Type")] public int Type { get; set; }
[JsonProperty("OpenTime")] public string OpenTime { get; set; } = "";
[JsonProperty("CloseTime")] public string CloseTime { get; set; } = "";
public override uint GetId() => SeasonId;
public override void Loaded()
{
GameData.Rogue3DSeasonData[SeasonId] = this;
}
}

View File

@@ -0,0 +1,31 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("server_03_talent.json")]
public class Rogue3DTalentExcel : ExcelResource
{
[JsonProperty("TalentID")] public uint TalentId { get; set; }
[JsonProperty("UnlockCondition")] private object? UnlockConditionRaw { get; set; }
[JsonIgnore] public uint UnlockCondition { get; private set; }
public override uint GetId() => TalentId;
public override void Loaded()
{
UnlockCondition = ParseUnlockCondition(UnlockConditionRaw);
GameData.Rogue3DTalentData[TalentId] = this;
}
private static uint ParseUnlockCondition(object? raw)
{
return raw switch
{
null => 0,
long value when value > 0 => (uint)value,
int value when value > 0 => (uint)value,
string text when uint.TryParse(text, out var value) => value,
_ => 0
};
}
}

View File

@@ -0,0 +1,24 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("weapon_parts.json")]
public class WeaponPartsExcel : ExcelResource
{
public uint Genre { get; set; }
public uint Detail { get; set; }
public uint Particular { get; set; }
public uint Level { get; set; }
public uint Icon { get; set; }
public int AppearID { get; set; }
public string I18n { get; set; } = "";
public override uint GetId()
{
return (uint)I18n.GetHashCode();
}
public override void Loaded()
{
GameData.WeaponPartsData.Add(GetId(), this);
}
}

View File

@@ -16,6 +16,9 @@ public static class GameData
public static Dictionary<uint, ArItemExcel> ArItemData { get; private set; } = []; public static Dictionary<uint, ArItemExcel> ArItemData { get; private set; } = [];
public static Dictionary<uint, ManifestationExcel> ManifestationData { get; private set; } = []; public static Dictionary<uint, ManifestationExcel> ManifestationData { get; private set; } = [];
public static Dictionary<uint, Rogue3DDifficultExcel> Rogue3DDifficultData { get; private set; } = []; public static Dictionary<uint, Rogue3DDifficultExcel> Rogue3DDifficultData { get; private set; } = [];
public static Dictionary<uint, Rogue3DSeasonExcel> Rogue3DSeasonData { get; private set; } = [];
public static Dictionary<uint, Rogue3DTalentExcel> Rogue3DTalentData { get; private set; } = [];
public static Dictionary<uint, Rogue3DDailyBuffExcel> Rogue3DDailyBuffData { get; private set; } = [];
public static Dictionary<int, BreakExcel> BreakData { get; private set; } = []; public static Dictionary<int, BreakExcel> BreakData { get; private set; } = [];
public static Dictionary<uint, SpineExcel> SpineData { get; private set; } = []; public static Dictionary<uint, SpineExcel> SpineData { get; private set; } = [];
public static Dictionary<uint, NodeConditionExcel> NodeConditionData { get; private set; } = []; public static Dictionary<uint, NodeConditionExcel> NodeConditionData { get; private set; } = [];
@@ -25,6 +28,7 @@ public static class GameData
public static Dictionary<uint, ProfileExcel> ProfileData { 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, CardSkinPartsExcel> CardSkinPartsData { get; private set; } = [];
public static Dictionary<uint, CallItemExcel> CallItemData { get; private set; } = []; public static Dictionary<uint, CallItemExcel> CallItemData { get; private set; } = [];
public static Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
} }
public static class GameResourceTemplateId public static class GameResourceTemplateId

View File

@@ -62,6 +62,7 @@ public abstract class GrowableItemInfo : BaseGameItemInfo
public class GameWeaponInfo : GrowableItemInfo public class GameWeaponInfo : GrowableItemInfo
{ {
[SugarColumn(IsJson = true)] public Dictionary<uint, ulong> PartSlots { get; set; } = [];
public override Item ToProto() public override Item ToProto()
{ {
var proto = new Item var proto = new Item
@@ -78,6 +79,7 @@ public class GameWeaponInfo : GrowableItemInfo
Evolue = Evolue Evolue = Evolue
} }
}; };
foreach (var (slot, uid) in PartSlots) proto.Slots[slot] = uid;
return proto; return proto;
} }
} }

View File

@@ -35,6 +35,7 @@ public class ServerTextCHS
/// </summary> /// </summary>
public class WordTextCHS public class WordTextCHS
{ {
public string WeaponPart => "武器部件";
public string CallItem => "召唤道具"; public string CallItem => "召唤道具";
public string SkinPart => "皮肤部件"; public string SkinPart => "皮肤部件";
public string Profile => "个人资料"; public string Profile => "个人资料";
@@ -246,6 +247,7 @@ public class GiveAllTextCHS
"用法:/giveall card <detail/-1> -p<特定> -l<等級>" + "用法:/giveall card <detail/-1> -p<特定> -l<等級>" +
"用法:/giveall profile <detail/-1> -g<类型> -p<特定> -l<等级>" + "用法:/giveall profile <detail/-1> -g<类型> -p<特定> -l<等级>" +
"用法:/giveall skinpart <detail/-1> -g<類型> -p<特定> -l<等級>" + "用法:/giveall skinpart <detail/-1> -g<類型> -p<特定> -l<等級>" +
"用法:/giveall weaponpart <detail/-1> -g<類型> -p<特定> -l<等級>" +
"用法:/giveall call <detail/-1> -g<類型> -p<特定> -l<等級>"; "用法:/giveall call <detail/-1> -g<類型> -p<特定> -l<等級>";
public string NotFound => "未找到 {0}"; public string NotFound => "未找到 {0}";
public string GiveAllItems => "已向玩家添加 {0} 个 {1}"; public string GiveAllItems => "已向玩家添加 {0} 个 {1}";

View File

@@ -35,6 +35,7 @@ public class ServerTextCHT
/// </summary> /// </summary>
public class WordTextCHT public class WordTextCHT
{ {
public string WeaponPart => "武器部件";
public string CallItem => "召喚道具"; public string CallItem => "召喚道具";
public string SkinPart => "外觀部件"; public string SkinPart => "外觀部件";
public string Profile => "個人資料"; public string Profile => "個人資料";
@@ -246,6 +247,7 @@ public class GiveAllTextCHT
"用法:/giveall card <detail/-1> -p<特定> -l<等級>" + "用法:/giveall card <detail/-1> -p<特定> -l<等級>" +
"用法:/giveall profile <detail/-1> -g<類型> -p<特定> -l<等級>" + "用法:/giveall profile <detail/-1> -g<類型> -p<特定> -l<等級>" +
"用法:/giveall skinpart <detail/-1> -g<類型> -p<特定> -l<等級>" + "用法:/giveall skinpart <detail/-1> -g<類型> -p<特定> -l<等級>" +
"用法:/giveall weaponpart <detail/-1> -g<類型> -p<特定> -l<等級>" +
"用法:/giveall call <detail/-1> -g<類型> -p<特定> -l<等級>"; "用法:/giveall call <detail/-1> -g<類型> -p<特定> -l<等級>";
public string NotFound => "未找到 {0}"; public string NotFound => "未找到 {0}";
public string GiveAllItems => "已向玩家添加 {0} 個 {1}"; public string GiveAllItems => "已向玩家添加 {0} 個 {1}";

View File

@@ -35,6 +35,7 @@ public class ServerTextEN
/// </summary> /// </summary>
public class WordTextEN public class WordTextEN
{ {
public string WeaponPart => "Weapon Part";
public string CallItem => "Call Item"; public string CallItem => "Call Item";
public string SkinPart => "Skin Part"; public string SkinPart => "Skin Part";
public string Profile => "Profile"; public string Profile => "Profile";
@@ -212,6 +213,7 @@ public class GiveAllTextEN
"Usage: /giveall card <detail/-1> -p<particular> -l<level>" + "Usage: /giveall card <detail/-1> -p<particular> -l<level>" +
"Usage: /giveall profile <detail/-1> -g<genre> -p<particular> -l<level>" + "Usage: /giveall profile <detail/-1> -g<genre> -p<particular> -l<level>" +
"Usage: /giveall skinpart <detail/-1> -g<genre> -p<particular> -l<level>" + "Usage: /giveall skinpart <detail/-1> -g<genre> -p<particular> -l<level>" +
"Usage: /giveall weaponpart <detail/-1> -g<genre> -p<particular> -l<level>" +
"Usage: /giveall call <detail/-1> -g<genre> -p<particular> -l<level>"; "Usage: /giveall call <detail/-1> -g<genre> -p<particular> -l<level>";
public string NotFound => "{0} not found!"; public string NotFound => "{0} not found!";
public string GiveAllItems => "Added {0} {1} to player!"; public string GiveAllItems => "Added {0} {1} to player!";

View File

@@ -222,4 +222,40 @@ public class CommandGiveAll : ICommands
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems", await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.CallItem"), callItems.Count.ToString())); I18NManager.Translate("Word.CallItem"), callItems.Count.ToString()));
} }
[CommandMethod("weaponpart")]
public async ValueTask GiveAllWeaponPart(CommandArg arg)
{
if (!await arg.CheckOnlineTarget()) return;
if (await arg.GetOption('p') is not int particular) return;
if (await arg.GetOption('l') is not int level) return;
if (await arg.GetOption('g') is not int genre) return;
var detail = arg.GetInt(0);
var player = arg.Target!.Player!;
List<BaseGameItemInfo> weaponPartItems = [];
if (detail == -1)
{
// add all
foreach (var config in GameData.WeaponPartsData.Values)
{
var weaponPart = await player.InventoryManager!
.AddWeaponPartItem((ItemTypeEnum)config.Genre, config.Detail, config.Particular, config.Level, false);
if (weaponPart != null) weaponPartItems.Add(weaponPart);
}
}
else
{
var weaponPart = await player.InventoryManager!.AddWeaponPartItem((ItemTypeEnum)genre, (uint)detail, (uint)particular, (uint)level, false);
if (weaponPart == null)
{
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.WeaponPart")));
return;
}
weaponPartItems.Add(weaponPart);
}
if (weaponPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponPartItems));
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.WeaponPart"), weaponPartItems.Count.ToString()));
}
} }

View File

@@ -312,4 +312,25 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return callInfo; return callInfo;
} }
public async ValueTask<BaseGameItemInfo?> AddWeaponPartItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{
if (genre != ItemTypeEnum.TYPE_WEAPON_PART) return null;
var weaponPartData = GameData.WeaponPartsData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
if (weaponPartData == null) return null;
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null;
var weaponPartInfo = new BaseGameItemInfo
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
ItemType = genre,
ItemCount = 1
};
InventoryData.Items[weaponPartInfo.UniqueId] = weaponPartInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([weaponPartInfo]));
return weaponPartInfo;
}
} }

View File

@@ -1,12 +1,7 @@
using Azure; using MikuSB.Data;
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Database.Inventory; using MikuSB.Database.Inventory;
using MikuSB.Enums.Item;
using MikuSB.GameServer.Game.Player;
using MikuSB.Proto; using MikuSB.Proto;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Nodes;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl; namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;

View File

@@ -0,0 +1,178 @@
using MikuSB.Data;
using MikuSB.Database.Player;
using MikuSB.GameServer.Game.Player;
using MikuSB.Proto;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Rogue3D;
internal static class Rogue3DStateHelper
{
private const uint GroupId = 124;
private const uint LevelPassStart = 20;
private const uint DailyBuffStart = 51;
private const uint DailyBuffEnd = 65;
private const int DailyBuffBitCount = 10;
private const int DailyBuffBitsPerValue = DailyBuffBitCount + 1;
private const uint DailyBuffMask = (1u << DailyBuffBitCount) - 1;
private const uint UnlockDiff1Sid = LevelPassStart + 1;
private const uint UnlockDiff2Sid = LevelPassStart + 2;
private const uint UnlockDiff3Sid = LevelPassStart + 3;
private const uint UnlockDiff4Sid = LevelPassStart + 4;
private static uint[]? ShuffledDailyBuffIds;
public static NtfSyncPlayer EnsureUnlockState(PlayerInstance player)
{
var sync = new NtfSyncPlayer();
EnsureMinAttr(player, UnlockDiff1Sid, 1, sync);
EnsureMinAttr(player, UnlockDiff2Sid, 1, sync);
EnsureMinAttr(player, UnlockDiff3Sid, 1, sync);
EnsureMinAttr(player, UnlockDiff4Sid, 1, sync);
foreach (var scienceSid in GetUnlockTalentScienceSids())
{
EnsureMinAttr(player, scienceSid, 1, sync);
}
EnsureDailyBuffAttrs(player, sync);
return sync;
}
private static IEnumerable<uint> GetUnlockTalentScienceSids()
{
return GameData.Rogue3DTalentData.Values
.Select(x => x.UnlockCondition)
.Where(x => x > 0)
.Distinct()
.OrderBy(x => x);
}
private static void EnsureDailyBuffAttrs(PlayerInstance player, NtfSyncPlayer sync)
{
var buffIds = GetOrCreateDailyBuffIds()
.Take((int)(DailyBuffEnd - DailyBuffStart + 1) * 3)
.ToArray();
var index = 0;
for (var sid = DailyBuffStart; sid <= DailyBuffEnd; sid++)
{
uint packed = 0;
for (var slot = 0; slot < 3 && index < buffIds.Length; slot++, index++)
{
packed |= (buffIds[index] & DailyBuffMask) << (slot * DailyBuffBitsPerValue);
}
SetAttr(player, sid, packed, sync);
}
}
private static uint[] GetOrCreateDailyBuffIds()
{
if (ShuffledDailyBuffIds != null)
{
return ShuffledDailyBuffIds;
}
var groupedBuffIds = GameData.Rogue3DDailyBuffData.Values
.Where(x => x.ScoreBuffId > 0 && x.ScoreBuffId <= DailyBuffMask)
.GroupBy(x => x.GroupId)
.OrderBy(x => x.Key)
.Select(x => x
.OrderBy(y => y.Id)
.Select(y => y.ScoreBuffId)
.Distinct()
.ToList())
.ToList();
var random = new Random();
foreach (var group in groupedBuffIds)
{
Shuffle(group, random);
}
Shuffle(groupedBuffIds, random);
var buffIds = new List<uint>();
var indexByGroup = new int[groupedBuffIds.Count];
var hasRemaining = true;
while (hasRemaining)
{
hasRemaining = false;
for (var i = 0; i < groupedBuffIds.Count; i++)
{
var group = groupedBuffIds[i];
var index = indexByGroup[i];
if (index >= group.Count)
{
continue;
}
buffIds.Add(group[index]);
indexByGroup[i] = index + 1;
hasRemaining = true;
}
}
ShuffledDailyBuffIds = buffIds.ToArray();
return ShuffledDailyBuffIds;
}
private static IEnumerable<uint> GetDailyBuffIds()
{
return GetOrCreateDailyBuffIds();
}
private static void Shuffle<T>(IList<T> list, Random random)
{
for (var i = list.Count - 1; i > 0; i--)
{
var swapIndex = random.Next(i + 1);
(list[i], list[swapIndex]) = (list[swapIndex], list[i]);
}
}
private static void EnsureMinAttr(PlayerInstance player, uint sid, uint value, NtfSyncPlayer sync, bool overwrite = false)
{
var attr = player.Data.Attrs.FirstOrDefault(x => x.Gid == GroupId && x.Sid == sid);
if (attr == null)
{
attr = new PlayerAttr { Gid = GroupId, Sid = sid, Val = value };
player.Data.Attrs.Add(attr);
AddSync(player, sync, sid, value);
return;
}
if ((!overwrite && attr.Val >= value) || (overwrite && attr.Val == value))
{
return;
}
attr.Val = value;
AddSync(player, sync, sid, value);
}
private static void SetAttr(PlayerInstance player, uint sid, uint value, NtfSyncPlayer sync)
{
var attr = player.Data.Attrs.FirstOrDefault(x => x.Gid == GroupId && x.Sid == sid);
if (attr == null)
{
attr = new PlayerAttr { Gid = GroupId, Sid = sid };
player.Data.Attrs.Add(attr);
}
if (attr.Val == value)
{
return;
}
attr.Val = value;
AddSync(player, sync, sid, value);
}
private static void AddSync(PlayerInstance player, NtfSyncPlayer sync, uint sid, uint value)
{
sync.Custom[player.ToPackedAttrKey(GroupId, sid)] = value;
sync.Custom[player.ToShiftedAttrKey(GroupId, sid)] = value;
}
}

View File

@@ -8,6 +8,7 @@ public class Rogue3D_CheckOpenAct : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
await CallGSRouter.SendScript(connection, "Rogue3D_CheckOpenAct", "{\"bOpen\":true}"); var sync = Rogue3DStateHelper.EnsureUnlockState(connection.Player!);
await CallGSRouter.SendScript(connection, "Rogue3D_CheckOpenAct", "{\"bOpen\":true}", sync);
} }
} }

View File

@@ -8,6 +8,7 @@ public class Rogue3D_SelectMode : ICallGSHandler
{ {
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
await CallGSRouter.SendScript(connection, "Rogue3D_SelectMode", "{}"); var sync = Rogue3DStateHelper.EnsureUnlockState(connection.Player!);
await CallGSRouter.SendScript(connection, "Rogue3D_SelectMode", "{}", sync);
} }
} }

View File

@@ -0,0 +1,47 @@
using MikuSB.Proto;
using System.Text.Json;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
[CallGSApi("Weapon_ReplacePart")]
public class Weapon_ReplacePart : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var req = JsonSerializer.Deserialize<WeaponPartReplaceParam>(param);
if (req == null)
{
await CallGSRouter.SendScript(connection, "Weapon_ReplacePart", "{\"sErr\":\"error.BadParam\"}");
return;
}
var player = connection.Player!;
var weaponData = player.InventoryManager.GetWeaponItem(req.Id);
if (weaponData == null)
{
await CallGSRouter.SendScript(connection, "Weapon_ReplacePart", "{}");
return;
}
uint partId = 0;
if (req.PartId != -1)
{
var partData = player.InventoryManager.GetNormalItem((uint)req.PartId);
if (partData != null) partId = partData.UniqueId;
}
weaponData.PartSlots[req.Type] = partId;
var sync = new NtfSyncPlayer
{
Items = { weaponData.ToProto() }
};
await CallGSRouter.SendScript(connection, "Weapon_ReplacePart", "null", sync);
}
}
internal sealed class WeaponPartReplaceParam
{
public int PartId { get; set; }
public uint Type { get; set; }
public uint Id { get; set; }
}

View File

@@ -0,0 +1,43 @@
using MikuSB.Enums.Item;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
[CallGSApi("Weapon_ShowDefaultPart")]
public class Weapon_ShowDefaultPart : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var req = JsonSerializer.Deserialize<WeaponShowDefaultPartParam>(param);
if (req == null)
{
await CallGSRouter.SendScript(connection, "Weapon_ShowDefaultPart", "{\"sErr\":\"error.BadParam\"}");
return;
}
var player = connection.Player!;
var weaponData = player.InventoryManager.GetWeaponItem(req.Id);
if (weaponData == null)
{
await CallGSRouter.SendScript(connection, "Weapon_ShowDefaultPart", "{}");
return;
}
if (req.Flag == 1) weaponData.Flag = ItemFlagEnum.FLAG_WEAPON_DEFAULT;
else weaponData.Flag = ItemFlagEnum.FLAG_READED;
var sync = new NtfSyncPlayer
{
Items = { weaponData.ToProto() }
};
await CallGSRouter.SendScript(connection, "Weapon_ShowDefaultPart", "null", sync);
}
}
internal sealed class WeaponShowDefaultPartParam
{
[JsonPropertyName("nFlag")] public int Flag { get; set; }
public uint Id { get; set; }
}

View File

@@ -198,7 +198,7 @@ public sealed class ProxyServer(
{ {
var pathAndQuery = request.GetPathAndQuery(); var pathAndQuery = request.GetPathAndQuery();
var uri = new Uri($"http://{ServerHost}:{_options.ServerHttpPort}{pathAndQuery}"); var uri = new Uri($"http://{ServerHost}:{_options.ServerHttpPort}{pathAndQuery}");
logger.Info($"Redirect: {request.Method} {request.HostOverride ?? request.Host}{pathAndQuery} -> {uri}"); if (ConfigManager.Config.HttpServer.EnableLog) logger.Info($"Redirect: {request.Method} {request.HostOverride ?? request.Host}{pathAndQuery} -> {uri}");
await SendHttpRequestAsync(clientStream, request, uri, true, cancellationToken); await SendHttpRequestAsync(clientStream, request, uri, true, cancellationToken);
} }

View File

@@ -1 +1 @@
v=1.6 v=1.7