[工器具刷新]

Framework/SimulationToolDev/CVR_Interactable/Example/Scripts/OperationData-Example/OPTrigger_SelectToolElemet.cs

@@ -63,8 +63,14 @@ public class OPTrigger_SelectToolElemet : OperationData_TriggerMode
                         toolLibraryType = ToolLibraryType.ToolRoom,
                         selectAction = Check,
                         rightTools = choseToolNames
-                    }); 
+                    });
                 }
+                //UIKit.OpenPanel<ToolLibraryForm>(new ToolLibraryFormData()
+                //{
+                //    toolLibraryType = ToolLibraryType.ToolRoom,
+                //    selectAction = Check,
+                //    rightTools = choseToolNames
+                //});
                 OperateSetting.Instance.m_CurrentStepRightToolNames = choseToolNames;
                 break;
         }

Framework/SimulationToolDev/Process/Scripts/Manager/FreeProcessManagement.cs

@@ -157,13 +157,7 @@ public class FreeProcessElement
         {
             FreeProcessManagement.Instance.RemoveProcessElementActiveState(freeProcessElement);
 
-            //刷新工具列表
-            if (UIKit.GetPanel<ToolLibraryForm>() == null)
-            {
-                UIKit.OpenPanel<ToolLibraryForm>().Hide();
-            }
-
-            UIKit.GetPanel<ToolLibraryForm>().RefrushAllChoseTool();
+            ToolLibraryForm.RefrushAllChoseTool();
         }
     }
 }

OperationUIFrame/OperationUIFrameV2/Scripts/UI/PC_OperatePanel.cs

@@ -272,15 +272,18 @@ namespace QFramework
             //当前步骤ID
             CurrentStepID = stepID + 1;
             //刷新工具列表
-            if (UIKit.GetPanel<ToolLibraryForm>() == null)
-            {
-                UIKit.OpenPanel<ToolLibraryForm>().Hide();
-            }
+            //if (UIKit.GetPanel<ToolLibraryForm>() == null)
+            //{
+            //    UIKit.OpenPanel<ToolLibraryForm>().Hide();
+            //}
 
             //流程进度
             OperateStep.ScheduleText.text = "<color=#20C7E3CC>" + CurrentStepID + "</color>" + "<color=#FFFFFF66>/" + ProcessManagement.Instance.processes.Count + "</color>";
-
-            UIKit.GetPanel<ToolLibraryForm>().RefrushAllChoseTool();
+            //if (UIKit.GetPanel<ToolLibraryForm>() != null)
+            //{
+            //    UIKit.GetPanel<ToolLibraryForm>().RefrushAllChoseTool();
+            //}
+            ToolLibraryForm.RefrushAllChoseTool();
 
             //刷新列表
             if (OperateSetting.Instance.m_CurrentOperationMode != OperationMode.Learn)

OperationUIFrame/OperationUIFrameV2/Scripts/UI/ToolLibraryForm.cs

@@ -7,7 +7,7 @@ using System;
 
 namespace QFramework
 {
-    public enum  ToolLibraryType
+    public enum ToolLibraryType
     {
         /// <summary>
         /// 工具间
@@ -34,7 +34,7 @@ namespace QFramework
         /// <summary>
         /// 这是为ToolLibrarySelectElement单加的模式
         /// </summary>
-        public List<string> rightTools;
+        public List<string> rightTools = new List<string>();
     }
     public partial class ToolLibraryForm : UIPanel
     {
@@ -212,15 +212,17 @@ namespace QFramework
             if (mData.selectAction != null)
             {
                 mData.selectAction?.Invoke();
-            }else
+            }
+            else
             {
                 UIKit.ClosePanel<ToolLibraryForm>();
             }
         }
 
-        public void RefrushAllChoseTool()
+        public static void RefrushAllChoseTool()
         {
-            m_ToolConfigProxy.ClearToolConfigInfoToCTKSTCIs();
+            ToolConfigProxy tmpToolConfigProxy = DAL.Instance.Get<ToolConfigProxy>();
+            tmpToolConfigProxy.ClearToolConfigInfoToCTKSTCIs();
             OperateSetting.Instance.m_ToolKitToolConfigs.Clear();
             UIKit.OpenPanel<ToolDisplayForm>(new ToolDisplayFormData() { m_ToolConfigs = null });
         }