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

Common/Configuration/ConfigContainer.cs

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

Common/Database/Inventory/InventoryData.cs

@@ -69,7 +69,7 @@ public class GameWeaponInfo : GrowableItemInfo
     }
 }public class GameSkinInfo : BaseGameItemInfo
 {
-    public uint Level { get; set; }
+    public uint SkinType { get; set; }
     public override Item ToProto()
     {
         var proto = new Item
@@ -79,6 +79,7 @@ public class GameWeaponInfo : GrowableItemInfo
             Count = ItemCount,
             Flag = (uint)Flag,
         };
+        proto.Slots[11] = SkinType;
         return proto;
     }
 }

GameServer/Game/Character/CharacterManager.cs

@@ -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);
         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);
         if (skinInfo != null) character.SkinId = skinInfo.UniqueId;
 

GameServer/Game/Inventory/InventoryManager.cs

@@ -51,27 +51,43 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
         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;
         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;
 
         var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level);
-        var skinInfo = new BaseGameItemInfo
+        var skinInfo = new GameSkinInfo
         {
             TemplateId = templateId,
             UniqueId = InventoryData.NextUniqueUid++,
             ItemType = ItemTypeEnum.TYPE_CARD_SKIN,
             ItemCount = 1
         };
-        InventoryData.Items[skinInfo.UniqueId] = skinInfo;
+        InventoryData.Skins[skinInfo.UniqueId] = skinInfo;
 
         if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([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)
     {
         if (genre != ItemTypeEnum.TYPE_AR) return null;

GameServer/Server/CallGS/Handlers/Girl/GirlSkin_ChangeSkinType.cs

@@ -1,4 +1,5 @@
-using System.Text.Json;
+using MikuSB.Proto;
+using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Text.Json.Serialization;
 
@@ -15,16 +16,35 @@ public class GirlSkin_ChangeSkinType : ICallGSHandler
             ["nType"] = req?.Type ?? 1,
             ["nSkinId"] = req?.SkinId
         };
-        // TODO change type in proto Item ??
+        if (req == null)
+        {
             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
 {
     [JsonPropertyName("nType")]
-    public int? Type { get; set; }
+    public uint Type { get; set; }
 
     [JsonPropertyName("nSkinId")]
-    public uint? SkinId { get; set; }
+    public uint SkinId { get; set; }
 }

GameServer/Server/CallGS/Handlers/Preview/RecordConfession.cs

@@ -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; }
+}

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

@@ -62,7 +62,8 @@ public class PacketNtfCallScript : BasePacket
         };
 
         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());
         proto.ExtraSync = extraSync;
         SetData(proto);

version.txt

@@ -1 +1 @@
-v=0.8
+v=0.9