mirror of
https://github.com/MikuLeaks/MikuSB.git
synced 2026-06-04 14:03:57 +00:00
Compare commits
10 Commits
v2.6
...
400db16f39
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
400db16f39 | ||
|
|
42b1ad1024 | ||
|
|
5aa5ef92d0 | ||
|
|
c34ad5eb1e | ||
|
|
8a597e24b6 | ||
|
|
9763f1f8d9 | ||
|
|
933ba097f9 | ||
|
|
c10d380e11 | ||
|
|
6c5d546026 | ||
|
|
9e518edb8e |
18
Common/Data/Excel/HouseFurniturePosData.cs
Normal file
18
Common/Data/Excel/HouseFurniturePosData.cs
Normal 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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -31,6 +31,7 @@ public static class GameData
|
|||||||
public static Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
|
public static Dictionary<uint, WeaponPartsExcel> WeaponPartsData { get; private set; } = [];
|
||||||
public static Dictionary<uint, GuideExcel> GuideData { 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, DormGiftExcel> DormGiftData { get; private set; } = [];
|
||||||
|
public static Dictionary<uint, HouseFurniturePosExcel> HouseFurniturePosData { get; private set; } = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class GameResourceTemplateId
|
public static class GameResourceTemplateId
|
||||||
|
|||||||
@@ -19,6 +19,11 @@ public static class ConfigManager
|
|||||||
//LoadHotfixData();
|
//LoadHotfixData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void SaveConfig()
|
||||||
|
{
|
||||||
|
SaveData(Config, ConfigFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
private static void LoadConfigData()
|
private static void LoadConfigData()
|
||||||
{
|
{
|
||||||
var file = new FileInfo(ConfigFilePath);
|
var file = new FileInfo(ConfigFilePath);
|
||||||
@@ -43,9 +48,26 @@ public static class ConfigManager
|
|||||||
Config = JsonConvert.DeserializeObject<ConfigContainer>(json)!;
|
Config = JsonConvert.DeserializeObject<ConfigContainer>(json)!;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Config.Loader.Arguments = NormalizeLoaderArguments(Config.Loader.Arguments);
|
||||||
SaveData(Config, ConfigFilePath);
|
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()
|
private static void LoadHotfixData()
|
||||||
{
|
{
|
||||||
var file = new FileInfo(HotfixFilePath);
|
var file = new FileInfo(HotfixFilePath);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using MikuSB.Data;
|
using MikuSB.Data;
|
||||||
|
using MikuSB.Database;
|
||||||
using MikuSB.Database.Inventory;
|
using MikuSB.Database.Inventory;
|
||||||
using MikuSB.Enums.Item;
|
using MikuSB.Enums.Item;
|
||||||
using MikuSB.Enums.Player;
|
using MikuSB.Enums.Player;
|
||||||
@@ -42,6 +43,7 @@ public class CommandGiveAll : ICommands
|
|||||||
weapons.Add(weapon);
|
weapons.Add(weapon);
|
||||||
}
|
}
|
||||||
if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons));
|
if (weapons.Count > 0) await player.SendPacket(new PacketNtfCallScript(weapons));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.Weapon"), weapons.Count.ToString()));
|
I18NManager.Translate("Word.Weapon"), weapons.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -77,6 +79,7 @@ public class CommandGiveAll : ICommands
|
|||||||
supportCards.Add(supportCard);
|
supportCards.Add(supportCard);
|
||||||
}
|
}
|
||||||
if (supportCards.Count > 0) await player.SendPacket(new PacketNtfCallScript(supportCards));
|
if (supportCards.Count > 0) await player.SendPacket(new PacketNtfCallScript(supportCards));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
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()));
|
||||||
}
|
}
|
||||||
@@ -111,6 +114,7 @@ public class CommandGiveAll : ICommands
|
|||||||
weaponSkins.Add(weaponSkin);
|
weaponSkins.Add(weaponSkin);
|
||||||
}
|
}
|
||||||
if (weaponSkins.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponSkins));
|
if (weaponSkins.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponSkins));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.WeaponSkin"), weaponSkins.Count.ToString()));
|
I18NManager.Translate("Word.WeaponSkin"), weaponSkins.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -147,6 +151,7 @@ public class CommandGiveAll : ICommands
|
|||||||
profileItems.Add(profile);
|
profileItems.Add(profile);
|
||||||
}
|
}
|
||||||
if (profileItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(profileItems));
|
if (profileItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(profileItems));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.Profile"), profileItems.Count.ToString()));
|
I18NManager.Translate("Word.Profile"), profileItems.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -183,6 +188,7 @@ public class CommandGiveAll : ICommands
|
|||||||
skinPartItems.Add(skinPart);
|
skinPartItems.Add(skinPart);
|
||||||
}
|
}
|
||||||
if (skinPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinPartItems));
|
if (skinPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinPartItems));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.SkinPart"), skinPartItems.Count.ToString()));
|
I18NManager.Translate("Word.SkinPart"), skinPartItems.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -219,6 +225,7 @@ public class CommandGiveAll : ICommands
|
|||||||
callItems.Add(callItem);
|
callItems.Add(callItem);
|
||||||
}
|
}
|
||||||
if (callItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(callItems));
|
if (callItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(callItems));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.CallItem"), callItems.Count.ToString()));
|
I18NManager.Translate("Word.CallItem"), callItems.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -255,6 +262,7 @@ public class CommandGiveAll : ICommands
|
|||||||
weaponPartItems.Add(weaponPart);
|
weaponPartItems.Add(weaponPart);
|
||||||
}
|
}
|
||||||
if (weaponPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponPartItems));
|
if (weaponPartItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(weaponPartItems));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.WeaponPart"), weaponPartItems.Count.ToString()));
|
I18NManager.Translate("Word.WeaponPart"), weaponPartItems.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -291,6 +299,7 @@ public class CommandGiveAll : ICommands
|
|||||||
skinItems.Add(skin);
|
skinItems.Add(skin);
|
||||||
}
|
}
|
||||||
if (skinItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinItems));
|
if (skinItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(skinItems));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.Skin"), skinItems.Count.ToString()));
|
I18NManager.Translate("Word.Skin"), skinItems.Count.ToString()));
|
||||||
}
|
}
|
||||||
@@ -327,6 +336,7 @@ public class CommandGiveAll : ICommands
|
|||||||
furnitureItems.Add(furniture);
|
furnitureItems.Add(furniture);
|
||||||
}
|
}
|
||||||
if (furnitureItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(furnitureItems));
|
if (furnitureItems.Count > 0) await player.SendPacket(new PacketNtfCallScript(furnitureItems));
|
||||||
|
DatabaseHelper.SaveDatabaseType(player.InventoryManager.InventoryData);
|
||||||
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
await arg.SendMsg(I18NManager.Translate("Game.Command.GiveAll.GiveAllItems",
|
||||||
I18NManager.Translate("Word.Furniture"), furnitureItems.Count.ToString()));
|
I18NManager.Translate("Word.Furniture"), furnitureItems.Count.ToString()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -214,6 +214,10 @@ public class PlayerInstance(PlayerGameData data)
|
|||||||
};
|
};
|
||||||
|
|
||||||
foreach (var chara in CharacterManager.CharacterData.Characters) proto.Items.Add(chara.ToProto());
|
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)
|
foreach (var x in Data.Attrs)
|
||||||
{
|
{
|
||||||
uint gid = x.Gid;
|
uint gid = x.Gid;
|
||||||
@@ -226,9 +230,7 @@ public class PlayerInstance(PlayerGameData data)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
//ToDo
|
proto.Attrs[ToPackedAttrKey(gid, sid)] = val;
|
||||||
//Temporary fix for login issues(need to handle LoginRsp properly with zlib.)
|
|
||||||
//proto.Attrs[ToPackedAttrKey(gid, sid)] = val;
|
|
||||||
proto.Attrs[ToShiftedAttrKey(gid, sid)] = val;
|
proto.Attrs[ToShiftedAttrKey(gid, sid)] = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -325,20 +327,49 @@ public class PlayerInstance(PlayerGameData data)
|
|||||||
|
|
||||||
private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildGirlFurnitureAttrs()
|
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;
|
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++)
|
for (uint girlId = 0; girlId <= 50; girlId++)
|
||||||
{
|
{
|
||||||
// FurnitureStart..FurnitureEnd = 10..19
|
var baseSid = girlId * 50;
|
||||||
for (uint offset = 10; offset <= 19; offset++)
|
for (uint offset = 10; offset <= 19; offset++)
|
||||||
{
|
yield return (101, baseSid + offset, furnitureUnlockedValue);
|
||||||
uint sid = (girlId * 50) + offset;
|
|
||||||
yield return (101, sid, 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()
|
private static IEnumerable<(uint Gid, uint Sid, uint Value)> BuildLobbyBootstrapAttrs()
|
||||||
|
|||||||
296
GameServer/Server/CallGS/Handlers/Girl/GirlCard_UpdateLevel.cs
Normal file
296
GameServer/Server/CallGS/Handlers/Girl/GirlCard_UpdateLevel.cs
Normal 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; }
|
||||||
|
}
|
||||||
@@ -87,7 +87,6 @@ public class HandlerReqLogin : Handler
|
|||||||
await connection.Player.OnHeartBeat();
|
await connection.Player.OnHeartBeat();
|
||||||
await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
|
await connection.SendPacket(new PacketNtfUpdateFriend(connection.Player!));
|
||||||
ApplySavedGirlSkinTypes(connection.Player!);
|
ApplySavedGirlSkinTypes(connection.Player!);
|
||||||
await connection.SendPacket(new PacketNtfCallScript(connection.Player!.InventoryManager.InventoryData));
|
|
||||||
await SendGirlSkinTypeOnLogin(connection);
|
await SendGirlSkinTypeOnLogin(connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ public class PacketRspLogin : BasePacket
|
|||||||
};
|
};
|
||||||
|
|
||||||
var bytes = Google.Protobuf.MessageExtensions.ToByteArray(proto);
|
var bytes = Google.Protobuf.MessageExtensions.ToByteArray(proto);
|
||||||
Logger.Info($"RspLogin proto size: {bytes.Length} bytes (limit: 65535)");
|
Logger.Info($"RspLogin proto size: {bytes.Length} bytes");
|
||||||
|
|
||||||
SetData(bytes);
|
SetData(bytes);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -293,11 +293,14 @@ public sealed class LaunchOptions
|
|||||||
public static LaunchOptions FromConfig(IEnumerable<string>? extraGameArguments = null)
|
public static LaunchOptions FromConfig(IEnumerable<string>? extraGameArguments = null)
|
||||||
{
|
{
|
||||||
var config = ConfigManager.Config;
|
var config = ConfigManager.Config;
|
||||||
|
var serverBaseDirectory = AppContext.BaseDirectory;
|
||||||
var gamePath = ResolvePath(config.Loader.GamePath, 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 ?? []);
|
var gameArgs = new List<string>(config.Loader.Arguments ?? []);
|
||||||
if (extraGameArguments is not null)
|
if (extraGameArguments is not null)
|
||||||
gameArgs.AddRange(extraGameArguments.Where(x => !string.IsNullOrWhiteSpace(x)));
|
gameArgs.AddRange(extraGameArguments.Where(x => !string.IsNullOrWhiteSpace(x)));
|
||||||
|
gameArgs = EnsureUserDirArgument(gameArgs, serverBaseDirectory);
|
||||||
|
PersistResolvedArgumentsIfChanged(config, gameArgs);
|
||||||
|
|
||||||
var env = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
var env = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||||
if (config.Loader.SetAllProxy && config.Proxy.Enabled)
|
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)
|
private static string? ResolvePath(string? value, string baseDirectory)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(value))
|
if (string.IsNullOrWhiteSpace(value))
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ dotnet build
|
|||||||
```
|
```
|
||||||
2. Set `GamePath` in `Config.json` to the path of your game executable.
|
2. Set `GamePath` in `Config.json` to the path of your game executable.
|
||||||
3. Start the server and run the `game` command.
|
3. Start the server and run the `game` command.
|
||||||
4. Enjoy.
|
4. Create an account in the server console.
|
||||||
|
5. Enjoy.
|
||||||
|
|
||||||
## Feature List
|
## Feature List
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ dotnet build
|
|||||||
```
|
```
|
||||||
2. Config.json の`GamePath`にあなたのゲームの実行ファイルのパスを書き込みます
|
2. Config.json の`GamePath`にあなたのゲームの実行ファイルのパスを書き込みます
|
||||||
3. サーバーを起動し`game`コマンドを入力します
|
3. サーバーを起動し`game`コマンドを入力します
|
||||||
4. 楽しむ
|
4. サーバーコンソールでアカウントを作成する
|
||||||
|
5. 楽しむ
|
||||||
|
|
||||||
## 機能一覧
|
## 機能一覧
|
||||||
|
|
||||||
|
|||||||
@@ -270,12 +270,17 @@ public class RouteController : ControllerBase
|
|||||||
var finalEmail = email ?? form_email ?? await GetJsonBodyValue("email");
|
var finalEmail = email ?? form_email ?? await GetJsonBodyValue("email");
|
||||||
if (!string.IsNullOrWhiteSpace(finalEmail))
|
if (!string.IsNullOrWhiteSpace(finalEmail))
|
||||||
{
|
{
|
||||||
var accountByEmail = AccountData.GetAccountByEmail(finalEmail);
|
var username = finalEmail.Split('@')[0];
|
||||||
if (accountByEmail == null)
|
var accountData = AccountData.GetAccountByUserName(username);
|
||||||
return BuildLoginFailedResponse("Account not found.");
|
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 finalUidValue = accountData.Uid.ToString();
|
||||||
var finalTokenValue = accountByEmail.GenerateComboToken();
|
var finalTokenValue = accountData.GenerateComboToken();
|
||||||
|
|
||||||
object emailLoginRsp = new
|
object emailLoginRsp = new
|
||||||
{
|
{
|
||||||
@@ -286,14 +291,14 @@ public class RouteController : ControllerBase
|
|||||||
isFirstLogin = false,
|
isFirstLogin = false,
|
||||||
isNeedKoreaSciAuth = false,
|
isNeedKoreaSciAuth = false,
|
||||||
ksOpenId = $"ks_{finalUidValue}",
|
ksOpenId = $"ks_{finalUidValue}",
|
||||||
nickname = accountByEmail.Username,
|
nickname = accountData.Username,
|
||||||
passportId = finalUidValue,
|
passportId = finalUidValue,
|
||||||
playerFillAgeUrl = "",
|
playerFillAgeUrl = "",
|
||||||
status = 0,
|
status = 0,
|
||||||
thirdPartyUid = "",
|
thirdPartyUid = "",
|
||||||
token = finalTokenValue,
|
token = finalTokenValue,
|
||||||
type = "guest",
|
type = "guest",
|
||||||
uid = accountByEmail.Uid
|
uid = accountData.Uid
|
||||||
},
|
},
|
||||||
msg = "操作成功"
|
msg = "操作成功"
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ public class BasePacket
|
|||||||
public long Timestamp { get; set; }
|
public long Timestamp { get; set; }
|
||||||
public IMessage? Message { get; set; }
|
public IMessage? Message { get; set; }
|
||||||
public PacketFraming Framing { get; set; }
|
public PacketFraming Framing { get; set; }
|
||||||
|
public int UncompressedBodySize { get; set; }
|
||||||
|
|
||||||
public BasePacket(ushort cmdId)
|
public BasePacket(ushort cmdId)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using MikuSB.Enums.Packet;
|
using MikuSB.Enums.Packet;
|
||||||
using MikuSB.Util;
|
using MikuSB.Util;
|
||||||
using System.Buffers.Binary;
|
using System.Buffers.Binary;
|
||||||
|
using System.IO.Compression;
|
||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
|
|
||||||
namespace MikuSB.TcpSharp
|
namespace MikuSB.TcpSharp
|
||||||
@@ -63,11 +64,11 @@ namespace MikuSB.TcpSharp
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public byte[] Encode(ushort packetId, byte[] payload, PacketFraming framing = PacketFraming.FourByteLittleEndianLength)
|
public byte[] Encode(ushort packetId, byte[] payload, PacketFraming framing = PacketFraming.FourByteLittleEndianLength, int uncompressedSize = 0)
|
||||||
{
|
{
|
||||||
return framing switch
|
return framing switch
|
||||||
{
|
{
|
||||||
PacketFraming.TwoByteBigEndianLength => EncodeTwoByteFrame(packetId, payload),
|
PacketFraming.TwoByteBigEndianLength => EncodeTwoByteFrame(packetId, payload, uncompressedSize),
|
||||||
PacketFraming.FourByteLittleEndianLength => EncodeFourByteFrame(packetId, payload),
|
PacketFraming.FourByteLittleEndianLength => EncodeFourByteFrame(packetId, payload),
|
||||||
_ => EncodeFourByteFrame(packetId, payload)
|
_ => EncodeFourByteFrame(packetId, payload)
|
||||||
};
|
};
|
||||||
@@ -220,8 +221,20 @@ namespace MikuSB.TcpSharp
|
|||||||
return payload;
|
return payload;
|
||||||
}
|
}
|
||||||
|
|
||||||
private byte[] EncodeTwoByteFrame(ushort packetId, byte[] payload)
|
private const int CompressionThreshold = 60000;
|
||||||
|
|
||||||
|
private static byte[] ZlibCompress(byte[] data)
|
||||||
{
|
{
|
||||||
|
using var ms = new MemoryStream();
|
||||||
|
using (var zlib = new ZLibStream(ms, CompressionLevel.Optimal, leaveOpen: true))
|
||||||
|
zlib.Write(data, 0, data.Length);
|
||||||
|
return ms.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] EncodeTwoByteFrame(ushort packetId, byte[] payload, int uncompressedSize = 0)
|
||||||
|
{
|
||||||
|
if (payload.Length > CompressionThreshold)
|
||||||
|
payload = ZlibCompress(payload);
|
||||||
var wrappedPayload = WrapPayload(payload);
|
var wrappedPayload = WrapPayload(payload);
|
||||||
var buffer = new byte[HeaderSize4Byte + wrappedPayload.Length];
|
var buffer = new byte[HeaderSize4Byte + wrappedPayload.Length];
|
||||||
|
|
||||||
@@ -246,7 +259,9 @@ namespace MikuSB.TcpSharp
|
|||||||
const int wrapperHeaderSize = 35;
|
const int wrapperHeaderSize = 35;
|
||||||
var wrapped = new byte[wrapperHeaderSize + payload.Length];
|
var wrapped = new byte[wrapperHeaderSize + payload.Length];
|
||||||
BinaryPrimitives.WriteUInt16LittleEndian(wrapped.AsSpan(6, 2), (ushort)payload.Length);
|
BinaryPrimitives.WriteUInt16LittleEndian(wrapped.AsSpan(6, 2), (ushort)payload.Length);
|
||||||
wrapped[11] = 1;
|
if (payload.Length >= 2 && payload[0] == 0x78 &&
|
||||||
|
(payload[1] == 0x01 || payload[1] == 0x5E || payload[1] == 0x9C || payload[1] == 0xDA))
|
||||||
|
wrapped[10] = 2;
|
||||||
payload.CopyTo(wrapped.AsSpan(wrapperHeaderSize));
|
payload.CopyTo(wrapped.AsSpan(wrapperHeaderSize));
|
||||||
|
|
||||||
return wrapped;
|
return wrapped;
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
v=2.6
|
v=3.0
|
||||||
Reference in New Issue
Block a user