From c64d8daf2f5dce3d20f257e69991d6964cf20d8d Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Fri, 6 Sep 2024 13:18:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9livescene=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=92=8C=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Models/man@拿着木板和纸讨论.fbx.meta | 2 +- Assets/ArtRes/Sprite/客户@2x.png | Bin 0 -> 10982 bytes Assets/ArtRes/Sprite/客户@2x.png.meta | 159 +++++ Assets/ArtRes/Sprite/感叹@2x.png | Bin 0 -> 13136 bytes Assets/ArtRes/Sprite/感叹@2x.png.meta | 159 +++++ Assets/Scenes/05_LiveScene.unity | 128 +++- Assets/Scripts/CXX/Devices/杂/门/Door.cs | 26 +- .../Project/Objects/Other/MirrorController.cs | 14 +- .../Project/Objects/Other/MobileController.cs | 15 +- .../Project/Objects/Other/NPCController.cs | 41 +- .../UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs | 1 - .../UI_Panel/UI_LowTensionWorkTicketPanel.cs | 4 + Assets/StreamingAssets/realtimeStat.json | 582 +++++++++--------- 13 files changed, 791 insertions(+), 340 deletions(-) create mode 100644 Assets/ArtRes/Sprite/客户@2x.png create mode 100644 Assets/ArtRes/Sprite/客户@2x.png.meta create mode 100644 Assets/ArtRes/Sprite/感叹@2x.png create mode 100644 Assets/ArtRes/Sprite/感叹@2x.png.meta diff --git a/Assets/ArtRes/Models/man@拿着木板和纸讨论.fbx.meta b/Assets/ArtRes/Models/man@拿着木板和纸讨论.fbx.meta index 5fd3a2c..b1d1e45 100644 --- a/Assets/ArtRes/Models/man@拿着木板和纸讨论.fbx.meta +++ b/Assets/ArtRes/Models/man@拿着木板和纸讨论.fbx.meta @@ -86,7 +86,7 @@ ModelImporter: cycleOffset: 0 loop: 0 hasAdditiveReferencePose: 0 - loopTime: 0 + loopTime: 1 loopBlend: 0 loopBlendOrientation: 0 loopBlendPositionY: 0 diff --git a/Assets/ArtRes/Sprite/客户@2x.png b/Assets/ArtRes/Sprite/客户@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..33628136560ea076d0bf163542c22004cbc5d950 GIT binary patch literal 10982 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%0D*00 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 /// ͨ /// -public class Door : MonoBehaviour +public class Door : PermanentTriggerBase { public bool isOpen; public ZhouEnum zhouEnum; @@ -22,30 +22,26 @@ public class Door : MonoBehaviour [SerializeField] private Vector3 nextR; - private HighlightEffect highlightEffect; - - private void Awake() + protected override void OnAwake() { + base.OnAwake(); GetEndAngle(); - highlightEffect = GetComponent(); } - - private void OnMouseDown() + protected override void OnMDown() { - if (EventSystem.current.IsPointerOverGameObject()) return; + base.OnMDown(); isOpen = !isOpen; transform.DOLocalRotate(dic[isOpen], duration); } - private void OnMouseEnter() + protected override void OnMEnter() { - if (EventSystem.current.IsPointerOverGameObject()) return; - highlightEffect.SetHighlighted(true); + base.OnMEnter(); + _highlight.SetHighlighted(true); } - - private void OnMouseExit() + protected override void OnMExit() { - if (EventSystem.current.IsPointerOverGameObject()) return; - highlightEffect.SetHighlighted(false); + _highlight.SetHighlighted(false); + base.OnMExit(); } private void GetEndAngle() diff --git a/Assets/Scripts/Project/Objects/Other/MirrorController.cs b/Assets/Scripts/Project/Objects/Other/MirrorController.cs index f8369e4..e2d974a 100644 --- a/Assets/Scripts/Project/Objects/Other/MirrorController.cs +++ b/Assets/Scripts/Project/Objects/Other/MirrorController.cs @@ -4,9 +4,19 @@ using UnityEngine; public class MirrorController : PermanentTriggerBase { - protected override void OnStart() + protected override void OnMEnter() { - base.OnStart(); + base.OnMEnter(); + if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) + { + _highlight.SetHighlighted(true); + } + } + protected override void OnMExit() + { + if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) + _highlight.SetHighlighted(false); + base.OnMExit(); } protected override void OnMDown() { diff --git a/Assets/Scripts/Project/Objects/Other/MobileController.cs b/Assets/Scripts/Project/Objects/Other/MobileController.cs index df8c153..fa48c7a 100644 --- a/Assets/Scripts/Project/Objects/Other/MobileController.cs +++ b/Assets/Scripts/Project/Objects/Other/MobileController.cs @@ -7,7 +7,20 @@ using UnityEngine.EventSystems; public class MobileController : PermanentTriggerBase { public int downIndex = 0; - + protected override void OnMEnter() + { + base.OnMEnter(); + if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) + { + _highlight.SetHighlighted(true); + } + } + protected override void OnMExit() + { + if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) + _highlight.SetHighlighted(false); + base.OnMExit(); + } protected override void OnMDown() { switch (downIndex) diff --git a/Assets/Scripts/Project/Objects/Other/NPCController.cs b/Assets/Scripts/Project/Objects/Other/NPCController.cs index 9a69f17..f25b2e4 100644 --- a/Assets/Scripts/Project/Objects/Other/NPCController.cs +++ b/Assets/Scripts/Project/Objects/Other/NPCController.cs @@ -9,10 +9,47 @@ public class NPCController : PermanentTriggerBase public SpriteRenderer spriteRenderer; public Animator animator; public string animatorParameters; + public Transform target; + private float distance; + public float minDistance; + /// + /// Ƿ񿿽 + /// + private bool isClose = false; + + private void Update() + { + if (target != null) + distance = Vector3.Distance(transform.position, target.position); + if (distance < minDistance) + { + transform.LookAt(target.position); + transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0); + isClose = true; + } + else + { + isClose = false; + } + } + protected override void OnMEnter() + { + base.OnMEnter(); + if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) + { + _highlight.SetHighlighted(true); + } + } + protected override void OnMExit() + { + if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) + _highlight.SetHighlighted(false); + base.OnMExit(); + } protected override void OnMDown() { base.OnMDown(); - + if (!isClose) return; if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(triggerName, false) == 0) { GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => @@ -21,7 +58,7 @@ public class NPCController : PermanentTriggerBase }); _highlight.SetHighlighted(false); spriteRenderer.gameObject.SetActive(false); - if(animator != null) + if (animator != null) { animator.SetInteger(animatorParameters, 1); } diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index 1624c35..eafd2a2 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs @@ -72,7 +72,6 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem currentTool.GetComponent().enabled = false; currentTool.name = currentItem.toolName; GameManager.EventMgr.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, currentTool); - //LiveSceneManager.Instance.SetSpawnToolInfo(currentTool); GameManager.UIMgr.imageTips.HideTips(); } break; diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs index e9a6726..75c5836 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_LowTensionWorkTicketPanel.cs @@ -51,6 +51,10 @@ public class UI_LowTensionWorkTicketPanel : BasePanel LayoutRebuilder.ForceRebuildLayoutImmediate(Content.GetComponent()); temp.callBack += OnSetUIRect; break; + case "BackBtn": + GameManager.UIMgr.ShowPanel(); + GameManager.UIMgr.HidePanel(); + break; default: break; } diff --git a/Assets/StreamingAssets/realtimeStat.json b/Assets/StreamingAssets/realtimeStat.json index f855b21..78431eb 100644 --- a/Assets/StreamingAssets/realtimeStat.json +++ b/Assets/StreamingAssets/realtimeStat.json @@ -36,26 +36,26 @@ { "index": 6, "subProcessId": 6, - "currentScore": 2.99999928, + "currentScore": 0.0, "isDone": true }, { "index": 7, "subProcessId": 7, - "currentScore": 0.0, - "isDone": false + "currentScore": 5.0, + "isDone": true }, { "index": 8, "subProcessId": 8, "currentScore": 0.0, - "isDone": true + "isDone": false }, { "index": 9, "subProcessId": 9, "currentScore": 0.0, - "isDone": true + "isDone": false }, { "index": 10, @@ -73,7 +73,7 @@ "index": 12, "subProcessId": 12, "currentScore": 0.0, - "isDone": true + "isDone": false }, { "index": 13, @@ -113,59 +113,61 @@ } ], "allToolAndMaterial": [ - "三相四线电能表", - "三相四线电能表", - "绝缘螺丝刀", - "绝缘螺丝刀", - "剥线钳", - "验电笔" + "工作证" ], "allWear": [], "sceneName": "05_LiveScene", - "currentSceneTools": [ + "currentSceneTools": [], + "currentSceneTriggers": [ { - "toolId": 0, "triggerID": 0, - "toolName": "", - "selfPosInToolRoom": { + "triggerName": "空开1", + "selfPosInScene": { + "x": 0.0278625488, + "y": 0.08226776, + "z": -0.008735657 + }, + "selfRotInScene": { "x": 0.0, "y": 0.0, "z": 0.0 } }, { - "toolId": 0, - "triggerID": 0, - "toolName": "", - "selfPosInToolRoom": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - } - ], - "currentSceneTriggers": [ - { - "triggerID": 0, - "triggerName": "", + "triggerID": 5023, + "triggerName": "电能表封印2", "selfPosInScene": { - "x": -176.113083, - "y": 1.43965042, - "z": -56.50579 + "x": 0.0612678528, + "y": 0.07292634, + "z": -0.109647989 }, "selfRotInScene": { - "x": 1.00179141E-05, - "y": 270.0, - "z": 0.0 + "x": 0.0, + "y": 0.0, + "z": 180.0 + } + }, + { + "triggerID": 5023, + "triggerName": "电能表封印1", + "selfPosInScene": { + "x": -0.06092453, + "y": 0.07292634, + "z": -0.109647989 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 180.0 } }, { "triggerID": 5024, "triggerName": "电能表盖子", "selfPosInScene": { - "x": 0.0001220703, - "y": 0.1388763, - "z": -0.2485413 + "x": -0.000122070313, + "y": 0.0416763425, + "z": -0.09854126 }, "selfRotInScene": { "x": 0.0, @@ -191,9 +193,9 @@ "triggerID": 0, "triggerName": "电能表拆装螺丝2", "selfPosInScene": { - "x": -0.06737137, - "y": 0.0210711714, - "z": -0.109404683 + "x": -0.06473, + "y": 0.051071167, + "z": -0.10885 }, "selfRotInScene": { "x": 0.0, @@ -206,7 +208,7 @@ "triggerName": "电能表拆装螺丝1", "selfPosInScene": { "x": 0.06592941, - "y": 0.0210711714, + "y": 0.051071167, "z": -0.109404683 }, "selfRotInScene": { @@ -216,12 +218,12 @@ } }, { - "triggerID": 0, - "triggerName": "A_in_螺丝up", + "triggerID": 5025, + "triggerName": "电能表盖子固定螺丝2", "selfPosInScene": { - "x": 0.0501709, - "y": -0.00430419855, - "z": -0.09305191 + "x": -0.06129074, + "y": -0.0140533447, + "z": -0.101232052 }, "selfRotInScene": { "x": 0.0, @@ -230,152 +232,12 @@ } }, { - "triggerID": 0, - "triggerName": "A_in_螺丝down", + "triggerID": 5025, + "triggerName": "电能表盖子固定螺丝1", "selfPosInScene": { - "x": 0.0501709, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "A_out_螺丝down", - "selfPosInScene": { - "x": 0.03305435, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "A_out_螺丝up", - "selfPosInScene": { - "x": 0.03305435, - "y": -0.00430419855, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "B_in_螺丝down", - "selfPosInScene": { - "x": 0.0237312317, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "B_in_螺丝up", - "selfPosInScene": { - "x": 0.0237312317, - "y": -0.00430419855, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "B_out_螺丝down", - "selfPosInScene": { - "x": 0.006591797, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "B_out_螺丝up", - "selfPosInScene": { - "x": 0.006591797, - "y": -0.00430419855, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "C_in_螺丝down", - "selfPosInScene": { - "x": -0.002609253, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "C_in_螺丝up", - "selfPosInScene": { - "x": -0.002609253, - "y": -0.00430419855, - "z": -0.09305191 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "C_out_螺丝down", - "selfPosInScene": { - "x": -0.0201148987, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 0, - "triggerName": "C_out_螺丝up", - "selfPosInScene": { - "x": -0.0201148987, - "y": -0.00430419855, - "z": -0.09305191 + "x": 0.0612869263, + "y": -0.0140533447, + "z": -0.101232052 }, "selfRotInScene": { "x": 0.0, @@ -388,7 +250,7 @@ "triggerName": "零_地_螺丝up", "selfPosInScene": { "x": -0.0295066833, - "y": -0.00430419855, + "y": 0.0256958, "z": -0.09305191 }, "selfRotInScene": { @@ -397,26 +259,12 @@ "z": 0.0 } }, - { - "triggerID": 0, - "triggerName": "零_地_螺丝down", - "selfPosInScene": { - "x": -0.0295066833, - "y": -0.00430419855, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, { "triggerID": 0, "triggerName": "零_out_螺丝up", "selfPosInScene": { "x": -0.0381965637, - "y": -0.00779845938, + "y": 0.0222015381, "z": -0.09305191 }, "selfRotInScene": { @@ -425,82 +273,12 @@ "z": 0.0 } }, - { - "triggerID": 0, - "triggerName": "零_out_螺丝down", - "selfPosInScene": { - "x": -0.0381965637, - "y": -0.00779845938, - "z": -0.101950169 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, - { - "triggerID": 5025, - "triggerName": "电能表盖子固定螺丝2", - "selfPosInScene": { - "x": -0.06129077, - "y": -0.1840469, - "z": -0.251232177 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": -5.008956E-06 - } - }, - { - "triggerID": 5025, - "triggerName": "电能表盖子固定螺丝1", - "selfPosInScene": { - "x": 0.06128691, - "y": -0.1840469, - "z": -0.251232177 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": -5.008956E-06 - } - }, - { - "triggerID": 0, - "triggerName": "", - "selfPosInScene": { - "x": 0.146900177, - "y": -0.126495361, - "z": 0.5191498 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 180.0 - } - }, - { - "triggerID": 0, - "triggerName": "空开1", - "selfPosInScene": { - "x": 0.0278625488, - "y": 0.08226776, - "z": -0.008735657 - }, - "selfRotInScene": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - } - }, { "triggerID": 0, "triggerName": "B_out_线", "selfPosInScene": { "x": 20.0205078, - "y": 142.2929, + "y": 142.292862, "z": 21.0742188 }, "selfRotInScene": { @@ -514,7 +292,7 @@ "triggerName": "C_out_线", "selfPosInScene": { "x": 17.5166016, - "y": 142.2929, + "y": 142.292862, "z": 21.0742188 }, "selfRotInScene": { @@ -528,7 +306,7 @@ "triggerName": "C_in_线", "selfPosInScene": { "x": 13.3569336, - "y": 129.0804, + "y": 131.0804, "z": 22.4726563 }, "selfRotInScene": { @@ -570,7 +348,7 @@ "triggerName": "零_out_线", "selfPosInScene": { "x": 16.4960938, - "y": 142.2929, + "y": 142.292862, "z": 21.0742188 }, "selfRotInScene": { @@ -579,6 +357,34 @@ "z": 4.85314136E-20 } }, + { + "triggerID": 0, + "triggerName": "B_out_螺丝up", + "selfPosInScene": { + "x": 0.006591797, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "C_out_螺丝up", + "selfPosInScene": { + "x": -0.0201148987, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, { "triggerID": 5021, "triggerName": "插座", @@ -595,14 +401,28 @@ }, { "triggerID": 0, - "triggerName": "垃圾", + "triggerName": "B_in_螺丝down", "selfPosInScene": { - "x": 0.161129, - "y": -0.371765137, - "z": -0.0119395256 + "x": 0.0237312317, + "y": 0.0256958, + "z": -0.101950169 }, "selfRotInScene": { - "x": 90.0, + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "A_in_螺丝up", + "selfPosInScene": { + "x": 0.0501709, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, "y": 0.0, "z": 0.0 } @@ -626,7 +446,7 @@ "triggerName": "A_out_线", "selfPosInScene": { "x": 22.70166, - "y": 142.2929, + "y": 142.292862, "z": 21.0742188 }, "selfRotInScene": { @@ -649,6 +469,48 @@ "z": 0.0 } }, + { + "triggerID": 0, + "triggerName": "C_in_螺丝up", + "selfPosInScene": { + "x": -0.002609253, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "B_out_螺丝down", + "selfPosInScene": { + "x": 0.006591797, + "y": 0.0256958, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "零_地_螺丝down", + "selfPosInScene": { + "x": -0.0295066833, + "y": 0.0256958, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, { "triggerID": 5020, "triggerName": "NPC负责人", @@ -663,6 +525,20 @@ "z": 0.0 } }, + { + "triggerID": 0, + "triggerName": "C_out_螺丝down", + "selfPosInScene": { + "x": -0.0201148987, + "y": 0.0256958, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, { "triggerID": 0, "triggerName": "零_地_线", @@ -679,11 +555,25 @@ }, { "triggerID": 0, - "triggerName": "in开关_螺丝2", + "triggerName": "", "selfPosInScene": { - "x": 0.0108642578, - "y": -0.07393646, - "z": 0.03310418 + "x": 0.146900177, + "y": -0.1265, + "z": 0.5191498 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 180.0 + } + }, + { + "triggerID": 0, + "triggerName": "零_out_螺丝down", + "selfPosInScene": { + "x": -0.0381965637, + "y": 0.0222015381, + "z": -0.101950169 }, "selfRotInScene": { "x": 0.0, @@ -693,15 +583,15 @@ }, { "triggerID": 0, - "triggerName": "in开关_螺丝3", + "triggerName": "B_in_螺丝up", "selfPosInScene": { - "x": 0.0108642578, - "y": -0.111083522, - "z": 0.0330979824 + "x": 0.0237312317, + "y": 0.0256958, + "z": -0.09305191 }, "selfRotInScene": { "x": 0.0, - "y": 253.5234, + "y": 0.0, "z": 0.0 } }, @@ -721,15 +611,57 @@ }, { "triggerID": 0, - "triggerName": "in开关_螺丝1", + "triggerName": "C_in_螺丝down", "selfPosInScene": { - "x": 0.0108642578, - "y": -0.05678177, - "z": 0.0330979824 + "x": -0.002609253, + "y": 0.0256958, + "z": -0.101950169 }, "selfRotInScene": { "x": 0.0, - "y": 70.98747, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "A_out_螺丝down", + "selfPosInScene": { + "x": 0.03305435, + "y": 0.0256958, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "A_in_螺丝down", + "selfPosInScene": { + "x": 0.0501709, + "y": 0.0256958, + "z": -0.101950169 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "A_out_螺丝up", + "selfPosInScene": { + "x": 0.03305435, + "y": 0.0256958, + "z": -0.09305191 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, "z": 0.0 } }, @@ -742,9 +674,51 @@ "z": 0.47206974 }, "selfRotInScene": { + "x": 2.72990741E-35, + "y": 9.03968E-29, + "z": -1.73028438E-05 + } + }, + { + "triggerID": 0, + "triggerName": "in开关_螺丝3", + "selfPosInScene": { "x": 0.0, "y": 0.0, - "z": 170.0 + "z": 0.0 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "in开关_螺丝2", + "selfPosInScene": { + "x": 0.01717, + "y": -0.00067, + "z": 0.0 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + } + }, + { + "triggerID": 0, + "triggerName": "in开关_螺丝1", + "selfPosInScene": { + "x": 0.03411, + "y": -0.00094, + "z": 0.0 + }, + "selfRotInScene": { + "x": 0.0, + "y": 0.0, + "z": 0.0 } } ]