diff --git a/SCHALE.Common/Database/dbs.cs b/SCHALE.Common/Database/dbs.cs index 461e22c..5361ebb 100644 --- a/SCHALE.Common/Database/dbs.cs +++ b/SCHALE.Common/Database/dbs.cs @@ -2086,14 +2086,14 @@ namespace SCHALE.Common.Database public BattleTypes BattleType { get; set; } public long StageId { get; set; } public long GroundId { get; set; } - public GroupTag Winner { get; set; } + public string Winner { get; set; } [JsonIgnore] public bool IsPlayerWin { get; } public BattleEndType EndType { get; set; } public int EndFrame { get; set; } - public GroupSummary Group01Summary { get; set; } - public GroupSummary Group02Summary { get; set; } + //public GroupSummary Group01Summary { get; set; } + //public GroupSummary Group02Summary { get; set; } public WeekDungeonSummary WeekDungeonSummary { get; set; } public RaidSummary RaidSummary { get; set; } public ArenaSummary ArenaSummary { get; set; } diff --git a/SCHALE.Common/NetworkProtocol/protos.cs b/SCHALE.Common/NetworkProtocol/protos.cs index ac54738..17447a6 100644 --- a/SCHALE.Common/NetworkProtocol/protos.cs +++ b/SCHALE.Common/NetworkProtocol/protos.cs @@ -5845,8 +5845,8 @@ namespace SCHALE.Common.NetworkProtocol public class EquipmentItemEquipResponse : ResponsePacket { - public CharacterDB CharacterDB; - public List EquipmentDBs; + public CharacterDB CharacterDB { get; set; } + public List EquipmentDBs { get; set; } public override Protocol Protocol { get diff --git a/SCHALE.GameServer/Commands/InventoryCommand.cs b/SCHALE.GameServer/Commands/InventoryCommand.cs index 410e429..4579662 100644 --- a/SCHALE.GameServer/Commands/InventoryCommand.cs +++ b/SCHALE.GameServer/Commands/InventoryCommand.cs @@ -25,9 +25,9 @@ namespace SCHALE.GameServer.Commands InventoryUtils.AddAllWeapons(connection); InventoryUtils.AddAllEquipment(connection); InventoryUtils.AddAllItems(connection); - InventoryUtils.AddAllGears(connection); + //InventoryUtils.AddAllGears(connection); InventoryUtils.AddAllMemoryLobbies(connection); - InventoryUtils.AddAllScenarios(connection); + //InventoryUtils.AddAllScenarios(connection); InventoryUtils.AddAllFurnitures(connection); connection.SendChatMessage("Added Everything!"); diff --git a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Equipment.cs b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Equipment.cs index 8da45e3..3a6938c 100644 --- a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Equipment.cs +++ b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Equipment.cs @@ -30,6 +30,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers Level = originalStack.Level, StackCount = 1, BoundCharacterServerId = req.CharacterServerId, + }; var equippedCharacter = account.Characters.FirstOrDefault(x => x.ServerId == req.CharacterServerId); diff --git a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Raid.cs b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Raid.cs index de12e75..31e4648 100644 --- a/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Raid.cs +++ b/SCHALE.GameServer/Controllers/Api/ProtocolHandlers/Raid.cs @@ -196,7 +196,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers AccountId = 2, RepresentCharacterUniqueId = 19009113, Level = 1, - Nickname = "夏萝莉是小楠梁", + Nickname = "seggs", Tier = 0, Rank = 1, BestRankingPoint = int.MaxValue, diff --git a/SCHALE.GameServer/Utils/Config.cs b/SCHALE.GameServer/Utils/Config.cs index 86703fe..1087e17 100644 --- a/SCHALE.GameServer/Utils/Config.cs +++ b/SCHALE.GameServer/Utils/Config.cs @@ -14,7 +14,7 @@ namespace SCHALE.GameServer.Utils public string IRCAddress { get; set; } = "127.0.0.1"; public int IRCPort { get; set; } = 6667; - public string VersionId { get; set; } = "r73_6chhs5tfm4odqqb24x75"; + public string VersionId { get; set; } = "r75_49ajrpwcziy395uuk0jq_2"; public static void Load() { diff --git a/SCHALE.GameServer/Utils/InventoryUtils.cs b/SCHALE.GameServer/Utils/InventoryUtils.cs index 07596f8..9a4d6a0 100644 --- a/SCHALE.GameServer/Utils/InventoryUtils.cs +++ b/SCHALE.GameServer/Utils/InventoryUtils.cs @@ -42,7 +42,7 @@ namespace SCHALE.Common.Utils { UniqueId = x.Id, Level = 1, - StackCount = 77777, // ~ 90,000 cap, auto converted if over + StackCount = 7777, // ~ 90,000 cap, auto converted if over }; }).ToList();