Compare commits

...

4 Commits

Author SHA1 Message Date
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
14 changed files with 263 additions and 35 deletions

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

@@ -19,6 +19,9 @@ public static class GameData
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

@@ -35,6 +35,7 @@ public class ServerTextCHS
/// </summary> /// </summary>
public class WordTextCHS public class WordTextCHS
{ {
public string WeaponSkin => "武器皮肤";
public string SupportCard => "支援卡"; public string SupportCard => "支援卡";
public string Weapon => "武器"; public string Weapon => "武器";
public string Rank => "星魂"; public string Rank => "星魂";
@@ -236,8 +237,9 @@ public class GiveAllTextCHS
{ {
public string Desc => "给予玩家所有物品\n" + public string Desc => "给予玩家所有物品\n" +
"注意:-1 表示全部"; "注意:-1 表示全部";
public string Usage => "用法:/giveall weapon <detail/-1> -p<特定> -l<等>\n" + public string Usage => "用法:/giveall weapon <detail/-1> -p<特定> -l<等>\n" +
"用法:/giveall card <detail/-1> -p<特定> -l<等级>"; "用法:/giveall weaponskin <detail/-1> -p<特定>\n" +
"用法:/giveall card <detail/-1> -p<特定> -l<等級>";
public string NotFound => "未找到 {0}"; public string NotFound => "未找到 {0}";
public string GiveAllItems => "已向玩家添加 {0} 个 {1}"; public string GiveAllItems => "已向玩家添加 {0} 个 {1}";
} }

View File

@@ -35,6 +35,7 @@ public class ServerTextCHT
/// </summary> /// </summary>
public class WordTextCHT public class WordTextCHT
{ {
public string WeaponSkin => "武器外觀";
public string SupportCard => "支援卡"; public string SupportCard => "支援卡";
public string Weapon => "武器"; public string Weapon => "武器";
public string Rank => "星魂"; public string Rank => "星魂";
@@ -237,6 +238,7 @@ public class GiveAllTextCHT
public string Desc => "給予玩家所有物品\n" + public string Desc => "給予玩家所有物品\n" +
"注意:-1 表示全部"; "注意:-1 表示全部";
public string Usage => "用法:/giveall weapon <detail/-1> -p<特定> -l<等級>\n" + public string Usage => "用法:/giveall weapon <detail/-1> -p<特定> -l<等級>\n" +
"用法:/giveall weaponskin <detail/-1> -p<特定>\n" +
"用法:/giveall card <detail/-1> -p<特定> -l<等級>"; "用法:/giveall card <detail/-1> -p<特定> -l<等級>";
public string NotFound => "未找到 {0}"; public string NotFound => "未找到 {0}";
public string GiveAllItems => "已向玩家添加 {0} 個 {1}"; public string GiveAllItems => "已向玩家添加 {0} 個 {1}";

View File

@@ -35,7 +35,7 @@ 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 SupportCard => "Support Card"; public string SupportCard => "Support Card";
@@ -204,6 +204,7 @@ 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>\n" + public string Usage => "Usage: /giveall weapon <detail/-1> -p<particular> -l<level>\n" +
"Usage: /giveall weaponskin <detail/-1> -p<particular>\n" +
"Usage: /giveall card <detail/-1> -p<particular> -l<level>"; "Usage: /giveall card <detail/-1> -p<particular> -l<level>";
public string NotFound => "{0} not found!"; public string NotFound => "{0} not found!";
public string GiveAllItems => "Added {0} {1} to player!"; public string GiveAllItems => "Added {0} {1} to player!";

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)
@@ -80,4 +80,38 @@ public class CommandGiveAll : ICommands
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems", await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.SupportCard"), supportCards.Count.ToString())); 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);
@@ -216,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

@@ -79,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();
@@ -226,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
{ {
@@ -293,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,
@@ -337,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

@@ -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

@@ -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;
@@ -84,4 +84,33 @@ public class PacketNtfCallScript : BasePacket
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

@@ -1 +1 @@
v=1.1 v=1.2