diff --git a/Common/Enums/Quest/ConditionTypeEnum.cs b/Common/Enums/Quest/ConditionTypeEnum.cs index 86c29dd5..63f5b173 100644 --- a/Common/Enums/Quest/ConditionTypeEnum.cs +++ b/Common/Enums/Quest/ConditionTypeEnum.cs @@ -20,5 +20,6 @@ public enum ConditionTypeEnum ReleaseContentPackage = 15, SubMissionTaken = 16, HasItemMainType = 17, - FinishSimulatedRogueAreaProgress = 20 + FinishSimulatedRogueAreaProgress = 20, + RealFinishSubMission = 21 } \ No newline at end of file diff --git a/GameServer/Game/Avatar/AvatarManager.cs b/GameServer/Game/Avatar/AvatarManager.cs index f7a3a7b2..9b734825 100644 --- a/GameServer/Game/Avatar/AvatarManager.cs +++ b/GameServer/Game/Avatar/AvatarManager.cs @@ -20,6 +20,7 @@ public class AvatarManager(PlayerInstance player) : BasePlayerManager(player) { GameData.AvatarConfigData.TryGetValue(avatarId, out var avatarExcel); if (avatarExcel == null) return null; + if (avatarExcel.MaxRank < 6) return null; GameData.MultiplePathAvatarConfigData.TryGetValue(avatarId, out var multiPathAvatar); if (multiPathAvatar != null && multiPathAvatar.BaseAvatarID != avatarId) diff --git a/GameServer/Game/Quest/UnlockHandler.cs b/GameServer/Game/Quest/UnlockHandler.cs index dd83845e..13b97ca7 100644 --- a/GameServer/Game/Quest/UnlockHandler.cs +++ b/GameServer/Game/Quest/UnlockHandler.cs @@ -33,6 +33,7 @@ public class UnlockHandler(PlayerInstance player) if (Player.Data.Level < int.Parse(condition.Param)) return false; break; case ConditionTypeEnum.FinishSubMission: + case ConditionTypeEnum.RealFinishSubMission: if (Player.MissionManager?.GetSubMissionStatus(int.Parse(condition.Param)) != MissionPhaseEnum.Finish) return false; break; diff --git a/GameServer/Game/Scene/SceneInstance.cs b/GameServer/Game/Scene/SceneInstance.cs index 824299d2..f28dbfd8 100644 --- a/GameServer/Game/Scene/SceneInstance.cs +++ b/GameServer/Game/Scene/SceneInstance.cs @@ -18,7 +18,6 @@ using EggLink.DanhengServer.GameServer.Game.Scene.Entity; using EggLink.DanhengServer.GameServer.Server.Packet.Send.Scene; using EggLink.DanhengServer.Proto; using EggLink.DanhengServer.Util; -using System.Management; namespace EggLink.DanhengServer.GameServer.Game.Scene;