add girl skin command

Common/Data/Config/StringToUIntConverter.cs

@@ -0,0 +1,24 @@
+using Newtonsoft.Json;
+
+namespace MikuSB.Data.Config;
+
+public class StringToUIntConverter : JsonConverter<uint>
+{
+    public override uint ReadJson(JsonReader reader, Type objectType, uint existingValue, bool hasExistingValue, JsonSerializer serializer)
+    {
+        if (reader.Value == null)
+            return 0;
+
+        var value = reader.Value.ToString();
+
+        if (string.IsNullOrWhiteSpace(value))
+            return 0;
+
+        return uint.TryParse(value, out var result) ? result : 0;
+    }
+
+    public override void WriteJson(JsonWriter writer, uint value, JsonSerializer serializer)
+    {
+        writer.WriteValue(value);
+    }
+}

Common/Data/Excel/ArItemExcel.cs

@@ -1,6 +1,6 @@
-namespace MikuSB.Data.Excel;
+namespace MikuSB.Data.Excel;
 
-[ResourceEntity("ar_item.json")]
+[ResourceEntity("item/templates/ar_item.json")]
 public class ArItemExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/BreakExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("break.json")]
+[ResourceEntity("item/break.json")]
 public class BreakExcel : ExcelResource
 {
     [JsonProperty("ID")] public int Id { get; set; }

Common/Data/Excel/BreakLevelLimitExcel.cs

@@ -1,6 +1,6 @@
-namespace MikuSB.Data.Excel;
+namespace MikuSB.Data.Excel;
 
-[ResourceEntity("break_level_limit.json")]
+[ResourceEntity("item/break_level_limit.json")]
 public class BreakLevelLimitExcel : ExcelResource
 {
     public int ID { get; set; }

Common/Data/Excel/CallItemExcel.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("call_item.json")]
+[ResourceEntity("item/templates/call_item.json")]
 public class CallItemExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/CardExcel.cs

@@ -2,7 +2,7 @@
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("card.json")]
+[ResourceEntity("item/templates/card.json")]
 public class CardExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/CardSkinExcel.cs

@@ -2,7 +2,7 @@
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("card_skin.json")]
+[ResourceEntity("item/templates/card_skin.json")]
 public class CardSkinExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/CardSkinPartsExcel.cs

@@ -2,7 +2,7 @@
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("card_skin_parts.json")]
+[ResourceEntity("item/templates/card_skin_parts.json")]
 public class CardSkinPartsExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/ChapterLevelExcel.cs

@@ -1,6 +1,6 @@
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("level.json")]
+[ResourceEntity("chapter/level.json")]
 public class ChapterLevelExcel : ExcelResource
 {
     public uint ID { get; set; }

Common/Data/Excel/DailyLevelExcel.cs

@@ -1,6 +1,6 @@
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("daily_level.json")]
+[ResourceEntity("daily/level.json")]
 public class DailyLevelExcel : ExcelResource
 {
     public uint ID { get; set; }

Common/Data/Excel/GuideExcel.cs

@@ -0,0 +1,21 @@
+using MikuSB.Data.Config;
+using Newtonsoft.Json;
+
+namespace MikuSB.Data.Excel;
+
+[ResourceEntity("guide/guide.json")]
+public class GuideExcel : ExcelResource
+{
+    public uint ID { get; set; }
+    [JsonConverter(typeof(StringToUIntConverter))] public uint Group { get; set; }
+
+    public override uint GetId()
+    {
+        return (ID << 48) | (Group << 32);
+    }
+
+    public override void Loaded()
+    {
+        GameData.GuideData.TryAdd(GetId(), this);
+    }
+}

Common/Data/Excel/ManifestationExcel.cs

@@ -2,7 +2,7 @@
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("manifestation.json")]
+[ResourceEntity("item/templates/manifestation.json")]
 public class ManifestationExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/NodeConditionExcel.cs

@@ -1,9 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
 // nodecondition.json: NodeConditionId → NodeXCost per sub-node (1-9)
-[ResourceEntity("nodecondition.json")]
+[ResourceEntity("item/skill/nodecondition.json")]
 public class NodeConditionExcel : ExcelResource
 {
     [JsonProperty("ID")] public uint Id { get; set; }

Common/Data/Excel/ProfileExcel.cs

@@ -1,6 +1,6 @@
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("profile.json")]
+[ResourceEntity("item/templates/profile.json")]
 public class ProfileExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/RecycleExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("recycle.json")]
+[ResourceEntity("item/recycle.json")]
 public class RecycleExcel : ExcelResource
 {
     public int ID { get; set; }

Common/Data/Excel/Rogue3DDailyBuffExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("dailybuff.json")]
+[ResourceEntity("dlc/rogue3d/dailybuff.json")]
 public class Rogue3DDailyBuffExcel : ExcelResource
 {
     [JsonProperty("ID")] public uint Id { get; set; }

Common/Data/Excel/Rogue3DDifficultExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("server_01_difficult.json")]
+[ResourceEntity("dlc/rogue3d/server_01_difficult.json")]
 public class Rogue3DDifficultExcel : ExcelResource
 {
     [JsonProperty("DifficultID")] public uint DifficultId { get; set; }

Common/Data/Excel/Rogue3DSeasonExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("server_10_season.json")]
+[ResourceEntity("dlc/rogue3d/server_10_season.json")]
 public class Rogue3DSeasonExcel : ExcelResource
 {
     [JsonProperty("SeasonID")] public uint SeasonId { get; set; }

Common/Data/Excel/Rogue3DTalentExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("server_03_talent.json")]
+[ResourceEntity("dlc/rogue3d/server_03_talent.json")]
 public class Rogue3DTalentExcel : ExcelResource
 {
     [JsonProperty("TalentID")] public uint TalentId { get; set; }

Common/Data/Excel/SpineExcel.cs

@@ -1,9 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
 // spine.json: SpineId → Node{i}Req (nodecondition ID per master node index)
-[ResourceEntity("spine.json")]
+[ResourceEntity("item/skill/spine.json")]
 public class SpineExcel : ExcelResource
 {
     [JsonProperty("ID")] public uint Id { get; set; }

Common/Data/Excel/SuppliesExcel.cs

@@ -1,9 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("suplies.json")]
+[ResourceEntity("item/templates/suplies.json")]
 public class SuppliesExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/SupportCardExcel.cs

@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("support_card.json")]
+[ResourceEntity("item/templates/support_card.json")]
 public class SupportCardExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/UpgradeExpExcel.cs

@@ -1,9 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("upgrade_exp.json")]
+[ResourceEntity("item/upgrade_exp.json")]
 public class UpgradeExpExcel : ExcelResource
 {
     public int Lv { get; set; }

Common/Data/Excel/WeaponExcel.cs

@@ -1,9 +1,9 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("weapon.json")]
+[ResourceEntity("item/templates/weapon.json")]
 public class WeaponExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/WeaponPartsExcel.cs

@@ -2,7 +2,7 @@
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("weapon_parts.json")]
+[ResourceEntity("item/templates/weapon_parts.json")]
 public class WeaponPartsExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/Excel/WeaponSkinExcel.cs

@@ -3,7 +3,7 @@ using Newtonsoft.Json.Linq;
 
 namespace MikuSB.Data.Excel;
 
-[ResourceEntity("weapon_skin.json")]
+[ResourceEntity("item/templates/weapon_skin.json")]
 public class WeaponSkinExcel : ExcelResource
 {
     public uint Genre { get; set; }

Common/Data/GameData.cs

@@ -29,6 +29,7 @@ public static class GameData
     public static Dictionary<uint, CardSkinPartsExcel> CardSkinPartsData { get; private set; } = [];
     public static Dictionary<uint, CallItemExcel> CallItemData { get; private set; } = [];
     public static Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
+    public static Dictionary<uint, GuideExcel> GuideData { get; private set; } = [];
 }
 
 public static class GameResourceTemplateId

Common/Data/ResourceManager.cs

@@ -46,7 +46,7 @@ public class ResourceManager
         foreach (var fileName in attribute.FileName)
             try
             {
-                var path = ConfigManager.Config.Path.ResourcePath + "/ExcelOutput/" + fileName;
+                var path = ConfigManager.Config.Path.ResourcePath + "/" + fileName;
                 var file = new FileInfo(path);
                 if (!file.Exists)
                 {

Common/Internationalization/Message/LanguageCHS.cs

@@ -35,6 +35,7 @@ public class ServerTextCHS
 /// </summary>
 public class WordTextCHS
 {
+    public string Skin => "Skin";
     public string WeaponPart => "武器部件";
     public string CallItem => "召唤道具";
     public string SkinPart => "皮肤部件";
@@ -227,12 +228,14 @@ public class GirlTextCHS
     public string Usage =>
         "用法: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" +
         "用法: /girl level <guid/-1> <level>\n" +
-        "用法: /girl neuronic <guid/-1> <level>";
+        "用法: /girl neuronic <guid/-1> <level>\n" +
+        "用法: /girl break <guid/-1> <level>";
 
     public string NotFound => "角色不存在！";
     public string Added => "已为玩家添加 {0} 个角色！";
     public string UpdateLevel => "已将 {1} 个角色等级设置为 {0}！";
     public string UpdateNeuronicLevel => "已将 {1} 个角色的神经元等级设置为 {0}！";
+    public string UpdateBreakLevel => "已将 {1} 个角色的天启/武格等级设置为 {0}！";
 }
 
 /// <summary>

Common/Internationalization/Message/LanguageCHT.cs

@@ -35,6 +35,7 @@ public class ServerTextCHT
 /// </summary>
 public class WordTextCHT
 {
+    public string Skin => "皮膚";
     public string WeaponPart => "武器部件";
     public string CallItem => "召喚道具";
     public string SkinPart => "外觀部件";
@@ -227,12 +228,14 @@ public class GirlTextCHT
     public string Usage =>
         "用法: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" +
         "用法: /girl level <guid/-1> <level>\n" +
-        "用法: /girl neuronic <guid/-1> <level>";
+        "用法: /girl neuronic <guid/-1> <level>\n" +
+        "用法: /girl break <guid/-1> <level>";
 
     public string NotFound => "角色不存在！";
     public string Added => "已為玩家新增 {0} 個角色！";
     public string UpdateLevel => "已將 {1} 個角色等級設為 {0}！";
     public string UpdateNeuronicLevel => "已將 {1} 個角色的神經元等級設置為 {0}！";
+    public string UpdateBreakLevel => "已将 {1} 个角色的天啟/武格等级设置为 {0}！";
 }
 
 /// <summary>

Common/Internationalization/Message/LanguageEN.cs

@@ -35,6 +35,7 @@ public class ServerTextEN
 /// </summary>
 public class WordTextEN
 {
+    public string Skin => "Skin";
     public string WeaponPart => "Weapon Part";
     public string CallItem => "Call Item";
     public string SkinPart => "Skin Part";
@@ -193,12 +194,14 @@ public class GirlTextEN
     public string Usage =>
         "Usage: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" +
         "Usage: /girl level <guid/-1> <level>\n" +
-        "Usage: /girl neuronic <guid/-1> <level>";
+        "Usage: /girl neuronic <guid/-1> <level>\n" +
+        "Usage: /girl break <guid/-1> <level>";
 
     public string NotFound => "Character not found!";
     public string Added => "Granted {0} character(s) to player!";
     public string UpdateLevel => "Set {1} character(s) to level {0}!";
     public string UpdateNeuronicLevel => "Set {1} character(s) Neuronic to level {0}!";
+    public string UpdateBreakLevel => "Set {1} character(s) Manifestation to level {0}!";
 }
 
 /// <summary>

GameServer/Command/Commands/CommandGirl.cs

@@ -129,4 +129,41 @@ public class CommandGirl : ICommands
                     level.ToString(), 
                     girls.Count.ToString()));
     }
+
+    [CommandMethod("break")]
+    public async ValueTask UpdateBreakLevel(CommandArg arg)
+    {
+        if (!await arg.CheckOnlineTarget()) return;
+        if (!await arg.CheckArgCnt(2)) return;
+
+        var guid = arg.GetInt(0);
+        var level = Math.Clamp(arg.GetInt(1), 0, 45);
+        var player = arg.Target!.Player!;
+        List<CharacterInfo> girls = [];
+
+        if (guid == -1)
+        {
+            foreach (var girl in player.CharacterManager.CharacterData.Characters)
+            {
+                girl.Break = (uint)level;
+                girls.Add(girl);
+            }
+        }
+        else
+        {
+            var girl = player.CharacterManager.GetCharacterByGUID((uint)guid);
+            if (girl == null)
+            {
+                await arg.SendMsg(I18NManager.Translate("Game.Command.Girl.NotFound"));
+                return;
+            }
+            girl.Break = (uint)level;
+            girls.Add(girl);
+        }
+
+        if (girls.Count > 0) await player.SendPacket(new PacketNtfCallScript(girls));
+        await arg.SendMsg(I18NManager.Translate("Game.Command.Girl.UpdateBreakLevel",
+                    level.ToString(),
+                    girls.Count.ToString()));
+    }
 }

GameServer/Command/Commands/CommandGiveAll.cs

@@ -258,4 +258,40 @@ public class CommandGiveAll : ICommands
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.WeaponPart"), weaponPartItems.Count.ToString()));
     }
+
+    [CommandMethod("skin")]
+    public async ValueTask GiveAllSkin(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<GameSkinInfo> skinItems = [];
+        if (detail == -1)
+        {
+            // add all
+            foreach (var config in GameData.CardSkinData.Values)
+            {
+                var skin = await player.InventoryManager!
+                    .AddSkinItem((ItemTypeEnum)config.Genre, config.Detail, config.Particular, config.Level, false);
+                if (skin != null) skinItems.Add(skin);
+            }
+        }
+        else
+        {
+            var skin = await player.InventoryManager!.AddSkinItem((ItemTypeEnum)genre, (uint)detail, (uint)particular, (uint)level, false);
+            if (skin == null)
+            {
+                await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.Skin")));
+                return;
+            }
+            skinItems.Add(skin);
+        }
+        if (skinItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinItems));
+        await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
+            I18NManager.Translate("Word.Skin"), skinItems.Count.ToString()));
+    }
 }

GameServer/Game/Character/CharacterManager.cs

@@ -27,11 +27,11 @@ public class CharacterManager(PlayerInstance player) : BasePlayerManager(player)
             Timestamp = Extensions.GetUnixSec()
         };
 
-        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: true);
         if (weaponInfo != null) character.WeaponUniqueId = weaponInfo.UniqueId;
 
         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, true);
         if (skinInfo != null) character.SkinId = skinInfo.UniqueId;
 
         if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([character]));

GameServer/Game/Player/PlayerInstance.cs

@@ -1,4 +1,4 @@
-using Google.Protobuf;
+using Google.Protobuf;
 using MikuSB.Data;
 using MikuSB.Database;
 using MikuSB.Database.Account;
@@ -230,6 +230,11 @@ public class PlayerInstance(PlayerGameData data)
             proto.Attrs[ToShiftedAttrKey(gid, sid)] = val;
         }
 
+        foreach (var x in Data.StrAttrs)
+        {
+            proto.StrAttrs[ToShiftedAttrKey(x.Gid, x.Sid)] = x.Val;
+        }
+
         proto.ShowItems.AddRange(Data.ShowItems);
 
         return proto;
@@ -251,6 +256,22 @@ public class PlayerInstance(PlayerGameData data)
         Data.ShowItems[index - 1] = itemId;
     }
 
+    public void SetStrAttr(uint gid, uint sid, string value)
+    {
+        var attr = Data.StrAttrs.FirstOrDefault(x => x.Gid == gid && x.Sid == sid);
+        if (attr == null)
+        {
+            attr = new PlayerStrAttr
+            {
+                Gid = gid,
+                Sid = sid
+            };
+            Data.StrAttrs.Add(attr);
+        }
+
+        attr.Val = value;
+    }
+
     public uint ToPackedAttrKey(uint gid, uint sid)
     {
         if (gid == 0)
@@ -349,6 +370,14 @@ public class PlayerInstance(PlayerGameData data)
             yield return (22, levelId, 1_700_000_000);
         }
 
+        foreach (var guide in GameData.GuideData.Values)
+        {
+            yield return (4, guide.ID, 999);
+        }
+
+        for (uint favor = 1; favor <= 50; favor++)
+            yield return (101, favor * 50, 500);
+
         // Main Scene 0 mean default scene
         yield return (132, 1, 0);
     }

GameServer/Server/CallGS/Handlers/House/House_Func/HouseBedroom.cs

@@ -12,9 +12,15 @@ public class GirlRegister : IHouseFuncHandler
         if (root == null) return;
 
         var girlId = HouseJson.NumField(root, "GirlId");
+        var floorId = HouseJson.NumField(root, "FloorId");
         var sync = new NtfSyncPlayer();
         if (girlId > 0)
+        {
+            var bedroomSid = HouseAttr.GetNextBedroomSid(connection.Player!, (uint)floorId);
             await HouseAttr.SetAsync(connection, HouseAttr.GirlRoomNumSid(girlId), HouseAttr.BedroomRegisteredNoRoom, sync);
+            if (bedroomSid != 0)  await HouseAttr.SetAsync(connection, bedroomSid, (uint)girlId, sync);
+        }
+            
 
         await CallGSRouter.SendScript(connection, "House_Request", HouseRequestScript.Synthesize(root), sync);
     }

GameServer/Server/CallGS/Handlers/House/House_Func/HouseShared.cs

@@ -105,6 +105,7 @@ internal static class HouseAttr
     internal const uint BedroomStartSid = 2550;
     internal const uint BedroomRegisteredNoRoom = 100;
     internal const uint PlayerRingInfoSidBase = 3174;
+    internal const uint BedroomPerFloor = 8;
 
     internal static uint Read(PlayerInstance player, uint sid)
     {
@@ -175,6 +176,25 @@ internal static class HouseAttr
         }
     }
 
+    internal static uint GetNextBedroomSid(PlayerInstance player, uint floorId)
+    {
+        var floorStartSid = BedroomStartSid + ((floorId - 2) * BedroomPerFloor) + 1;
+
+        for (uint i = 0; i < BedroomPerFloor; i++)
+        {
+            var sid = floorStartSid + i;
+
+            var exists = player.Data.Attrs.Any(x =>
+                x.Gid == Gid &&
+                x.Sid == sid);
+
+            if (!exists)
+                return sid;
+        }
+
+        return 0;
+    }
+
     internal static uint PackArcadePropUse(int type, int id, ushort count) =>
         (((uint)count & 0xffffu) << 16) | (((uint)id & 0xffu) << 8) | ((uint)type & 0xffu);
 }

GameServer/Server/CallGS/Handlers/Misc/PlayerSetting_ChangeShowCard.cs

@@ -1,3 +1,4 @@
+using MikuSB.Database;
 using MikuSB.Enums.Player;
 using MikuSB.Proto;
 using System.Text.Json;
@@ -22,6 +23,7 @@ public class PlayerSetting_ChangeShowCard : ICallGSHandler
             return;
         }
         player.SetShowItem((int)ProfileShowItemTypeEnum.SHOWITEM_GIRL, card.Guid);
+        DatabaseHelper.SaveDatabaseType(player.Data);
         var sync = new NtfSyncPlayer();
         sync.ShowItems.AddRange(player.Data.ShowItems);
         await CallGSRouter.SendScript(connection, "PlayerSetting_ChangeShowCard", "{}", sync);

GameServer/Server/CallGS/Handlers/Misc/PlayerSetting_SetProfileFace.cs

@@ -1,4 +1,5 @@
-using MikuSB.Enums.Player;
+using MikuSB.Database;
+using MikuSB.Enums.Player;
 using MikuSB.Proto;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -35,7 +36,7 @@ public class PlayerSetting_SetProfileFace : ICallGSHandler
             }
             player.SetShowItem((int)ProfileShowItemTypeEnum.SHOWITEM_FRAME, item.UniqueId);
         }
-        
+        DatabaseHelper.SaveDatabaseType(player.Data);
         var sync = new NtfSyncPlayer();
         sync.ShowItems.AddRange(player.Data.ShowItems);
         await CallGSRouter.SendScript(connection, "PlayerSetting_SetProfileFace", "null", sync);

GameServer/Server/CallGS/Handlers/Misc/PlayerSetting_SetShowBadge.cs

@@ -1,4 +1,5 @@
-using MikuSB.Enums.Player;
+using MikuSB.Database;
+using MikuSB.Enums.Player;
 using MikuSB.Proto;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -30,6 +31,8 @@ public class PlayerSetting_SetShowBadge : ICallGSHandler
             player.SetShowItem((int)slots[i], uniqueId);
         }
 
+        DatabaseHelper.SaveDatabaseType(player.Data);
+
         var sync = new NtfSyncPlayer();
         sync.ShowItems.AddRange(player.Data.ShowItems);
         await CallGSRouter.SendScript(connection, "PlayerSetting_SetShowBadge", "null", sync);

GameServer/Server/CallGS/Handlers/Misc/PlayerSetting_SetShowBubble.cs

@@ -1,4 +1,5 @@
-using MikuSB.Enums.Player;
+using MikuSB.Database;
+using MikuSB.Enums.Player;
 using MikuSB.Proto;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -23,6 +24,8 @@ public class PlayerSetting_SetShowBubble : ICallGSHandler
         }
 
         player.SetShowItem((int)ProfileShowItemTypeEnum.SHOWITEM_BUBBLE, item.UniqueId);
+        DatabaseHelper.SaveDatabaseType(player.Data);
+
         var sync = new NtfSyncPlayer();
         sync.ShowItems.AddRange(player.Data.ShowItems);
         await CallGSRouter.SendScript(connection, "PlayerSetting_SetShowBubble", "null", sync);

GameServer/Server/CallGS/Handlers/Misc/PlayerSetting_SetShowCover.cs

@@ -1,4 +1,5 @@
-using MikuSB.Enums.Player;
+using MikuSB.Database;
+using MikuSB.Enums.Player;
 using MikuSB.Proto;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -23,6 +24,8 @@ public class PlayerSetting_SetShowCover : ICallGSHandler
         }
 
         player.SetShowItem((int)ProfileShowItemTypeEnum.SHOWITEM_COVER, item.UniqueId);
+        DatabaseHelper.SaveDatabaseType(player.Data);
+
         var sync = new NtfSyncPlayer();
         sync.ShowItems.AddRange(player.Data.ShowItems);
         await CallGSRouter.SendScript(connection, "PlayerSetting_SetShowCover", "null", sync);

GameServer/Server/CallGS/Handlers/Misc/PlayerSetting_SetShowNameCard.cs

@@ -1,4 +1,5 @@
-using MikuSB.Enums.Player;
+using MikuSB.Database;
+using MikuSB.Enums.Player;
 using MikuSB.Proto;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -23,6 +24,8 @@ public class PlayerSetting_SetShowNameCard : ICallGSHandler
         }
 
         player.SetShowItem((int)ProfileShowItemTypeEnum.SHOWITEM_NAMECARD, item.UniqueId);
+        DatabaseHelper.SaveDatabaseType(player.Data);
+
         var sync = new NtfSyncPlayer();
         sync.ShowItems.AddRange(player.Data.ShowItems);
         await CallGSRouter.SendScript(connection, "PlayerSetting_SetShowNameCard", "null", sync);

GameServer/Server/CallGS/Handlers/Misc/SettingChange.cs

@@ -0,0 +1,39 @@
+using MikuSB.Proto;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace MikuSB.GameServer.Server.CallGS.Handlers.Misc;
+
+[CallGSApi("SettingChange")]
+public class SettingChange : ICallGSHandler
+{
+    private const uint PlayerSettingGid = 44;
+
+    public async Task Handle(Connection connection, string param, ushort seqNo)
+    {
+        var changes = JsonSerializer.Deserialize<List<SettingChangeParam>>(param) ?? [];
+        var player = connection.Player!;
+        var sync = new NtfSyncPlayer();
+
+        foreach (var change in changes)
+        {
+            var value = player.Data.StrAttrs
+                .FirstOrDefault(x => x.Gid == PlayerSettingGid && x.Sid == change.Id)?
+                .Val;
+
+            if (value == null)
+                continue;
+
+            sync.CustomStr[player.ToShiftedAttrKey(PlayerSettingGid, change.Id)] = value;
+        }
+
+        if (sync.CustomStr.Count > 0)
+            await connection.SendPacket(CmdIds.NtfSyncAttr, sync);
+    }
+}
+
+internal sealed class SettingChangeParam
+{
+    [JsonPropertyName("id")]
+    public uint Id { get; set; }
+}

GameServer/Server/Packet/Recv/Player/HandlerNtfSetAttr.cs

@@ -1,4 +1,5 @@
-using MikuSB.Database.Player;
+using MikuSB.Database;
+using MikuSB.Database.Player;
 using MikuSB.Proto;
 
 namespace MikuSB.GameServer.Server.Packet.Recv.Login;
@@ -12,7 +13,11 @@ public class HandlerNtfSetAttr : Handler
         var player = connection.Player!;
         var attr = player.Data.Attrs
             .FirstOrDefault(x => x.Gid == req.Gid && x.Sid == req.Sid);
-        if (attr != null) attr.Val = req.Val;
+
+        if (attr != null)
+        {
+            attr.Val = req.Val;
+        }
         else
         {
             player.Data.Attrs.Add(new PlayerAttr
@@ -22,6 +27,7 @@ public class HandlerNtfSetAttr : Handler
                 Val = req.Val
             });
         }
+        DatabaseHelper.SaveDatabaseType(player.Data);
         await player.OnHeartBeat();
     }
 }

GameServer/Server/Packet/Recv/Player/HandlerNtfSetStrAttr.cs

@@ -0,0 +1,19 @@
+using MikuSB.Database;
+using MikuSB.Proto;
+
+namespace MikuSB.GameServer.Server.Packet.Recv.Login;
+
+[Opcode(CmdIds.NtfSetStrAttr)]
+public class HandlerNtfSetStrAttr : Handler
+{
+    public override async Task OnHandle(Connection connection, byte[] data, ushort seqNo)
+    {
+        var req = NtfSetStrAttr.Parser.ParseFrom(data);
+        var player = connection.Player!;
+
+        player.SetStrAttr(req.Gid, req.Sid, req.Val);
+        DatabaseHelper.SaveDatabaseType(player.Data);
+
+        await player.OnHeartBeat();
+    }
+}

GameServer/Server/Packet/Send/Misc/PacketNtfCallScript.cs

@@ -68,6 +68,21 @@ public class PacketNtfCallScript : BasePacket
         SetData(proto);
     }
 
+    public PacketNtfCallScript(List<GameSkinInfo> skins) : base(CmdIds.NtfScript)
+    {
+        var proto = new NtfCallScript
+        {
+            Api = "",
+            Arg = "{}",
+            ExtraSync = new NtfSyncPlayer
+            {
+                Items = { skins.Select(x => x.ToProto()) }
+            }
+        };
+
+        SetData(proto);
+    }
+
     public PacketNtfCallScript(InventoryData inventory) : base(CmdIds.NtfScript)
     {
         var proto = new NtfCallScript

MikuSB.Updater/Program.cs

@@ -102,11 +102,6 @@ static void UpdateResources(string resourcePackagePath, string resourceTargetDir
     ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true);
 
     var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory;
-    var excelOutputSource = Path.Combine(extractedRoot, "ExcelOutput");
-    if (!Directory.Exists(excelOutputSource))
-        throw new DirectoryNotFoundException($"ExcelOutput directory was not found in resource package: {excelOutputSource}");
-
-    var excelOutputTarget = Path.Combine(resourceTargetDirectory, "ExcelOutput");
-    Directory.CreateDirectory(excelOutputTarget);
-    CopyDirectory(excelOutputSource, excelOutputTarget);
+    Directory.CreateDirectory(resourceTargetDirectory);
+    CopyDirectory(extractedRoot, resourceTargetDirectory);
 }

MikuSB/Update/UpdateService.cs

@@ -24,8 +24,8 @@ public static class UpdateService
         "https://github.com/Kei-Luna/MikuSB-Resource/archive/refs/heads/main.zip";
     private static readonly string[] RequiredResourceFiles =
     [
-        "card.json",
-        "weapon.json"
+        "item/templates/card.json",
+        "item/templates/weapon.json"
     ];
 
     public static async Task<bool> TryStartSelfUpdateAsync()
@@ -160,11 +160,11 @@ public static class UpdateService
 
     private static bool AreRequiredResourcesPresent()
     {
-        var excelOutputPath = Path.Combine(AppContext.BaseDirectory, ConfigManager.Config.Path.ResourcePath, "ExcelOutput");
-        if (!Directory.Exists(excelOutputPath))
+        var resourcePath = Path.Combine(AppContext.BaseDirectory, ConfigManager.Config.Path.ResourcePath);
+        if (!Directory.Exists(resourcePath))
             return false;
 
-        return RequiredResourceFiles.All(fileName => File.Exists(Path.Combine(excelOutputPath, fileName)));
+        return RequiredResourceFiles.All(fileName => File.Exists(Path.Combine(resourcePath, fileName)));
     }
 
     private static async Task DownloadAndInstallResourcesAsync()
@@ -187,13 +187,8 @@ public static class UpdateService
         ZipFile.ExtractToDirectory(resourcePackagePath, resourceStagingDirectory, overwriteFiles: true);
 
         var extractedRoot = Directory.GetDirectories(resourceStagingDirectory).FirstOrDefault() ?? resourceStagingDirectory;
-        var excelOutputSource = Path.Combine(extractedRoot, "ExcelOutput");
-        if (!Directory.Exists(excelOutputSource))
-            throw new DirectoryNotFoundException($"ExcelOutput directory was not found in resource package: {excelOutputSource}");
-
-        var excelOutputTarget = Path.Combine(resourceTargetDirectory, "ExcelOutput");
-        Directory.CreateDirectory(excelOutputTarget);
-        CopyDirectory(excelOutputSource, excelOutputTarget);
+        Directory.CreateDirectory(resourceTargetDirectory);
+        CopyDirectory(extractedRoot, resourceTargetDirectory);
     }
 
     private static bool ConfirmUpdate(string latestVersion)

version.txt

@@ -1 +1 @@
-v=1.9
+v=2.2