From dec3b2261f713792d04a9d5cd618ce8098260844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= Date: Sun, 14 May 2023 18:52:25 +0800 Subject: [PATCH] Fix Activity add issue --- .../GrasscutterTools/Forms/FormActivityEditor.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Source/GrasscutterTools/Forms/FormActivityEditor.cs b/Source/GrasscutterTools/Forms/FormActivityEditor.cs index b22cf5f..11369dc 100644 --- a/Source/GrasscutterTools/Forms/FormActivityEditor.cs +++ b/Source/GrasscutterTools/Forms/FormActivityEditor.cs @@ -231,19 +231,21 @@ namespace GrasscutterTools.Forms private async void BtnAddOrUpdate_Click(object sender, EventArgs e) { var activityId = (int)NUDActivityId.Value; + var isNew = false; var item = ActivityConfigItems.Find(it => it.ActivityId == activityId); if (item == null) { item = new ActivityConfigItem(); - ActivityConfigItems.Add(item); - ListActivityConfigItems.Items.Add(Convert(item)); + isNew = true; } item.ActivityType = (int)NUDActivityType.Value; item.ScheduleId = (int)NUDScheduleId.Value; try { - item.MeetCondList = TxtMeetCondList.Text.Split(',').Select(it => int.Parse(it.Trim())).ToList(); + item.MeetCondList = !string.IsNullOrEmpty(TxtMeetCondList.Text) + ? TxtMeetCondList.Text.Split(',').Select(it => int.Parse(it.Trim())).ToList() + : new List(); } catch (Exception) { @@ -258,6 +260,12 @@ namespace GrasscutterTools.Forms item.BeginTime = DTPBeginTime.Value.Date; item.EndTime = DTPEndTime.Value.Date.AddDays(1).AddSeconds(-1); + if (isNew) + { + ActivityConfigItems.Add(item); + ListActivityConfigItems.Items.Add(Convert(item)); + } + BtnDelete.Enabled = true; await UIUtil.ButtonComplete(BtnAddOrUpdate); }