diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 7d799df..b4bdbdd 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png b/Assets/Resources/Sprites/ToolAndmaterial/三相四线电能表.png similarity index 100% rename from Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png rename to Assets/Resources/Sprites/ToolAndmaterial/三相四线电能表.png diff --git a/Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png.meta b/Assets/Resources/Sprites/ToolAndmaterial/三相四线电能表.png.meta similarity index 100% rename from Assets/Resources/Sprites/ToolAndmaterial/l型集中器.png.meta rename to Assets/Resources/Sprites/ToolAndmaterial/三相四线电能表.png.meta diff --git a/Assets/Scenes/05_LiveScene.unity b/Assets/Scenes/05_LiveScene.unity index 302d851..c333652 100644 --- a/Assets/Scenes/05_LiveScene.unity +++ b/Assets/Scenes/05_LiveScene.unity @@ -3438,7 +3438,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1180096483 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs index 48877f4..02f64d2 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_3Phase4WireMeter.cs @@ -64,7 +64,6 @@ public class Device_3Phase4WireMeter : Device_Base JieXianScrewUninstallState(); //̶˿š״̬ FixScrewUninstall(); - gameObject.SetActive(false); } } @@ -184,6 +183,7 @@ public class Device_3Phase4WireMeter : Device_Base public void Add() { transform.parent = SiteManager.instance.measuringCabinet.transform; + SiteManager.instance.measuringCabinet.meteringDevice = this; //ĬDz״̬ Init(false); transform.DOLocalMove(new Vector3(0.1469002f, -0.1793365f, 0.5191498f), 2).OnStart(() => @@ -191,7 +191,6 @@ public class Device_3Phase4WireMeter : Device_Base transform.localEulerAngles = Vector3.zero; }).OnComplete(() => { - SiteManager.instance.measuringCabinet.meteringDevice = this; LiveSceneManager.Instance.currentTool = null; Debug.Log("ܱѰװ"); }); diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs index 06914c3..2b831b3 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs @@ -70,6 +70,9 @@ public class Device_Cover : Device_Base Debug.Log("ϸ"); isOpen = false; transform.DOLocalMoveY(0.01112366f, 2); - transform.DOLocalMoveZ(-0.09854126f, 2); + transform.DOLocalMoveZ(-0.09854126f, 2).OnComplete(() => + { + int result = (triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)); + }); } } diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index 822d949..2dcaeea 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -86,6 +86,10 @@ public class Device_MeasuringCabinet : MonoBehaviour public void Init() { //ԭߵܱ + if (meteringDevice == null) + { + meteringDevice = GameObject.FindObjectOfType(true); + } meteringDevice.Init(true); //ԭ check_JieXian.isChecked = false; diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index d2810e0..8d2c2c5 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -151,10 +151,11 @@ public class StepState_1002 : StepState { //װܱ - //̶˿š - SiteManager.instance.measuringCabinet.meteringDevice.FixScrewUninstall(); - //˿š - SiteManager.instance.measuringCabinet.meteringDevice.JieXianScrewUninstallState(); + //״̬ + SiteManager.instance.measuringCabinet.meteringDevice.Init(false); + SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false); + SiteManager.instance.measuringCabinet.meteringDevice = null; + //ܱȡ SiteManager.instance.measuringCabinet.jieXian_screws.ForEach(screw => { @@ -168,7 +169,8 @@ public class StepState_1002 : StepState { //װ - + SiteManager.instance.measuringCabinet.meteringDevice = GameObject.FindObjectOfType(true); + SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(true); //δ SiteManager.instance.measuringCabinet.check_JieXian.isChecked = false; SiteManager.instance.measuringCabinet.check_JieXian.gameObject.SetActive(true); diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs index 31ad8f0..bb27c25 100644 --- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs @@ -33,6 +33,11 @@ public class LiveSceneManager : SingletonMono tMDTips.gameObject.SetActive(false); currentTool.transform.localEulerAngles = new Vector3(90, 0, 0); } + if (currentTool.name.Equals("ߵܱ")) + { + tMDTips.gameObject.SetActive(false); + currentTool.transform.localEulerAngles = new Vector3(-90, 0, -180); + } } private void Update() diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index 9c4aa09..5c01010 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary and b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary differ