Compare commits

...

10 Commits

Author SHA1 Message Date
Kei-Luna
0e62fcc9b2 v 1.1 2026-04-28 16:29:57 +09:00
Kei-Luna
f4ad74e00d Keep username changes 2026-04-28 16:12:27 +09:00
Kei-Luna
ccdfbee828 Implemented a level-up for SupporterCards. 2026-04-28 16:12:02 +09:00
Kei-Luna
5d0f587fb9 Support cards can now be equipped. 2026-04-28 15:37:44 +09:00
Kei-Luna
94f972ff82 add all support card 2026-04-28 15:23:42 +09:00
Kei-Luna
1b4f3531d1 SelfContained false 2026-04-28 15:00:20 +09:00
Kei-Luna
1cac82d10d Deiwos Alignment 2026-04-28 14:55:14 +09:00
Kei-Luna
1e4d93bab1 Implement Neuronics 2026-04-28 14:46:06 +09:00
Naruse
5f92f2c116 add girl skin type change
note: need to delete old database because im moving skin to different item type

database located in Config/Database/Miku.db
2026-04-27 23:18:08 +08:00
Naruse
16d1413cd8 unlock convenant after finish intimate chat 2026-04-27 21:46:03 +08:00
24 changed files with 888 additions and 24 deletions

View File

@@ -16,7 +16,7 @@ public class HttpServerConfig
public string BindAddress { get; set; } = "0.0.0.0"; public string BindAddress { get; set; } = "0.0.0.0";
public string PublicAddress { get; set; } = "127.0.0.1"; public string PublicAddress { get; set; } = "127.0.0.1";
public int Port { get; set; } = 21500; public int Port { get; set; } = 21500;
public bool EnableLog { get; set; } = true; public bool EnableLog { get; set; } = false;
public string GetDisplayAddress() public string GetDisplayAddress()
{ {

View File

@@ -19,6 +19,7 @@ public class CardExcel : ExcelResource
[JsonProperty("profile")] public List<List<int>> Profile { get; set; } = []; [JsonProperty("profile")] public List<List<int>> Profile { get; set; } = [];
public List<List<int>> Pieces { get; set; } = []; public List<List<int>> Pieces { get; set; } = [];
public List<int> Attribute { get; set; } = []; public List<int> Attribute { get; set; } = [];
[JsonProperty("SpineID")] public uint SpineId { get; set; }
public override uint GetId() public override uint GetId()
{ {
return Icon; return Icon;

View File

@@ -0,0 +1,41 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
// nodecondition.json: NodeConditionId → NodeXCost per sub-node (1-9)
[ResourceEntity("nodecondition.json")]
public class NodeConditionExcel : ExcelResource
{
[JsonProperty("ID")] public uint Id { get; set; }
[JsonProperty("Node1Cost")] public List<List<int>> Node1Cost { get; set; } = [];
[JsonProperty("Node2Cost")] public List<List<int>> Node2Cost { get; set; } = [];
[JsonProperty("Node3Cost")] public List<List<int>> Node3Cost { get; set; } = [];
[JsonProperty("Node4Cost")] public List<List<int>> Node4Cost { get; set; } = [];
[JsonProperty("Node5Cost")] public List<List<int>> Node5Cost { get; set; } = [];
[JsonProperty("Node6Cost")] public List<List<int>> Node6Cost { get; set; } = [];
[JsonProperty("Node7Cost")] public List<List<int>> Node7Cost { get; set; } = [];
[JsonProperty("Node8Cost")] public List<List<int>> Node8Cost { get; set; } = [];
[JsonProperty("Node9Cost")] public List<List<int>> Node9Cost { get; set; } = [];
public List<List<int>> GetNodeCost(int subIdx) => subIdx switch
{
1 => Node1Cost,
2 => Node2Cost,
3 => Node3Cost,
4 => Node4Cost,
5 => Node5Cost,
6 => Node6Cost,
7 => Node7Cost,
8 => Node8Cost,
9 => Node9Cost,
_ => []
};
public override uint GetId() => Id;
public override void Loaded()
{
GameData.NodeConditionData[Id] = this;
}
}

View File

@@ -0,0 +1,35 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
// spine.json: SpineId → Node{i}Req (nodecondition ID per master node index)
[ResourceEntity("spine.json")]
public class SpineExcel : ExcelResource
{
[JsonProperty("ID")] public uint Id { get; set; }
[JsonProperty("Node1Req")] public uint Node1Req { get; set; }
[JsonProperty("Node2Req")] public uint Node2Req { get; set; }
[JsonProperty("Node3Req")] public uint Node3Req { get; set; }
[JsonProperty("Node4Req")] public uint Node4Req { get; set; }
[JsonProperty("Node5Req")] public uint Node5Req { get; set; }
[JsonProperty("Node6Req")] public uint Node6Req { get; set; }
public uint GetNodeReq(int mastIdx) => mastIdx switch
{
1 => Node1Req,
2 => Node2Req,
3 => Node3Req,
4 => Node4Req,
5 => Node5Req,
6 => Node6Req,
_ => 0
};
public override uint GetId() => Id;
public override void Loaded()
{
GameData.SpineData[Id] = this;
}
}

View File

@@ -0,0 +1,32 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("support_card.json")]
public class SupportCardExcel : 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 uint ProvideExp { get; set; }
[JsonProperty("LevelLimitID")] public int LevelLimitId { get; set; }
public uint MaxLevel => LevelLimitId switch
{
1007 => 10,
1008 => 13,
1009 => 16,
_ => 10
};
public ulong TemplateId => GameResourceTemplateId.FromGdpl(Genre, Detail, Particular, Level);
public override uint GetId() => Icon;
public override void Loaded()
{
GameData.SupportCardData.Add(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, SpineExcel> SpineData { get; private set; } = [];
public static Dictionary<uint, NodeConditionExcel> NodeConditionData { get; private set; } = [];
public static List<SupportCardExcel> SupportCardData { get; private set; } = [];
} }
public static class GameResourceTemplateId public static class GameResourceTemplateId

View File

@@ -19,6 +19,7 @@ public class CharacterInfo
public int Exp { get; set; } public int Exp { get; set; }
public uint Break { get; set; } public uint Break { get; set; }
public int Evolue { get; set; } public int Evolue { get; set; }
public uint ProLevel { get; set; }
public int Trust { get; set; } public int Trust { get; set; }
public uint WeaponUniqueId { get; set; } public uint WeaponUniqueId { get; set; }
public uint SkinId { get; set; } public uint SkinId { get; set; }
@@ -27,6 +28,8 @@ public class CharacterInfo
[SugarColumn(IsJson = true)] public List<uint> UnlockedSkin { get; set; } = []; [SugarColumn(IsJson = true)] public List<uint> UnlockedSkin { get; set; } = [];
[SugarColumn(IsJson = true)] public List<uint> Spines { get; set; } = []; [SugarColumn(IsJson = true)] public List<uint> Spines { get; set; } = [];
[SugarColumn(IsJson = true)] public List<uint> Affixs { get; set; } = []; [SugarColumn(IsJson = true)] public List<uint> Affixs { get; set; } = [];
// Key = EqSlot (= support card Detail), Value = support card UniqueId
[SugarColumn(IsJson = true)] public Dictionary<uint, uint> SupportSlots { get; set; } = [];
public long Timestamp { get; set; } public long Timestamp { get; set; }
public uint Count { get; set; } = 1; public uint Count { get; set; } = 1;
@@ -45,6 +48,7 @@ public class CharacterInfo
Exp = ToUInt32(Exp), Exp = ToUInt32(Exp),
Break = Break, Break = Break,
Evolue = ToUInt32(Evolue), Evolue = ToUInt32(Evolue),
ProLevel = ProLevel,
Trust = ToUInt32(Trust) Trust = ToUInt32(Trust)
} }
}; };
@@ -53,6 +57,8 @@ public class CharacterInfo
proto.Slots[4] = WeaponUniqueId; proto.Slots[4] = WeaponUniqueId;
proto.Slots[5] = SkinId; proto.Slots[5] = SkinId;
foreach (var (slot, uid) in SupportSlots)
proto.Slots[slot] = uid;
return proto; return proto;
} }

View File

@@ -26,24 +26,29 @@ public class BaseGameItemInfo
public uint ItemCount { get; set; } public uint ItemCount { get; set; }
public ItemTypeEnum ItemType { get; set; } public ItemTypeEnum ItemType { get; set; }
public ItemFlagEnum Flag { get; set; } = ItemFlagEnum.FLAG_READED; public ItemFlagEnum Flag { get; set; } = ItemFlagEnum.FLAG_READED;
public uint Level { get; set; }
public uint Exp { get; set; }
public virtual Item ToProto() public virtual Item ToProto()
{ {
return new Item var proto = new Item
{ {
Id = UniqueId, Id = UniqueId,
Template = TemplateId, Template = TemplateId,
Count = ItemCount, Count = ItemCount,
Flag = (uint)Flag Flag = (uint)Flag
}; };
if (Level > 0 || Exp > 0)
proto.Enhance = new Enhance { Level = Level, Exp = Exp };
return proto;
} }
} }
public abstract class GrowableItemInfo : BaseGameItemInfo public abstract class GrowableItemInfo : BaseGameItemInfo
{ {
public bool IsLocked { get; set; } public bool IsLocked { get; set; }
public uint Level { get; set; } public new uint Level { get; set; }
public uint Exp { get; set; } public new uint Exp { get; set; }
public uint Break { get; set; } public uint Break { get; set; }
public uint EquipAvatarId { get; set; } public uint EquipAvatarId { get; set; }
} }
@@ -69,7 +74,7 @@ public class GameWeaponInfo : GrowableItemInfo
} }
}public class GameSkinInfo : BaseGameItemInfo }public class GameSkinInfo : BaseGameItemInfo
{ {
public uint Level { get; set; } public uint SkinType { get; set; }
public override Item ToProto() public override Item ToProto()
{ {
var proto = new Item var proto = new Item
@@ -79,6 +84,7 @@ public class GameWeaponInfo : GrowableItemInfo
Count = ItemCount, Count = ItemCount,
Flag = (uint)Flag, Flag = (uint)Flag,
}; };
proto.Slots[11] = SkinType;
return proto; return proto;
} }
} }

View File

@@ -7,6 +7,8 @@ namespace MikuSB.Database.Player;
[SugarTable("Player")] [SugarTable("Player")]
public class PlayerGameData : BaseDatabaseDataHelper public class PlayerGameData : BaseDatabaseDataHelper
{ {
public const string DefaultDisplayName = "Miku";
public string? Name { get; set; } = ""; public string? Name { get; set; } = "";
public string? Signature { get; set; } = "MikuPS"; public string? Signature { get; set; } = "MikuPS";
public uint Level { get; set; } = 100; public uint Level { get; set; } = 100;
@@ -16,6 +18,7 @@ public class PlayerGameData : BaseDatabaseDataHelper
public Sex Gender { get; set; } = Sex.Female; public Sex Gender { get; set; } = Sex.Female;
public uint Vigor { get; set; } = 240; public uint Vigor { get; set; } = 240;
[SugarColumn(IsJson = true)] public List<PlayerAttr> Attrs { get; set; } = []; [SugarColumn(IsJson = true)] public List<PlayerAttr> Attrs { get; set; } = [];
[SugarColumn(IsJson = true)] public List<PlayerStrAttr> StrAttrs { get; set; } = [];
[SugarColumn(IsJson = true)] public List<ulong> ShowItems { get; set; } = []; [SugarColumn(IsJson = true)] public List<ulong> ShowItems { get; set; } = [];
public static PlayerGameData? GetPlayerByUid(long uid) public static PlayerGameData? GetPlayerByUid(long uid)
@@ -24,13 +27,30 @@ public class PlayerGameData : BaseDatabaseDataHelper
return result; return result;
} }
public static string NormalizeDisplayName(string? name)
{
var normalized = name?.Trim();
return string.IsNullOrWhiteSpace(normalized) ? DefaultDisplayName : normalized;
}
public bool EnsureDisplayName()
{
var normalized = NormalizeDisplayName(Name);
if (string.Equals(Name, normalized, StringComparison.Ordinal))
return false;
Name = normalized;
return true;
}
public PlayerProfile ToProfileProto() public PlayerProfile ToProfileProto()
{ {
var displayName = NormalizeDisplayName(Name);
var proto = new PlayerProfile var proto = new PlayerProfile
{ {
Pid = (uint)Uid, Pid = (uint)Uid,
Account = Name, Account = displayName,
Name = Name, Name = displayName,
Level = Level, Level = Level,
Sex = Gender, Sex = Gender,
Sign = Signature, Sign = Signature,
@@ -45,4 +65,11 @@ public class PlayerAttr
public uint Gid { get; set; } public uint Gid { get; set; }
public uint Sid { get; set; } public uint Sid { get; set; }
public uint Val { get; set; } public uint Val { get; set; }
}
public class PlayerStrAttr
{
public uint Gid { get; set; }
public uint Sid { get; set; }
public string Val { get; set; } = "";
} }

View File

@@ -30,7 +30,7 @@ public class CharacterManager(PlayerInstance player) : BasePlayerManager(player)
var weaponInfo = await Player.InventoryManager!.AddWeaponItem((ItemTypeEnum)CharacterExcel.DefaultWeaponGPDL[0], CharacterExcel.DefaultWeaponGPDL[1], CharacterExcel.DefaultWeaponGPDL[2], CharacterExcel.DefaultWeaponGPDL[3],sendPacket:false); var weaponInfo = await Player.InventoryManager!.AddWeaponItem((ItemTypeEnum)CharacterExcel.DefaultWeaponGPDL[0], CharacterExcel.DefaultWeaponGPDL[1], CharacterExcel.DefaultWeaponGPDL[2], CharacterExcel.DefaultWeaponGPDL[3],sendPacket:false);
if (weaponInfo != null) character.WeaponUniqueId = weaponInfo.UniqueId; if (weaponInfo != null) character.WeaponUniqueId = weaponInfo.UniqueId;
var skinInfo = Player.InventoryManager!.GetNormalItemGDPL(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level) var skinInfo = Player.InventoryManager!.GetSkinItemGDPL(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level)
?? await Player.InventoryManager!.AddSkinItem(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level, false); ?? await Player.InventoryManager!.AddSkinItem(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level, false);
if (skinInfo != null) character.SkinId = skinInfo.UniqueId; if (skinInfo != null) character.SkinId = skinInfo.UniqueId;

View File

@@ -51,27 +51,43 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return InventoryData.Weapons.Values.FirstOrDefault(x => x.TemplateId == templateId); return InventoryData.Weapons.Values.FirstOrDefault(x => x.TemplateId == templateId);
} }
public async ValueTask<BaseGameItemInfo?> AddSkinItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true) public async ValueTask<GameSkinInfo?> AddSkinItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{ {
if (genre != ItemTypeEnum.TYPE_CARD_SKIN) return null; if (genre != ItemTypeEnum.TYPE_CARD_SKIN) return null;
var skinData = GameData.CardSkinData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level); var skinData = GameData.CardSkinData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
if (skinData == null) return null; if (skinData == null) return null;
var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level); var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level);
var skinInfo = new BaseGameItemInfo var skinInfo = new GameSkinInfo
{ {
TemplateId = templateId, TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++, UniqueId = InventoryData.NextUniqueUid++,
ItemType = ItemTypeEnum.TYPE_CARD_SKIN, ItemType = ItemTypeEnum.TYPE_CARD_SKIN,
ItemCount = 1 ItemCount = 1
}; };
InventoryData.Items[skinInfo.UniqueId] = skinInfo; InventoryData.Skins[skinInfo.UniqueId] = skinInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([skinInfo])); if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([skinInfo]));
return skinInfo; return skinInfo;
} }
public GameSkinInfo? GetSkinItem(uint uniqueId)
{
return InventoryData.Skins.GetValueOrDefault(uniqueId);
}
public GameSkinInfo? GetSkinItemByTemplateId(ulong templateId)
{
return InventoryData.Skins.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
public GameSkinInfo? GetSkinItemGDPL(ItemTypeEnum genre, uint detail, uint particular, uint level)
{
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
return InventoryData.Skins.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
public async ValueTask<BaseGameItemInfo?> AddArItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true) public async ValueTask<BaseGameItemInfo?> AddArItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{ {
if (genre != ItemTypeEnum.TYPE_AR) return null; if (genre != ItemTypeEnum.TYPE_AR) return null;
@@ -94,6 +110,26 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return arInfo; return arInfo;
} }
public async ValueTask<BaseGameItemInfo?> AddSupportCardItem(uint detail, uint particular, uint level = 1, bool sendPacket = true)
{
const ItemTypeEnum genre = ItemTypeEnum.TYPE_SUPPORT;
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null;
var info = new BaseGameItemInfo
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
ItemType = genre,
ItemCount = 1
};
InventoryData.Items[info.UniqueId] = info;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([info]));
return info;
}
public async ValueTask<BaseGameItemInfo?> AddManifestationItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true) public async ValueTask<BaseGameItemInfo?> AddManifestationItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{ {
if (genre != ItemTypeEnum.TYPE_MANIFESTATION) return null; if (genre != ItemTypeEnum.TYPE_MANIFESTATION) return null;

View File

@@ -43,7 +43,7 @@ public class PlayerInstance(PlayerGameData data)
{ {
// new player // new player
IsNewPlayer = true; IsNewPlayer = true;
Data.Name = AccountData.GetAccountByUid(uid)?.Username; Data.Name = PlayerGameData.NormalizeDisplayName(AccountData.GetAccountByUid(uid)?.Username);
DatabaseHelper.CreateInstance(Data); DatabaseHelper.CreateInstance(Data);
@@ -66,6 +66,10 @@ public class PlayerInstance(PlayerGameData data)
{ {
await CharacterManager.AddCharacter((ItemTypeEnum)card.Genre, card.Detail, card.Particular, card.Level, sendPacket:false); await CharacterManager.AddCharacter((ItemTypeEnum)card.Genre, card.Detail, card.Particular, card.Level, sendPacket:false);
} }
foreach (var sc in GameData.SupportCardData)
{
await InventoryManager.AddSupportCardItem(sc.Detail, sc.Particular, sc.Level, sendPacket: false);
}
foreach (var supplies in GameData.AllSuppliesData) foreach (var supplies in GameData.AllSuppliesData)
{ {
await InventoryManager.AddSuppliesItem(supplies, 90000, false); await InventoryManager.AddSuppliesItem(supplies, 90000, false);
@@ -134,6 +138,7 @@ public class PlayerInstance(PlayerGameData data)
public async ValueTask OnEnterGame() public async ValueTask OnEnterGame()
{ {
if (!Initialized) await InitialPlayerManager(); if (!Initialized) await InitialPlayerManager();
Data.EnsureDisplayName();
await CharacterManager.RepairCharacterWeapons(); await CharacterManager.RepairCharacterWeapons();
await EnsureSupplies(); await EnsureSupplies();
} }
@@ -225,12 +230,13 @@ public class PlayerInstance(PlayerGameData data)
public Proto.Player ToPlayerProto() public Proto.Player ToPlayerProto()
{ {
var displayName = PlayerGameData.NormalizeDisplayName(Data.Name);
var proto = new Proto.Player var proto = new Proto.Player
{ {
Pid = (ulong)Data.Uid, Pid = (ulong)Data.Uid,
Account = Data.Name, Account = displayName,
Provider = Data.Name, Provider = displayName,
Name = Data.Name, Name = displayName,
Level = Data.Level, Level = Data.Level,
Sex = Data.Gender, Sex = Data.Gender,
Vigor = Data.Vigor, Vigor = Data.Vigor,
@@ -259,6 +265,11 @@ public class PlayerInstance(PlayerGameData data)
return proto; return proto;
} }
public void SetDisplayName(string? name)
{
Data.Name = PlayerGameData.NormalizeDisplayName(name);
}
public void SetShowItem(int index, ulong itemId) public void SetShowItem(int index, ulong itemId)
{ {
if (index <= 0) if (index <= 0)

View File

@@ -0,0 +1,52 @@
using MikuSB.Database;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
[CallGSApi("GirlCard_ProLevelPromote")]
public class GirlCard_ProLevelPromote : ICallGSHandler
{
private const uint MaxProLevel = 3;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<ProLevelPromoteParam>(param);
if (req == null || req.CardId == 0)
{
await CallGSRouter.SendScript(connection, "GirlCard_ProLevelPromote", "{\"sErr\":\"error.BadParam\"}");
return;
}
var card = player.CharacterManager.GetCharacterByGUID((uint)req.CardId);
if (card == null)
{
await CallGSRouter.SendScript(connection, "GirlCard_ProLevelPromote", "{\"sErr\":\"error.BadParam\"}");
return;
}
if (card.ProLevel >= MaxProLevel)
{
await CallGSRouter.SendScript(connection, "GirlCard_ProLevelPromote", "{\"sErr\":\"error.BadParam\"}");
return;
}
card.ProLevel++;
DatabaseHelper.SaveDatabaseType(player.CharacterManager.CharacterData);
var sync = new NtfSyncPlayer();
sync.Items.Add(card.ToProto());
// s2c callback takes no params — return empty arg
await CallGSRouter.SendScript(connection, "GirlCard_ProLevelPromote", "{}", sync);
}
}
internal sealed class ProLevelPromoteParam
{
[JsonPropertyName("nID")]
public int CardId { get; set; }
}

View File

@@ -1,4 +1,5 @@
using System.Text.Json; using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@@ -15,16 +16,35 @@ public class GirlSkin_ChangeSkinType : ICallGSHandler
["nType"] = req?.Type ?? 1, ["nType"] = req?.Type ?? 1,
["nSkinId"] = req?.SkinId ["nSkinId"] = req?.SkinId
}; };
// TODO change type in proto Item ?? if (req == null)
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString()); {
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString());
return;
}
var player = connection.Player!;
var skinData = player.InventoryManager.GetSkinItem(req.SkinId);
if (skinData == null)
{
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString());
return;
}
skinData.SkinType = req.Type;
var sync = new NtfSyncPlayer
{
Items = { skinData.ToProto() }
};
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString(), sync);
} }
} }
internal sealed class ChangeSkinTypeParam internal sealed class ChangeSkinTypeParam
{ {
[JsonPropertyName("nType")] [JsonPropertyName("nType")]
public int? Type { get; set; } public uint Type { get; set; }
[JsonPropertyName("nSkinId")] [JsonPropertyName("nSkinId")]
public uint? SkinId { get; set; } public uint SkinId { get; set; }
} }

View File

@@ -0,0 +1,182 @@
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Database.Player;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
// Spine node encoding: (MastIdx << 8) | SubIdx stored as uint in CharacterInfo.Spines
// GetStrAttribute(Gid=30, Sid=Detail) stores JSON: { "<Particular>": { "ns": <MastIdx>, "tbn": [0,0], "tbr": [] } }
[CallGSApi("GirlSpine_ChildUnLock")]
public class GirlSpine_ChildUnLock : ICallGSHandler
{
private const uint SpineStrAttrGid = 30;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<ChildUnLockParam>(param);
if (req == null || req.CardId == 0 || req.Info == null || req.Materials == null)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"error.BadParam\"}");
return;
}
var card = player.CharacterManager.GetCharacterByGUID((uint)req.CardId);
if (card == null)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"error.BadParam\"}");
return;
}
var mastIdx = req.Info.Indx;
var subIdx = req.Info.InSubIdx;
if (mastIdx <= 0 || subIdx <= 0)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"error.BadParam\"}");
return;
}
// Spines[MastIdx-1] is a bitmask; bit (SubIdx-1) = 1 means that sub-node is unlocked.
// GetSpine(MastIdx, SubIdx) checks (Spines[MastIdx-1] & (1 << (SubIdx-1))) != 0
int spineListIdx = mastIdx - 1;
uint spineBit = 1u << (subIdx - 1);
while (card.Spines.Count <= spineListIdx)
card.Spines.Add(0);
if ((card.Spines[spineListIdx] & spineBit) != 0)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"tip.girlcard_alread_break\"}");
return;
}
// Consume materials
var requestedMaterials = new Dictionary<ulong, uint>();
foreach (var row in req.Materials)
{
if (row == null || row.Count < 5) continue;
var genre = (uint)Math.Max(0, row[0]);
var detail = (uint)Math.Max(0, row[1]);
var particular = (uint)Math.Max(0, row[2]);
var level = (uint)Math.Max(0, row[3]);
var count = (uint)Math.Max(0, row[4]);
if (genre == 0 || detail == 0 || particular == 0 || level == 0 || count == 0) continue;
var tid = GameResourceTemplateId.FromGdpl(genre, detail, particular, level);
requestedMaterials[tid] = requestedMaterials.GetValueOrDefault(tid) + count;
}
var syncItems = new List<Item>();
foreach (var (tid, count) in requestedMaterials)
{
var item = player.InventoryManager.InventoryData.Items.Values.FirstOrDefault(x => x.TemplateId == tid);
if (item == null || item.ItemCount < count)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"tip.not_material\"}");
return;
}
}
foreach (var (tid, count) in requestedMaterials)
{
var item = player.InventoryManager.InventoryData.Items.Values.First(x => x.TemplateId == tid);
item.ItemCount -= count;
var proto = item.ToProto();
if (item.ItemCount == 0)
{
player.InventoryManager.InventoryData.Items.Remove(item.UniqueId);
proto.Count = 0;
}
syncItems.Add(proto);
}
// Unlock the spine node by setting the corresponding bit
card.Spines[spineListIdx] |= spineBit;
syncItems.Add(card.ToProto());
// Extract Detail and Particular from TemplateId for StrAttr
var cardDetail = (uint)((card.TemplateId >> 16) & 0xFFFF);
var cardParticular = (uint)((card.TemplateId >> 32) & 0xFFFF);
// Build and persist StrAttr JSON: { "<particular>": { "ns": mastIdx, "tbn": [0,0], "tbr": [] } }
UpdateSpineStrAttr(player.Data, cardDetail, cardParticular, mastIdx);
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
DatabaseHelper.SaveDatabaseType(player.CharacterManager.CharacterData);
DatabaseHelper.SaveDatabaseType(player.Data);
// Send NtfSetStrAttr so client's GetStrAttribute(30, Detail) returns fresh data
var strAttrData = GetSpineStrAttrJson(player.Data, cardDetail);
var ntfStrAttr = new NtfSetStrAttr { Gid = SpineStrAttrGid, Sid = cardDetail, Val = strAttrData };
await connection.Player!.SendPacket(CmdIds.NtfSetStrAttr, ntfStrAttr);
var sync = new NtfSyncPlayer();
sync.Items.AddRange(syncItems);
var rsp = $"{{\"tb\":{{\"D\":{cardDetail},\"pId\":{req.CardId},\"MastIdx\":{mastIdx},\"SubIdx\":{subIdx}}}}}";
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", rsp, sync);
}
private static void UpdateSpineStrAttr(PlayerGameData data, uint detail, uint particular, int mastIdx)
{
var existing = data.StrAttrs.FirstOrDefault(x => x.Gid == SpineStrAttrGid && x.Sid == detail);
if (existing == null)
{
existing = new PlayerStrAttr { Gid = SpineStrAttrGid, Sid = detail, Val = "{}" };
data.StrAttrs.Add(existing);
}
var root = JsonSerializer.Deserialize<Dictionary<string, SpineStrData>>(existing.Val)
?? new Dictionary<string, SpineStrData>();
var key = particular.ToString();
if (!root.TryGetValue(key, out var entry))
entry = new SpineStrData();
entry.Ns = mastIdx;
root[key] = entry;
existing.Val = JsonSerializer.Serialize(root);
}
private static string GetSpineStrAttrJson(PlayerGameData data, uint detail)
{
var existing = data.StrAttrs.FirstOrDefault(x => x.Gid == SpineStrAttrGid && x.Sid == detail);
return existing?.Val ?? "{}";
}
}
internal sealed class ChildUnLockParam
{
[JsonPropertyName("pId")]
public int CardId { get; set; }
[JsonPropertyName("tbInfo")]
public NodeInfo? Info { get; set; }
[JsonPropertyName("tbMat")]
public List<List<int>> Materials { get; set; } = [];
}
internal sealed class NodeInfo
{
[JsonPropertyName("Indx")]
public int Indx { get; set; }
[JsonPropertyName("InSubIdx")]
public int InSubIdx { get; set; }
}
internal sealed class SpineStrData
{
[JsonPropertyName("ns")]
public int Ns { get; set; } = 0;
[JsonPropertyName("tbn")]
public List<int> Tbn { get; set; } = [0, 0];
[JsonPropertyName("tbr")]
public List<int> Tbr { get; set; } = [];
}

View File

@@ -0,0 +1,125 @@
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
[CallGSApi("GirlSpine_UnlockNodeOneKey")]
public class GirlSpine_UnlockNodeOneKey : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<OneKeyUnlockParam>(param);
if (req == null || req.CardId == 0 || req.MastIdx <= 0 || req.SubIdxList == null || req.SubIdxList.Count == 0)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"error.BadParam\"}");
return;
}
var card = player.CharacterManager.GetCharacterByGUID((uint)req.CardId);
if (card == null)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"error.BadParam\"}");
return;
}
// Look up costs from config: CardExcel → SpineId → SpineExcel → NodeConditionId → NodeConditionExcel
var cardTemplateId = card.TemplateId;
var cardDetail = (uint)((cardTemplateId >> 16) & 0xFFFF);
var cardParticular = (uint)((cardTemplateId >> 32) & 0xFFFF);
var cardExcel = GameData.CardData.Values.FirstOrDefault(
x => x.Detail == cardDetail && x.Particular == cardParticular);
var requestedMaterials = new Dictionary<ulong, uint>();
if (cardExcel != null && GameData.SpineData.TryGetValue(cardExcel.SpineId, out var spineExcel))
{
var nodeCondId = spineExcel.GetNodeReq(req.MastIdx);
if (nodeCondId != 0 && GameData.NodeConditionData.TryGetValue(nodeCondId, out var nodeCond))
{
int spineListIdx = req.MastIdx - 1;
while (card.Spines.Count <= spineListIdx) card.Spines.Add(0);
var currentMask = card.Spines[spineListIdx];
foreach (var subIdx in req.SubIdxList)
{
if (subIdx <= 0) continue;
uint bit = 1u << (subIdx - 1);
if ((currentMask & bit) != 0) continue; // already unlocked, skip cost
foreach (var row in nodeCond.GetNodeCost(subIdx))
{
if (row.Count < 5) continue;
var tid = GameResourceTemplateId.FromGdpl(
(uint)row[0], (uint)row[1], (uint)row[2], (uint)row[3]);
requestedMaterials[tid] = requestedMaterials.GetValueOrDefault(tid) + (uint)row[4];
}
}
}
}
// Validate materials
foreach (var (tid, count) in requestedMaterials)
{
var item = player.InventoryManager.InventoryData.Items.Values.FirstOrDefault(x => x.TemplateId == tid);
if (item == null || item.ItemCount < count)
{
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", "{\"sErr\":\"tip.not_material\"}");
return;
}
}
// Consume materials
var syncItems = new List<Item>();
foreach (var (tid, count) in requestedMaterials)
{
var item = player.InventoryManager.InventoryData.Items.Values.First(x => x.TemplateId == tid);
item.ItemCount -= count;
var proto = item.ToProto();
if (item.ItemCount == 0)
{
player.InventoryManager.InventoryData.Items.Remove(item.UniqueId);
proto.Count = 0;
}
syncItems.Add(proto);
}
// Unlock all specified sub-nodes
int mastSpineIdx = req.MastIdx - 1;
while (card.Spines.Count <= mastSpineIdx) card.Spines.Add(0);
foreach (var subIdx in req.SubIdxList)
{
if (subIdx <= 0) continue;
card.Spines[mastSpineIdx] |= 1u << (subIdx - 1);
}
syncItems.Add(card.ToProto());
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
DatabaseHelper.SaveDatabaseType(player.CharacterManager.CharacterData);
var sync = new NtfSyncPlayer();
sync.Items.AddRange(syncItems);
// No s2c handler exists for GirlSpine_UnlockNodeOneKey — reuse GirlSpine_ChildUnLock
// which calls UI.CloseConnection() and triggers OnNerveNodeUp to refresh the UI.
var lastSubIdx = req.SubIdxList.Count > 0 ? req.SubIdxList[^1] : 9;
var rsp = $"{{\"tb\":{{\"D\":{cardDetail},\"pId\":{req.CardId},\"MastIdx\":{req.MastIdx},\"SubIdx\":{lastSubIdx}}}}}";
await CallGSRouter.SendScript(connection, "GirlSpine_ChildUnLock", rsp, sync);
}
}
internal sealed class OneKeyUnlockParam
{
[JsonPropertyName("pId")]
public int CardId { get; set; }
[JsonPropertyName("nIdx")]
public int MastIdx { get; set; }
[JsonPropertyName("tbOneKey")]
public List<int> SubIdxList { get; set; } = [];
}

View File

@@ -0,0 +1,42 @@
using MikuSB.Database.Player;
using MikuSB.GameServer.Server.CallGS.Handlers.Misc;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Preview;
[CallGSApi("RecordConfession")]
public class RecordConfession : ICallGSHandler
{
private const int MainSceneGID = 132;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var req = JsonSerializer.Deserialize<RecordConfessionParam>(param);
if (req == null) return;
var sid = req.Id + 10;
var player = connection.Player!;
var attr = player.Data.Attrs
.FirstOrDefault(x => x.Gid == MainSceneGID && x.Sid == sid);
if (attr == null)
{
attr = new PlayerAttr
{
Gid = MainSceneGID,
Sid = sid,
Val = 1
};
player.Data.Attrs.Add(attr);
}
var sync = new NtfSyncPlayer();
sync.Custom[player.ToPackedAttrKey(MainSceneGID, sid)] = attr.Val;
sync.Custom[player.ToShiftedAttrKey(MainSceneGID, sid)] = attr.Val;
await CallGSRouter.SendScript(connection, "RecordConfession", "{}", sync);
}
}
internal sealed class RecordConfessionParam
{
[JsonPropertyName("nIdx")]
public uint Id { get; set; }
}

View File

@@ -0,0 +1,70 @@
using MikuSB.Database;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.SupporterCard;
[CallGSApi("SupporterCard_Equip")]
public class SupporterCard_Equip : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<SupporterCardEquipParam>(param);
if (req == null || req.CardId == 0 || req.SupportCardUid == 0)
{
await CallGSRouter.SendScript(connection, "Logistics_Equip", "{}");
return;
}
var card = player.CharacterManager.GetCharacterByGUID((uint)req.CardId);
if (card == null)
{
await CallGSRouter.SendScript(connection, "Logistics_Equip", "{}");
return;
}
var slot = (uint)req.EqSlot;
// If an existing card is equipped in this slot and bForce is false, ask for confirmation
if (!req.Force && req.CurrentEquippedUid != 0 && card.SupportSlots.TryGetValue(slot, out var existing) && existing != 0)
{
await CallGSRouter.SendScript(connection, "Logistics_Confirm", "{}");
return;
}
// Perform equip
card.SupportSlots[slot] = (uint)req.SupportCardUid;
DatabaseHelper.SaveDatabaseType(player.CharacterManager.CharacterData);
var sync = new NtfSyncPlayer();
sync.Items.Add(card.ToProto());
// Req_EquipChange (no Model) → Logistics_Change; Req_Equip (has Model) → Logistics_Equip
var responseApi = string.IsNullOrEmpty(req.Model) ? "Logistics_Change" : "Logistics_Equip";
await CallGSRouter.SendScript(connection, responseApi, "{}", sync);
}
}
internal sealed class SupporterCardEquipParam
{
[JsonPropertyName("EqId")]
public int CardId { get; set; }
[JsonPropertyName("beEqId")]
public int SupportCardUid { get; set; }
[JsonPropertyName("EqSlot")]
public int EqSlot { get; set; }
[JsonPropertyName("BEqId")]
public int CurrentEquippedUid { get; set; }
[JsonPropertyName("bForce")]
public bool Force { get; set; }
[JsonPropertyName("Model")]
public string? Model { get; set; }
}

View File

@@ -0,0 +1,119 @@
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.SupporterCard;
[CallGSApi("SupporterCard_Upgrade")]
public class SupporterCard_Upgrade : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<SupporterCardUpgradeParam>(param);
if (req == null || req.SupportCardUid == 0 || req.Materials == null || req.Materials.Count == 0)
{
await CallGSRouter.SendScript(connection, "Logistics_Upgrade", "{}");
return;
}
var supportCard = player.InventoryManager.InventoryData.Items.GetValueOrDefault((uint)req.SupportCardUid);
if (supportCard == null)
{
await CallGSRouter.SendScript(connection, "Logistics_Upgrade", "{}");
return;
}
var supportCardExcel = GameData.SupportCardData.FirstOrDefault(x => x.TemplateId == supportCard.TemplateId);
var maxLevel = supportCardExcel?.MaxLevel ?? 10;
// Validate all materials exist with sufficient count
foreach (var mat in req.Materials)
{
var item = player.InventoryManager.InventoryData.Items.GetValueOrDefault((uint)mat.Id);
if (item == null || item.ItemCount < mat.Num)
{
await CallGSRouter.SendScript(connection, "Logistics_Upgrade", "{}");
return;
}
}
// Consume materials and accumulate exp
var syncItems = new List<Item>();
uint gainedExp = 0;
foreach (var mat in req.Materials)
{
var item = player.InventoryManager.InventoryData.Items[(uint)mat.Id];
// Look up ProvideExp: check SupportCardData first, then SuppliesData
uint provideExp = 0;
var scExcel = GameData.SupportCardData.FirstOrDefault(x => x.TemplateId == item.TemplateId);
if (scExcel != null)
provideExp = scExcel.ProvideExp;
else if (GameData.SuppliesData.TryGetValue((uint)item.TemplateId, out var supExcel))
provideExp = supExcel.ProvideExp;
gainedExp += provideExp * (uint)mat.Num;
item.ItemCount -= (uint)mat.Num;
var proto = item.ToProto();
if (item.ItemCount == 0)
{
player.InventoryManager.InventoryData.Items.Remove(item.UniqueId);
proto.Count = 0;
}
syncItems.Add(proto);
}
// Apply exp and level up
supportCard.Exp += gainedExp;
while (supportCard.Level < maxLevel)
{
var expNeeded = GetExpNeeded(supportCard.Level + 1);
if (expNeeded == 0 || supportCard.Exp < expNeeded) break;
supportCard.Exp -= expNeeded;
supportCard.Level++;
}
if (supportCard.Level >= maxLevel)
{
supportCard.Exp = 0;
supportCard.Level = maxLevel;
}
syncItems.Add(supportCard.ToProto());
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
var sync = new NtfSyncPlayer();
sync.Items.AddRange(syncItems);
await CallGSRouter.SendScript(connection, "Logistics_Upgrade", "{}", sync);
}
private static uint GetExpNeeded(uint level)
{
if (GameData.UpgradeExpData.TryGetValue((int)level, out var row))
return row.SusNeedExp;
return 0;
}
}
internal sealed class SupporterCardUpgradeParam
{
[JsonPropertyName("Id")]
public int SupportCardUid { get; set; }
[JsonPropertyName("tbMaterials")]
public List<UpgradeMaterial> Materials { get; set; } = [];
}
internal sealed class UpgradeMaterial
{
[JsonPropertyName("Id")]
public int Id { get; set; }
[JsonPropertyName("Num")]
public uint Num { get; set; }
}

View File

@@ -43,6 +43,8 @@ public class HandlerReqLogin : Handler
connection.State = SessionStateEnum.WAITING_FOR_LOGIN; connection.State = SessionStateEnum.WAITING_FOR_LOGIN;
var pd = DatabaseHelper.GetInstance<PlayerGameData>(account.Uid); var pd = DatabaseHelper.GetInstance<PlayerGameData>(account.Uid);
connection.Player = pd == null ? new PlayerInstance(account.Uid) : new PlayerInstance(pd); connection.Player = pd == null ? new PlayerInstance(account.Uid) : new PlayerInstance(pd);
if (connection.Player.Data.EnsureDisplayName())
DatabaseHelper.UpdateInstance(connection.Player.Data);
connection.DebugFile = Path.Combine(ConfigManager.Config.Path.LogPath, "Debug/", $"{account.Uid}/", connection.DebugFile = Path.Combine(ConfigManager.Config.Path.LogPath, "Debug/", $"{account.Uid}/",
$"Debug-{DateTime.Now:yyyy-MM-dd HH-mm-ss}.log"); $"Debug-{DateTime.Now:yyyy-MM-dd HH-mm-ss}.log");

View File

@@ -1,4 +1,6 @@
using MikuSB.Proto; using Google.Protobuf;
using MikuSB.Database;
using MikuSB.Proto;
namespace MikuSB.GameServer.Server.Packet.Recv.Login; namespace MikuSB.GameServer.Server.Packet.Recv.Login;
@@ -7,6 +9,57 @@ public class HandlerReqRename : Handler
{ {
public override async Task OnHandle(Connection connection, byte[] data, ushort seqNo) public override async Task OnHandle(Connection connection, byte[] data, ushort seqNo)
{ {
var player = connection.Player;
if (player != null)
{
var requestedName = ParseDisplayName(data);
player.SetDisplayName(requestedName);
DatabaseHelper.UpdateInstance(player.Data);
await player.OnHeartBeat();
}
await connection.SendPacket(CmdIds.RspRename); await connection.SendPacket(CmdIds.RspRename);
} }
private static string? ParseDisplayName(byte[] data)
{
if (data.Length == 0)
return null;
try
{
var input = new CodedInputStream(data);
while (!input.IsAtEnd)
{
var tag = input.ReadTag();
if (tag == 0)
break;
if (WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
{
var value = input.ReadString();
if (!string.IsNullOrWhiteSpace(value))
return value;
}
else
{
input.SkipLastField();
}
}
}
catch
{
// Fall back to raw UTF-8 payload handling below.
}
try
{
var rawText = System.Text.Encoding.UTF8.GetString(data).Trim('\0', ' ', '\r', '\n', '\t');
return string.IsNullOrWhiteSpace(rawText) ? null : rawText;
}
catch
{
return null;
}
}
} }

View File

@@ -62,7 +62,8 @@ public class PacketNtfCallScript : BasePacket
}; };
var extraSync = new NtfSyncPlayer(); var extraSync = new NtfSyncPlayer();
foreach (var item in inventory.Items.Values) if ((item.TemplateId & 0xFFFF) != 5) extraSync.Items.Add(item.ToProto()); foreach (var item in inventory.Items.Values) extraSync.Items.Add(item.ToProto());
foreach (var skin in inventory.Skins.Values) extraSync.Items.Add(skin.ToProto());
foreach (var weapon in inventory.Weapons.Values) extraSync.Items.Add(weapon.ToProto()); foreach (var weapon in inventory.Weapons.Values) extraSync.Items.Add(weapon.ToProto());
proto.ExtraSync = extraSync; proto.ExtraSync = extraSync;
SetData(proto); SetData(proto);

View File

@@ -49,7 +49,7 @@
Projects="..\MikuSB.Updater\MikuSB.Updater.csproj" Projects="..\MikuSB.Updater\MikuSB.Updater.csproj"
Targets="Restore;Publish" Targets="Restore;Publish"
RemoveProperties="PublishProfile" RemoveProperties="PublishProfile"
Properties="Configuration=$(Configuration);RuntimeIdentifier=$(RuntimeIdentifier);SelfContained=true;PublishSingleFile=true;PublishDir=$(_UpdaterPublishDir)" /> Properties="Configuration=$(Configuration);RuntimeIdentifier=$(RuntimeIdentifier);SelfContained=false;PublishSingleFile=true;PublishDir=$(_UpdaterPublishDir)" />
<Copy <Copy
SourceFiles="$(_UpdaterPublishDir)MikuSB.Updater.exe" SourceFiles="$(_UpdaterPublishDir)MikuSB.Updater.exe"

View File

@@ -1 +1 @@
v=0.8 v=1.1