add weapon parts

Common/Configuration/ConfigContainer.cs

@@ -60,7 +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 EnableGmMenu { get; set; } = false;
     public bool AutoCreateUser { get; set; } = true;
     public bool SavePersonalDebugFile { get; set; } = false;
     public bool AutoSendResponseWhenNoHandler { get; set; } = true;

Common/Data/Excel/WeaponPartsExcel.cs

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

Common/Data/GameData.cs

@@ -25,6 +25,7 @@ public static class GameData
     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 Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
 }
 
 public static class GameResourceTemplateId

Common/Database/Inventory/InventoryData.cs

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

Common/Internationalization/Message/LanguageCHS.cs

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

Common/Internationalization/Message/LanguageCHT.cs

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

Common/Internationalization/Message/LanguageEN.cs

@@ -35,6 +35,7 @@ public class ServerTextEN
 /// </summary>
 public class WordTextEN
 {
+    public string WeaponPart => "Weapon Part";
     public string CallItem => "Call Item";
     public string SkinPart => "Skin Part";
     public string Profile => "Profile";
@@ -212,6 +213,7 @@ public class GiveAllTextEN
                            "Usage: /giveall card <detail/-1> -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 weaponpart <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

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

GameServer/Game/Inventory/InventoryManager.cs

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

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

@@ -1,12 +1,7 @@
-using Azure;
-using MikuSB.Data;
-using MikuSB.Database;
+using MikuSB.Data;
 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;

GameServer/Server/CallGS/Handlers/Weapon/Weapon_ReplacePart.cs

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

GameServer/Server/CallGS/Handlers/Weapon/Weapon_ShowDefaultPart.cs

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

Proxy/ProxyServer.cs

@@ -74,19 +74,27 @@ public sealed class ProxyServer(
         catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
         {
         }
+        catch (SocketException) when (stoppingToken.IsCancellationRequested)
+        {
+        }
+        catch (ObjectDisposedException) when (stoppingToken.IsCancellationRequested)
+        {
+        }
     }
 
-    public override Task StopAsync(CancellationToken cancellationToken)
+    public override async Task StopAsync(CancellationToken cancellationToken)
     {
+        // Cancel the BackgroundService token first so shutdown exceptions are treated as expected.
+        var stopTask = base.StopAsync(cancellationToken);
         _listener?.Stop();
-        return base.StopAsync(cancellationToken);
+        await stopTask;
     }
 
     private async Task HandleClientAsync(TcpClient client, CancellationToken cancellationToken)
     {
         using (client)
         {
-            logger.Info($"Proxy New client: {client.Client.RemoteEndPoint}");
+            //logger.Debug($"Proxy New client: {client.Client.RemoteEndPoint}");
             try
             {
                 await HandleClientCoreAsync(client, cancellationToken);
@@ -190,7 +198,7 @@ public sealed class ProxyServer(
     {
         var pathAndQuery = request.GetPathAndQuery();
         var uri = new Uri($"http://{ServerHost}:{_options.ServerHttpPort}{pathAndQuery}");
-        logger.Info($"Redirect: {request.Method} {request.HostOverride ?? request.Host}{pathAndQuery} -> {uri}");
+        if (ConfigManager.Config.HttpServer.EnableLog) logger.Info($"Redirect: {request.Method} {request.HostOverride ?? request.Host}{pathAndQuery} -> {uri}");
         await SendHttpRequestAsync(clientStream, request, uri, true, cancellationToken);
     }
 

README.md

@@ -32,7 +32,7 @@
 
 ## Requirements
 
-- [.NET SDK 9.0](https://dotnet.microsoft.com/en-us/download/dotnet/9.0)
+- [.NET SDK 10.0](https://dotnet.microsoft.com/en-us/download/dotnet/10.0)
 
 ## Running
 

README_jp.md

@@ -32,7 +32,7 @@ English documentation is available in [README.md](README.md).
 
 ## 要件
 
-- [.NET SDK 9.0](https://dotnet.microsoft.com/ja-jp/download/dotnet/9.0)
+- [.NET SDK 10.0](https://dotnet.microsoft.com/ja-jp/download/dotnet/10.0)
 
 ## 起動方法