From 9ca554ab57861f661258cdc9fc35d4a82e8c639d Mon Sep 17 00:00:00 2001
From: liuyu <272912176@qq.com>
Date: Thu, 5 Sep 2024 13:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E7=B1=BB=E6=94=B9virtual?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device_LowVoltageCurrentTransformer.cs       | 12 ------------
 .../CXX/Devices/杂/触发体/DeviceTrigger.cs       | 16 ----------------
 .../Device_3Phase4WireMeter.cs                   | 15 ---------------
 .../CXX/Devices/计量柜/Device_Sundries.cs        | 15 ---------------
 Assets/Scripts/CXX/Tools/Tool_Base.cs            | 15 ---------------
 .../Project/Objects/Other/MirrorController.cs    | 12 ------------
 .../Objects/Other/PermanentTriggerBase.cs        |  6 +++---
 7 files changed, 3 insertions(+), 88 deletions(-)

diff --git a/Assets/Scripts/CXX/Devices/杂/低压电流互感器/Device_LowVoltageCurrentTransformer.cs b/Assets/Scripts/CXX/Devices/杂/低压电流互感器/Device_LowVoltageCurrentTransformer.cs
index f9153ca..ccdf097 100644
--- a/Assets/Scripts/CXX/Devices/杂/低压电流互感器/Device_LowVoltageCurrentTransformer.cs
+++ b/Assets/Scripts/CXX/Devices/杂/低压电流互感器/Device_LowVoltageCurrentTransformer.cs
@@ -7,17 +7,5 @@ using UnityEngine;
 /// </summary>
 public class Device_LowVoltageCurrentTransformer : Device_Base
 {
-    /// <summary>
-    /// ����Ҫ
-    /// </summary>
-    /// <param name="triggerInfo"></param>
-    public override void LoadCurrentTriggerStat(string triggerInfo)
-    {
-        
-    }
 
-    public override string SaveCurrentTriggerStat()
-    {
-        return "";
-    }
 }
diff --git a/Assets/Scripts/CXX/Devices/杂/触发体/DeviceTrigger.cs b/Assets/Scripts/CXX/Devices/杂/触发体/DeviceTrigger.cs
index 4dd7d48..0b68e51 100644
--- a/Assets/Scripts/CXX/Devices/杂/触发体/DeviceTrigger.cs
+++ b/Assets/Scripts/CXX/Devices/杂/触发体/DeviceTrigger.cs
@@ -40,20 +40,4 @@ public class DeviceTrigger : PermanentTriggerBase
             _highlight.SetHighlighted(false);
         }
     }
-
-    /// <summary>
-    /// ����Ҫ
-    /// </summary>
-    /// <param name="triggerInfo"></param>
-    /// <exception cref="NotImplementedException"></exception>
-    public override void LoadCurrentTriggerStat(string triggerInfo)
-    {
-        throw new NotImplementedException();
-    }
-
-    public override string SaveCurrentTriggerStat()
-    {
-        return "";
-        //throw new NotImplementedException();
-    }
 }
diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
index 51c92c5..0299b84 100644
--- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
+++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs
@@ -218,19 +218,4 @@ public class Device_3Phase4WireMeter : Device_Base
             CallScoreAction(true);
         });
     }
-
-    /// <summary>
-    /// ����Ҫ
-    /// </summary>
-    /// <returns></returns>
-    public override string SaveCurrentTriggerStat()
-    {
-        return "";
-        //throw new System.NotImplementedException();
-    }
-
-    public override void LoadCurrentTriggerStat(string triggerInfo)
-    {
-        //throw new System.NotImplementedException();
-    }
 }
diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
index ef6c81c..b6e806a 100644
--- a/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
+++ b/Assets/Scripts/CXX/Devices/计量柜/Device_Sundries.cs
@@ -16,19 +16,4 @@ public class Device_Sundries : Device_Base
         }
 
     }
-
-    /// <summary>
-    /// ����Ҫ
-    /// </summary>
-    /// <param name="triggerInfo"></param>
-    /// <exception cref="System.NotImplementedException"></exception>
-    public override void LoadCurrentTriggerStat(string triggerInfo)
-    {
-        throw new System.NotImplementedException();
-    }
-
-    public override string SaveCurrentTriggerStat()
-    {
-        return "";
-    }
 }
diff --git a/Assets/Scripts/CXX/Tools/Tool_Base.cs b/Assets/Scripts/CXX/Tools/Tool_Base.cs
index 9e72c39..e196ec4 100644
--- a/Assets/Scripts/CXX/Tools/Tool_Base.cs
+++ b/Assets/Scripts/CXX/Tools/Tool_Base.cs
@@ -102,19 +102,4 @@ public class Tool_Base : PermanentTriggerBase
         });
     }
 
-    /// <summary>
-    /// ����Ҫ
-    /// </summary>
-    /// <returns></returns>
-    /// <exception cref="NotImplementedException"></exception>
-    public override string SaveCurrentTriggerStat()
-    {
-        return "";
-        //throw new NotImplementedException();
-    }
-
-    public override void LoadCurrentTriggerStat(string triggerInfo)
-    {
-        //throw new NotImplementedException();
-    }
 }
diff --git a/Assets/Scripts/Project/Objects/Other/MirrorController.cs b/Assets/Scripts/Project/Objects/Other/MirrorController.cs
index 0e325cd..7276487 100644
--- a/Assets/Scripts/Project/Objects/Other/MirrorController.cs
+++ b/Assets/Scripts/Project/Objects/Other/MirrorController.cs
@@ -16,16 +16,4 @@ public class MirrorController : PermanentTriggerBase
             GameManager.UIMgr.ShowPanel<UI_CheckMyselfPanel>(E_UI_Layer.Mid);
         }
     }
-
-    /// <summary>
-    /// ����Ҫ���������ָ�
-    /// </summary>
-    /// <returns></returns>
-    /// <exception cref="System.NotImplementedException"></exception>
-    public override string SaveCurrentTriggerStat()
-    {
-        return "";
-    }
-
-    public override void LoadCurrentTriggerStat(string triggerInfo){ }
 }
diff --git a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
index 36c5a1b..a3d9ef4 100644
--- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
+++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
@@ -9,7 +9,7 @@ using Unity.VisualScripting;
 /// <summary>
 /// ��פ����
 /// </summary>
-public abstract class PermanentTriggerBase : MonoBehaviour
+public class PermanentTriggerBase : MonoBehaviour
 {
     public int triggerID;
     public string triggerName;
@@ -134,9 +134,9 @@ public abstract class PermanentTriggerBase : MonoBehaviour
     /// <summary>
     /// ����Trigger������������Ϣ,�ο�scoreBase
     /// </summary>
-    public abstract string SaveCurrentTriggerStat();
+    public virtual string SaveCurrentTriggerStat() { return ""; }
     /// <summary>
     /// ����Trigger������������Ϣ,�ο�scoreBase
     /// </summary>
-    public abstract void LoadCurrentTriggerStat(string triggerInfo);
+    public virtual void LoadCurrentTriggerStat(string triggerInfo) { }
 }