From f4a9c04e0ae41a88ecb5618f3695f177de820ff9 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Mon, 26 Aug 2024 21:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=80=E6=9C=89=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 21701 -> 22134 bytes .../{l型集中器.png => 三相四线电能表.png} | Bin ...集中器.png.meta => 三相四线电能表.png.meta} | 0 Assets/Scenes/05_LiveScene.unity | 2 +- .../Device_3Phase4WireMeter.cs | 3 +-- .../直接接入式电能计量装置/Device_Cover.cs | 5 ++++- .../Devices/计量柜/Device_MeasuringCabinet.cs | 4 ++++ .../CXX/StepState/1002/StepState_1002.cs | 12 +++++++----- .../Project/Manager/LiveSceneManager.cs | 5 +++++ .../BinaryData/TB_SubProcessStep.binary | Bin 3537 -> 4168 bytes 10 files changed, 22 insertions(+), 9 deletions(-) rename Assets/Resources/Sprites/ToolAndmaterial/{l型集中器.png => 三相四线电能表.png} (100%) rename Assets/Resources/Sprites/ToolAndmaterial/{l型集中器.png.meta => 三相四线电能表.png.meta} (100%) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 7d799df67c399c34884b3c430579612fa3a678ec..b4bdbddc9ca58ca1f45cbcaccbf0a5f5aea55dc0 100644 GIT binary patch delta 7588 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 b6CcG9_EeyldSVE>AE2sw^vEij|H1q};?s+J 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 9c4aa094e25a67c197be94ac5bb0069884199312..5c010105d878ee303d6b8db0221258ca4eff5361 100644 GIT binary patch delta 668 zcmZ`$OHUe66uuL2BqPKWW75Wj+Ry|G8f9nOO?9hjlP;RB*wh7G7?ZY%ODX{b21~ir zgz^&6#6Cb;N*RWNE7ERFx^~5xJFx68@LmQ-Y0~BW&iNkayJwTXr@32Sxfe!DMs7=K z&VUel;(oO*aR}jaVXB-mCb)4cMb(ok*{(sLu7v#%k?=F&4t{K$eLg{FBwkUy4K;TR zq72zAIVdTy%$P=^>z%}*T5Q5$fFkG{#k)fY{TV^1HHr}9E8$aky9dRfn)m5idX{?# z?+XvClYPA)hMykQD}w0LcvsqG{8F$RSoZR{AaQepxeIxcD{3Zc?^=k7)Q!leEZ2A3 zFxhaIzq?wwmhcx%XrfcHTY{9_@qC~JJs7=8>*#S3QJ)B9{ot4$1cVnqi@#%SMAdIOP?L)X{d&VPZ$%L_yMI*DmZc-?HD zXG3@wBH1H|yjObi7G`%+h1_TGC))KogmQGoC^eim+h%x1$#@~v>?#F9!99~v9Yx`@wTquGT=!z$t|vR@KAqI_e9G46yY>T3 uV%Rh}k5_{i#Dam%lX>_IQAD;(R_8}mvvu+^er*&r+a~|#*WiJf0ippgE;zsd