From 7a683b707d4441193c541a5793a57e10ab3ee8d2 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Mon, 26 Aug 2024 15:53:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 21331 -> 21363 bytes Assets/Scenes/05_LiveScene.unity | 18 +++++++++- .../直接接入式电能计量装置/Device_Switch.cs | 31 ++++++++++-------- .../BinaryData/TB_SubProcessStep.binary | Bin 2443 -> 2514 bytes 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index e9514fd355b095104a8204a1141ec0ca2f21974b..faff1ef7ce06a50cbb46f7c4b648bde72c747565 100644 GIT binary patch delta 5647 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 delta 5615 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 public void AddAction(Action actionBack) { - this.actionBack= actionBack; + this.actionBack = actionBack; } private void OnMouseDown() { - if(isOpen) + if ((triggerAction == null ? 0 : triggerAction.Invoke(triggerName, true)) == 0) { - isOpen = false; - transform.localEulerAngles = new Vector3(0, 45, 0); - } - else - { - isOpen = true; - transform.localEulerAngles = new Vector3(0, 0, 0); - } + if (isOpen) + { + isOpen = false; + transform.localEulerAngles = new Vector3(0, 45, 0); + } + else + { + isOpen = true; + transform.localEulerAngles = new Vector3(0, 0, 0); + } - //Զ¼ - if (actionBack != null) - { - actionBack.Invoke(isOpen); + //Զ¼ + if (actionBack != null) + { + actionBack.Invoke(isOpen); + } } } diff --git a/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary b/Assets/StreamingAssets/BinaryData/TB_SubProcessStep.binary index b095d880bc006f70d2feb1d7f38899a36f49eafa..2cd153dbb43c0ec5011909afe3fd773a38c977b6 100644 GIT binary patch delta 120 zcmeAcz9hWi6`KGL0|Ude#SPEqFMZax^!cv+lmD{$Fy>G8Vpj@yxvJ;+l&#O#OwrEF gd%CCLY3t_r7xQ*K*)i8p2d9(~ZYkrIM@J0002zl(p!Cz38E+=bM)0t&o%Y2224ZlSc<42Ih~F<+`V{ Hxd#~nKtdMs