add all weapon & skin on init and fix CallGS

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

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);

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);
}
}

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);