Merge remote-tracking branch 'origin/master' into LouDi_Pig

2024-12-23 11:49:02 +08:00 · 2024-12-23 11:49:02 +08:00 · 3c844cb1b3
commit 3c844cb1b3
parent 2336ae112d f070adfade
2 changed files with 1 additions and 1 deletions
--- a/Assets/Scripts/Actions/LineAction.cs
+++ b/Assets/Scripts/Actions/LineAction.cs
@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using UnityEngine;
-using static UnityEditor.Progress;

 namespace QFramework
 {
--- a/Assets/Scripts/Actions/UIShowAction.cs
+++ b/Assets/Scripts/Actions/UIShowAction.cs
@ -54,6 +54,7 @@ public class UIShowAction : IAction
        else
        {
            UIKit.ClosePanel(ActionHelper.typeDict[uiName]);
+            this.Finish();
        }
    }