Merge branch 'main' of https://github.com/MikuLeaks/MikuSB

Common/Configuration/ConfigContainer.cs

@@ -60,6 +60,7 @@ public class ServerOption
     public string FallbackLanguage { get; set; } = "EN";
     public string[] DefaultPermissions { get; set; } = ["Admin"];
     public ServerProfile ServerProfile { get; set; } = new();
+    public bool EnableGmMenu { get; set; } = true;
     public bool AutoCreateUser { get; set; } = true;
     public bool SavePersonalDebugFile { get; set; } = false;
     public bool AutoSendResponseWhenNoHandler { get; set; } = true;

Common/Data/Excel/CallItemExcel.cs

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

Common/Data/Excel/CardSkinPartsExcel.cs

@@ -0,0 +1,27 @@
+using Newtonsoft.Json;
+
+namespace MikuSB.Data.Excel;
+
+[ResourceEntity("card_skin_parts.json")]
+public class CardSkinPartsExcel : 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; }
+    [JsonProperty("profile")] public List<List<int>> CardSkinID { get; set; } = [];
+    public string I18n { get; set; } = "";
+    [JsonIgnore] public ulong TemplateId { get; set; }
+    public override uint GetId()
+    {
+        return (uint)I18n.GetHashCode();
+    }
+
+    public override void Loaded()
+    {
+        TemplateId = GameResourceTemplateId.FromGdpl(Genre, Detail, Particular, Level);
+        GameData.CardSkinPartsData.Add(Icon, this);
+    }
+}

Common/Data/GameData.cs

@@ -23,6 +23,8 @@ public static class GameData
     public static Dictionary<uint, WeaponSkinExcel> WeaponSkinData { get; private set; } = [];
     public static Dictionary<uint, DailyLevelExcel> DailyLevelData { get; private set; } = [];
     public static Dictionary<uint, ProfileExcel> ProfileData { get; private set; } = [];
+    public static Dictionary<uint, CardSkinPartsExcel> CardSkinPartsData { get; private set; } = [];
+    public static Dictionary<uint, CallItemExcel> CallItemData { get; private set; } = [];
 }
 
 public static class GameResourceTemplateId

Common/Database/Inventory/InventoryData.cs

@@ -83,6 +83,7 @@ public class GameWeaponInfo : GrowableItemInfo
 }
 public class GameSkinInfo : BaseGameItemInfo
 {
+    [SugarColumn(IsJson = true)] public Dictionary<uint, ulong> PartSlots { get; set; } = [];
     public uint SkinType { get; set; }
     public override Item ToProto()
     {
@@ -94,6 +95,7 @@ public class GameSkinInfo : BaseGameItemInfo
             Flag = (uint)Flag,
         };
         proto.Slots[(uint)ItemSkinSlotTypeEnum.SLOT_CARD_SKIL_TYPE] = Math.Min(SkinType, 1);
+        foreach (var (slot, uid) in PartSlots) proto.Slots[slot] = uid;
         return proto;
     }
 }

Common/Internationalization/Message/LanguageCHS.cs

@@ -35,6 +35,8 @@ public class ServerTextCHS
 /// </summary>
 public class WordTextCHS
 {
+    public string CallItem => "召唤道具";
+    public string SkinPart => "皮肤部件";
     public string Profile => "个人资料";
     public string WeaponSkin => "武器皮肤";
     public string SupportCard => "支援卡";
@@ -242,7 +244,9 @@ public class GiveAllTextCHS
     public string Usage => "用法：/giveall weapon <detail/-1> -p<特定> -l<等級>\n" +
                            "用法：/giveall weaponskin <detail/-1> -p<特定>\n" +
                            "用法：/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 call <detail/-1> -g<類型> -p<特定> -l<等級>";
     public string NotFound => "未找到 {0}！";
     public string GiveAllItems => "已向玩家添加 {0} 个 {1}！";
 }

Common/Internationalization/Message/LanguageCHT.cs

@@ -35,6 +35,8 @@ public class ServerTextCHT
 /// </summary>
 public class WordTextCHT
 {
+    public string CallItem => "召喚道具";
+    public string SkinPart => "外觀部件";
     public string Profile => "個人資料";
     public string WeaponSkin => "武器外觀";
     public string SupportCard => "支援卡";
@@ -242,7 +244,9 @@ public class GiveAllTextCHT
     public string Usage => "用法：/giveall weapon <detail/-1> -p<特定> -l<等級>\n" +
                            "用法：/giveall weaponskin <detail/-1> -p<特定>\n" +
                            "用法：/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 call <detail/-1> -g<類型> -p<特定> -l<等級>";
     public string NotFound => "未找到 {0}！";
     public string GiveAllItems => "已向玩家添加 {0} 個 {1}！";
 }

Common/Internationalization/Message/LanguageEN.cs

@@ -35,6 +35,8 @@ public class ServerTextEN
 /// </summary>
 public class WordTextEN
 {
+    public string CallItem => "Call Item";
+    public string SkinPart => "Skin Part";
     public string Profile => "Profile";
     public string WeaponSkin => "Weapon Skin";
     public string Valk => "Valkyrie";
@@ -208,7 +210,9 @@ public class GiveAllTextEN
     public string Usage => "Usage: /giveall weapon <detail/-1> -p<particular> -l<level>\n" +
                            "Usage: /giveall weaponskin <detail/-1> -p<particular>\n" +
                            "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 call <detail/-1> -g<genre> -p<particular> -l<level>";
     public string NotFound => "{0} not found!";
     public string GiveAllItems => "Added {0} {1} to player!";
 }

GameServer/Command/Commands/CommandGiveAll.cs

@@ -150,4 +150,76 @@ public class CommandGiveAll : ICommands
         await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
             I18NManager.Translate("Word.Profile"), profileItems.Count.ToString()));
     }
+
+    [CommandMethod("skinpart")]
+    public async ValueTask GiveAllSkinPart(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> skinPartItems = [];
+        if (detail == -1)
+        {
+            // add all
+            foreach (var config in GameData.CardSkinPartsData.Values)
+            {
+                var skinPart = await player.InventoryManager!
+                    .AddSkinPartItem((ItemTypeEnum)config.Genre, config.Detail, config.Particular, config.Level, false);
+                if (skinPart != null) skinPartItems.Add(skinPart);
+            }
+        }
+        else
+        {
+            var skinPart = await player.InventoryManager!.AddSkinPartItem((ItemTypeEnum)genre, (uint)detail, (uint)particular, (uint)level, false);
+            if (skinPart == null)
+            {
+                await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.SkinPart")));
+                return;
+            }
+            skinPartItems.Add(skinPart);
+        }
+        if (skinPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinPartItems));
+        await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
+            I18NManager.Translate("Word.SkinPart"), skinPartItems.Count.ToString()));
+    }
+
+    [CommandMethod("call")]
+    public async ValueTask GiveAllCallItem(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> callItems = [];
+        if (detail == -1)
+        {
+            // add all
+            foreach (var config in GameData.CallItemData.Values)
+            {
+                var callItem = await player.InventoryManager!
+                    .AddCallItem((ItemTypeEnum)config.Genre, config.Detail, config.Particular, config.Level, false);
+                if (callItem != null) callItems.Add(callItem);
+            }
+        }
+        else
+        {
+            var callItem = await player.InventoryManager!.AddCallItem((ItemTypeEnum)genre, (uint)detail, (uint)particular, (uint)level, false);
+            if (callItem == null)
+            {
+                await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.CallItem")));
+                return;
+            }
+            callItems.Add(callItem);
+        }
+        if (callItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(callItems));
+        await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
+            I18NManager.Translate("Word.CallItem"), callItems.Count.ToString()));
+    }
 }

GameServer/Game/Inventory/InventoryManager.cs

@@ -270,4 +270,46 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
 
         return profileInfo;
     }
+
+    public async ValueTask<BaseGameItemInfo?> AddSkinPartItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
+    {
+        if (genre != ItemTypeEnum.TYPE_CARD_SKIN_PART) return null;
+        var skinPartData = GameData.CardSkinPartsData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
+        if (skinPartData == null) return null;
+        var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
+        if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null;
+        var skinPartInfo = new BaseGameItemInfo
+        {
+            TemplateId = templateId,
+            UniqueId = InventoryData.NextUniqueUid++,
+            ItemType = genre,
+            ItemCount = 1
+        };
+        InventoryData.Items[skinPartInfo.UniqueId] = skinPartInfo;
+
+        if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([skinPartInfo]));
+
+        return skinPartInfo;
+    }
+
+    public async ValueTask<BaseGameItemInfo?> AddCallItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
+    {
+        if (genre != ItemTypeEnum.TYPE_CALL) return null;
+        var callData = GameData.CallItemData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
+        if (callData == null) return null;
+        var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
+        if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null;
+        var callInfo = new BaseGameItemInfo
+        {
+            TemplateId = templateId,
+            UniqueId = InventoryData.NextUniqueUid++,
+            ItemType = genre,
+            ItemCount = 1
+        };
+        InventoryData.Items[callInfo.UniqueId] = callInfo;
+
+        if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([callInfo]));
+
+        return callInfo;
+    }
 }

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

@@ -0,0 +1,57 @@
+using Azure;
+using MikuSB.Data;
+using MikuSB.Database;
+using MikuSB.Database.Inventory;
+using MikuSB.Enums.Item;
+using MikuSB.GameServer.Game.Player;
+using MikuSB.Proto;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+
+namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
+
+[CallGSApi("GirlSkinParts_Update")]
+public class GirlSkinParts_Update : ICallGSHandler
+{
+    public async Task Handle(Connection connection, string param, ushort seqNo)
+    {
+        var req = JsonSerializer.Deserialize<GirlSkinPartsUpdateParam>(param);
+        if (req == null)
+        {
+            await CallGSRouter.SendScript(connection, "GirlSkinParts_Update", "{\"sErr\":\"error.BadParam\"}");
+            return;
+        }
+        var player = connection.Player!;
+        var data = new List<GameSkinInfo>();
+        foreach(var partId in req.PartsId)
+        {
+            var partData = player.InventoryManager.GetNormalItem(partId);
+            if (partData == null) continue;
+
+            var partExcel = GameData.CardSkinPartsData.Values.FirstOrDefault(x => x.TemplateId == partData.TemplateId);
+            if (partExcel == null) continue;
+
+            var skinData = player.InventoryManager.GetSkinItem(req.SkinId);
+            if (skinData == null) continue;
+
+            skinData.PartSlots[partExcel.Detail] = partData.UniqueId;
+            data.Add(skinData);
+        }
+
+        var sync = new NtfSyncPlayer 
+        {
+            Items = { data.Select(x => x.ToProto()) }
+        };
+        await CallGSRouter.SendScript(connection, "GirlSkinParts_Update", "{}", sync);
+    }
+}
+
+internal sealed class GirlSkinPartsUpdateParam
+{
+    [JsonPropertyName("tbPartsID")]
+    public List<uint> PartsId { get; set; } = [];
+
+    [JsonPropertyName("nSkinId")]
+    public uint SkinId { get; set; }
+}

GameServer/Server/Packet/Recv/Login/HandlerReqLogin.cs

@@ -53,6 +53,7 @@ public class HandlerReqLogin : Handler
         await connection.Player.OnEnterGame();
         connection.Player.Connection = connection;
         await connection.SendPacket(new PacketRspLogin(connection.Player!));
+        await SendDebugLoginState(connection);
 
         await connection.Player.OnHeartBeat();
         await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
@@ -118,4 +119,14 @@ public class HandlerReqLogin : Handler
             });
         }
     }
+
+    private static async Task SendDebugLoginState(Connection connection)
+    {
+        var response = new JsonObject
+        {
+            ["IsDebug"] = ConfigManager.Config.ServerOption.EnableGmMenu
+        };
+
+        await CallGSRouter.SendScript(connection, "gm.notifylogin", response.ToJsonString());
+    }
 }

version.txt

@@ -1 +1 @@
-v=1.4
+v=1.5