From 7360dabcdc6ff108f638082249ba29ed2674a554 Mon Sep 17 00:00:00 2001 From: Somebody Date: Sun, 4 Aug 2024 12:50:23 +0800 Subject: [PATCH] Enhancement: The given key was not in xxx will not display now --- DanhengKcpSharp/DanhengConnection.cs | 2 +- GameServer/Game/Mission/MissionManager.cs | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/DanhengKcpSharp/DanhengConnection.cs b/DanhengKcpSharp/DanhengConnection.cs index 0fd2fc2b..4d360348 100644 --- a/DanhengKcpSharp/DanhengConnection.cs +++ b/DanhengKcpSharp/DanhengConnection.cs @@ -94,7 +94,7 @@ public class DanhengConnection } catch { - var output = $"{sendOrRecv}: {LogMap[opcode.ToString()]}({opcode})"; + var output = $"{sendOrRecv}: {LogMap.GetValueOrDefault(opcode.ToString(), "UnknownPacket")}({opcode})"; #if DEBUG Logger.Debug(output); #endif diff --git a/GameServer/Game/Mission/MissionManager.cs b/GameServer/Game/Mission/MissionManager.cs index 27fb51ba..6d12cb91 100644 --- a/GameServer/Game/Mission/MissionManager.cs +++ b/GameServer/Game/Mission/MissionManager.cs @@ -13,7 +13,6 @@ using EggLink.DanhengServer.GameServer.Plugin.Event; using EggLink.DanhengServer.GameServer.Server.Packet.Send.HeartDial; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Mission; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Player; -using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; using MissionData = EggLink.DanhengServer.Database.Quests.MissionData; @@ -415,7 +414,8 @@ public class MissionManager : BasePlayerManager foreach (var quest in Player.QuestManager?.GetRunningQuest() ?? []) { - var excel = GameData.QuestDataData[quest.QuestId]; + var excel = GameData.QuestDataData.GetValueOrDefault(quest.QuestId); + if (excel == null) continue; var finishWay = GameData.FinishWayData.GetValueOrDefault(excel.FinishWayID); if (finishWay == null) continue; if (finishWay.FinishType == finishType) @@ -443,7 +443,8 @@ public class MissionManager : BasePlayerManager foreach (var quest in Player.QuestManager?.GetRunningQuest() ?? []) { - var excel = GameData.QuestDataData[quest.QuestId]; + var excel = GameData.QuestDataData.GetValueOrDefault(quest.QuestId); + if (excel == null) continue; var finishWay = GameData.FinishWayData.GetValueOrDefault(excel.FinishWayID); if (finishWay == null) continue; if (finishWay.FinishType == MissionFinishTypeEnum.Talk) @@ -462,7 +463,7 @@ public class MissionManager : BasePlayerManager GameData.MainMissionData.TryGetValue(mainMissionId, out var mainMission); if (mainMission == null) return; - foreach (var mission in mainMission?.MissionInfo?.SubMissionList ?? []) + foreach (var mission in mainMission.MissionInfo?.SubMissionList ?? []) if (mission.TakeType == SubMissionTakeTypeEnum.CustomValue) { var index = 0;