From b6dda3f171e3eb43ed2c5d49a011b6e9acc58577 Mon Sep 17 00:00:00 2001 From: Somebody Date: Wed, 27 Aug 2025 19:02:19 +0800 Subject: [PATCH] fix: the buff menu in tourn rogue cannot display --- Command/Command/Cmd/CommandRogue.cs | 20 +++++++++++++++++++ Common/Database/Lineup/LineupData.cs | 2 +- .../Game/RogueTourn/RogueTournInstance.cs | 9 ++++----- .../Game/RogueTourn/RogueTournManager.cs | 2 +- .../Scene/RogueTournEntityLoader.cs | 1 - .../HandlerRogueTournEnterRoomCsReq.cs | 2 ++ 6 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Command/Command/Cmd/CommandRogue.cs b/Command/Command/Cmd/CommandRogue.cs index 9d96000a..22d0aef5 100644 --- a/Command/Command/Cmd/CommandRogue.cs +++ b/Command/Command/Cmd/CommandRogue.cs @@ -80,6 +80,26 @@ public class CommandRogue : ICommand } } + + [CommandMethod("0 roll")] + public async ValueTask RollBuff(CommandArg arg) + { + if (arg.Target == null) + { + await arg.SendMsg(I18NManager.Translate("Game.Command.Notice.PlayerNotFound")); + return; + } + + var instance = arg.Target.Player!.RogueManager?.GetRogueInstance(); + if (instance == null) + { + await arg.SendMsg(I18NManager.Translate("Game.Command.Rogue.PlayerNotInRogue")); + return; + } + + await instance.RollBuff(1); + } + [CommandMethod("0 miracle")] public async ValueTask GetMiracle(CommandArg arg) { diff --git a/Common/Database/Lineup/LineupData.cs b/Common/Database/Lineup/LineupData.cs index 8a238bd7..7bf7b237 100644 --- a/Common/Database/Lineup/LineupData.cs +++ b/Common/Database/Lineup/LineupData.cs @@ -130,7 +130,7 @@ public class LineupInfo Index = (uint)(LineupData?.Lineups?.Values.ToList().IndexOf(this) ?? 0) }; - if (LineupType != (int)ExtraLineupType.LineupNone) info.Index = (uint)(LineupType + 10); + if (LineupType != (int)ExtraLineupType.LineupNone) info.Index = 0; if (BaseAvatars?.Find(item => item.BaseAvatarId == LeaderAvatarId) != null) // find leader,if not exist,set to 0 info.LeaderSlot = (uint)BaseAvatars.IndexOf(BaseAvatars.Find(item => item.BaseAvatarId == LeaderAvatarId)!); diff --git a/GameServer/Game/RogueTourn/RogueTournInstance.cs b/GameServer/Game/RogueTourn/RogueTournInstance.cs index 90d210ee..c6b6b22b 100644 --- a/GameServer/Game/RogueTourn/RogueTournInstance.cs +++ b/GameServer/Game/RogueTourn/RogueTournInstance.cs @@ -72,7 +72,6 @@ public class RogueTournInstance : BaseRogueInstance { RogueTournRoomTypeEnum.Coin, 4 }, { RogueTournRoomTypeEnum.Shop, 4 }, { RogueTournRoomTypeEnum.Event, 7 }, - { RogueTournRoomTypeEnum.Adventure, 6 }, { RogueTournRoomTypeEnum.Reward, 5 }, { RogueTournRoomTypeEnum.Hidden, 1 } }; @@ -108,7 +107,6 @@ public class RogueTournInstance : BaseRogueInstance CurLevel.CurRoom?.Init(type); // next room - CurActionQueuePosition += 15; var next = CurLevel.Rooms.Find(x => x.RoomIndex == roomIndex + 1); if (next != null) next.Status = RogueTournRoomStatus.Inited; @@ -200,7 +198,7 @@ public class RogueTournInstance : BaseRogueInstance } await Player.SendPacket(new PacketSyncRogueCommonActionResultScNotify(RogueSubMode, - bless.ToResultProto(RogueCommonActionResultSourceType.Select))); + bless.ToResultProto(RogueCommonActionResultSourceType.None), RogueCommonActionResultDisplayType.Multi)); } RogueActions.Remove(action.QueuePosition); @@ -358,7 +356,7 @@ public class RogueTournInstance : BaseRogueInstance RogueFormulas.Add(formula); await Player.SendPacket(new PacketSyncRogueCommonActionResultScNotify(RogueSubMode, formula.ToResultProto(RogueCommonActionResultSourceType.Select, - RogueBuffs.Select(x => x.BuffId).ToList()), RogueCommonActionResultDisplayType.Single)); + RogueBuffs.Select(x => x.BuffId).ToList()), RogueCommonActionResultDisplayType.Multi)); } RogueActions.Remove(action.QueuePosition); @@ -554,7 +552,8 @@ public class RogueTournInstance : BaseRogueInstance TournModuleInfo = new RogueTournModuleInfo { AllowFood = true - } + }, + JMIDLLDKJBI = new() }; } diff --git a/GameServer/Game/RogueTourn/RogueTournManager.cs b/GameServer/Game/RogueTourn/RogueTournManager.cs index b1dbcd09..273896f5 100644 --- a/GameServer/Game/RogueTourn/RogueTournManager.cs +++ b/GameServer/Game/RogueTourn/RogueTournManager.cs @@ -116,7 +116,7 @@ public class RogueTournManager(PlayerInstance player) : BasePlayerManager(player return new RogueTournSeasonInfo { SubTournId = GameConstants.CURRENT_ROGUE_TOURN_SEASON, - MainTournId = 1 + MainTournId = 2 }; } diff --git a/GameServer/Game/RogueTourn/Scene/RogueTournEntityLoader.cs b/GameServer/Game/RogueTourn/Scene/RogueTournEntityLoader.cs index 5de60a78..10569a3c 100644 --- a/GameServer/Game/RogueTourn/Scene/RogueTournEntityLoader.cs +++ b/GameServer/Game/RogueTourn/Scene/RogueTournEntityLoader.cs @@ -32,7 +32,6 @@ public class RogueTournEntityLoader(SceneInstance scene, PlayerInstance player) foreach (var group in Scene.FloorInfo?.Groups.Values!) if (rogue.CurLevel?.CurRoom?.GetLoadGroupList().Contains(group.Id) == true) await LoadGroup(group); - else if (group.Category == GroupCategoryEnum.Normal) await LoadGroup(group); } Scene.IsLoaded = true; diff --git a/GameServer/Server/Packet/Recv/RogueTourn/HandlerRogueTournEnterRoomCsReq.cs b/GameServer/Server/Packet/Recv/RogueTourn/HandlerRogueTournEnterRoomCsReq.cs index 833eb45b..63171571 100644 --- a/GameServer/Server/Packet/Recv/RogueTourn/HandlerRogueTournEnterRoomCsReq.cs +++ b/GameServer/Server/Packet/Recv/RogueTourn/HandlerRogueTournEnterRoomCsReq.cs @@ -1,5 +1,6 @@ using EggLink.DanhengServer.Enums.TournRogue; using EggLink.DanhengServer.GameServer.Server.Packet.Send.RogueTourn; +using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Kcp; using EggLink.DanhengServer.Proto; @@ -23,5 +24,6 @@ public class HandlerRogueTournEnterRoomCsReq : Handler await inst.EnterRoom((int)(req.CurRoomIndex + 1), (RogueTournRoomTypeEnum)req.NextRoomType); await connection.SendPacket(new PacketRogueTournEnterRoomScRsp(Retcode.RetSucc, inst)); + await connection.SendPacket(new PacketEnterSceneByServerScNotify(player.SceneInstance!)); } } \ No newline at end of file