Compare commits

...

8 Commits

Author SHA1 Message Date
Kei-Luna
400db16f39 Character level-up implemented. 2026-05-15 10:14:35 +09:00
Kei-Luna
42b1ad1024 Changed the location where client save data is stored to the MikuSB directory. 2026-05-15 09:19:00 +09:00
Naruse
5aa5ef92d0 Update version.txt 2026-05-13 19:59:33 +08:00
Naruse
c34ad5eb1e unlock more furniture 2026-05-13 19:58:53 +08:00
Naruse
8a597e24b6 add system change furniture 2026-05-13 19:42:10 +08:00
Naruse
9763f1f8d9 auto create account if not exist 2026-05-13 19:08:02 +08:00
Kei-Luna
933ba097f9 Modified to send all inventory data via RspLogin upon login. 2026-05-13 19:31:01 +09:00
Kei-Luna
c10d380e11 Added a process to save data to the database when the giveall command is executed. 2026-05-13 19:29:49 +09:00
10 changed files with 430 additions and 18 deletions

View File

@@ -0,0 +1,18 @@
namespace MikuSB.Data.Excel;
[ResourceEntity("house/FurniturePos.json")]
public class HouseFurniturePosExcel : ExcelResource
{
public uint AreaId { get; set; }
public uint GroupId { get; set; }
public override uint GetId()
{
return (AreaId << 48) | (GroupId << 32);
}
public override void Loaded()
{
GameData.HouseFurniturePosData.TryAdd(GetId(), this);
}
}

View File

@@ -31,6 +31,7 @@ public static class GameData
public static Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
public static Dictionary<uint, GuideExcel> GuideData { get; private set; } = [];
public static Dictionary<uint, DormGiftExcel> DormGiftData { get; private set; } = [];
public static Dictionary<uint, HouseFurniturePosExcel> HouseFurniturePosData { get; private set; } = [];
}
public static class GameResourceTemplateId

View File

@@ -19,6 +19,11 @@ public static class ConfigManager
//LoadHotfixData();
}
public static void SaveConfig()
{
SaveData(Config, ConfigFilePath);
}
private static void LoadConfigData()
{
var file = new FileInfo(ConfigFilePath);
@@ -43,9 +48,26 @@ public static class ConfigManager
Config = JsonConvert.DeserializeObject<ConfigContainer>(json)!;
}
Config.Loader.Arguments = NormalizeLoaderArguments(Config.Loader.Arguments);
SaveData(Config, ConfigFilePath);
}
private static string[] NormalizeLoaderArguments(string[]? arguments)
{
var result = new List<string>(arguments ?? []);
var userDataDirectory = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "Client_User_Data"));
Directory.CreateDirectory(userDataDirectory);
var userDirArgument = $"-userdir={userDataDirectory}";
var existingIndex = result.FindIndex(x => x.StartsWith("-userdir=", StringComparison.OrdinalIgnoreCase));
if (existingIndex >= 0)
result[existingIndex] = userDirArgument;
else
result.Add(userDirArgument);
return result.ToArray();
}
private static void LoadHotfixData()
{
var file = new FileInfo(HotfixFilePath);

View File

@@ -1,4 +1,5 @@
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Database.Inventory;
using MikuSB.Enums.Item;
using MikuSB.Enums.Player;
@@ -42,6 +43,7 @@ public class CommandGiveAll : ICommands
weapons.Add(weapon);
}
if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.Weapon"), weapons.Count.ToString()));
}
@@ -77,6 +79,7 @@ public class CommandGiveAll : ICommands
supportCards.Add(supportCard);
}
if (supportCards.Count > 0) await player.SendPacket(new PacketNtfCallScript(supportCards));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.SupportCard"), supportCards.Count.ToString()));
}
@@ -111,6 +114,7 @@ public class CommandGiveAll : ICommands
weaponSkins.Add(weaponSkin);
}
if (weaponSkins.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponSkins));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.WeaponSkin"), weaponSkins.Count.ToString()));
}
@@ -147,6 +151,7 @@ public class CommandGiveAll : ICommands
profileItems.Add(profile);
}
if (profileItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(profileItems));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.Profile"), profileItems.Count.ToString()));
}
@@ -183,6 +188,7 @@ public class CommandGiveAll : ICommands
skinPartItems.Add(skinPart);
}
if (skinPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinPartItems));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.SkinPart"), skinPartItems.Count.ToString()));
}
@@ -219,6 +225,7 @@ public class CommandGiveAll : ICommands
callItems.Add(callItem);
}
if (callItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(callItems));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.CallItem"), callItems.Count.ToString()));
}
@@ -255,6 +262,7 @@ public class CommandGiveAll : ICommands
weaponPartItems.Add(weaponPart);
}
if (weaponPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponPartItems));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.WeaponPart"), weaponPartItems.Count.ToString()));
}
@@ -291,6 +299,7 @@ public class CommandGiveAll : ICommands
skinItems.Add(skin);
}
if (skinItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinItems));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.Skin"), skinItems.Count.ToString()));
}
@@ -327,6 +336,7 @@ public class CommandGiveAll : ICommands
furnitureItems.Add(furniture);
}
if (furnitureItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(furnitureItems));
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
I18NManager.Translate("Word.Furniture"), furnitureItems.Count.ToString()));
}

View File

@@ -214,6 +214,10 @@ public class PlayerInstance(PlayerGameData data)
};
foreach (var chara in CharacterManager.CharacterData.Characters) proto.Items.Add(chara.ToProto());
foreach (var item in InventoryManager.InventoryData.Items.Values) proto.Items.Add(item.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 card in InventoryManager.InventoryData.SupportCards.Values) proto.Items.Add(card.ToProto());
foreach (var x in Data.Attrs)
{
uint gid = x.Gid;
@@ -323,20 +327,49 @@ public class PlayerInstance(PlayerGameData data)
private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildGirlFurnitureAttrs()
{
// Unlock some furniture slots for every girl
// Each furniture attr int stores 10 slots using 3 bits per slot
// Value below means slot 0..9 = 1
const uint furnitureUnlockedValue = 153391689;
var groupFurnitureByArea = new Dictionary<uint, uint>();
foreach (var pos in GameData.HouseFurniturePosData.Values)
{
var areaId = pos.AreaId;
var groupId = pos.GroupId;
uint selectedIndex = 1;
var shift = (groupId - 1) * 3;
if (!groupFurnitureByArea.TryGetValue(areaId, out var packed)) packed = 0;
packed |= (selectedIndex << (int)shift);
groupFurnitureByArea[areaId] = packed;
}
for (uint girlId = 0; girlId <= 50; girlId++)
{
// FurnitureStart..FurnitureEnd = 10..19
var baseSid = girlId * 50;
for (uint offset = 10; offset <= 19; offset++)
{
uint sid = (girlId * 50) + offset;
yield return (101, sid, furnitureUnlockedValue);
}
yield return (101, baseSid + offset, furnitureUnlockedValue);
if (groupFurnitureByArea.TryGetValue(girlId, out var groupValue))
yield return (101, baseSid + 20, groupValue);
}
// Massage room furniture
// 10010..10019
for (uint sid = 10010; sid <= 10019; sid++)
yield return (101, sid, furnitureUnlockedValue);
// Massage room group state
yield return (101, 10020, 1);
// Hot spring furniture
// 15001..15010
for (uint sid = 15001; sid <= 15010; sid++)
yield return (101, sid, furnitureUnlockedValue);
// Beach furniture
// 17101..17110
for (uint sid = 17101; sid <= 17110; sid++)
yield return (101, sid, furnitureUnlockedValue);
for (uint sid = 30000; sid < 31000; sid++)
yield return (101, sid, furnitureUnlockedValue);
}
private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildLobbyBootstrapAttrs()

View File

@@ -0,0 +1,296 @@
using MikuSB.Data;
using MikuSB.Database;
using MikuSB.Database.Inventory;
using MikuSB.Database.Player;
using MikuSB.Enums.Item;
using MikuSB.Proto;
using System.Text.Json;
using System.Text.Json.Serialization;
namespace MikuSB.GameServer.Server.CallGS.Handlers.Girl;
[CallGSApi("GirlCard_UpdateLevel")]
public class GirlCard_UpdateLevel : ICallGSHandler
{
private const uint CashGroupId = 1;
private const uint SilverMoneyType = 3;
private const uint SilverSid = SilverMoneyType * 2 + 1;
private const uint RoleMaxLevel = 80;
public async Task Handle(Connection connection, string param, ushort seqNo)
{
var player = connection.Player!;
var req = JsonSerializer.Deserialize<GirlCardUpdateLevelParam>(param);
if (req == null || req.Id == 0 || req.Materials == null || req.Materials.Count == 0)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"error.BadParam\"}");
return;
}
var card = player.CharacterManager.GetCharacterByGUID((uint)req.Id);
if (card == null)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"error.BadParam\"}");
return;
}
var cardTemplate = GameData.CardData.Values.FirstOrDefault(x =>
GameResourceTemplateId.FromGdpl(x.Genre, x.Detail, x.Particular, x.Level) == card.TemplateId);
if (cardTemplate == null)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"error.BadParam\"}");
return;
}
var levelCap = GetCardLevelCap(player.Data.Level, cardTemplate.LevelLimitID);
if (levelCap == 0)
{
levelCap = card.Level;
}
if (card.Level >= RoleMaxLevel)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"tip.card_max_level\"}");
return;
}
var requestedMaterials = new Dictionary<uint, uint>();
foreach (var row in req.Materials)
{
if (row == null || row.Id == 0 || row.Num == 0)
continue;
requestedMaterials[(uint)row.Id] = requestedMaterials.GetValueOrDefault((uint)row.Id) + row.Num;
}
if (requestedMaterials.Count == 0)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"tip.material_not_enough\"}");
return;
}
ulong totalExp = 0;
ulong totalSilverCost = 0;
foreach (var (itemId, count) in requestedMaterials)
{
var item = player.InventoryManager.GetNormalItem(itemId);
if (item == null || item.ItemCount < count)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"tip.material_not_enough\"}");
return;
}
if (!GameData.SuppliesData.TryGetValue((uint)item.TemplateId, out var supplies) || supplies.ProvideExp == 0)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"error.BadParam\"}");
return;
}
totalExp += (ulong)supplies.ProvideExp * count;
totalSilverCost += (ulong)supplies.ConsumeGold * count;
}
var silverAttr = GetOrCreateAttr(player.Data, CashGroupId, SilverSid);
if ((ulong)silverAttr.Val < totalSilverCost)
{
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "{\"sErr\":\"tip.material_not_enough\"}");
return;
}
var syncItems = new List<Item>();
foreach (var (itemId, count) in requestedMaterials)
{
var item = player.InventoryManager.GetNormalItem(itemId)!;
item.ItemCount -= count;
if (item.ItemCount == 0)
{
player.InventoryManager.InventoryData.Items.Remove(item.UniqueId);
syncItems.Add(BuildRemovedProto(item));
}
else
{
syncItems.Add(item.ToProto());
}
}
silverAttr.Val -= checked((uint)totalSilverCost);
var (newLevel, newExp) = ApplyCardExp(card.Level, card.Exp, totalExp, levelCap);
card.Level = newLevel;
card.Exp = checked((int)newExp);
syncItems.Add(card.ToProto());
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
DatabaseHelper.SaveDatabaseType(player.CharacterManager.CharacterData);
DatabaseHelper.SaveDatabaseType(player.Data);
var sync = new NtfSyncPlayer();
sync.Items.AddRange(syncItems);
sync.Custom[player.ToPackedAttrKey(CashGroupId, SilverSid)] = silverAttr.Val;
sync.Custom[player.ToShiftedAttrKey(CashGroupId, SilverSid)] = silverAttr.Val;
await CallGSRouter.SendScript(connection, "GirlCard_UpdateLevel", "null", sync);
}
private static PlayerAttr GetOrCreateAttr(PlayerGameData data, uint gid, uint sid)
{
var attr = data.Attrs.FirstOrDefault(x => x.Gid == gid && x.Sid == sid);
if (attr != null)
return attr;
attr = new PlayerAttr
{
Gid = gid,
Sid = sid,
Val = 0
};
data.Attrs.Add(attr);
return attr;
}
private static Item BuildRemovedProto(BaseGameItemInfo item)
{
var proto = item.ToProto();
proto.Count = 0;
return proto;
}
private static uint GetCardLevelCap(uint playerLevel, int levelLimitId)
{
var limits = LoadCardLevelLimit(levelLimitId);
if (limits.Count == 0)
return 0;
uint nearestAccountLevel = 0;
uint nearestCardLevel = 0;
foreach (var (accountLevel, cardLevel) in limits)
{
if (accountLevel < playerLevel)
{
nearestAccountLevel = accountLevel;
nearestCardLevel = cardLevel;
continue;
}
if (accountLevel == playerLevel)
return Math.Min(cardLevel, RoleMaxLevel);
var distance = accountLevel - nearestAccountLevel;
if (distance == 0)
return Math.Min(cardLevel, RoleMaxLevel);
var percent = (playerLevel - nearestAccountLevel) / (double)distance;
var interpolated = (uint)Math.Floor(nearestCardLevel + ((cardLevel - nearestCardLevel) * percent));
return Math.Min(interpolated, RoleMaxLevel);
}
return Math.Min(nearestCardLevel, RoleMaxLevel);
}
private static List<(uint AccountLevel, uint CardLevel)> LoadCardLevelLimit(int levelLimitId)
{
var path = Path.Combine(
AppContext.BaseDirectory,
"Resources",
"item",
"level_limit.json");
if (!File.Exists(path))
return [];
using var doc = JsonDocument.Parse(File.ReadAllText(path));
var result = new List<(uint AccountLevel, uint CardLevel)>();
foreach (var row in doc.RootElement.EnumerateArray())
{
if (!row.TryGetProperty("ID", out var idProp) || idProp.GetInt32() != levelLimitId)
continue;
if (!row.TryGetProperty("Type", out var typeProp) || typeProp.GetInt32() != 1)
continue;
if (!row.TryGetProperty("Limit", out var limitProp) || limitProp.ValueKind != JsonValueKind.Object)
continue;
foreach (var property in limitProp.EnumerateObject())
{
if (!uint.TryParse(property.Name, out var accountLevel))
continue;
uint cardLevel;
if (property.Value.ValueKind == JsonValueKind.Number)
{
cardLevel = property.Value.GetUInt32();
}
else if (property.Value.ValueKind == JsonValueKind.String &&
uint.TryParse(property.Value.GetString(), out var parsed))
{
cardLevel = parsed;
}
else
{
continue;
}
result.Add((accountLevel, cardLevel));
}
break;
}
result.Sort((a, b) => a.AccountLevel.CompareTo(b.AccountLevel));
return result;
}
private static (uint Level, ulong Exp) ApplyCardExp(uint level, int currentExp, ulong addedExp, uint levelCap)
{
var destLevel = level == 0 ? 1u : level;
var destExp = (ulong)Math.Max(0, currentExp) + addedExp;
if (levelCap > 0 && destLevel >= levelCap)
return (destLevel, destExp);
while (destLevel < RoleMaxLevel)
{
var needExp = GetCardNeedExp(destLevel);
if (needExp == 0 || destExp < needExp)
break;
destExp -= needExp;
destLevel++;
if (levelCap > 0 && destLevel >= levelCap)
return (levelCap, destExp);
}
return (destLevel, destExp);
}
private static uint GetCardNeedExp(uint currentLevel)
{
if (GameData.UpgradeExpData.TryGetValue((int)currentLevel, out var row))
return row.CardNeedExp;
return 0;
}
}
internal sealed class GirlCardUpdateLevelParam
{
[JsonPropertyName("Id")]
public int Id { get; set; }
[JsonPropertyName("tbMaterials")]
public List<GirlCardLevelMaterial> Materials { get; set; } = [];
}
internal sealed class GirlCardLevelMaterial
{
[JsonPropertyName("Id")]
public int Id { get; set; }
[JsonPropertyName("Num")]
public uint Num { get; set; }
}

View File

@@ -87,7 +87,6 @@ public class HandlerReqLogin : Handler
await connection.Player.OnHeartBeat();
await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
ApplySavedGirlSkinTypes(connection.Player!);
await connection.SendPacket(new PacketNtfCallScript(connection.Player!.InventoryManager.InventoryData));
await SendGirlSkinTypeOnLogin(connection);
}

View File

@@ -293,11 +293,14 @@ public sealed class LaunchOptions
public static LaunchOptions FromConfig(IEnumerable<string>? extraGameArguments = null)
{
var config = ConfigManager.Config;
var serverBaseDirectory = AppContext.BaseDirectory;
var gamePath = ResolvePath(config.Loader.GamePath, AppContext.BaseDirectory);
var patchPaths = ResolvePatchPaths(config.Loader.PatchPaths, AppContext.BaseDirectory);
var patchPaths = ResolvePatchPaths(config.Loader.PatchPaths, serverBaseDirectory);
var gameArgs = new List<string>(config.Loader.Arguments ?? []);
if (extraGameArguments is not null)
gameArgs.AddRange(extraGameArguments.Where(x => !string.IsNullOrWhiteSpace(x)));
gameArgs = EnsureUserDirArgument(gameArgs, serverBaseDirectory);
PersistResolvedArgumentsIfChanged(config, gameArgs);
var env = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
if (config.Loader.SetAllProxy && config.Proxy.Enabled)
@@ -330,6 +333,31 @@ public sealed class LaunchOptions
};
}
private static List<string> EnsureUserDirArgument(List<string> gameArgs, string baseDirectory)
{
var userDataDirectory = Path.GetFullPath(Path.Combine(baseDirectory, "Client_User_Data"));
Directory.CreateDirectory(userDataDirectory);
var userDirArgument = $"-userdir={userDataDirectory}";
var existingIndex = gameArgs.FindIndex(x => x.StartsWith("-userdir=", StringComparison.OrdinalIgnoreCase));
if (existingIndex >= 0)
gameArgs[existingIndex] = userDirArgument;
else
gameArgs.Add(userDirArgument);
return gameArgs;
}
private static void PersistResolvedArgumentsIfChanged(Configuration.ConfigContainer config, List<string> gameArgs)
{
var currentArgs = config.Loader.Arguments ?? [];
if (currentArgs.SequenceEqual(gameArgs, StringComparer.Ordinal))
return;
config.Loader.Arguments = gameArgs.ToArray();
ConfigManager.SaveConfig();
}
private static string? ResolvePath(string? value, string baseDirectory)
{
if (string.IsNullOrWhiteSpace(value))

View File

@@ -270,12 +270,17 @@ public class RouteController : ControllerBase
var finalEmail = email ?? form_email ?? await GetJsonBodyValue("email");
if (!string.IsNullOrWhiteSpace(finalEmail))
{
var accountByEmail = AccountData.GetAccountByEmail(finalEmail);
if (accountByEmail == null)
return BuildLoginFailedResponse("Account not found.");
var username = finalEmail.Split('@')[0];
var accountData = AccountData.GetAccountByUserName(username);
if (accountData == null)
{
if (!ConfigManager.Config.ServerOption.AutoCreateUser) return BuildLoginFailedResponse("Account not found.");
AccountData.CreateAccount(username, 0, "123456");
accountData = AccountData.GetAccountByUserName(username)!;
}
var finalUidValue = accountByEmail.Uid.ToString();
var finalTokenValue = accountByEmail.GenerateComboToken();
var finalUidValue = accountData.Uid.ToString();
var finalTokenValue = accountData.GenerateComboToken();
object emailLoginRsp = new
{
@@ -286,14 +291,14 @@ public class RouteController : ControllerBase
isFirstLogin = false,
isNeedKoreaSciAuth = false,
ksOpenId = $"ks_{finalUidValue}",
nickname = accountByEmail.Username,
nickname = accountData.Username,
passportId = finalUidValue,
playerFillAgeUrl = "",
status = 0,
thirdPartyUid = "",
token = finalTokenValue,
type = "guest",
uid = accountByEmail.Uid
uid = accountData.Uid
},
msg = "操作成功"
};

View File

@@ -1 +1 @@
v=2.7
v=3.0