diff --git a/Common/Data/Config/Task/PropStateExecute.cs b/Common/Data/Config/Task/PropStateExecute.cs index 859afeb8..5d3ea896 100644 --- a/Common/Data/Config/Task/PropStateExecute.cs +++ b/Common/Data/Config/Task/PropStateExecute.cs @@ -14,7 +14,7 @@ namespace EggLink.DanhengServer.Data.Config.Task { public TargetEvaluator TargetType { get; set; } = new(); [JsonConverter(typeof(StringEnumConverter))] - public PropStateEnum PropState { get; set; } = PropStateEnum.Closed; + public PropStateEnum State { get; set; } = PropStateEnum.Closed; public List Execute { get; set; } = []; public static new TaskConfigInfo LoadFromJsonObject(JObject obj) @@ -30,9 +30,9 @@ namespace EggLink.DanhengServer.Data.Config.Task info.TargetType = (targetType!.ToObject(classType!) as TargetEvaluator)!; } - if (obj.ContainsKey(nameof(PropState))) + if (obj.ContainsKey(nameof(State))) { - info.PropState = obj[nameof(PropState)]?.ToObject() ?? PropStateEnum.Closed; + info.State = obj[nameof(State)]?.ToObject() ?? PropStateEnum.Closed; } foreach (var item in obj[nameof(Execute)]?.Select(x => TaskConfigInfo.LoadFromJsonObject((x as JObject)!)) ?? []) diff --git a/GameServer/Game/Task/LevelTask.cs b/GameServer/Game/Task/LevelTask.cs index 5fe0778f..241e8a67 100644 --- a/GameServer/Game/Task/LevelTask.cs +++ b/GameServer/Game/Task/LevelTask.cs @@ -392,7 +392,7 @@ namespace EggLink.DanhengServer.GameServer.Game.Task var resp = method.Invoke(this, [propStateExecute.TargetType, subMission, group]); if (resp is EntityProp result && result != null) { - result.SetState(propStateExecute.PropState); + result.SetState(propStateExecute.State); } } }