Compare commits

..

16 Commits
v1.1 ... v1.4

Author SHA1 Message Date
Kei-Luna
846139347a Implement Weapon_Evolution 2026-04-29 09:58:35 +09:00
Kei-Luna
d1102b444c Implement Weapon_Break 2026-04-29 09:40:36 +09:00
Kei-Luna
3611624073 Update version.txt 2026-04-29 09:01:38 +09:00
Kei-Luna
c61ac08dd3 Fixed a critical issue with in-game chat. 2026-04-29 09:01:20 +09:00
Kei-Luna
720f56c708 fix 2026-04-29 06:59:22 +09:00
Kei-Luna
5fa42bdb23 Merge pull request #2 from ahasasjeb/main 2026-04-29 06:34:49 +09:00
Naruse
5af23a8113 unlock more stage for operation 2026-04-29 00:47:21 +08:00
Naruse
ee79486748 v1.2 2026-04-29 00:46:44 +08:00
Naruse
0cf0e3beb4 fix weapon break limit 2026-04-29 00:36:17 +08:00
Naruse
8d6e0d7638 add weapon skin & command for it 2026-04-28 23:48:14 +08:00
Naruse
5f0de1a9f0 add support card giveall command
NOTE: need to delete old database because im moving support card to different column
2026-04-28 23:08:23 +08:00
Naruse
069ee6aa2a add girl neuronic command 2026-04-28 21:45:32 +08:00
Kei-Luna
64f977173f Update README.md 2026-04-28 18:03:34 +09:00
lvjia
2f8d0c6afc Fix debug command i18n keys 2026-04-28 14:05:32 +08:00
lvjia
f6204134a9 /debug Multiple languages
Co-authored-by: Copilot <copilot@github.com>
2026-04-28 13:09:34 +08:00
lvjia
57ce0e183b Rewrite girl skin type handling 2026-04-28 12:47:05 +08:00
25 changed files with 924 additions and 76 deletions

View File

@@ -0,0 +1,34 @@
using Newtonsoft.Json;
namespace MikuSB.Data.Excel;
[ResourceEntity("break.json")]
public class BreakExcel : ExcelResource
{
[JsonProperty("ID")] public int Id { get; set; }
[JsonProperty("Items1")] public List<List<int>> Items1 { get; set; } = [];
[JsonProperty("Items2")] public List<List<int>> Items2 { get; set; } = [];
[JsonProperty("Items3")] public List<List<int>> Items3 { get; set; } = [];
[JsonProperty("Items4")] public List<List<int>> Items4 { get; set; } = [];
[JsonProperty("Items5")] public List<List<int>> Items5 { get; set; } = [];
[JsonProperty("Items6")] public List<List<int>> Items6 { get; set; } = [];
public List<List<int>> GetItems(uint breakLevel) => breakLevel switch
{
1 => Items1,
2 => Items2,
3 => Items3,
4 => Items4,
5 => Items5,
6 => Items6,
_ => []
};
public override uint GetId() => (uint)Id;
public override void Loaded()
{
GameData.BreakData[Id] = this;
}
}

View File

@@ -0,0 +1,14 @@
namespace MikuSB.Data.Excel;
[ResourceEntity("daily_level.json")]
public class DailyLevelExcel : ExcelResource
{
public uint ID { get; set; }
public override uint GetId() => ID;
public override void Loaded()
{
GameData.DailyLevelData.Add(ID, this);
}
}

View File

@@ -0,0 +1,24 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace MikuSB.Data.Excel;
[ResourceEntity("weapon_skin.json")]
public class WeaponSkinExcel : 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.WeaponSkinData.Add(GetId(), this);
}
}

View File

@@ -16,9 +16,13 @@ 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<int, BreakExcel> BreakData { get; private set; } = [];
public static Dictionary<uint, SpineExcel> SpineData { get; private set; } = []; public static Dictionary<uint, SpineExcel> SpineData { get; private set; } = [];
public static Dictionary<uint, NodeConditionExcel> NodeConditionData { get; private set; } = []; public static Dictionary<uint, NodeConditionExcel> NodeConditionData { get; private set; } = [];
public static List<SupportCardExcel> SupportCardData { get; private set; } = []; public static List<SupportCardExcel> SupportCardData { get; private set; } = [];
public static Dictionary<uint, WeaponSkinExcel> WeaponSkinData { get; private set; } = [];
public static Dictionary<uint, DailyLevelExcel> DailyLevelData { get; private set; } = [];
} }
public static class GameResourceTemplateId public static class GameResourceTemplateId

View File

@@ -23,6 +23,7 @@ public class CharacterInfo
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; }
public uint WeaponSkinId { get; set; }
public ItemFlagEnum Flag { get; set; } = ItemFlagEnum.FLAG_READED; public ItemFlagEnum Flag { get; set; } = ItemFlagEnum.FLAG_READED;
public uint Expiration { get; set; } public uint Expiration { get; set; }
[SugarColumn(IsJson = true)] public List<uint> UnlockedSkin { get; set; } = []; [SugarColumn(IsJson = true)] public List<uint> UnlockedSkin { get; set; } = [];
@@ -57,6 +58,7 @@ public class CharacterInfo
proto.Slots[4] = WeaponUniqueId; proto.Slots[4] = WeaponUniqueId;
proto.Slots[5] = SkinId; proto.Slots[5] = SkinId;
proto.Slots[6] = WeaponSkinId;
foreach (var (slot, uid) in SupportSlots) foreach (var (slot, uid) in SupportSlots)
proto.Slots[slot] = uid; proto.Slots[slot] = uid;

View File

@@ -17,6 +17,12 @@ public class InventoryData : BaseDatabaseDataHelper
[SugarColumn(IsJson = true)] [SugarColumn(IsJson = true)]
public Dictionary<uint, GameSkinInfo> Skins { get; set; } = []; // Key: UniqueId public Dictionary<uint, GameSkinInfo> Skins { get; set; } = []; // Key: UniqueId
[SugarColumn(IsJson = true)]
public Dictionary<uint, GameSupportCardInfo> SupportCards { get; set; } = []; // Key: UniqueId
[SugarColumn(IsJson = true)]
public Dictionary<uint, uint> SkinTypesBySkinId { get; set; } = []; // Key: nSkinId, Value: client nType
} }
public class BaseGameItemInfo public class BaseGameItemInfo
@@ -50,6 +56,7 @@ public abstract class GrowableItemInfo : BaseGameItemInfo
public new uint Level { get; set; } public new uint Level { get; set; }
public new uint Exp { get; set; } public new uint Exp { get; set; }
public uint Break { get; set; } public uint Break { get; set; }
public uint Evolue { get; set; }
public uint EquipAvatarId { get; set; } public uint EquipAvatarId { get; set; }
} }
@@ -67,12 +74,14 @@ public class GameWeaponInfo : GrowableItemInfo
{ {
Level = Level, Level = Level,
Exp = Exp, Exp = Exp,
Break = Break Break = Break,
Evolue = Evolue
} }
}; };
return proto; return proto;
} }
}public class GameSkinInfo : BaseGameItemInfo }
public class GameSkinInfo : BaseGameItemInfo
{ {
public uint SkinType { get; set; } public uint SkinType { get; set; }
public override Item ToProto() public override Item ToProto()
@@ -84,7 +93,30 @@ public class GameWeaponInfo : GrowableItemInfo
Count = ItemCount, Count = ItemCount,
Flag = (uint)Flag, Flag = (uint)Flag,
}; };
proto.Slots[11] = SkinType; proto.Slots[11] = Math.Min(SkinType, 1);
return proto;
}
}
public class GameSupportCardInfo : BaseGameItemInfo
{
public uint AffixId { get; set; }
public override Item ToProto()
{
var proto = new Item
{
Id = UniqueId,
Template = TemplateId,
Count = ItemCount,
Flag = (uint)Flag,
Enhance = new Enhance
{
Level = Level,
Exp = Exp
}
};
proto.Slots[1] = AffixId;
return proto; return proto;
} }
} }

View File

@@ -35,6 +35,9 @@ public class ServerTextCHS
/// </summary> /// </summary>
public class WordTextCHS public class WordTextCHS
{ {
public string WeaponSkin => "武器皮肤";
public string SupportCard => "支援卡";
public string Weapon => "武器";
public string Rank => "星魂"; public string Rank => "星魂";
public string Avatar => "角色"; public string Avatar => "角色";
public string Material => "材料"; public string Material => "材料";
@@ -121,6 +124,7 @@ public class CommandTextCHS
public HelpTextCHS Help { get; } = new(); public HelpTextCHS Help { get; } = new();
public GirlTextCHS Girl { get; } = new(); public GirlTextCHS Girl { get; } = new();
public GiveAllTextCHS GiveAll { get; } = new(); public GiveAllTextCHS GiveAll { get; } = new();
public DebugTextCHS Debug { get; } = new();
} }
#endregion #endregion
@@ -218,11 +222,13 @@ public class GirlTextCHS
public string Usage => public string Usage =>
"用法: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" + "用法: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" +
"用法: /girl level <guid/-1> <level>"; "用法: /girl level <guid/-1> <level>\n" +
"用法: /girl neuronic <guid/-1> <level>";
public string NotFound => "角色不存在!"; public string NotFound => "角色不存在!";
public string Added => "已为玩家添加 {0} 个角色!"; public string Added => "已为玩家添加 {0} 个角色!";
public string UpdateLevel => "已将 {1} 个角色等级设置为 {0}"; public string UpdateLevel => "已将 {1} 个角色等级设置为 {0}";
public string UpdateNeuronicLevel => "已将 {1} 个角色的神经元等级设置为 {0}";
} }
/// <summary> /// <summary>
@@ -230,11 +236,28 @@ public class GirlTextCHS
/// </summary> /// </summary>
public class GiveAllTextCHS public class GiveAllTextCHS
{ {
public string Desc => "给玩家所有物品\n" + public string Desc => "给玩家所有物品\n" +
"备注: -1 表全部"; "注意:-1 表全部";
public string Usage => "用法: /giveall weapon <detail/-1> -p<particular> -l<level>"; public string Usage => "用法/giveall weapon <detail/-1> -p<特定> -l<等級>\n" +
public string WeaponNotFound => "找不到武器!"; "用法:/giveall weaponskin <detail/-1> -p<特定>\n" +
public string WeaponAdded => "已添加 {0} 把武器给玩家!"; "用法:/giveall card <detail/-1> -p<特定> -l<等級>";
public string NotFound => "未找到 {0}";
public string GiveAllItems => "已向玩家添加 {0} 个 {1}";
}
/// <summary>
/// path: Game.Command.Debug
/// </summary>
public class DebugTextCHS
{
public string Desc => "调试包输出开关";
public string Usage => "用法: /debug [on|off|simple|detail|file]";
public string Enabled => "已启用调试包输出。";
public string Disabled => "已禁用调试包输出。";
public string SimpleEnabled => "已启用简单调试包输出。";
public string DetailEnabled => "已启用详细调试包输出。";
public string FileEnabled => "个人调试文件输出已启用。";
public string FileDisabled => "个人调试文件输出已禁用。";
} }
#endregion #endregion

View File

@@ -35,6 +35,9 @@ public class ServerTextCHT
/// </summary> /// </summary>
public class WordTextCHT public class WordTextCHT
{ {
public string WeaponSkin => "武器外觀";
public string SupportCard => "支援卡";
public string Weapon => "武器";
public string Rank => "星魂"; public string Rank => "星魂";
public string Avatar => "角色"; public string Avatar => "角色";
public string Material => "材料"; public string Material => "材料";
@@ -121,6 +124,7 @@ public class CommandTextCHT
public HelpTextCHT Help { get; } = new(); public HelpTextCHT Help { get; } = new();
public GirlTextCHT Girl { get; } = new(); public GirlTextCHT Girl { get; } = new();
public GiveAllTextCHT GiveAll { get; } = new(); public GiveAllTextCHT GiveAll { get; } = new();
public DebugTextCHT Debug { get; } = new();
} }
#endregion #endregion
@@ -218,11 +222,13 @@ public class GirlTextCHT
public string Usage => public string Usage =>
"用法: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" + "用法: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" +
"用法: /girl level <guid/-1> <level>"; "用法: /girl level <guid/-1> <level>\n" +
"用法: /girl neuronic <guid/-1> <level>";
public string NotFound => "角色不存在!"; public string NotFound => "角色不存在!";
public string Added => "已為玩家新增 {0} 個角色!"; public string Added => "已為玩家新增 {0} 個角色!";
public string UpdateLevel => "已將 {1} 個角色等級設為 {0}"; public string UpdateLevel => "已將 {1} 個角色等級設為 {0}";
public string UpdateNeuronicLevel => "已將 {1} 個角色的神經元等級設置為 {0}";
} }
/// <summary> /// <summary>
@@ -230,11 +236,28 @@ public class GirlTextCHT
/// </summary> /// </summary>
public class GiveAllTextCHT public class GiveAllTextCHT
{ {
public string Desc => "給玩家所有物品\n" + public string Desc => "給玩家所有物品\n" +
"備註: -1 表全部"; "注意:-1 表全部";
public string Usage => "用法: /giveall weapon <detail/-1> -p<particular> -l<level>"; public string Usage => "用法/giveall weapon <detail/-1> -p<特定> -l<等級>\n" +
public string WeaponNotFound => "找不到武器!"; "用法:/giveall weaponskin <detail/-1> -p<特定>\n" +
public string WeaponAdded => "已添加 {0} 把武器給玩家!"; "用法:/giveall card <detail/-1> -p<特定> -l<等級>";
public string NotFound => "未找到 {0}";
public string GiveAllItems => "已向玩家添加 {0} 個 {1}";
}
/// <summary>
/// path: Game.Command.Debug
/// </summary>
public class DebugTextCHT
{
public string Desc => "切換調試封包輸出";
public string Usage => "用法: /debug [on|off|simple|detail|file]";
public string Enabled => "已啟用調試封包輸出。";
public string Disabled => "已停用調試封包輸出。";
public string SimpleEnabled => "已啟用簡易調試封包輸出。";
public string DetailEnabled => "已啟用詳細調試封包輸出。";
public string FileEnabled => "個人調試檔案輸出已啟用。";
public string FileDisabled => "個人調試檔案輸出已停用。";
} }
#endregion #endregion

View File

@@ -35,10 +35,10 @@ public class ServerTextEN
/// </summary> /// </summary>
public class WordTextEN public class WordTextEN
{ {
public string Star => "Star"; public string WeaponSkin => "Weapon Skin";
public string Valk => "Valkyrie"; public string Valk => "Valkyrie";
public string Material => "Material"; public string Material => "Material";
public string Stigmata => "Stigmata"; public string SupportCard => "Support Card";
public string Weapon => "Weapon"; public string Weapon => "Weapon";
public string Banner => "Gacha"; public string Banner => "Gacha";
public string Activity => "Activity"; public string Activity => "Activity";
@@ -83,6 +83,7 @@ public class CommandTextEN
public HelpTextEN Help { get; } = new(); public HelpTextEN Help { get; } = new();
public GirlTextEN Girl { get; } = new(); public GirlTextEN Girl { get; } = new();
public GiveAllTextEN GiveAll { get; } = new(); public GiveAllTextEN GiveAll { get; } = new();
public DebugTextEN Debug { get; } = new();
} }
#endregion #endregion
@@ -187,11 +188,13 @@ public class GirlTextEN
public string Usage => public string Usage =>
"Usage: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" + "Usage: /girl add <detail/-1> -p<particular> -l<level> -s<star>\n" +
"Usage: /girl level <guid/-1> <level>"; "Usage: /girl level <guid/-1> <level>\n" +
"Usage: /girl neuronic <guid/-1> <level>";
public string NotFound => "Character not found!"; public string NotFound => "Character not found!";
public string Added => "Granted {0} character(s) to player!"; public string Added => "Granted {0} character(s) to player!";
public string UpdateLevel => "Set {1} character(s) to level {0}!"; public string UpdateLevel => "Set {1} character(s) to level {0}!";
public string UpdateNeuronicLevel => "Set {1} character(s) Neuronic to level {0}!";
} }
/// <summary> /// <summary>
@@ -201,9 +204,26 @@ public class GiveAllTextEN
{ {
public string Desc => "Give all items to player\n"+ public string Desc => "Give all items to player\n"+
"Note: -1 means all"; "Note: -1 means all";
public string Usage => "Usage: /giveall weapon <detail/-1> -p<particular> -l<level>"; public string Usage => "Usage: /giveall weapon <detail/-1> -p<particular> -l<level>\n" +
public string WeaponNotFound => "Weapon not found!"; "Usage: /giveall weaponskin <detail/-1> -p<particular>\n" +
public string WeaponAdded => "Added {0} weapon(s) to player!"; "Usage: /giveall card <detail/-1> -p<particular> -l<level>";
public string NotFound => "{0} not found!";
public string GiveAllItems => "Added {0} {1} to player!";
}
/// <summary>
/// path: Game.Command.Debug
/// </summary>
public class DebugTextEN
{
public string Desc => "Toggle debug packet output";
public string Usage => "Usage: /debug [on|off|simple|detail|file]";
public string Enabled => "Debug packet output enabled.";
public string Disabled => "Debug packet output disabled.";
public string SimpleEnabled => "Simple debug packet output enabled.";
public string DetailEnabled => "Detailed debug packet output enabled.";
public string FileEnabled => "Personal debug file output enabled.";
public string FileDisabled => "Personal debug file output disabled.";
} }
#endregion #endregion

View File

@@ -38,9 +38,9 @@ public class PlayerCommandSender(PlayerInstance player) : ICommandSender
Type = ChatType.Friend, Type = ChatType.Friend,
Sender = (uint)ConfigManager.Config.ServerOption.ServerProfile.Uid, Sender = (uint)ConfigManager.Config.ServerOption.ServerProfile.Uid,
Recver = (uint)Player.Uid, Recver = (uint)Player.Uid,
Text = msg, Text = ChatMessageHelper.NormalizeForClient(msg),
Profile = Player.ToServerFriendProto(), Profile = Player.ToServerFriendProto(),
TimeStamp = (uint)Extensions.GetUnixMs() TimeStamp = ChatMessageHelper.BuildClientTimestamp()
}; };
await Player.SendPacket(CmdIds.NtfFriendChat, data); await Player.SendPacket(CmdIds.NtfFriendChat, data);
} }

View File

@@ -0,0 +1,69 @@
using MikuSB.Configuration;
using MikuSB.Enums.Player;
using MikuSB.Util;
using MikuSB.Internationalization;
namespace MikuSB.GameServer.Command.Commands;
[CommandInfo("debug", "Game.Command.Debug.Desc", "Game.Command.Debug.Usage", ["dbg"], [PermEnum.Admin, PermEnum.Support])]
public class CommandDebug : ICommands
{
private static readonly Logger Logger = new("CommandManager");
[CommandDefault]
public async ValueTask ToggleDebug(CommandArg arg)
{
var option = arg.Args.FirstOrDefault()?.ToLowerInvariant() ?? "on";
var serverOption = ConfigManager.Config.ServerOption;
var message = option switch
{
"on" => EnableDebug(serverOption),
"off" => DisableDebug(serverOption),
"simple" => EnableSimpleDebug(serverOption),
"detail" => EnableDetailDebug(serverOption),
"file" => ToggleDebugFile(serverOption),
_ => I18NManager.Translate("Game.Command.Debug.Usage")
};
Logger.Info(message);
await arg.SendMsg(message);
}
private static string EnableDebug(ServerOption serverOption)
{
serverOption.EnableDebug = true;
serverOption.DebugMessage = true;
serverOption.DebugDetailMessage = true;
return I18NManager.Translate("Game.Command.Debug.Enabled");
}
private static string DisableDebug(ServerOption serverOption)
{
serverOption.EnableDebug = false;
return I18NManager.Translate("Game.Command.Debug.Disabled");
}
private static string EnableSimpleDebug(ServerOption serverOption)
{
serverOption.EnableDebug = true;
serverOption.DebugMessage = true;
serverOption.DebugDetailMessage = false;
return I18NManager.Translate("Game.Command.Debug.SimpleEnabled");
}
private static string EnableDetailDebug(ServerOption serverOption)
{
serverOption.EnableDebug = true;
serverOption.DebugMessage = true;
serverOption.DebugDetailMessage = true;
return I18NManager.Translate("Game.Command.Debug.DetailEnabled");
}
private static string ToggleDebugFile(ServerOption serverOption)
{
serverOption.SavePersonalDebugFile = !serverOption.SavePersonalDebugFile;
return serverOption.SavePersonalDebugFile
? I18NManager.Translate("Game.Command.Debug.FileEnabled")
: I18NManager.Translate("Game.Command.Debug.FileDisabled");
}
}

View File

@@ -84,4 +84,49 @@ public class CommandGirl : ICommands
level.ToString(), level.ToString(),
girls.Count.ToString())); girls.Count.ToString()));
} }
[CommandMethod("neuronic")]
public async ValueTask UpdateNeuronicLevel(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, 6);
var player = arg.Target!.Player!;
List<CharacterInfo> girls = [];
List<uint> spines = new List<uint>();
for (int i = 0; i < 6; i++)
spines.Add(i < level ? 511u : 0u);
uint proLevel = (uint)(spines.Count(x => x == 511) / 2);
if (guid == -1)
{
foreach (var girl in player.CharacterManager.CharacterData.Characters)
{
girl.Spines = spines;
girl.ProLevel = proLevel;
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.Spines = spines;
girl.ProLevel = proLevel;
girls.Add(girl);
}
if (girls.Count > 0) await player.SendPacket(new PacketNtfCallScript(girls));
await arg.SendMsg(I18NManager.Translate("Game.Command.Girl.UpdateNeuronicLevel",
level.ToString(),
girls.Count.ToString()));
}
} }

View File

@@ -18,7 +18,7 @@ public class CommandGiveAll : ICommands
if (await arg.GetOption('l') is not int level) return; if (await arg.GetOption('l') is not int level) return;
var detail = arg.GetInt(0); var detail = arg.GetInt(0);
level = Math.Clamp(level, 1, 80); level = Math.Clamp(level, 1, 90);
var player = arg.Target!.Player!; var player = arg.Target!.Player!;
List<GameWeaponInfo> weapons = []; List<GameWeaponInfo> weapons = [];
if (detail == -1) if (detail == -1)
@@ -36,12 +36,82 @@ public class CommandGiveAll : ICommands
var weapon = await player.InventoryManager!.AddWeaponItem(ItemTypeEnum.TYPE_WEAPON, (uint)detail,(uint)particular,1,(uint)level,false); var weapon = await player.InventoryManager!.AddWeaponItem(ItemTypeEnum.TYPE_WEAPON, (uint)detail,(uint)particular,1,(uint)level,false);
if (weapon == null) if (weapon == null)
{ {
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.WeaponNotFound")); await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.Weapon")));
return; return;
} }
weapons.Add(weapon); weapons.Add(weapon);
} }
if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons)); if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons));
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.WeaponAdded", weapons.Count.ToString())); await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.Weapon"), weapons.Count.ToString()));
}
[CommandMethod("card")]
public async ValueTask GiveAllSupportCard(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;
var detail = arg.GetInt(0);
var player = arg.Target!.Player!;
List<GameSupportCardInfo> supportCards = [];
if (detail == -1)
{
// add all
foreach (var config in GameData.SupportCardData)
{
var supportCard = await player.InventoryManager!
.AddSupportCardItem(config.Detail, config.Particular, config.Level, (uint)level, false);
if (supportCard != null) supportCards.Add(supportCard);
}
}
else
{
var supportCard = await player.InventoryManager!.AddSupportCardItem((uint)detail, (uint)particular, 1, (uint)level, false);
if (supportCard == null)
{
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.SupportCard")));
return;
}
supportCards.Add(supportCard);
}
if (supportCards.Count > 0) await player.SendPacket(new PacketNtfCallScript(supportCards));
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.SupportCard"), supportCards.Count.ToString()));
}
[CommandMethod("weaponskin")]
public async ValueTask GiveAllWeaponSkin(CommandArg arg)
{
if (!await arg.CheckOnlineTarget()) return;
if (await arg.GetOption('p') is not int particular) return;
var detail = arg.GetInt(0);
var player = arg.Target!.Player!;
List<BaseGameItemInfo> weaponSkins = [];
if (detail == -1)
{
// add all
foreach (var config in GameData.WeaponSkinData.Values)
{
var weaponSkin = await player.InventoryManager!
.AddWeaponSkinItem((ItemTypeEnum)config.Genre, config.Detail, config.Particular, 1, false);
if (weaponSkin != null) weaponSkins.Add(weaponSkin);
}
}
else
{
var weaponSkin = await player.InventoryManager!.AddWeaponSkinItem(ItemTypeEnum.TYPE_WEAPON, (uint)detail, (uint)particular, 1, false);
if (weaponSkin == null)
{
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.NotFound", I18NManager.Translate("Word.WeaponSkin")));
return;
}
weaponSkins.Add(weaponSkin);
}
if (weaponSkins.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponSkins));
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.WeaponSkin"), weaponSkins.Count.ToString()));
} }
} }

View File

@@ -24,7 +24,7 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
TemplateId = templateId, TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++, UniqueId = InventoryData.NextUniqueUid++,
Level = weaponLevel, Level = weaponLevel,
Break = weaponData.InitBreak, Break = GetWeaponBreak(weaponLevel),
ItemType = ItemTypeEnum.TYPE_WEAPON, ItemType = ItemTypeEnum.TYPE_WEAPON,
ItemCount = 1 ItemCount = 1
}; };
@@ -35,6 +35,17 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return weaponInfo; return weaponInfo;
} }
private static uint GetWeaponBreak(uint level)
{
if (level <= 20) return 1;
if (level <= 40) return 2;
if (level <= 60) return 3;
if (level <= 70) return 4;
if (level <= 80) return 5;
if (level <= 90) return 6;
return 7;
}
public GameWeaponInfo? GetWeaponItem(uint uniqueId) public GameWeaponInfo? GetWeaponItem(uint uniqueId)
{ {
return InventoryData.Weapons.GetValueOrDefault(uniqueId); return InventoryData.Weapons.GetValueOrDefault(uniqueId);
@@ -110,26 +121,44 @@ 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) public async ValueTask<GameSupportCardInfo?> AddSupportCardItem(uint detail, uint particular, uint level = 1, uint cardLevel = 1, bool sendPacket = true)
{ {
const ItemTypeEnum genre = ItemTypeEnum.TYPE_SUPPORT; const ItemTypeEnum genre = ItemTypeEnum.TYPE_SUPPORT;
var spCard = GameData.SupportCardData.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
if (spCard == null) return null;
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level); var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null; cardLevel = Math.Clamp(cardLevel, 1, spCard.MaxLevel);
var info = new GameSupportCardInfo
var info = new BaseGameItemInfo
{ {
TemplateId = templateId, TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++, UniqueId = InventoryData.NextUniqueUid++,
ItemType = genre, ItemType = genre,
ItemCount = 1 ItemCount = 1,
Level = cardLevel,
}; };
InventoryData.Items[info.UniqueId] = info; InventoryData.SupportCards[info.UniqueId] = info;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([info])); if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([info]));
return info; return info;
} }
public GameSupportCardInfo? GetSupportCardItem(uint uniqueId)
{
return InventoryData.SupportCards.GetValueOrDefault(uniqueId);
}
public GameSupportCardInfo? GetSupportCardByTemplateId(ulong templateId)
{
return InventoryData.SupportCards.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
public GameSupportCardInfo? GetSupportCardItemGDPL(ItemTypeEnum genre, uint detail, uint particular, uint level)
{
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, detail, particular, level);
return InventoryData.SupportCards.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
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;
@@ -198,4 +227,26 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return itemInfo; return itemInfo;
} }
public async ValueTask<BaseGameItemInfo?> AddWeaponSkinItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{
if (genre != ItemTypeEnum.TYPE_WEAPON_SKIN) return null;
var skinData = GameData.WeaponSkinData.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);
if (InventoryData.Items.Values.Any(x => x.TemplateId == templateId)) return null;
var skinInfo = new BaseGameItemInfo
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
ItemType = ItemTypeEnum.TYPE_WEAPON_SKIN,
ItemCount = 1
};
InventoryData.Items[skinInfo.UniqueId] = skinInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([skinInfo]));
return skinInfo;
}
} }

View File

@@ -0,0 +1,27 @@
using System.Text.RegularExpressions;
namespace MikuSB.GameServer.Game.Player;
public static partial class ChatMessageHelper
{
[GeneratedRegex(@"\s+")]
private static partial Regex MultiWhitespaceRegex();
public static uint BuildClientTimestamp()
{
return (uint)MikuSB.Util.Extensions.Extensions.GetUnixSec();
}
public static string NormalizeForClient(string? text)
{
if (string.IsNullOrWhiteSpace(text))
return string.Empty;
var normalized = text
.Replace("\r\n", " ")
.Replace('\r', ' ')
.Replace('\n', ' ');
return MultiWhitespaceRegex().Replace(normalized, " ").Trim();
}
}

View File

@@ -66,10 +66,6 @@ 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);
@@ -83,34 +79,6 @@ public class PlayerInstance(PlayerGameData data)
await LineupManager.UpdateLineup(1, selected[0], selected[1], selected[2],false); await LineupManager.UpdateLineup(1, selected[0], selected[1], selected[2],false);
var bootstrapAttrs = BuildLobbyBootstrapAttrs();
var existingAttrs = Data.Attrs
.ToDictionary(x => (x.Gid, x.Sid));
var seenAttrs = new HashSet<(uint Gid, uint Sid)>();
foreach (var (gid, sid, value) in bootstrapAttrs)
{
if (!seenAttrs.Add((gid, sid)))
continue;
if (existingAttrs.TryGetValue((gid, sid), out var attr))
{
if (attr.Val < value)
attr.Val = value;
continue;
}
var newAttr = new PlayerAttr
{
Gid = gid,
Sid = sid,
Val = value
};
Data.Attrs.Add(newAttr);
existingAttrs[(gid, sid)] = newAttr;
}
}); });
t.Wait(); t.Wait();
@@ -192,9 +160,9 @@ public class PlayerInstance(PlayerGameData data)
Sender = sendUid, Sender = sendUid,
Recver = recvUid, Recver = recvUid,
Emoji = emojiId ?? 0, Emoji = emojiId ?? 0,
Text = message ?? "", Text = ChatMessageHelper.NormalizeForClient(message),
Profile = Data.ToProfileProto(), Profile = Data.ToProfileProto(),
TimeStamp = (uint)Extensions.GetUnixMs() TimeStamp = ChatMessageHelper.BuildClientTimestamp()
}; };
await SendPacket(CmdIds.NtfFriendChat, data); await SendPacket(CmdIds.NtfFriendChat, data);
@@ -230,6 +198,7 @@ public class PlayerInstance(PlayerGameData data)
public Proto.Player ToPlayerProto() public Proto.Player ToPlayerProto()
{ {
BuildPlayerAttr();
var displayName = PlayerGameData.NormalizeDisplayName(Data.Name); var displayName = PlayerGameData.NormalizeDisplayName(Data.Name);
var proto = new Proto.Player var proto = new Proto.Player
{ {
@@ -297,6 +266,38 @@ public class PlayerInstance(PlayerGameData data)
return (gid << 16) | sid; return (gid << 16) | sid;
} }
public void BuildPlayerAttr()
{
var bootstrapAttrs = BuildLobbyBootstrapAttrs();
var existingAttrs = Data.Attrs
.ToDictionary(x => (x.Gid, x.Sid));
var seenAttrs = new HashSet<(uint Gid, uint Sid)>();
foreach (var (gid, sid, value) in bootstrapAttrs)
{
if (!seenAttrs.Add((gid, sid)))
continue;
if (existingAttrs.TryGetValue((gid, sid), out var attr))
{
if (attr.Val < value)
attr.Val = value;
continue;
}
var newAttr = new PlayerAttr
{
Gid = gid,
Sid = sid,
Val = value
};
Data.Attrs.Add(newAttr);
existingAttrs[(gid, sid)] = newAttr;
}
}
private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildLobbyBootstrapAttrs() private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildLobbyBootstrapAttrs()
{ {
// GuideLogic uses group 4. Value 999 is safely above every configured step count, // GuideLogic uses group 4. Value 999 is safely above every configured step count,
@@ -341,6 +342,12 @@ public class PlayerInstance(PlayerGameData data)
yield return (22, levelId, 1_700_000_000); yield return (22, levelId, 1_700_000_000);
} }
foreach (var levelId in GameData.DailyLevelData.Keys)
{
yield return (21, levelId, 7);
yield return (22, levelId, 1_700_000_000);
}
// Main Scene 0 mean default scene // Main Scene 0 mean default scene
yield return (132, 1, 0); yield return (132, 1, 0);
} }

View File

@@ -0,0 +1,26 @@
using System.Text.Json;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Daily;
[CallGSApi("Daily_SetSelectSuit")]
public class Daily_SetSelectSuit : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var req = JsonSerializer.Deserialize<GirlWeaponSkinParam>(param);
if (req == null)
{
await CallGSRouter.SendScript(connection, "GirlWeaponSkin_Change", "{}");
return;
}
var rsp = $"{{\"SuitId\":{req.Suit}}}";
await CallGSRouter.SendScript(connection, "Daily_SetSelectSuit", rsp);
}
}
internal sealed class GirlWeaponSkinParam
{
public uint Type { get; set; }
public uint Suit { get; set; }
}

View File

@@ -1,4 +1,9 @@
using MikuSB.Proto; 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;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
@@ -11,9 +16,10 @@ public class GirlSkin_ChangeSkinType : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo) public async Task Handle(Connection connection, string param, ushort seqNo)
{ {
var req = JsonSerializer.Deserialize<ChangeSkinTypeParam>(param); var req = JsonSerializer.Deserialize<ChangeSkinTypeParam>(param);
var skinType = ClampClientSkinType(req?.Type ?? 0);
var response = new JsonObject var response = new JsonObject
{ {
["nType"] = req?.Type ?? 1, ["nType"] = skinType,
["nSkinId"] = req?.SkinId ["nSkinId"] = req?.SkinId
}; };
if (req == null) if (req == null)
@@ -23,14 +29,20 @@ public class GirlSkin_ChangeSkinType : ICallGSHandler
} }
var player = connection.Player!; var player = connection.Player!;
var skinData = player.InventoryManager.GetSkinItem(req.SkinId); var skinData = GetOrCreateSkinItem(player, req.SkinId);
if (skinData != null)
skinData.SkinType = skinType;
player.InventoryManager.InventoryData.SkinTypesBySkinId ??= [];
player.InventoryManager.InventoryData.SkinTypesBySkinId[req.SkinId] = skinType;
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
if (skinData == null) if (skinData == null)
{ {
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString()); await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString());
return; return;
} }
skinData.SkinType = req.Type;
var sync = new NtfSyncPlayer var sync = new NtfSyncPlayer
{ {
Items = { skinData.ToProto() } Items = { skinData.ToProto() }
@@ -38,6 +50,42 @@ public class GirlSkin_ChangeSkinType : ICallGSHandler
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString(), sync); await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString(), sync);
} }
internal static uint ClampClientSkinType(uint skinType)
{
return Math.Min(skinType, 1);
}
internal static GameSkinInfo? GetOrCreateSkinItem(PlayerInstance player, uint skinId)
{
var inventoryData = player.InventoryManager.InventoryData;
if (inventoryData.Skins.TryGetValue(skinId, out var skinInfo))
return skinInfo;
if (!GameData.CardSkinData.TryGetValue(skinId, out var skinData))
return null;
var templateId = GameResourceTemplateId.FromGdpl(skinData.Genre, skinData.Detail, skinData.Particular, skinData.Level);
skinInfo = player.InventoryManager.GetSkinItemByTemplateId(templateId);
if (skinInfo != null)
{
inventoryData.Skins.Remove(skinInfo.UniqueId);
skinInfo.UniqueId = skinId;
}
else
{
skinInfo = new GameSkinInfo
{
UniqueId = skinId,
TemplateId = templateId,
ItemType = ItemTypeEnum.TYPE_CARD_SKIN,
ItemCount = 1
};
}
inventoryData.Skins[skinId] = skinInfo;
return skinInfo;
}
} }
internal sealed class ChangeSkinTypeParam internal sealed class ChangeSkinTypeParam

View File

@@ -0,0 +1,47 @@
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("GirlWeaponSkin_Change")]
public class GirlWeaponSkin_Change : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var req = JsonSerializer.Deserialize<GirlWeaponSkinParam>(param);
if (req == null)
{
await CallGSRouter.SendScript(connection, "GirlWeaponSkin_Change", "{}");
return;
}
var player = connection.Player!;
var cardData = player.CharacterManager.GetCharacterByGUID(req.CardId);
if (cardData == null) return;
var skinData = player.InventoryManager.GetNormalItem(req.SkinId);
if (skinData == null)
{
await CallGSRouter.SendScript(connection, "GirlWeaponSkin_Change", "{\"err\":\"error.BadParam\"}");
return;
}
cardData.WeaponSkinId = req.SkinId;
var sync = new NtfSyncPlayer
{
Items = { cardData.ToProto() }
};
await CallGSRouter.SendScript(connection, "GirlWeaponSkin_Change", "{}", sync);
}
}
internal sealed class GirlWeaponSkinParam
{
[JsonPropertyName("nCardId")]
public uint CardId { get; set; }
[JsonPropertyName("nSkinId")]
public uint SkinId { get; set; }
}

View File

@@ -0,0 +1,98 @@
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Weapon;
// s2c: function(sErr) — send "null" on success (json.decode("null") = nil = falsy in Lua)
[CallGSApi("Weapon_Break")]
public class Weapon_Break : ICallGSHandler
{
private const uint MaxBreak = 6;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<WeaponBreakParam>(param);
if (req == null || req.WeaponId == 0)
{
await CallGSRouter.SendScript(connection, "Weapon_Break", "\"error.BadParam\"");
return;
}
var weapon = player.InventoryManager.InventoryData.Weapons.GetValueOrDefault((uint)req.WeaponId);
if (weapon == null)
{
await CallGSRouter.SendScript(connection, "Weapon_Break", "\"error.BadParam\"");
return;
}
if (weapon.Break >= MaxBreak)
{
await CallGSRouter.SendScript(connection, "Weapon_Break", "\"tip.already_max_break\"");
return;
}
var nextBreak = weapon.Break + 1;
// Look up break cost from WeaponExcel → BreakExcel
var weaponExcel = GameData.WeaponData.Values.FirstOrDefault(x =>
GameResourceTemplateId.FromGdpl(x.Genre, x.Detail, x.Particular, x.Level) == weapon.TemplateId);
var requestedMaterials = new Dictionary<ulong, uint>();
if (weaponExcel != null && GameData.BreakData.TryGetValue(weaponExcel.BreakMatID, out var breakExcel))
{
foreach (var row in breakExcel.GetItems(nextBreak))
{
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, "Weapon_Break", "\"tip.not_material_for_break\"");
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);
}
weapon.Break = nextBreak;
syncItems.Add(weapon.ToProto());
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
var sync = new NtfSyncPlayer();
sync.Items.AddRange(syncItems);
await CallGSRouter.SendScript(connection, "Weapon_Break", "null", sync);
}
}
internal sealed class WeaponBreakParam
{
[JsonPropertyName("Id")]
public int WeaponId { get; set; }
}

View File

@@ -0,0 +1,77 @@
using MikuSB.Database;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Weapon;
// s2c: function(sErr) — send "null" on success
// Id = target weapon UniqueId
// nItemId = material item UniqueId (weapon or supply item to consume)
[CallGSApi("Weapon_Evolution")]
public class Weapon_Evolution : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<WeaponEvolutionParam>(param);
if (req == null || req.WeaponId == 0 || req.MaterialId == 0)
{
await CallGSRouter.SendScript(connection, "Weapon_Evolution", "\"error.BadParam\"");
return;
}
var weapon = player.InventoryManager.InventoryData.Weapons.GetValueOrDefault((uint)req.WeaponId);
if (weapon == null)
{
await CallGSRouter.SendScript(connection, "Weapon_Evolution", "\"error.BadParam\"");
return;
}
var syncItems = new List<Item>();
// Material can be a weapon or a regular item
if (player.InventoryManager.InventoryData.Weapons.TryGetValue((uint)req.MaterialId, out var matWeapon))
{
player.InventoryManager.InventoryData.Weapons.Remove((uint)req.MaterialId);
var removed = matWeapon.ToProto();
removed.Count = 0;
syncItems.Add(removed);
}
else if (player.InventoryManager.InventoryData.Items.TryGetValue((uint)req.MaterialId, out var matItem))
{
matItem.ItemCount--;
var proto = matItem.ToProto();
if (matItem.ItemCount == 0)
{
player.InventoryManager.InventoryData.Items.Remove(matItem.UniqueId);
proto.Count = 0;
}
syncItems.Add(proto);
}
else
{
await CallGSRouter.SendScript(connection, "Weapon_Evolution", "\"tip.not_material\"");
return;
}
weapon.Evolue++;
syncItems.Add(weapon.ToProto());
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
var sync = new NtfSyncPlayer();
sync.Items.AddRange(syncItems);
await CallGSRouter.SendScript(connection, "Weapon_Evolution", "null", sync);
}
}
internal sealed class WeaponEvolutionParam
{
[JsonPropertyName("Id")]
public int WeaponId { get; set; }
[JsonPropertyName("nItemId")]
public int MaterialId { get; set; }
}

View File

@@ -4,12 +4,14 @@ using MikuSB.Database.Account;
using MikuSB.Database.Player; using MikuSB.Database.Player;
using MikuSB.GameServer.Game.Player; using MikuSB.GameServer.Game.Player;
using MikuSB.GameServer.Server.CallGS; using MikuSB.GameServer.Server.CallGS;
using MikuSB.GameServer.Server.CallGS.Handlers.Girl;
using MikuSB.GameServer.Server.Packet.Send.Friend; using MikuSB.GameServer.Server.Packet.Send.Friend;
using MikuSB.GameServer.Server.Packet.Send.Login; using MikuSB.GameServer.Server.Packet.Send.Login;
using MikuSB.GameServer.Server.Packet.Send.Misc; using MikuSB.GameServer.Server.Packet.Send.Misc;
using MikuSB.Proto; using MikuSB.Proto;
using MikuSB.TcpSharp; using MikuSB.TcpSharp;
using MikuSB.Util; using MikuSB.Util;
using System.Text.Json.Nodes;
namespace MikuSB.GameServer.Server.Packet.Recv.Login; namespace MikuSB.GameServer.Server.Packet.Recv.Login;
@@ -54,6 +56,66 @@ public class HandlerReqLogin : Handler
await connection.Player.OnHeartBeat(); await connection.Player.OnHeartBeat();
await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!)); await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
ApplySavedGirlSkinTypes(connection.Player!);
await connection.SendPacket(new PacketNtfCallScript(connection.Player!.InventoryManager.InventoryData)); await connection.SendPacket(new PacketNtfCallScript(connection.Player!.InventoryManager.InventoryData));
await SendGirlSkinTypeOnLogin(connection);
}
private static void ApplySavedGirlSkinTypes(PlayerInstance player)
{
var inventoryData = player.InventoryManager.InventoryData;
inventoryData.SkinTypesBySkinId ??= [];
var changed = false;
foreach (var (skinId, skinType) in inventoryData.SkinTypesBySkinId.ToArray())
{
var clamped = GirlSkin_ChangeSkinType.ClampClientSkinType(skinType);
if (clamped != skinType)
{
inventoryData.SkinTypesBySkinId[skinId] = clamped;
changed = true;
}
var skinData = GirlSkin_ChangeSkinType.GetOrCreateSkinItem(player, skinId);
if (skinData != null && skinData.SkinType != clamped)
{
skinData.SkinType = clamped;
changed = true;
}
}
if (changed)
DatabaseHelper.SaveDatabaseType(inventoryData);
}
private static async Task SendGirlSkinTypeOnLogin(Connection connection)
{
var player = connection.Player;
if (player == null)
return;
var inventoryData = player.InventoryManager.InventoryData;
inventoryData.SkinTypesBySkinId ??= [];
foreach (var (skinId, skinType) in inventoryData.SkinTypesBySkinId)
{
var clamped = GirlSkin_ChangeSkinType.ClampClientSkinType(skinType);
var skinData = GirlSkin_ChangeSkinType.GetOrCreateSkinItem(player, skinId);
var response = new JsonObject
{
["nType"] = clamped,
["nSkinId"] = skinId
};
if (skinData == null)
{
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString());
continue;
}
await CallGSRouter.SendScript(connection, "GirlSkin_ChangeSkinType", response.ToJsonString(), new NtfSyncPlayer
{
Items = { skinData.ToProto() }
});
}
} }
} }

View File

@@ -1,6 +1,6 @@
using MikuSB.Database.Character; using MikuSB.Database.Character;
using MikuSB.Database.Inventory; using MikuSB.Database.Inventory;
using MikuSB.GameServer.Game.Inventory; using MikuSB.GameServer.Game.Player;
using MikuSB.Proto; using MikuSB.Proto;
using MikuSB.TcpSharp; using MikuSB.TcpSharp;
@@ -53,6 +53,21 @@ public class PacketNtfCallScript : BasePacket
SetData(proto); SetData(proto);
} }
public PacketNtfCallScript(List<GameSupportCardInfo> cards) : base(CmdIds.NtfScript)
{
var proto = new NtfCallScript
{
Api = "",
Arg = "{}",
ExtraSync = new NtfSyncPlayer
{
Items = { cards.Select(x => x.ToProto()) }
}
};
SetData(proto);
}
public PacketNtfCallScript(InventoryData inventory) : base(CmdIds.NtfScript) public PacketNtfCallScript(InventoryData inventory) : base(CmdIds.NtfScript)
{ {
var proto = new NtfCallScript var proto = new NtfCallScript
@@ -65,7 +80,37 @@ public class PacketNtfCallScript : BasePacket
foreach (var item in inventory.Items.Values) 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 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());
foreach (var supportCard in inventory.SupportCards.Values) extraSync.Items.Add(supportCard.ToProto());
proto.ExtraSync = extraSync; proto.ExtraSync = extraSync;
SetData(proto); SetData(proto);
} }
public PacketNtfCallScript(PlayerInstance Player) : base(CmdIds.NtfScript)
{
Player.BuildPlayerAttr();
var proto = new NtfCallScript
{
Api = "",
Arg = "{}"
};
var sync = new NtfSyncPlayer();
foreach (var x in Player.Data.Attrs)
{
uint gid = x.Gid;
uint sid = x.Sid;
uint val = x.Val;
if (gid == 0)
{
sync.Custom[sid] = val;
continue;
}
sync.Custom[Player.ToPackedAttrKey(gid, sid)] = val;
sync.Custom[Player.ToShiftedAttrKey(gid, sid)] = val;
}
proto.ExtraSync = sync;
SetData(proto);
}
} }

View File

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

View File

@@ -1 +1 @@
v=1.1 v=1.4