DevilProMT/MikuSB
1
0
Fork 0
mirror of https://github.com/MikuLeaks/MikuSB.git synced 2026-06-04 06:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor manager & add giveall command

Browse Source 
- giveall only weapon for now
- move all item into SyncPlayer to prevent RspLogin too large
This commit is contained in:
Naruse
2026-04-27 14:33:25 +08:00
parent ac087f240b
commit 4bf3f0d715
15 changed files with 205 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
GameServer/Command/Commands/CommandGirl.cs
View File

@@ -14,7 +14,6 @@ public class CommandGirl : ICommands
public async ValueTask AddGirl(CommandArg arg)
{
if (!await arg.CheckOnlineTarget()) return;
if (!await arg.CheckArgCnt(1)) 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('s') is not int star) return;
@@ -29,7 +28,7 @@ public class CommandGirl : ICommands
// add all
foreach (var config in GameData.CardData.Values)
{
var character = await arg.Target!.Player!.CharacterManager!
var character = await player.CharacterManager!
.AddCharacter((ItemTypeEnum)config.Genre, config.Detail, config.Particular, config.Level,(uint)star,false);
if (character != null) girls.Add(character);
}

47
GameServer/Command/Commands/CommandGiveAll.cs Normal file
View File

@@ -0,0 +1,47 @@
using MikuSB.Data;
using MikuSB.Database.Inventory;
using MikuSB.Enums.Item;
using MikuSB.Enums.Player;
using MikuSB.GameServer.Server.Packet.Send.Misc;
using MikuSB.Internationalization;
namespace MikuSB.GameServer.Command.Commands;
[CommandInfo("giveall", "Game.Command.GiveAll.Desc", "Game.Command.GiveAll.Usage", ["ga"], [PermEnum.Admin, PermEnum.Support])]
public class CommandGiveAll : ICommands
{
[CommandMethod("weapon")]
public async ValueTask GiveAllWeapon(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);
level = Math.Clamp(level, 1, 80);
var player = arg.Target!.Player!;
List<GameWeaponInfo> weapons = [];
if (detail == -1)
{
// add all
foreach (var config in GameData.WeaponData.Values)
{
var weapon = await player.InventoryManager!
.AddWeaponItem((ItemTypeEnum)config.Genre,config.Detail,config.Particular,config.Level,(uint)level,false);
if (weapon != null) weapons.Add(weapon);
}
}
else
{
var weapon = await player.InventoryManager!.AddWeaponItem(ItemTypeEnum.TYPE_WEAPON, (uint)detail,(uint)particular,1,(uint)level,false);
if (weapon == null)
{
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.WeaponNotFound"));
return;
}
weapons.Add(weapon);
}
if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons));
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.WeaponAdded", weapons.Count.ToString()));
}
}

12
GameServer/Game/Character/CharacterManager.cs
View File

@@ -24,15 +24,14 @@ public class CharacterManager(PlayerInstance player) : BasePlayerManager(player)
TemplateId = characterId,
Level = level,
Break = star,
Timestamp = Extensions.GetUnixSec(),
Flag = ItemFlagEnum.FLAG_READED
Timestamp = Extensions.GetUnixSec()
};
var weaponInfo = await Player.InventoryManager!.AddWeaponItem((ItemTypeEnum)CharacterExcel.DefaultWeaponGPDL[0], CharacterExcel.DefaultWeaponGPDL[1], CharacterExcel.DefaultWeaponGPDL[2], (uint)CharacterExcel.DefaultWeaponGPDL[3]);
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!.GetSkinItemGDPL(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level)
?? await Player.InventoryManager!.AddSkinItem(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level);
var skinInfo = Player.InventoryManager!.GetNormalItemGDPL(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;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([character]));
@@ -75,7 +74,8 @@ public class CharacterManager(PlayerInstance player) : BasePlayerManager(player)
(ItemTypeEnum)cardData.DefaultWeaponGPDL[0],
cardData.DefaultWeaponGPDL[1],
cardData.DefaultWeaponGPDL[2],
cardData.DefaultWeaponGPDL[3]);
cardData.DefaultWeaponGPDL[3],
sendPacket:false);
if (weapon != null)
{
character.WeaponUniqueId = weapon.UniqueId;

57
GameServer/Game/Inventory/InventoryManager.cs
View File

@@ -4,6 +4,7 @@ using MikuSB.Database;
using MikuSB.Database.Inventory;
using MikuSB.Enums.Item;
using MikuSB.GameServer.Game.Player;
using MikuSB.GameServer.Server.Packet.Send.Misc;
namespace MikuSB.GameServer.Game.Inventory;
@@ -11,7 +12,7 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
{
public InventoryData InventoryData { get; } = DatabaseHelper.GetInstanceOrCreateNew<InventoryData>(player.Uid);
public async ValueTask<GameWeaponInfo?> AddWeaponItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1)
public async ValueTask<GameWeaponInfo?> AddWeaponItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, uint weaponLevel = 1, bool sendPacket = true)
{
if (genre != ItemTypeEnum.TYPE_WEAPON) return null;
var weaponData = GameData.WeaponData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
@@ -22,13 +23,15 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
Level = level,
Level = weaponLevel,
Break = weaponData.InitBreak,
Flag = ItemFlagEnum.FLAG_READED,
ItemType = ItemTypeEnum.TYPE_WEAPON,
ItemCount = 1
};
InventoryData.Weapons[weaponInfo.UniqueId] = weaponInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([weaponInfo]));
return weaponInfo;
}
@@ -48,43 +51,28 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return InventoryData.Weapons.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
public async ValueTask<GameSkinInfo?> AddSkinItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1)
public async ValueTask<BaseGameItemInfo?> 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 GameSkinInfo
var skinInfo = new BaseGameItemInfo
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
Level = level,
Flag = ItemFlagEnum.FLAG_READED,
ItemType = ItemTypeEnum.TYPE_CARD_SKIN,
ItemCount = 1
};
InventoryData.Skins[skinInfo.UniqueId] = skinInfo;
InventoryData.Items[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)
public async ValueTask<BaseGameItemInfo?> AddArItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{
if (genre != ItemTypeEnum.TYPE_AR) return null;
var arData = GameData.ArItemData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
@@ -96,14 +84,17 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
Flag = ItemFlagEnum.FLAG_READED,
ItemType = ItemTypeEnum.TYPE_AR,
ItemCount = 1
};
InventoryData.Items[arInfo.UniqueId] = arInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([arInfo]));
return arInfo;
}
public async ValueTask<BaseGameItemInfo?> AddManifestationItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1)
public async ValueTask<BaseGameItemInfo?> AddManifestationItem(ItemTypeEnum genre, uint detail, uint particular, uint level = 1, bool sendPacket = true)
{
if (genre != ItemTypeEnum.TYPE_MANIFESTATION) return null;
var manifestData = GameData.ManifestationData.Values.FirstOrDefault(x => x.Genre == (int)genre && x.Detail == detail && x.Particular == particular && x.Level == level);
@@ -115,10 +106,13 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
Flag = ItemFlagEnum.FLAG_READED,
ItemType = ItemTypeEnum.TYPE_MANIFESTATION,
ItemCount = 1
};
InventoryData.Items[manifestInfo.UniqueId] = manifestInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([manifestInfo]));
return manifestInfo;
}
@@ -141,7 +135,7 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
private static uint GetSuppliesMaxCount(SuppliesExcel suppliesData) =>
suppliesData.Genre == 5 && suppliesData.Detail == 4 ? 999999u : 99999u;
public async ValueTask<BaseGameItemInfo?> AddSuppliesItem(SuppliesExcel suppliesData, uint count)
public async ValueTask<BaseGameItemInfo?> AddSuppliesItem(SuppliesExcel suppliesData, uint count, bool sendPacket = true)
{
var templateId = GameResourceTemplateId.FromGdpl(suppliesData.Genre, suppliesData.Detail, suppliesData.Particular, suppliesData.Level);
@@ -159,10 +153,13 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
{
TemplateId = templateId,
UniqueId = InventoryData.NextUniqueUid++,
Flag = ItemFlagEnum.FLAG_READED,
ItemType = ItemTypeEnum.TYPE_SUPPLIES,
ItemCount = giveCount
};
InventoryData.Items[itemInfo.UniqueId] = itemInfo;
if (sendPacket) await Player.SendPacket(new PacketNtfCallScript([itemInfo]));
return itemInfo;
}
}

9
GameServer/Game/Lineup/LineupManager.cs
View File

@@ -1,6 +1,7 @@
using MikuSB.Database;
using MikuSB.GameServer.Game.Player;
using MikuSB.Database.Lineup;
using MikuSB.GameServer.Game.Player;
using MikuSB.GameServer.Server.Packet.Send.Lineup;
namespace MikuSB.GameServer.Game.Lineup;
@@ -8,7 +9,7 @@ public class LineupManager(PlayerInstance player) : BasePlayerManager(player)
{
public LineupData LineupData { get; } = DatabaseHelper.GetInstanceOrCreateNew<LineupData>(player.Uid);
public async ValueTask<LineupDataInfo?> UpdateLineup(int lineupId, uint member1, uint member2, uint member3)
public async ValueTask<LineupDataInfo?> UpdateLineup(int lineupId, uint member1, uint member2, uint member3, bool sendPacket = true)
{
if (!LineupData.LineupInfo.TryGetValue(lineupId, out var formation))
{
@@ -20,10 +21,12 @@ public class LineupManager(PlayerInstance player) : BasePlayerManager(player)
LineupData.LineupInfo[lineupId] = formation;
}
formation.Member1 = member1;
formation.Member2 = member2;
formation.Member3 = member3;
if (sendPacket) await Player.SendPacket(new PacketNtfSyncLineup(formation));
return formation;
}
}

21
GameServer/Game/Player/PlayerInstance.cs
View File

@@ -52,19 +52,15 @@ public class PlayerInstance(PlayerGameData data)
await InitialPlayerManager();
foreach (var skinCard in GameData.CardSkinData.Values)
{
await InventoryManager.AddSkinItem((ItemTypeEnum)skinCard.Genre, skinCard.Detail, skinCard.Particular, skinCard.Level);
}
foreach (var weapon in GameData.WeaponData.Values)
{
await InventoryManager.AddWeaponItem((ItemTypeEnum)weapon.Genre, weapon.Detail, weapon.Particular, weapon.Level);
await InventoryManager.AddSkinItem((ItemTypeEnum)skinCard.Genre, skinCard.Detail, skinCard.Particular, skinCard.Level, false);
}
foreach (var ar in GameData.ArItemData.Values)
{
await InventoryManager.AddArItem((ItemTypeEnum)ar.Genre, ar.Detail, ar.Particular, ar.Level);
await InventoryManager.AddArItem((ItemTypeEnum)ar.Genre, ar.Detail, ar.Particular, ar.Level, false);
}
foreach (var manifest in GameData.ManifestationData.Values)
{
await InventoryManager.AddManifestationItem((ItemTypeEnum)manifest.Genre, manifest.Detail, manifest.Particular, manifest.Level);
await InventoryManager.AddManifestationItem((ItemTypeEnum)manifest.Genre, manifest.Detail, manifest.Particular, manifest.Level, false);
}
foreach (var card in GameData.CardData.Values)
{
@@ -72,7 +68,7 @@ public class PlayerInstance(PlayerGameData data)
}
foreach (var supplies in GameData.AllSuppliesData)
{
await InventoryManager.AddSuppliesItem(supplies, 90000);
await InventoryManager.AddSuppliesItem(supplies, 90000, false);
}
var selected = CharacterManager.CharacterData.Characters
@@ -81,7 +77,7 @@ public class PlayerInstance(PlayerGameData data)
.Select(x => x.Guid)
.ToList();
await LineupManager.UpdateLineup(1, selected[0], selected[1], selected[2]);
await LineupManager.UpdateLineup(1, selected[0], selected[1], selected[2],false);
var bootstrapAttrs = BuildLobbyBootstrapAttrs();
var existingAttrs = Data.Attrs
@@ -149,7 +145,7 @@ public class PlayerInstance(PlayerGameData data)
{
foreach (var supplies in GameData.AllSuppliesData)
{
await InventoryManager.AddSuppliesItem(supplies, 90000);
await InventoryManager.AddSuppliesItem(supplies, 90000, false);
}
}
@@ -241,12 +237,7 @@ public class PlayerInstance(PlayerGameData data)
Solutions = { LineupManager.LineupData.LineupInfo.Values.Select(x => x.ToProto()) },
};
foreach (var item in InventoryManager.InventoryData.Items.Values)
if ((item.TemplateId & 0xFFFF) != 5) proto.Items.Add(item.ToProto());
foreach (var weapon in InventoryManager.InventoryData.Weapons.Values) proto.Items.Add(weapon.ToProto());
foreach (var skin in InventoryManager.InventoryData.Skins.Values) proto.Items.Add(skin.ToProto());
foreach (var chara in CharacterManager.CharacterData.Characters) proto.Items.Add(chara.ToProto());
foreach (var x in Data.Attrs)
{
uint gid = x.Gid;

6
GameServer/Server/CallGS/Handlers/Lineup/Lineup_Update.cs
View File

@@ -22,12 +22,6 @@ public class Lineup_Update : ICallGSHandler
await CallGSRouter.SendScript(connection, "UpdateLineup", "{}");
return;
}
var rsp = new NtfSyncLineup
{
Lineup = formation.ToProto()
};
await connection.SendPacket(CmdIds.NtfSyncLineup, rsp);
await CallGSRouter.SendScript(connection, "UpdateLineup", "{}");
}
}

8
GameServer/Server/Packet/Recv/Login/HandlerReqLogin.cs
View File

@@ -6,6 +6,7 @@ using MikuSB.GameServer.Game.Player;
using MikuSB.GameServer.Server.CallGS;
using MikuSB.GameServer.Server.Packet.Send.Friend;
using MikuSB.GameServer.Server.Packet.Send.Login;
using MikuSB.GameServer.Server.Packet.Send.Misc;
using MikuSB.Proto;
using MikuSB.TcpSharp;
using MikuSB.Util;
@@ -49,13 +50,8 @@ public class HandlerReqLogin : Handler
connection.Player.Connection = connection;
await connection.SendPacket(new PacketRspLogin(connection.Player!));
var supplySync = new MikuSB.Proto.NtfSyncPlayer();
foreach (var item in connection.Player.GetSupplyItems())
supplySync.Items.Add(item.ToProto());
if (supplySync.Items.Count > 0)
await CallGSRouter.SendScript(connection, "", "{}", supplySync);
await connection.Player.OnHeartBeat();
await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
await connection.SendPacket(new PacketNtfCallScript(connection.Player!.InventoryManager.InventoryData));
}
}

19
GameServer/Server/Packet/Send/Lineup/PacketNtfSyncLineup.cs Normal file
View File

@@ -0,0 +1,19 @@
using MikuSB.Database.Lineup;
using MikuSB.Proto;
using MikuSB.TcpSharp;
namespace MikuSB.GameServer.Server.Packet.Send.Lineup;
public class PacketNtfSyncLineup : BasePacket
{
public PacketNtfSyncLineup(LineupDataInfo lineup) : base(CmdIds.NtfSyncLineup)
{
var proto = new NtfSyncLineup
{
Lineup = lineup.ToProto()
};
SetData(proto);
}
}

51
GameServer/Server/Packet/Send/Misc/PacketNtfCallScript.cs
View File

@@ -1,4 +1,6 @@
using MikuSB.Database.Character;
using MikuSB.Database.Inventory;
using MikuSB.GameServer.Game.Inventory;
using MikuSB.Proto;
using MikuSB.TcpSharp;
@@ -6,7 +8,7 @@ namespace MikuSB.GameServer.Server.Packet.Send.Misc;
public class PacketNtfCallScript : BasePacket
{
public PacketNtfCallScript(List<CharacterInfo> Characters) : base(CmdIds.NtfScript)
public PacketNtfCallScript(List<CharacterInfo> characters) : base(CmdIds.NtfScript)
{
var proto = new NtfCallScript
{
@@ -14,10 +16,55 @@ public class PacketNtfCallScript : BasePacket
Arg = "{}",
ExtraSync = new NtfSyncPlayer
{
Items = { Characters.Select(x => x.ToProto()) }
Items = { characters.Select(x => x.ToProto()) }
}
};
SetData(proto);
}
public PacketNtfCallScript(List<GameWeaponInfo> weapons) : base(CmdIds.NtfScript)
{
var proto = new NtfCallScript
{
Api = "",
Arg = "{}",
ExtraSync = new NtfSyncPlayer
{
Items = { weapons.Select(x => x.ToProto()) }
}
};
SetData(proto);
}
public PacketNtfCallScript(List<BaseGameItemInfo> items) : base(CmdIds.NtfScript)
{
var proto = new NtfCallScript
{
Api = "",
Arg = "{}",
ExtraSync = new NtfSyncPlayer
{
Items = { items.Select(x => x.ToProto()) }
}
};
SetData(proto);
}
public PacketNtfCallScript(InventoryData inventory) : base(CmdIds.NtfScript)
{
var proto = new NtfCallScript
{
Api = "",
Arg = "{}"
};
var extraSync = new NtfSyncPlayer();
foreach (var item in inventory.Items.Values) if ((item.TemplateId & 0xFFFF) != 5) extraSync.Items.Add(item.ToProto());
foreach (var weapon in inventory.Weapons.Values) extraSync.Items.Add(weapon.ToProto());
proto.ExtraSync = extraSync;
SetData(proto);
}
}