From 13982782456f5bb46401d5082aee03028f33d8d3 Mon Sep 17 00:00:00 2001 From: Somebody Date: Sat, 19 Apr 2025 18:59:49 +0800 Subject: [PATCH] refactor: rename `EnterMissionScene` to `EnterSceneByEntranceId` --- GameServer/Game/ChessRogue/ChessRogueInstance.cs | 2 +- .../Handler/MissionHandlerEnterEntryIfNotThere.cs | 2 +- .../FinishAction/Handler/MissionHandlerMoveToAnchor.cs | 2 +- GameServer/Game/Mission/StoryLineManager.cs | 6 +++--- GameServer/Game/Player/PlayerInstance.cs | 2 +- GameServer/Game/RogueMagic/RogueMagicInstance.cs | 4 ++-- GameServer/Game/RogueTourn/RogueTournInstance.cs | 4 ++-- GameServer/Game/Task/LevelTask.cs | 4 ++-- Program/Program/EntryPoint.cs | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/GameServer/Game/ChessRogue/ChessRogueInstance.cs b/GameServer/Game/ChessRogue/ChessRogueInstance.cs index ce53ada1..c9ab884a 100644 --- a/GameServer/Game/ChessRogue/ChessRogueInstance.cs +++ b/GameServer/Game/ChessRogue/ChessRogueInstance.cs @@ -416,7 +416,7 @@ public class ChessRogueInstance : BaseRogueInstance CurCell = cell; cell.CellStatus = ChessRogueBoardCellStatus.Finish; - await Player.EnterMissionScene(cell.GetEntryId(), cell.RoomConfig!.AnchorGroup, cell.RoomConfig!.AnchorId, + await Player.EnterSceneByEntranceId(cell.GetEntryId(), cell.RoomConfig!.AnchorGroup, cell.RoomConfig!.AnchorId, false); HistoryCell.Add(cell); diff --git a/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerEnterEntryIfNotThere.cs b/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerEnterEntryIfNotThere.cs index 6328ff07..024b6fbd 100644 --- a/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerEnterEntryIfNotThere.cs +++ b/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerEnterEntryIfNotThere.cs @@ -12,6 +12,6 @@ public class MissionHandlerEnterEntryIfNotThere : MissionFinishActionHandler var anchorGroup = Params[1]; var anchorId = Params[2]; - await Player.EnterMissionScene(entryId, anchorGroup, anchorId, true); + await Player.EnterSceneByEntranceId(entryId, anchorGroup, anchorId, true); } } \ No newline at end of file diff --git a/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerMoveToAnchor.cs b/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerMoveToAnchor.cs index b0da825e..3772377d 100644 --- a/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerMoveToAnchor.cs +++ b/GameServer/Game/Mission/FinishAction/Handler/MissionHandlerMoveToAnchor.cs @@ -11,6 +11,6 @@ public class MissionHandlerMoveToAnchor : MissionFinishActionHandler var entryId = Params[0]; var anchorGroup = Params[1]; var anchorId = Params[2]; - await Player.EnterMissionScene(entryId, anchorGroup, anchorId, true); + await Player.EnterSceneByEntranceId(entryId, anchorGroup, anchorId, true); } } \ No newline at end of file diff --git a/GameServer/Game/Mission/StoryLineManager.cs b/GameServer/Game/Mission/StoryLineManager.cs index 67cafc3b..e9846203 100644 --- a/GameServer/Game/Mission/StoryLineManager.cs +++ b/GameServer/Game/Mission/StoryLineManager.cs @@ -57,12 +57,12 @@ public class StoryLineManager : BasePlayerManager await Player.SendPacket(new PacketSyncLineupNotify(Player.LineupManager!.GetCurLineup()!)); if (entryId > 0) { - await Player.EnterMissionScene(entryId, anchorGroupId, anchorId, true); + await Player.EnterSceneByEntranceId(entryId, anchorGroupId, anchorId, true); } else { if (lineInfo == null) - await Player.EnterMissionScene(storyExcel.InitEntranceID, storyExcel.InitGroupID, + await Player.EnterSceneByEntranceId(storyExcel.InitEntranceID, storyExcel.InitGroupID, storyExcel.InitAnchorID, true); else @@ -219,7 +219,7 @@ public class StoryLineManager : BasePlayerManager if (tp) { if (entryId > 0) - await Player.EnterMissionScene(entryId, anchorGroupId, anchorId, true); + await Player.EnterSceneByEntranceId(entryId, anchorGroupId, anchorId, true); else await Player.LoadScene(StoryLineData.OldPlaneId, StoryLineData.OldFloorId, StoryLineData.OldEntryId, StoryLineData.OldPos, StoryLineData.OldRot, true); diff --git a/GameServer/Game/Player/PlayerInstance.cs b/GameServer/Game/Player/PlayerInstance.cs index d45629d0..e897e39b 100644 --- a/GameServer/Game/Player/PlayerInstance.cs +++ b/GameServer/Game/Player/PlayerInstance.cs @@ -729,7 +729,7 @@ public class PlayerInstance(PlayerData data) beforeStoryLineId != storyLineId; // return true if entryId changed or story line changed } - public async ValueTask EnterMissionScene(int entranceId, int anchorGroupId, int anchorId, bool sendPacket) + public async ValueTask EnterSceneByEntranceId(int entranceId, int anchorGroupId, int anchorId, bool sendPacket) { GameData.MapEntranceData.TryGetValue(entranceId, out var entrance); if (entrance == null) return; diff --git a/GameServer/Game/RogueMagic/RogueMagicInstance.cs b/GameServer/Game/RogueMagic/RogueMagicInstance.cs index 81643745..d8466386 100644 --- a/GameServer/Game/RogueMagic/RogueMagicInstance.cs +++ b/GameServer/Game/RogueMagic/RogueMagicInstance.cs @@ -176,7 +176,7 @@ public class RogueMagicInstance : BaseRogueInstance EventManager?.OnNextRoom(); foreach (var miracle in RogueMiracles.Values) miracle.OnEnterNextRoom(); - await Player.EnterMissionScene(entrance, group, anchor, false); + await Player.EnterSceneByEntranceId(entrance, group, anchor, false); // sync await Player.SendPacket(new PacketRogueMagicLevelInfoUpdateScNotify(this, [CurLevel], [ @@ -193,7 +193,7 @@ public class RogueMagicInstance : BaseRogueInstance await Player.SendPacket(new PacketSyncLineupNotify(currentLineup)); - await Player.EnterMissionScene(801120102, 0, 0, false); + await Player.EnterSceneByEntranceId(801120102, 0, 0, false); Player.RogueMagicManager!.RogueMagicInstance = null; } diff --git a/GameServer/Game/RogueTourn/RogueTournInstance.cs b/GameServer/Game/RogueTourn/RogueTournInstance.cs index 742da4ce..90debab1 100644 --- a/GameServer/Game/RogueTourn/RogueTournInstance.cs +++ b/GameServer/Game/RogueTourn/RogueTournInstance.cs @@ -122,7 +122,7 @@ public class RogueTournInstance : BaseRogueInstance EventManager?.OnNextRoom(); foreach (var miracle in RogueMiracles.Values) miracle.OnEnterNextRoom(); - await Player.EnterMissionScene(entrance, group, anchor, false); + await Player.EnterSceneByEntranceId(entrance, group, anchor, false); // check if era flipper if (Player.SceneInstance!.FloorInfo!.LevelFeatureModules.Contains(LevelFeatureTypeEnum.EraFlipper)) @@ -151,7 +151,7 @@ public class RogueTournInstance : BaseRogueInstance await Player.SendPacket(new PacketSyncLineupNotify(currentLineup)); - await Player.EnterMissionScene(1034102, 0, 0, false); + await Player.EnterSceneByEntranceId(1034102, 0, 0, false); Player.RogueTournManager!.RogueTournInstance = null; } diff --git a/GameServer/Game/Task/LevelTask.cs b/GameServer/Game/Task/LevelTask.cs index 3b139cd1..c4080947 100644 --- a/GameServer/Game/Task/LevelTask.cs +++ b/GameServer/Game/Task/LevelTask.cs @@ -96,13 +96,13 @@ public class LevelTask(PlayerInstance player) public async ValueTask EnterMap(TaskConfigInfo act, SubMissionExcel subMission, GroupInfo? group = null) { if (act is EnterMap enterMap) - await Player.EnterMissionScene(enterMap.EntranceID, enterMap.GroupID, enterMap.AnchorID, true); + await Player.EnterSceneByEntranceId(enterMap.EntranceID, enterMap.GroupID, enterMap.AnchorID, true); } public async ValueTask EnterMapByCondition(TaskConfigInfo act, SubMissionExcel subMission, GroupInfo? group = null) { if (act is EnterMapByCondition enterMapByCondition) - await Player.EnterMissionScene(enterMapByCondition.EntranceID.GetValue(), 0, 0, true); + await Player.EnterSceneByEntranceId(enterMapByCondition.EntranceID.GetValue(), 0, 0, true); } public async ValueTask TriggerPerformance(TaskConfigInfo act, SubMissionExcel subMission, GroupInfo? group = null) diff --git a/Program/Program/EntryPoint.cs b/Program/Program/EntryPoint.cs index f78163a9..165b1ef7 100644 --- a/Program/Program/EntryPoint.cs +++ b/Program/Program/EntryPoint.cs @@ -172,7 +172,7 @@ public class EntryPoint } // check option - if (true || args.Contains("-generate-tourn")) + if (args.Contains("-generate-tourn")) { TournRoomGenerator.GenerateFile("RogueTournRoom.json"); return;