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

add all weapon & skin on init and fix CallGS

Browse Source
This commit is contained in:
Naruse
2026-04-25 18:36:35 +08:00
parent 86b1fc75a0
commit a3b421920e
15 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Common/Database/Inventory/InventoryData.cs
View File

@@ -60,11 +60,7 @@ public class GameSkinInfo : BaseGameItemInfo
{
Id = UniqueId,
Template = TemplateId,
Count = ItemCount,
Enhance = new Enhance
{
Level = Level
}
Count = ItemCount
};
return proto;
}

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

@@ -30,7 +30,8 @@ public class CharacterManager(PlayerInstance player) : BasePlayerManager(player)
var weaponInfo = await Player.InventoryManager!.AddWeaponItem((ItemTypeEnum)CharacterExcel.DefaultWeaponGPDL[0], CharacterExcel.DefaultWeaponGPDL[1], CharacterExcel.DefaultWeaponGPDL[2], (uint)CharacterExcel.DefaultWeaponGPDL[3]);
if (weaponInfo != null) character.WeaponUniqueId = weaponInfo.UniqueId;
var skinInfo = await Player.InventoryManager!.AddSkinItem(ItemTypeEnum.TYPE_CARD_SKIN,detail,particular,level);
//var skinInfo = await Player.InventoryManager!.AddSkinItem(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level);
var skinInfo = Player.InventoryManager!.GetSkinItemGDPL(ItemTypeEnum.TYPE_CARD_SKIN, detail, particular, level);
if (skinInfo != null)
{
character.SkinId = skinInfo.UniqueId;
@@ -46,6 +47,11 @@ public class CharacterManager(PlayerInstance player) : BasePlayerManager(player)
return CharacterData.Characters.Find(Character => Character.TemplateId == TemplateId);
}
public CharacterInfo? GetCharacterByGUID(uint guid)
{
return CharacterData.Characters.Find(Character => Character.Guid == guid);
}
public CharacterInfo? GetCharacterGDPL(ItemTypeEnum genre, int detail, int particular)
{
var templateId = GameResourceTemplateId.FromGdpl((uint)genre,(uint)detail,(uint)particular,1);

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

@@ -39,9 +39,9 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return InventoryData.Weapons.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
public GameWeaponInfo? GetWeaponItemGDPL(ItemTypeEnum genre, int detail, int particular)
public GameWeaponInfo? GetWeaponItemGDPL(ItemTypeEnum genre, uint detail, uint particular, uint level)
{
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, (uint)detail, (uint)particular, 1);
var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular, level);
return InventoryData.Weapons.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
@@ -74,9 +74,9 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player)
return InventoryData.Skins.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
public GameSkinInfo? GetSkinItemGDPL(ItemTypeEnum genre, int detail, int particular)
public GameSkinInfo? GetSkinItemGDPL(ItemTypeEnum genre, uint detail, uint particular, uint level)
{
var templateId = GameResourceTemplateId.FromGdpl((uint)genre, (uint)detail, (uint)particular, 1);
var templateId = GameResourceTemplateId.FromGdpl((uint)genre,detail,particular,level);
return InventoryData.Skins.Values.FirstOrDefault(x => x.TemplateId == templateId);
}
}

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

@@ -44,7 +44,18 @@ public class PlayerInstance(PlayerGameData data)
var t = Task.Run(async () =>
{
await InitialPlayerManager();
foreach (var card in GameData.CardData.Values) await CharacterManager.AddCharacter((ItemTypeEnum)card.Genre, card.Detail, card.Particular, card.Level);
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);
}
foreach (var card in GameData.CardData.Values)
{
await CharacterManager.AddCharacter((ItemTypeEnum)card.Genre, card.Detail, card.Particular, card.Level);
}
var bootstrapAttrs = BuildLobbyBootstrapAttrs();
var existingAttrs = Data.Attrs
@@ -156,8 +167,8 @@ public class PlayerInstance(PlayerGameData data)
},
};
//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 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)
@@ -229,7 +240,7 @@ public class PlayerInstance(PlayerGameData data)
// Launch.GPASSID = 22 stores pass counts. ChapterLevel.GID = 21 stores star flags.
// Completing the prologue/early chapter range prevents function conditions from
// treating the account as a fresh tutorial player.
for (uint levelId = 10_000; levelId <= 11_007; levelId++)
for (uint levelId = 10_000; levelId <= 10_160; levelId++)
{
yield return (21, levelId, 7);
yield return (22, levelId, 1);

7
GameServer/Server/CallGS/CallGSRouter.cs
View File

@@ -38,9 +38,10 @@ public static class CallGSRouter
Logger.Error($"No handler for CallGS API: {req.Api}");
}
public static async Task SendScript(Connection connection, string api, string arg, ushort seqNo = 0)
public static async Task SendScript(Connection connection, string api, string arg, NtfSyncPlayer extra = null!)
{
var rsp = new NtfCallScript { Api = api, Arg = arg };
await connection.SendPacket(CmdIds.RspCallGS, rsp, seqNo);
var rsp = new NtfCallScript { Api = api, Arg = arg, ExtraSync = extra };
await connection.SendPacket(CmdIds.NtfScript, rsp);
await connection.SendPacket(CmdIds.RspCallGS);
}
}

2
GameServer/Server/CallGS/Handlers/Achievement/Achievement_GetReward.cs
View File

@@ -9,6 +9,6 @@ public class Achievement_GetReward : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo)
{
// TODO: validate achievement completion and grant reward items
await CallGSRouter.SendScript(connection, "Achievement_GetReward", "{}", seqNo);
await CallGSRouter.SendScript(connection, "Achievement_GetReward", "{}");
}
}

2
GameServer/Server/CallGS/Handlers/Activity/ActivityFace_Update.cs
View File

@@ -9,6 +9,6 @@ public class ActivityFace_Update : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo)
{
// TODO: process face equip/unequip state and return the next face to display
await CallGSRouter.SendScript(connection, "ActivityFace_Update", "{\"nFaceId\":0,\"nId\":0,\"nType\":0}", seqNo);
await CallGSRouter.SendScript(connection, "ActivityFace_Update", "{\"nFaceId\":0,\"nId\":0,\"nType\":0}");
}
}

2
GameServer/Server/CallGS/Handlers/Daily/Daily_GetActivityInfo.cs
View File

@@ -8,6 +8,6 @@ public class Daily_GetActivityInfo : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo)
{
// TODO: return actual daily activity data
await CallGSRouter.SendScript(connection, "Daily_GetActivityInfo", "{}", seqNo);
await CallGSRouter.SendScript(connection, "Daily_GetActivityInfo", "{}");
}
}

24
GameServer/Server/CallGS/Handlers/Girl/GirlSkin_Change.cs Normal file
View File

@@ -0,0 +1,24 @@
using MikuSB.Proto;
using System.Text.Json;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Daily;
[CallGSApi("GirlSkin_Change")]
public class GirlSkin_Change : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var girlSkinData = JsonSerializer.Deserialize<ChangeSkinParam>(param);
var cardData = player.CharacterManager.GetCharacterByGUID((uint)girlSkinData!.CardId);
if (cardData == null) return;
cardData.SkinId = (uint)girlSkinData.Id;
var sync = new NtfSyncPlayer
{
Items = { cardData.ToProto() }
};
await CallGSRouter.SendScript(connection, "GirlSkin_Change", "{}", sync);
}
}

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

@@ -5,6 +5,6 @@ public class Lineup_Update : ICallGSHandler
{
public async Task Handle(Connection connection, string param, ushort seqNo)
{
await CallGSRouter.SendScript(connection, "UpdateLineup", "{}", seqNo);
await CallGSRouter.SendScript(connection, "UpdateLineup", "{}");
}
}

2
GameServer/Server/CallGS/Handlers/Misc/ZoneTime_ReqTime.cs
View File

@@ -11,6 +11,6 @@ public class ZoneTime_ReqTime : ICallGSHandler
{
var now = Extensions.GetUnixSec();
var arg = $"{{\"nTime1\":{now},\"nTime2\":{now}}}";
await CallGSRouter.SendScript(connection, "ZoneTime_ChangeTime", arg, seqNo);
await CallGSRouter.SendScript(connection, "ZoneTime_ChangeTime", arg);
}
}

2
GameServer/Server/CallGS/Handlers/Preview/ReqEntranceGreenLevel.cs
View File

@@ -8,6 +8,6 @@ public class ReqEntranceGreenLevel : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo)
{
// TODO: return actual skin green levels from player data
await CallGSRouter.SendScript(connection, "ReqEntranceGreenLevel", "[]", seqNo);
await CallGSRouter.SendScript(connection, "ReqEntranceGreenLevel", "[]");
}
}

2
GameServer/Server/CallGS/Handlers/Role/Role_EnterLevel.cs
View File

@@ -9,6 +9,6 @@ public class Role_EnterLevel : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo)
{
string rsp = $"{{\"tbRet\":{{\"nSeed\":{_random.Next(1, 1000000000)}}}}}";
await CallGSRouter.SendScript(connection, "Role_EnterLevel", rsp, seqNo);
await CallGSRouter.SendScript(connection, "Role_EnterLevel", rsp);
}
}

2
GameServer/Server/CallGS/Handlers/Shop/ShopLogic_GetOpenTime.cs
View File

@@ -8,6 +8,6 @@ public class ShopLogic_GetOpenTime : ICallGSHandler
public async Task Handle(Connection connection, string param, ushort seqNo)
{
// TODO: return actual shop open times from config
await CallGSRouter.SendScript(connection, "ShopLogic_GetOpenTime", "{}", seqNo);
await CallGSRouter.SendScript(connection, "ShopLogic_GetOpenTime", "{}");
}
}

5
GameServer/Server/CallGS/Models/Girl/GirlSkin_Change.cs Normal file
View File

@@ -0,0 +1,5 @@
public class ChangeSkinParam
{
public int Id { get; set; }
public int CardId { get; set; }
}