From 7f2cb0ef58badd8ad3a3ea8db966a07c1c9912dd Mon Sep 17 00:00:00 2001 From: Somebody Date: Tue, 13 Aug 2024 18:51:39 +0800 Subject: [PATCH] Code Format --- .../Data/Config/Rogue/RogueNPCConfigInfo.cs | 8 ++- Common/Data/Config/Scene/FloorInfo.cs | 50 +++++++++---------- Common/Data/Excel/RogueNPCExcel.cs | 3 +- Common/Database/Lineup/LineupData.cs | 9 ++-- Common/Database/Player/ServerPrefsData.cs | 16 +++--- Common/Enums/Rogue/RogueDialogueTypeEnum.cs | 2 +- Common/Enums/Rogue/RogueSubModeEnum.cs | 4 +- .../Game/ChessRogue/ChessRogueInstance.cs | 8 ++- GameServer/Game/Inventory/InventoryManager.cs | 31 +++++------- GameServer/Game/Lineup/LineupManager.cs | 3 +- GameServer/Game/Player/PlayerInstance.cs | 1 - .../Game/Rogue/Buff/RogueBuffSelectMenu.cs | 2 +- .../EventHandlerCostItemPercent.cs | 2 +- .../CostHandler/EventHandlerCostItemValue.cs | 3 +- .../EventHandlerRepeatableGamble.cs | 5 +- .../EventHandlerTriggerBattle.cs | 6 +-- .../Game/Rogue/Event/RogueEventInstance.cs | 7 +-- .../Game/Rogue/Event/RogueEventManager.cs | 2 + .../Packet/Recv/Item/HandlerUseItemCsReq.cs | 7 ++- .../HandlerGetAllServerPrefsDataCsReq.cs | 2 +- .../HandlerGetServerPrefsDataCsReq.cs | 2 +- .../HandlerUpdateServerPrefsDataCsReq.cs | 7 +-- .../Packet/Send/Item/PacketUseItemScRsp.cs | 8 ++- .../Send/Lineup/PacketSyncLineupNotify.cs | 7 +-- .../Player/PacketMonthCardRewardNotify.cs | 1 - ...ketSelectRogueCommonDialogueOptionScRsp.cs | 2 - ...cketSyncRogueCommonActionResultScNotify.cs | 3 +- ...ketSyncRogueCommonPendingActionScNotify.cs | 5 +- .../PacketGetAllServerPrefsDataScRsp.cs | 5 +- .../PacketGetServerPrefsDataScRsp.cs | 2 +- 30 files changed, 105 insertions(+), 108 deletions(-) diff --git a/Common/Data/Config/Rogue/RogueNPCConfigInfo.cs b/Common/Data/Config/Rogue/RogueNPCConfigInfo.cs index cdb10ef1..6725e5e2 100644 --- a/Common/Data/Config/Rogue/RogueNPCConfigInfo.cs +++ b/Common/Data/Config/Rogue/RogueNPCConfigInfo.cs @@ -8,15 +8,13 @@ public class RogueNPCConfigInfo { [JsonConverter(typeof(StringEnumConverter))] public RogueDialogueTypeEnum DialogueType { get; set; } + public List DialogueList { get; set; } = []; public void Loaded() { if (DialogueList.Count == 0) return; - foreach (var info in DialogueList) - { - info.Loaded(); - } + foreach (var info in DialogueList) info.Loaded(); } -} +} \ No newline at end of file diff --git a/Common/Data/Config/Scene/FloorInfo.cs b/Common/Data/Config/Scene/FloorInfo.cs index 092d476f..09c30324 100644 --- a/Common/Data/Config/Scene/FloorInfo.cs +++ b/Common/Data/Config/Scene/FloorInfo.cs @@ -42,36 +42,36 @@ public class FloorInfo // Cache anchors foreach (var group in Groups.Values) - foreach (var prop in group.PropList) - // Check if prop can be teleported to - if (prop.AnchorID > 0) + foreach (var prop in group.PropList) + // Check if prop can be teleported to + if (prop.AnchorID > 0) + { + // Put inside cached teleport list to send to client when they request map info + CachedTeleports.TryAdd(prop.MappingInfoID, prop); + UnlockedCheckpoints.Add(prop); + + // Force prop to be in the unlocked state + prop.State = PropStateEnum.CheckPointEnable; + } + else if (!string.IsNullOrEmpty(prop.InitLevelGraph)) + { + var json = prop.InitLevelGraph; + + // Hacky way to setup prop triggers + if (json.Contains("Maze_GroupProp_OpenTreasure_WhenMonsterDie")) { - // Put inside cached teleport list to send to client when they request map info - CachedTeleports.TryAdd(prop.MappingInfoID, prop); - UnlockedCheckpoints.Add(prop); - - // Force prop to be in the unlocked state - prop.State = PropStateEnum.CheckPointEnable; + //prop.Trigger = new TriggerOpenTreasureWhenMonsterDie(group.Id); } - else if (!string.IsNullOrEmpty(prop.InitLevelGraph)) + else if (json.Contains("Common_Console")) { - var json = prop.InitLevelGraph; - - // Hacky way to setup prop triggers - if (json.Contains("Maze_GroupProp_OpenTreasure_WhenMonsterDie")) - { - //prop.Trigger = new TriggerOpenTreasureWhenMonsterDie(group.Id); - } - else if (json.Contains("Common_Console")) - { - prop.CommonConsole = true; - } - - // Clear for garbage collection - prop.ValueSource = null; - prop.InitLevelGraph = null; + prop.CommonConsole = true; } + // Clear for garbage collection + prop.ValueSource = null; + prop.InitLevelGraph = null; + } + Loaded = true; } } diff --git a/Common/Data/Excel/RogueNPCExcel.cs b/Common/Data/Excel/RogueNPCExcel.cs index 75a85515..8008a7cc 100644 --- a/Common/Data/Excel/RogueNPCExcel.cs +++ b/Common/Data/Excel/RogueNPCExcel.cs @@ -1,5 +1,4 @@ -using EggLink.DanhengServer.Data.Config; -using EggLink.DanhengServer.Data.Config.Rogue; +using EggLink.DanhengServer.Data.Config.Rogue; namespace EggLink.DanhengServer.Data.Excel; diff --git a/Common/Database/Lineup/LineupData.cs b/Common/Database/Lineup/LineupData.cs index d0b7e2cf..8a756359 100644 --- a/Common/Database/Lineup/LineupData.cs +++ b/Common/Database/Lineup/LineupData.cs @@ -49,9 +49,10 @@ public class LineupInfo if (avatarInfo != null) { if (avatarInfo.GetCurHp(IsExtraLineup()) <= 0 && !allowRevive) continue; - if (avatarInfo.GetCurHp(IsExtraLineup()) >= 10000 && count > 0) continue; // full hp - if (avatarInfo.GetCurHp(IsExtraLineup()) <= 0 && count < 0) continue; // dead - avatarInfo.SetCurHp(Math.Max(Math.Min(avatarInfo.GetCurHp(IsExtraLineup()) + count, 10000), 0), IsExtraLineup()); + if (avatarInfo.GetCurHp(IsExtraLineup()) >= 10000 && count > 0) continue; // full hp + if (avatarInfo.GetCurHp(IsExtraLineup()) <= 0 && count < 0) continue; // dead + avatarInfo.SetCurHp(Math.Max(Math.Min(avatarInfo.GetCurHp(IsExtraLineup()) + count, 10000), 0), + IsExtraLineup()); result = true; } } @@ -96,7 +97,7 @@ public class LineupInfo if (avatarInfo != null) { if (avatarInfo.CurrentHp <= 0) continue; - avatarInfo.SetCurSp((int)Math.Min(avatarInfo.GetCurSp(IsExtraLineup()) + count, 10000), IsExtraLineup()); + avatarInfo.SetCurSp(Math.Min(avatarInfo.GetCurSp(IsExtraLineup()) + count, 10000), IsExtraLineup()); result = true; } } diff --git a/Common/Database/Player/ServerPrefsData.cs b/Common/Database/Player/ServerPrefsData.cs index 88f3af12..314cc730 100644 --- a/Common/Database/Player/ServerPrefsData.cs +++ b/Common/Database/Player/ServerPrefsData.cs @@ -7,14 +7,13 @@ namespace EggLink.DanhengServer.Database.Player; [SugarTable("server_prefs_data")] public class ServerPrefsData : BaseDatabaseDataHelper { - [SugarColumn(IsJson = true)] - public Dictionary ServerPrefsDict { get; set; } = []; + [SugarColumn(IsJson = true)] public Dictionary ServerPrefsDict { get; set; } = []; public double Version { get; set; } = 2.4; public void SetData(int prefsId, string b64Data) { - ServerPrefsDict[prefsId] = new ServerPrefsInfo() + ServerPrefsDict[prefsId] = new ServerPrefsInfo { ServerPrefsId = prefsId, Data = b64Data @@ -27,9 +26,12 @@ public class ServerPrefsInfo public int ServerPrefsId { get; set; } public string Data { get; set; } = ""; - public ServerPrefs ToProto() => new() + public ServerPrefs ToProto() { - Data = ByteString.FromBase64(Data), - ServerPrefsId = (uint)ServerPrefsId - }; + return new ServerPrefs + { + Data = ByteString.FromBase64(Data), + ServerPrefsId = (uint)ServerPrefsId + }; + } } \ No newline at end of file diff --git a/Common/Enums/Rogue/RogueDialogueTypeEnum.cs b/Common/Enums/Rogue/RogueDialogueTypeEnum.cs index 9c30bc74..0e9809b0 100644 --- a/Common/Enums/Rogue/RogueDialogueTypeEnum.cs +++ b/Common/Enums/Rogue/RogueDialogueTypeEnum.cs @@ -6,4 +6,4 @@ public enum RogueDialogueTypeEnum Story = 1, Event = 2, Store = 3 -} +} \ No newline at end of file diff --git a/Common/Enums/Rogue/RogueSubModeEnum.cs b/Common/Enums/Rogue/RogueSubModeEnum.cs index a155f066..a65dac7b 100644 --- a/Common/Enums/Rogue/RogueSubModeEnum.cs +++ b/Common/Enums/Rogue/RogueSubModeEnum.cs @@ -7,5 +7,5 @@ public enum RogueSubModeEnum CosmosRogueEndless = 102, ChessRogue = 201, ChessRogueNous = 202, - TournRogue = 301, -} + TournRogue = 301 +} \ No newline at end of file diff --git a/GameServer/Game/ChessRogue/ChessRogueInstance.cs b/GameServer/Game/ChessRogue/ChessRogueInstance.cs index cf7616e8..46fb5631 100644 --- a/GameServer/Game/ChessRogue/ChessRogueInstance.cs +++ b/GameServer/Game/ChessRogue/ChessRogueInstance.cs @@ -288,7 +288,9 @@ public class ChessRogueInstance : BaseRogueInstance LayerMap = GameConstants.AllowedChessRogueEntranceId.RandomElement(); - CurBoardExcel = RogueSubMode == RogueSubModeEnum.ChessRogue ? GameData.RogueSwarmChessBoardData[level].RandomElement() : GameData.RogueNousChessBoardData[level].RandomElement(); + CurBoardExcel = RogueSubMode == RogueSubModeEnum.ChessRogue + ? GameData.RogueSwarmChessBoardData[level].RandomElement() + : GameData.RogueNousChessBoardData[level].RandomElement(); RogueCells.Clear(); CurCell = null; @@ -455,7 +457,9 @@ public class ChessRogueInstance : BaseRogueInstance RogueDifficultyInfo = ToDifficultyInfo(), VirtualItemInfo = ToVirtualItemInfo(), LevelInfo = ToLevelInfo(), - PendingAction = RogueActions.Count > 0 ? RogueActions.First().Value.ToProto() : new RogueCommonPendingAction() + PendingAction = RogueActions.Count > 0 + ? RogueActions.First().Value.ToProto() + : new RogueCommonPendingAction() }; proto.RogueCurrentGameInfo.AddRange(ToGameInfo()); diff --git a/GameServer/Game/Inventory/InventoryManager.cs b/GameServer/Game/Inventory/InventoryManager.cs index 38681dab..552171e9 100644 --- a/GameServer/Game/Inventory/InventoryManager.cs +++ b/GameServer/Game/Inventory/InventoryManager.cs @@ -553,7 +553,8 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) return items; } - public async ValueTask<(Retcode, List? returnItems)> UseItem(int itemId, int count = 1, int baseAvatarId = 0) + public async ValueTask<(Retcode, List? returnItems)> UseItem(int itemId, int count = 1, + int baseAvatarId = 0) { GameData.ItemConfigData.TryGetValue(itemId, out var itemConfig); if (itemConfig == null) return (Retcode.RetItemNotExist, null); @@ -561,12 +562,9 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) GameData.ItemUseBuffDataData.TryGetValue(dataId, out var useConfig); if (useConfig == null) return (Retcode.RetItemUseConfigNotExist, null); - for (int i = 0; i < count; i++) // do count times + for (var i = 0; i < count; i++) // do count times { - if (useConfig.PreviewSkillPoint != 0) - { - await Player.LineupManager!.GainMp((int)useConfig.PreviewSkillPoint); - } + if (useConfig.PreviewSkillPoint != 0) await Player.LineupManager!.GainMp((int)useConfig.PreviewSkillPoint); if (baseAvatarId > 0) { @@ -578,25 +576,30 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) if (useConfig.PreviewHPRecoveryPercent != 0) { - avatar.SetCurHp(Math.Min(Math.Max(avatar.CurrentHp + (int)(useConfig.PreviewHPRecoveryPercent * 10000), 0), 10000), extraLineup); + avatar.SetCurHp( + Math.Min(Math.Max(avatar.CurrentHp + (int)(useConfig.PreviewHPRecoveryPercent * 10000), 0), + 10000), extraLineup); await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); } if (useConfig.PreviewHPRecoveryValue != 0) { - avatar.SetCurHp(Math.Min(Math.Max(avatar.CurrentHp + (int)useConfig.PreviewHPRecoveryValue, 0), 10000), extraLineup); + avatar.SetCurHp( + Math.Min(Math.Max(avatar.CurrentHp + (int)useConfig.PreviewHPRecoveryValue, 0), 10000), + extraLineup); await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); } if (useConfig.PreviewPowerPercent != 0) { - avatar.SetCurSp(Math.Min(Math.Max(avatar.CurrentHp + (int)(useConfig.PreviewPowerPercent * 10000), 0), 10000), extraLineup); + avatar.SetCurSp( + Math.Min(Math.Max(avatar.CurrentHp + (int)(useConfig.PreviewPowerPercent * 10000), 0), 10000), + extraLineup); await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager.GetCurLineup()!)); } - } else { @@ -626,22 +629,14 @@ public class InventoryManager(PlayerInstance player) : BasePlayerManager(player) //maze buff if (useConfig.MazeBuffID > 0) - { foreach (var info in Player.SceneInstance?.AvatarInfo.Values.ToList() ?? []) - { if (baseAvatarId == 0 || info.AvatarInfo.GetBaseAvatarId() == baseAvatarId) await info.AddBuff(new SceneBuff(useConfig.MazeBuffID, 1, info.AvatarInfo.AvatarId)); - } - } if (useConfig.MazeBuffID2 > 0) - { foreach (var info in Player.SceneInstance?.AvatarInfo.Values.ToList() ?? []) - { if (baseAvatarId == 0 || info.AvatarInfo.GetBaseAvatarId() == baseAvatarId) await info.AddBuff(new SceneBuff(useConfig.MazeBuffID2, 1, info.AvatarInfo.AvatarId)); - } - } // remove item await RemoveItem(itemId, count); diff --git a/GameServer/Game/Lineup/LineupManager.cs b/GameServer/Game/Lineup/LineupManager.cs index c1f984ea..e6ec64fa 100644 --- a/GameServer/Game/Lineup/LineupManager.cs +++ b/GameServer/Game/Lineup/LineupManager.cs @@ -359,7 +359,8 @@ public class LineupManager : BasePlayerManager await Player.SendPacket(new PacketSceneCastSkillMpUpdateScNotify(castEntityId, curLineup.Mp)); } - public async ValueTask GainMp(int count, bool sendPacket = true, SyncLineupReason reason = SyncLineupReason.SyncReasonNone) + public async ValueTask GainMp(int count, bool sendPacket = true, + SyncLineupReason reason = SyncLineupReason.SyncReasonNone) { var curLineup = GetCurLineup()!; curLineup.Mp += count; diff --git a/GameServer/Game/Player/PlayerInstance.cs b/GameServer/Game/Player/PlayerInstance.cs index c0aba3d0..e0a835ed 100644 --- a/GameServer/Game/Player/PlayerInstance.cs +++ b/GameServer/Game/Player/PlayerInstance.cs @@ -504,7 +504,6 @@ public class PlayerInstance(PlayerData data) if (prop.PropInfo.IsLevelBtn) await prop.SetState(PropStateEnum.Closed); return prop; - } public async ValueTask EnterScene(int entryId, int teleportId, bool sendPacket, int storyLineId = 0, diff --git a/GameServer/Game/Rogue/Buff/RogueBuffSelectMenu.cs b/GameServer/Game/Rogue/Buff/RogueBuffSelectMenu.cs index f8995bde..fcd5fbb4 100644 --- a/GameServer/Game/Rogue/Buff/RogueBuffSelectMenu.cs +++ b/GameServer/Game/Rogue/Buff/RogueBuffSelectMenu.cs @@ -9,7 +9,7 @@ public class RogueBuffSelectMenu(BaseRogueInstance rogue) public int HintId { get; set; } = 1; public List Buffs { get; set; } = []; public int RollMaxCount { get; set; } = rogue.BaseRerollCount; - public int RollCount { get; set; } = 0; + public int RollCount { get; set; } public int RollFreeCount { get; set; } = rogue.BaseRerollFreeCount; public int RollCost { get; set; } = rogue.CurRerollCost; public int QueueAppend { get; set; } = 3; diff --git a/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemPercent.cs b/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemPercent.cs index 47996a92..229ab402 100644 --- a/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemPercent.cs +++ b/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemPercent.cs @@ -8,6 +8,6 @@ public class EventHandlerCostItemPercent : RogueEventCostHandler public override async ValueTask Handle(BaseRogueInstance rogue, RogueEventInstance? eventInstance, List paramList) { - await rogue.CostMoney((int)(rogue.CurMoney * (paramList[1] / 100f)), 0); + await rogue.CostMoney((int)(rogue.CurMoney * (paramList[1] / 100f))); } } \ No newline at end of file diff --git a/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemValue.cs b/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemValue.cs index 7d14437f..d2887b62 100644 --- a/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemValue.cs +++ b/GameServer/Game/Rogue/Event/CostHandler/EventHandlerCostItemValue.cs @@ -1,5 +1,4 @@ using EggLink.DanhengServer.Enums.Rogue; -using EggLink.DanhengServer.Proto; namespace EggLink.DanhengServer.GameServer.Game.Rogue.Event.CostHandler; @@ -10,6 +9,6 @@ public class EventHandlerCostItemValue : RogueEventCostHandler List paramList) { var decreaseMoney = paramList[1]; - await rogue.CostMoney(decreaseMoney, 0); + await rogue.CostMoney(decreaseMoney); } } \ No newline at end of file diff --git a/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerRepeatableGamble.cs b/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerRepeatableGamble.cs index 69b374f3..227ec6ab 100644 --- a/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerRepeatableGamble.cs +++ b/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerRepeatableGamble.cs @@ -13,7 +13,8 @@ public class EventHandlerRepeatableGamble : RogueEventEffectHandler option.Ratio = paramList[1] / 100f; } - public override async ValueTask Handle(BaseRogueInstance rogue, RogueEventInstance? eventInstance, List paramList, RogueEventParam? option) + public override async ValueTask Handle(BaseRogueInstance rogue, RogueEventInstance? eventInstance, + List paramList, RogueEventParam? option) { if (option == null) return; if (eventInstance == null) return; @@ -35,4 +36,4 @@ public class EventHandlerRepeatableGamble : RogueEventEffectHandler await rogue.TriggerEvent(eventInstance, paramList[3]); } } -} +} \ No newline at end of file diff --git a/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerTriggerBattle.cs b/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerTriggerBattle.cs index 0bd06dd0..0c74ed43 100644 --- a/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerTriggerBattle.cs +++ b/GameServer/Game/Rogue/Event/EffectHandler/EventHandlerTriggerBattle.cs @@ -1,6 +1,6 @@ -namespace EggLink.DanhengServer.GameServer.Game.Rogue.Event.EffectHandler; +using EggLink.DanhengServer.Enums.Rogue; -using EggLink.DanhengServer.Enums.Rogue; +namespace EggLink.DanhengServer.GameServer.Game.Rogue.Event.EffectHandler; [RogueEvent(DialogueEventTypeEnum.TriggerBattle)] public class EventHandlerTriggerBattle : RogueEventEffectHandler @@ -21,4 +21,4 @@ public class EventHandlerTriggerBattle : RogueEventEffectHandler }); await ValueTask.CompletedTask; } -} +} \ No newline at end of file diff --git a/GameServer/Game/Rogue/Event/RogueEventInstance.cs b/GameServer/Game/Rogue/Event/RogueEventInstance.cs index 2e61e04e..79ab1cbe 100644 --- a/GameServer/Game/Rogue/Event/RogueEventInstance.cs +++ b/GameServer/Game/Rogue/Event/RogueEventInstance.cs @@ -90,7 +90,7 @@ public class RogueEventParam OptionId = (uint)OptionId, DisplayValue = new RogueCommonDialogueOptionDisplayInfo { - DisplayFloatValue = Ratio, + DisplayFloatValue = Ratio }, OptionResultInfo = { Results.Select(x => x.ToProto()) }, Confirm = OverrideSelected ?? IsSelected @@ -110,11 +110,12 @@ public class RogueEventParam public class RogueEventResultInfo { public int BattleEventId { get; set; } + public RogueCommonDialogueOptionResultInfo ToProto() { - return new RogueCommonDialogueOptionResultInfo() + return new RogueCommonDialogueOptionResultInfo { - BattleResultInfo = new RogueCommonDialogueOptionBattleResultInfo() + BattleResultInfo = new RogueCommonDialogueOptionBattleResultInfo { BattleEventId = (uint)BattleEventId } diff --git a/GameServer/Game/Rogue/Event/RogueEventManager.cs b/GameServer/Game/Rogue/Event/RogueEventManager.cs index 79b581f1..6205e2b5 100644 --- a/GameServer/Game/Rogue/Event/RogueEventManager.cs +++ b/GameServer/Game/Rogue/Event/RogueEventManager.cs @@ -58,6 +58,7 @@ public class RogueEventManager if (EffectHandler.TryGetValue(dialogueEvent.RogueEffectType, out var effectHandler)) effectHandler.Init(Rogue, eventInstance, param, option); } + await Player.SendPacket(new PacketSyncRogueCommonDialogueDataScNotify(eventInstance)); } @@ -114,6 +115,7 @@ public class RogueEventManager await Player.SendPacket(new PacketSelectRogueCommonDialogueOptionScRsp()); return; } + await Player.SendPacket(new PacketSyncRogueCommonDialogueDataScNotify(eventInstance)); var param = dialogueEvent.RogueEffectParamList; diff --git a/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs b/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs index 7bf151cf..229d86ae 100644 --- a/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs +++ b/GameServer/Server/Packet/Recv/Item/HandlerUseItemCsReq.cs @@ -10,8 +10,11 @@ public class HandlerUseItemCsReq : Handler public override async Task OnHandle(Connection connection, byte[] header, byte[] data) { var req = UseItemCsReq.Parser.ParseFrom(data); - var result = await connection.Player!.InventoryManager!.UseItem((int)req.UseItemId, (int)req.UseItemCount, (int)req.BaseAvatarId); + var result = + await connection.Player!.InventoryManager!.UseItem((int)req.UseItemId, (int)req.UseItemCount, + (int)req.BaseAvatarId); - await connection.SendPacket(new PacketUseItemScRsp(result.Item1, req.UseItemId, req.UseItemCount, result.returnItems)); + await connection.SendPacket(new PacketUseItemScRsp(result.Item1, req.UseItemId, req.UseItemCount, + result.returnItems)); } } \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetAllServerPrefsDataCsReq.cs b/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetAllServerPrefsDataCsReq.cs index c6e223e5..60167258 100644 --- a/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetAllServerPrefsDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetAllServerPrefsDataCsReq.cs @@ -11,4 +11,4 @@ public class HandlerGetAllServerPrefsDataCsReq : Handler var infos = connection.Player?.ServerPrefsData?.ServerPrefsDict.Values.ToList() ?? []; await connection.SendPacket(new PacketGetAllServerPrefsDataScRsp(infos)); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetServerPrefsDataCsReq.cs b/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetServerPrefsDataCsReq.cs index a4e5172b..529176bb 100644 --- a/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetServerPrefsDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/ServerPrefs/HandlerGetServerPrefsDataCsReq.cs @@ -15,4 +15,4 @@ public class HandlerGetServerPrefsDataCsReq : Handler await connection.SendPacket(new PacketGetServerPrefsDataScRsp(info, req.ServerPrefsId)); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Recv/ServerPrefs/HandlerUpdateServerPrefsDataCsReq.cs b/GameServer/Server/Packet/Recv/ServerPrefs/HandlerUpdateServerPrefsDataCsReq.cs index 28e7b0cc..16b75441 100644 --- a/GameServer/Server/Packet/Recv/ServerPrefs/HandlerUpdateServerPrefsDataCsReq.cs +++ b/GameServer/Server/Packet/Recv/ServerPrefs/HandlerUpdateServerPrefsDataCsReq.cs @@ -10,8 +10,9 @@ public class HandlerUpdateServerPrefsDataCsReq : Handler public override async Task OnHandle(Connection connection, byte[] header, byte[] data) { var req = UpdateServerPrefsDataCsReq.Parser.ParseFrom(data); - - connection.Player?.ServerPrefsData?.SetData((int)req.ServerPrefs.ServerPrefsId, req.ServerPrefs.Data.ToBase64()); + + connection.Player?.ServerPrefsData?.SetData((int)req.ServerPrefs.ServerPrefsId, + req.ServerPrefs.Data.ToBase64()); await connection.SendPacket(new PacketUpdateServerPrefsDataScRsp(req.ServerPrefs.ServerPrefsId)); } -} +} \ No newline at end of file diff --git a/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs b/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs index c23fc180..d619969a 100644 --- a/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs +++ b/GameServer/Server/Packet/Send/Item/PacketUseItemScRsp.cs @@ -6,7 +6,8 @@ namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.Item; public class PacketUseItemScRsp : BasePacket { - public PacketUseItemScRsp(Retcode retCode, uint itemId, uint count, List? returnItems) : base(CmdIds.UseItemScRsp) + public PacketUseItemScRsp(Retcode retCode, uint itemId, uint count, List? returnItems) : base( + CmdIds.UseItemScRsp) { var proto = new UseItemScRsp { @@ -18,10 +19,7 @@ public class PacketUseItemScRsp : BasePacket if (returnItems != null) { proto.ReturnData = new ItemList(); - foreach (var item in returnItems) - { - proto.ReturnData.ItemList_.Add(item.ToProto()); - } + foreach (var item in returnItems) proto.ReturnData.ItemList_.Add(item.ToProto()); } SetData(proto); diff --git a/GameServer/Server/Packet/Send/Lineup/PacketSyncLineupNotify.cs b/GameServer/Server/Packet/Send/Lineup/PacketSyncLineupNotify.cs index d9bb7632..9c824ead 100644 --- a/GameServer/Server/Packet/Send/Lineup/PacketSyncLineupNotify.cs +++ b/GameServer/Server/Packet/Send/Lineup/PacketSyncLineupNotify.cs @@ -11,13 +11,10 @@ public class PacketSyncLineupNotify : BasePacket { var proto = new SyncLineupNotify { - Lineup = info.ToProto(), + Lineup = info.ToProto() }; - if (reason != SyncLineupReason.SyncReasonNone) - { - proto.ReasonList.Add(reason); - } + if (reason != SyncLineupReason.SyncReasonNone) proto.ReasonList.Add(reason); SetData(proto); } diff --git a/GameServer/Server/Packet/Send/Player/PacketMonthCardRewardNotify.cs b/GameServer/Server/Packet/Send/Player/PacketMonthCardRewardNotify.cs index 19eddc8a..edbda968 100644 --- a/GameServer/Server/Packet/Send/Player/PacketMonthCardRewardNotify.cs +++ b/GameServer/Server/Packet/Send/Player/PacketMonthCardRewardNotify.cs @@ -13,7 +13,6 @@ public class PacketMonthCardRewardNotify : BasePacket Reward = new ItemList { ItemList_ = { items.Select(x => x.ToProto()) } - } }; diff --git a/GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs index 63e66e54..c95ec6ce 100644 --- a/GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSelectRogueCommonDialogueOptionScRsp.cs @@ -23,13 +23,11 @@ public class PacketSelectRogueCommonDialogueOptionScRsp : BasePacket } foreach (var option in rogueEvent.Options) - { if (option.OverrideSelected ?? option.IsSelected) { proto.EventHasEffect = true; break; } - } SetData(proto); } diff --git a/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs index c5748520..f6d836c1 100644 --- a/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonActionResultScNotify.cs @@ -21,7 +21,8 @@ public class PacketSyncRogueCommonActionResultScNotify : BasePacket SetData(proto); } - public PacketSyncRogueCommonActionResultScNotify(RogueSubModeEnum rogueSubmode, List results, + public PacketSyncRogueCommonActionResultScNotify(RogueSubModeEnum rogueSubmode, + List results, RogueCommonActionResultDisplayType displayType = RogueCommonActionResultDisplayType.None) : base( CmdIds.SyncRogueCommonActionResultScNotify) { diff --git a/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs index 43bec946..a6a2acf4 100644 --- a/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs +++ b/GameServer/Server/Packet/Send/RogueCommon/PacketSyncRogueCommonPendingActionScNotify.cs @@ -7,8 +7,9 @@ namespace EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueCommon; public class PacketSyncRogueCommonPendingActionScNotify : BasePacket { - public PacketSyncRogueCommonPendingActionScNotify(RogueActionInstance actionInstance, RogueSubModeEnum rogueSubmode) : base( - CmdIds.SyncRogueCommonPendingActionScNotify) + public PacketSyncRogueCommonPendingActionScNotify(RogueActionInstance actionInstance, RogueSubModeEnum rogueSubmode) + : base( + CmdIds.SyncRogueCommonPendingActionScNotify) { var proto = new SyncRogueCommonPendingActionScNotify { diff --git a/GameServer/Server/Packet/Send/ServerPrefs/PacketGetAllServerPrefsDataScRsp.cs b/GameServer/Server/Packet/Send/ServerPrefs/PacketGetAllServerPrefsDataScRsp.cs index 9c70fa64..2030d259 100644 --- a/GameServer/Server/Packet/Send/ServerPrefs/PacketGetAllServerPrefsDataScRsp.cs +++ b/GameServer/Server/Packet/Send/ServerPrefs/PacketGetAllServerPrefsDataScRsp.cs @@ -10,10 +10,7 @@ public class PacketGetAllServerPrefsDataScRsp : BasePacket { var proto = new GetAllServerPrefsDataScRsp(); - foreach (var info in infos) - { - proto.CFHMFEBMJIK.Add(info.ToProto()); - } + foreach (var info in infos) proto.CFHMFEBMJIK.Add(info.ToProto()); SetData(proto); } diff --git a/GameServer/Server/Packet/Send/ServerPrefs/PacketGetServerPrefsDataScRsp.cs b/GameServer/Server/Packet/Send/ServerPrefs/PacketGetServerPrefsDataScRsp.cs index 379d007b..a915490e 100644 --- a/GameServer/Server/Packet/Send/ServerPrefs/PacketGetServerPrefsDataScRsp.cs +++ b/GameServer/Server/Packet/Send/ServerPrefs/PacketGetServerPrefsDataScRsp.cs @@ -11,7 +11,7 @@ public class PacketGetServerPrefsDataScRsp : BasePacket { var proto = new GetServerPrefsDataScRsp { - ServerPrefs = info?.ToProto() ?? new Proto.ServerPrefs() + ServerPrefs = info?.ToProto() ?? new Proto.ServerPrefs { Data = ByteString.Empty, ServerPrefsId = id