dev merge - r75_49ajrpwcziy395uuk0jq_2 update #1

Merged
Raphael merged 5 commits from dev into master 2024-12-31 02:20:50 +00:00
7 changed files with 11 additions and 10 deletions
Showing only changes of commit f51ca0e566 - Show all commits

View File

@ -2086,14 +2086,14 @@ namespace SCHALE.Common.Database
public BattleTypes BattleType { get; set; } public BattleTypes BattleType { get; set; }
public long StageId { get; set; } public long StageId { get; set; }
public long GroundId { get; set; } public long GroundId { get; set; }
public GroupTag Winner { get; set; } public string Winner { get; set; }
[JsonIgnore] [JsonIgnore]
public bool IsPlayerWin { get; } public bool IsPlayerWin { get; }
public BattleEndType EndType { get; set; } public BattleEndType EndType { get; set; }
public int EndFrame { get; set; } public int EndFrame { get; set; }
public GroupSummary Group01Summary { get; set; } //public GroupSummary Group01Summary { get; set; }
public GroupSummary Group02Summary { get; set; } //public GroupSummary Group02Summary { get; set; }
public WeekDungeonSummary WeekDungeonSummary { get; set; } public WeekDungeonSummary WeekDungeonSummary { get; set; }
public RaidSummary RaidSummary { get; set; } public RaidSummary RaidSummary { get; set; }
public ArenaSummary ArenaSummary { get; set; } public ArenaSummary ArenaSummary { get; set; }

View File

@ -5845,8 +5845,8 @@ namespace SCHALE.Common.NetworkProtocol
public class EquipmentItemEquipResponse : ResponsePacket public class EquipmentItemEquipResponse : ResponsePacket
{ {
public CharacterDB CharacterDB; public CharacterDB CharacterDB { get; set; }
public List<EquipmentDB> EquipmentDBs; public List<EquipmentDB> EquipmentDBs { get; set; }
public override Protocol Protocol public override Protocol Protocol
{ {
get get

View File

@ -25,9 +25,9 @@ namespace SCHALE.GameServer.Commands
InventoryUtils.AddAllWeapons(connection); InventoryUtils.AddAllWeapons(connection);
InventoryUtils.AddAllEquipment(connection); InventoryUtils.AddAllEquipment(connection);
InventoryUtils.AddAllItems(connection); InventoryUtils.AddAllItems(connection);
InventoryUtils.AddAllGears(connection); //InventoryUtils.AddAllGears(connection);
InventoryUtils.AddAllMemoryLobbies(connection); InventoryUtils.AddAllMemoryLobbies(connection);
InventoryUtils.AddAllScenarios(connection); //InventoryUtils.AddAllScenarios(connection);
InventoryUtils.AddAllFurnitures(connection); InventoryUtils.AddAllFurnitures(connection);
connection.SendChatMessage("Added Everything!"); connection.SendChatMessage("Added Everything!");

View File

@ -30,6 +30,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers
Level = originalStack.Level, Level = originalStack.Level,
StackCount = 1, StackCount = 1,
BoundCharacterServerId = req.CharacterServerId, BoundCharacterServerId = req.CharacterServerId,
}; };
var equippedCharacter = account.Characters.FirstOrDefault(x => x.ServerId == req.CharacterServerId); var equippedCharacter = account.Characters.FirstOrDefault(x => x.ServerId == req.CharacterServerId);

View File

@ -196,7 +196,7 @@ namespace SCHALE.GameServer.Controllers.Api.ProtocolHandlers
AccountId = 2, AccountId = 2,
RepresentCharacterUniqueId = 19009113, RepresentCharacterUniqueId = 19009113,
Level = 1, Level = 1,
Nickname = "夏萝莉是小楠梁", Nickname = "seggs",
Tier = 0, Tier = 0,
Rank = 1, Rank = 1,
BestRankingPoint = int.MaxValue, BestRankingPoint = int.MaxValue,

View File

@ -14,7 +14,7 @@ namespace SCHALE.GameServer.Utils
public string IRCAddress { get; set; } = "127.0.0.1"; public string IRCAddress { get; set; } = "127.0.0.1";
public int IRCPort { get; set; } = 6667; 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() public static void Load()
{ {

View File

@ -42,7 +42,7 @@ namespace SCHALE.Common.Utils
{ {
UniqueId = x.Id, UniqueId = x.Id,
Level = 1, Level = 1,
StackCount = 77777, // ~ 90,000 cap, auto converted if over StackCount = 7777, // ~ 90,000 cap, auto converted if over
}; };
}).ToList(); }).ToList();