zakir
/
ascnet
forked from PGR/ascnet
1
0
Fork 0
Code Pull Requests Activity

uniframe modification

This commit is contained in:
rfi 2024-01-25 22:23:47 +07:00
parent 5c296af253
commit a9fc6f557d
6 changed files with 155 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AscNet.Common/Database/Character.cs
View File

@ -77,7 +77,7 @@ namespace AscNet.Common.Database
throw new ServerCodeException("Character already obtained!", 20009022);
}
NotifyCharacterDataList.CharacterData characterData = new()
CharacterData characterData = new()
{
Id = (uint)character.Id,
Level = 1,
@ -100,7 +100,7 @@ namespace AscNet.Common.Database
};
// TODO: Don't do the ToString, query skill properly pls.
characterData.SkillList.AddRange(characterSkill.SkillGroupId.Take(8).Select(x => new NotifyCharacterDataList.CharacterData.CharacterSkill()
characterData.SkillList.AddRange(characterSkill.SkillGroupId.Take(8).Select(x => new CharacterSkill()
{
Id = uint.Parse(x.ToString().Take(6).ToArray()),
Level = 1
@ -121,7 +121,7 @@ namespace AscNet.Common.Database
return ret;
}
public NotifyCharacterDataList.CharacterData? AddCharacterExp(int characterId, int exp, int maxLvl = 0)
public CharacterData? AddCharacterExp(int characterId, int exp, int maxLvl = 0)
{
var characterData = TableReaderV2.Parse<CharacterTable>().FirstOrDefault(x => x.Id == characterId);
var character = Characters.FirstOrDefault(x => x.Id == characterId);
@ -153,7 +153,7 @@ namespace AscNet.Common.Database
return character;
}
public UpgradeCharacterSkillResult UpgradeCharacterSkillGroup(uint skillGroupId, int count)
public UpgradeCharacterSkillResult UpgradeCharacterSkillGroup(int skillGroupId, int count)
{
List<uint> affectedCharacters = new();
int totalCoinCost = 0;
@ -257,7 +257,7 @@ namespace AscNet.Common.Database
[BsonElement("characters")]
[BsonRequired]
public List<NotifyCharacterDataList.CharacterData> Characters { get; set; }
public List<CharacterData> Characters { get; set; }
[BsonElement("equips")]
[BsonRequired]
@ -307,7 +307,7 @@ namespace AscNet.Common.Database
public struct AddCharacterRet
{
public NotifyCharacterDataList.CharacterData Character { get; set; }
public CharacterData Character { get; set; }
public EquipData Equip { get; set; }
public FashionList Fashion { get; set; }
}

22
AscNet.Common/MsgPack/Types.cs
View File

@ -2503,7 +2503,7 @@ namespace AscNet.Common.MsgPack
[global::MessagePack.MessagePackObject(true)]
public class CharacterUpgradeSkillGroupRequest
{
public UInt32 SkillGroupId { get; set; }
public Int32 SkillGroupId { get; set; }
public Int32 Count { get; set; }
}
@ -2514,8 +2514,12 @@ namespace AscNet.Common.MsgPack
}
[global::MessagePack.MessagePackObject(true)]
public class NotifyCharacterDataList
public class CharacterSkill
{
public UInt32 Id { get; set; }
public Int32 Level { get; set; }
}
[global::MessagePack.MessagePackObject(true)]
public class CharacterData
{
@ -2526,31 +2530,27 @@ namespace AscNet.Common.MsgPack
public Int32 InitQuality { get; set; }
public Int32 Star { get; set; }
public Int32 Grade { get; set; }
[global::MessagePack.MessagePackObject(true)]
public class CharacterSkill
{
public UInt32 Id { get; set; }
public Int32 Level { get; set; }
}
public List<CharacterSkill> SkillList { get; set; } = new();
public List<dynamic> EnhanceSkillList { get; set; } = new();
public List<CharacterSkill> EnhanceSkillList { get; set; } = new();
public UInt32 FashionId { get; set; }
public Int64 CreateTime { get; set; }
public Int32 TrustLv { get; set; }
public Int32 TrustExp { get; set; }
public Int32 Ability { get; set; }
public Int32 LiberateLv { get; set; }
[global::MessagePack.MessagePackObject(true)]
public class CharacterHead
{
public UInt32 HeadFashionId { get; set; }
public Int32 HeadFashionType { get; set; }
}
public CharacterHead CharacterHeadInfo { get; set; }
}
[global::MessagePack.MessagePackObject(true)]
public class NotifyCharacterDataList
{
public List<CharacterData> CharacterDataList { get; set; } = new();
}

112
AscNet.GameServer/Handlers/CharacterModule.cs
View File

@ -9,11 +9,37 @@ using AscNet.Common;
using AscNet.Table.V2.share.character.quality;
using MongoDB.Driver.Linq;
using AscNet.Table.V2.share.character.skill;
using AscNet.Table.V2.share.character.enhanceskill;
namespace AscNet.GameServer.Handlers
{
#region MsgPackScheme
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
[MessagePackObject(true)]
public class CharacterUpgradeEnhanceSkillRequest
{
public int Count;
public int SkillGroupId;
}
[MessagePackObject(true)]
public class CharacterUpgradeEnhanceSkillResponse
{
public int Code;
}
[MessagePackObject(true)]
public class CharacterUnlockEnhanceSkillRequest
{
public int SkillGroupId;
}
[MessagePackObject(true)]
public class CharacterUnlockEnhanceSkillResponse
{
public int Code;
}
[MessagePackObject(true)]
public class CharacterLevelUpRequest
{
@ -291,7 +317,7 @@ namespace AscNet.GameServer.Handlers
var affectedChars = TableReaderV2.Parse<CharacterSkillTable>().Where(x => x.SkillGroupId.Contains(request.SkillGroupId)).Select(x => x.CharacterId);
foreach (var character in session.character.Characters.Where(x => affectedChars.Any(y => y == x.Id)))
{
character.SkillList.AddRange(TableReaderV2.Parse<CharacterSkillGroupTable>().Where(x => x.Id == request.SkillGroupId).SelectMany(x => x.SkillId).Select(x => new NotifyCharacterDataList.CharacterData.CharacterSkill() { Id = (uint)x, Level = 1 }));
character.SkillList.AddRange(TableReaderV2.Parse<CharacterSkillGroupTable>().Where(x => x.Id == request.SkillGroupId).SelectMany(x => x.SkillId).Select(x => new CharacterSkill() { Id = (uint)x, Level = 1 }));
notifyCharacterData.CharacterDataList.Add(character);
}
session.SendPush(notifyCharacterData);
@ -321,6 +347,88 @@ namespace AscNet.GameServer.Handlers
session.SendResponse(new CharacterUpgradeSkillGroupResponse(), packet.Id);
}
[RequestPacketHandler("CharacterUnlockEnhanceSkillRequest")]
public static void CharacterUnlockEnhanceSkillRequestHandler(Session session, Packet.Request packet)
{
CharacterUnlockEnhanceSkillRequest request = packet.Deserialize<CharacterUnlockEnhanceSkillRequest>();
var enhanceSkillIds = TableReaderV2.Parse<EnhanceSkillGroupTable>().Where(x => x.Id == request.SkillGroupId).SelectMany(x => x.SkillId);
NotifyItemDataList notifyItemData = new();
NotifyCharacterDataList notifyCharacterData = new();
foreach (var enhanceSkillId in enhanceSkillIds)
{
var affectedChars = TableReaderV2.Parse<EnhanceSkillTable>().Where(x => x.SkillGroupId.Contains(request.SkillGroupId)).Select(x => x.CharacterId).ToList();
foreach (var character in session.character.Characters.Where(x => affectedChars.Contains((int)x.Id)))
{
if (character.EnhanceSkillList.Any(x => x.Id == enhanceSkillId))
{
// CharacterSkillUnlocked
session.SendResponse(new CharacterUnlockEnhanceSkillResponse() { Code = 20009047 }, packet.Id);
return;
}
character.EnhanceSkillList.Add(new()
{
Id = (uint)enhanceSkillId,
Level = 1
});
notifyCharacterData.CharacterDataList.Add(character);
}
EnhanceSkillUpgradeTable? upgradeTable = TableReaderV2.Parse<EnhanceSkillUpgradeTable>().Find(x => x.SkillId == enhanceSkillId && x.Level == 0);
if (upgradeTable is null)
continue;
for (int i = 0; i < Math.Min(upgradeTable.CostItem.Count, upgradeTable.CostItemCount.Count); i++)
{
notifyItemData.ItemDataList.Add(session.inventory.Do(upgradeTable.CostItem[i], upgradeTable.CostItemCount[i] * -1));
}
}
session.SendPush(notifyItemData);
session.SendPush(notifyCharacterData);
session.SendResponse(new CharacterUnlockEnhanceSkillResponse(), packet.Id);
}
[RequestPacketHandler("CharacterUpgradeEnhanceSkillRequest")]
public static void CharacterUpgradeEnhanceSkillRequestHandler(Session session, Packet.Request packet)
{
CharacterUpgradeEnhanceSkillRequest request = packet.Deserialize<CharacterUpgradeEnhanceSkillRequest>();
var enhanceSkillIds = TableReaderV2.Parse<EnhanceSkillGroupTable>().Where(x => x.Id == request.SkillGroupId).SelectMany(x => x.SkillId);
NotifyItemDataList notifyItemData = new();
NotifyCharacterDataList notifyCharacterData = new();
foreach (var enhanceSkillId in enhanceSkillIds)
{
foreach (var character in session.character.Characters.Where(x => x.EnhanceSkillList.Any(x => x.Id == enhanceSkillId)))
{
for (int j = 0; j < request.Count; j++)
{
var skill = character.EnhanceSkillList.Find(x => x.Id == enhanceSkillId);
if (skill is not null)
{
EnhanceSkillUpgradeTable? upgradeTable = TableReaderV2.Parse<EnhanceSkillUpgradeTable>().Find(x => x.SkillId == enhanceSkillId && x.Level == skill.Level);
skill.Level++;
if (upgradeTable is null)
continue;
for (int i = 0; i < Math.Min(upgradeTable.CostItem.Count, upgradeTable.CostItemCount.Count); i++)
{
notifyItemData.ItemDataList.Add(session.inventory.Do(upgradeTable.CostItem[i], upgradeTable.CostItemCount[i] * -1));
}
}
}
notifyCharacterData.CharacterDataList.Add(character);
}
}
session.SendPush(notifyItemData);
session.SendPush(notifyCharacterData);
session.SendResponse(new CharacterUpgradeEnhanceSkillResponse(), packet.Id);
}
[RequestPacketHandler("CharacterExchangeRequest")]
public static void CharacterExchangeRequestHandler(Session session, Packet.Request packet)
{
@ -350,7 +458,7 @@ namespace AscNet.GameServer.Handlers
}
NotifyItemDataList notifyItemData = new();
// idk if it's always 50, please investigate later...
// TODO: idk if it's always 50, please investigate later...
notifyItemData.ItemDataList.Add(session.inventory.Do(characterData.ItemId, 50 * -1));
session.SendPush(notifyItemData);

2
AscNet.GameServer/Handlers/EquipModule.cs
View File

@ -255,7 +255,7 @@ namespace AscNet.GameServer.Handlers
session.SendResponse(new EquipTakeOffResponse(), packet.Id);
}
// TODO: Swapping equip resonance is broken!
// TODO: Swapping equip resonance is broken, this is only partially implemented!
[RequestPacketHandler("EquipResonanceRequest")]
public static void EquipResonanceRequestHandler(Session session, Packet.Request packet)
{

3
AscNet.GameServer/Handlers/FightModule.cs
View File

@ -1,6 +1,5 @@
using AscNet.Common.Database;
using AscNet.Common.MsgPack;
using static AscNet.Common.MsgPack.NotifyCharacterDataList;
using AscNet.Common.Util;
using AscNet.Common;
using AscNet.Table.V2.share.fuben;
@ -249,7 +248,7 @@ namespace AscNet.GameServer.Handlers
InitQuality = robot.CharacterQuality,
Star = robot.CharacterStar,
Grade = robot.CharacterGrade,
SkillList = skills.Where(x => !robot.RemoveSkillId.Contains(x)).Select(x => new CharacterData.CharacterSkill() { Id = (uint)x, Level = Math.Min(robot.SkillLevel, TableReaderV2.Parse<CharacterSkillLevelEffectTable>().OrderByDescending(x => x.Level).FirstOrDefault(y => y.SkillId == x)?.Level ?? 1) }).ToList(),
SkillList = skills.Where(x => !robot.RemoveSkillId.Contains(x)).Select(x => new CharacterSkill() { Id = (uint)x, Level = Math.Min(robot.SkillLevel, TableReaderV2.Parse<CharacterSkillLevelEffectTable>().OrderByDescending(x => x.Level).FirstOrDefault(y => y.SkillId == x)?.Level ?? 1) }).ToList(),
FashionId = (uint)robot.FashionId,
CreateTime = 0,
TrustLv = 1,

2
AscNet.GameServer/Handlers/PhotographModule.cs
View File

@ -38,7 +38,7 @@ namespace AscNet.GameServer.Handlers
session.player.PlayerData.DisplayCharIdList.Add(request.CharId);
}
NotifyCharacterDataList.CharacterData? character = session.character.Characters.Find(x => x.Id == request.CharId);
CharacterData? character = session.character.Characters.Find(x => x.Id == request.CharId);
if (character is not null && character.FashionId != request.FashionId && TableReaderV2.Parse<FashionTable>().Any(x => x.CharacterId == request.CharId && x.Id == request.FashionId))
{
character.FashionId = (uint)request.FashionId;