From 4ec73edeb08036902d869b795933e6ef7a8558aa Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 5 Sep 2023 23:00:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GQ_TongXin/Assets/Adam/Prefabs/6 1.prefab | 24 +++++++++++++ .../Assets/Adam/Scripts/DragController.cs | 2 ++ GQ_TongXin/Assets/Adam/Scripts/UPosItem.cs | 3 +- GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs | 7 +++- GQ_TongXin/Assets/script/GameManager.cs | 35 +++++++++++++++++-- 5 files changed, 67 insertions(+), 4 deletions(-) diff --git a/GQ_TongXin/Assets/Adam/Prefabs/6 1.prefab b/GQ_TongXin/Assets/Adam/Prefabs/6 1.prefab index ec56ea0b5..132d95d06 100644 --- a/GQ_TongXin/Assets/Adam/Prefabs/6 1.prefab +++ b/GQ_TongXin/Assets/Adam/Prefabs/6 1.prefab @@ -370,6 +370,7 @@ GameObject: m_Component: - component: {fileID: 1809810455016100285} - component: {fileID: 5015601091524974045} + - component: {fileID: -6911259714475533231} m_Layer: 8 m_Name: 6 1 m_TagString: Untagged @@ -412,6 +413,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: volume: 3 + selfIcon: {fileID: 0} +--- !u!114 &-6911259714475533231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1321364116395625223} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3} + m_Name: + m_EditorClassIdentifier: + isTransparentGlow: 0 + meshRenderers: [] + materials: [] + empty: [] + TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c, type: 3} + TransparentGlow_Shader_half: {fileID: 0} --- !u!1 &1749544084727868767 GameObject: m_ObjectHideFlags: 0 @@ -1336,6 +1356,7 @@ MonoBehaviour: conDeviceName: rackType: openFlag: + backDoorFlag: modelNum: occupyNum: residueNum: @@ -1865,6 +1886,7 @@ MonoBehaviour: conDeviceName: rackType: openFlag: + backDoorFlag: modelNum: occupyNum: residueNum: @@ -2794,6 +2816,7 @@ MonoBehaviour: conDeviceName: rackType: openFlag: + backDoorFlag: modelNum: occupyNum: residueNum: @@ -3047,6 +3070,7 @@ MonoBehaviour: conDeviceName: rackType: openFlag: + backDoorFlag: modelNum: occupyNum: residueNum: diff --git a/GQ_TongXin/Assets/Adam/Scripts/DragController.cs b/GQ_TongXin/Assets/Adam/Scripts/DragController.cs index 0982d2aae..1a6189d77 100644 --- a/GQ_TongXin/Assets/Adam/Scripts/DragController.cs +++ b/GQ_TongXin/Assets/Adam/Scripts/DragController.cs @@ -59,6 +59,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, targetObject = oriObjectPrefab; targetObject.gameObject.SetActive(true); } + targetObject.GetComponent().F1(); //currentDevice = targetObject.GetComponent(); targetObject.transform.eulerAngles = oriObjectPrefab.transform.eulerAngles; targetObject.transform.localScale = oriObjectPrefab.transform.lossyScale; @@ -86,6 +87,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, { GameManager.Inst.MoveParentAndChildren(targetObject.transform, new Vector3(-0.25f, 0, 0)); } + targetObject.GetComponent().F2(); currentUPosItem = null; targetObject = null; diff --git a/GQ_TongXin/Assets/Adam/Scripts/UPosItem.cs b/GQ_TongXin/Assets/Adam/Scripts/UPosItem.cs index 9002bc273..7802ef0ab 100644 --- a/GQ_TongXin/Assets/Adam/Scripts/UPosItem.cs +++ b/GQ_TongXin/Assets/Adam/Scripts/UPosItem.cs @@ -19,7 +19,7 @@ public class UPosItem : MonoBehaviour public int ID; public SpriteRenderer instruct; - + public UPosManger uPosManager; [ContextMenu("Set")] public void SetValue() { @@ -31,6 +31,7 @@ public class UPosItem : MonoBehaviour private void Start() { ID = int.Parse(gameObject.name); + uPosManager = transform.parent.GetComponent(); } /// diff --git a/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs b/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs index d8d1b5e28..a8332bd2b 100644 --- a/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs +++ b/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs @@ -71,7 +71,12 @@ public class UPosManger : MonoBehaviour //return startIndex + count - 1; } - + /// + /// 控制当前机位下的设备所占U位状态 + /// + /// + /// + /// public void SetCurrentUPosIsOccupied(int startIndex, int count, bool isEnabel) { //Debug.Log("startIndex-------------" + startIndex); diff --git a/GQ_TongXin/Assets/script/GameManager.cs b/GQ_TongXin/Assets/script/GameManager.cs index 22fe8e769..95dea5c39 100644 --- a/GQ_TongXin/Assets/script/GameManager.cs +++ b/GQ_TongXin/Assets/script/GameManager.cs @@ -155,7 +155,7 @@ public class GameManager : MonoBehaviour { PatternChoose.Inst.sb_xz_page.SetActive(true);//√ //objectToShow_add.gameObject.SetActive(false); - var SN1= objectToShow_add.GetComponent(); + var SN1 = objectToShow_add.GetComponent(); SN1.hide_menu(); } else @@ -167,6 +167,37 @@ public class GameManager : MonoBehaviour } } }); + /////---------------新加------------------------ + //editorMenu.editorBtn.onClick.AddListener(() => + //{ + // if (Menu.M_数字孪生_场景管理 == CabinetUIManager.Instance.current_menu && nowDevice != null) + // { + // if (nowDevice.GetComponent() == null) return; + // if (string.IsNullOrEmpty(nowDeviceID)) + // { + // DeviceItem di = nowDevice.GetComponent(); + // UPosItem upi = nowDevice.transform.parent.GetComponent(); + // upi.uPosManager.SetCurrentUPosIsOccupied(di.startIndex, di.volume, false); + // DestroyImmediate(nowDevice); + // } + // else + // { + // var delete = PatternChoose.Inst.transform.Find("设备类").GetComponent(); + // //DeleteDevice delete = new DeleteDevice(); + // delete.mybody.ids.Add(nowDeviceID); + // StartCoroutine(delete.SaveJsonCoroutine((x) => + // { + // DeviceItem di = nowDevice.GetComponent(); + // UPosItem upi = nowDevice.transform.parent.GetComponent(); + // upi.uPosManager.SetCurrentUPosIsOccupied(di.startIndex, di.volume, false); + // DestroyImmediate(nowDevice); + + // })); + // } + // } + // editorMenu.gameObject.SetActive(false); + //}); + /////---------------新加------------------------ editorMenu.deleteBtn.onClick.AddListener(() => { @@ -1694,7 +1725,7 @@ public class GameManager : MonoBehaviour /// /// /// - +