From f55e88a0d828d6ddbac9c0e158b08c632b0dd983 Mon Sep 17 00:00:00 2001 From: gaoguozheng Date: Tue, 5 Sep 2023 20:56:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/古泉站机房模型90个型号/6.prefab | 43 ++- GQ_TongXin/Assets/Scenes/SampleSceneG.unity | 255 +++++++++++++++++- GQ_TongXin/Assets/Scripts/Camera/CameraRT.cs | 16 +- GQ_TongXin/Assets/Scripts/SearchName.cs | 2 +- .../Scripts/WJ/LineGroup/LineGroupManager.cs | 2 +- GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs | 12 +- GQ_TongXin/Assets/script/GameManager.cs | 24 +- GQ_TongXin/Assets/script/SearchName1.cs | 65 ++++- GQ_TongXin/Assets/script/UI/PatternChoose.cs | 24 +- .../Assets/script/接口/修改/AddDevice.cs | 4 +- .../Assets/script/接口/修改/DeleteDevice.cs | 4 +- .../Assets/script/接口/修改/RedactDevice.cs | 4 +- .../Assets/script/接口/查询/LineQuery.cs | 2 +- GQ_TongXin/Assets/script/点击/ClickEvent.cs | 46 ++-- GQ_TongXin/Assets/script/画线/LineInfor.cs | 14 +- .../Assets/script/相机/ExtendedFlycam.cs | 25 +- 16 files changed, 462 insertions(+), 80 deletions(-) diff --git a/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/6.prefab b/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/6.prefab index 3abc49028..ef4cebebf 100644 --- a/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/6.prefab +++ b/GQ_TongXin/Assets/Resources/古泉站机房模型90个型号/6.prefab @@ -658,7 +658,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6436252087428107629} - - {fileID: 4252828664931021139} + - {fileID: 6415611005981486864} - {fileID: 3691432370352237127} - {fileID: 7773294191514167667} - {fileID: 9105152300404503799} @@ -777,6 +777,7 @@ MonoBehaviour: materials: [] empty: [] TransparentGlow_Shader: {fileID: 4800000, guid: 132fbf2263a23854080e8a5c3cec824c, type: 3} + TransparentGlow_Shader_half: {fileID: 0} --- !u!114 &-5882026763401495860 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4073,13 +4074,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8039408339996031659} - m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0.000000007450581, z: -0.012468845} + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: -0.1415, z: 0.0014311438} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1809810455016100285} - m_RootOrder: 1 + m_Father: {fileID: 6415611005981486864} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &674320866609351847 MeshFilter: @@ -4211,6 +4212,38 @@ MonoBehaviour: remark: createTime: createName: +--- !u!1 &8092245846019895861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6415611005981486864} + m_Layer: 8 + m_Name: "\u524D\u76D6" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6415611005981486864 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8092245846019895861} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0, y: 0.1415, z: -0.0139} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4252828664931021139} + m_Father: {fileID: 1809810455016100285} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8136364133597622351 GameObject: m_ObjectHideFlags: 0 diff --git a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity index dadf853d0..57d922229 100644 --- a/GQ_TongXin/Assets/Scenes/SampleSceneG.unity +++ b/GQ_TongXin/Assets/Scenes/SampleSceneG.unity @@ -9237,13 +9237,25 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4362348816139420719} m_Modifications: + - target: {fileID: 4065166174645593776, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: TZ + value: + objectReference: {fileID: 811247561} + - target: {fileID: 4065166174645593776, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: initialHeight + value: 216.4 + objectReference: {fileID: 0} + - target: {fileID: 4065166174645593776, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: rectTransform + value: + objectReference: {fileID: 1799877322} - target: {fileID: 4065166174645593778, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_Name value: "Panel\u641C\u7D22\u6846-\u65B0\u589E" objectReference: {fileID: 0} - target: {fileID: 4065166174645593778, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4065166174645593779, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_Pivot.x @@ -9331,22 +9343,62 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4065166174663843264, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4065166174663843264, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4065166174663843264, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_SizeDelta.x - value: -8.4015 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4065166176363962149, guid: cdff6149826a44f4abc275995ec2d804, type: 3} - propertyPath: m_AnchorMax.x + - target: {fileID: 4065166174663843267, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4065166175730843972, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4065166175730843973, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4065166175730843973, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4065166175730843973, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4065166175730843973, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_AnchoredPosition.x + value: -36.559326 + objectReference: {fileID: 0} + - target: {fileID: 4065166175730843973, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_AnchoredPosition.y + value: 140.99896 + objectReference: {fileID: 0} + - target: {fileID: 4065166175815114430, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_AnchoredPosition.y + value: -3.4476929 + objectReference: {fileID: 0} + - target: {fileID: 4065166176282489132, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 4065166176363962149, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4065166176363962149, guid: cdff6149826a44f4abc275995ec2d804, type: 3} propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4065166176728925583, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] @@ -64097,6 +64149,82 @@ MonoBehaviour: isOccupied: 0 ID: 0 instruct: {fileID: 1470381574} +--- !u!1 &633675350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 633675351} + - component: {fileID: 633675353} + - component: {fileID: 633675352} + m_Layer: 5 + m_Name: "\u906E\u7F69" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &633675351 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633675350} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2126159577475600050} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0.000030517578} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &633675352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633675350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.003921569} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &633675353 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 633675350} + m_CullTransparentMesh: 1 --- !u!1 &633792340 GameObject: m_ObjectHideFlags: 0 @@ -82962,6 +83090,11 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &811247561 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4065166176728925583, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + m_PrefabInstance: {fileID: 90559731} + m_PrefabAsset: {fileID: 0} --- !u!1 &811496630 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8685047274162845332, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -92018,6 +92151,17 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &894652719 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5981814513152299591, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + m_PrefabInstance: {fileID: 90559731} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8124e469eb4c87f46ad8cb8a995694a6, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &895605936 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2566416797954128582, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -114158,6 +114302,82 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1101723871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1101723872} + - component: {fileID: 1101723874} + - component: {fileID: 1101723873} + m_Layer: 5 + m_Name: "\u906E\u7F69" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1101723872 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101723871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4362348817005860679} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1101723873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101723871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.003921569} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1101723874 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1101723871} + m_CullTransparentMesh: 1 --- !u!1 &1101967991 stripped GameObject: m_CorrespondingSourceObject: {fileID: 195440020619539011, guid: c8f09218a803c944e84c2336104ca2f9, type: 3} @@ -183162,6 +183382,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1799221769} m_CullTransparentMesh: 1 +--- !u!224 &1799877322 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4065166175730843973, guid: cdff6149826a44f4abc275995ec2d804, type: 3} + m_PrefabInstance: {fileID: 90559731} + m_PrefabAsset: {fileID: 0} --- !u!1 &1800158235 GameObject: m_ObjectHideFlags: 0 @@ -185390,7 +185615,7 @@ MonoBehaviour: deviceItems: [] editorMenu: {fileID: 1016767011} canvasRect: {fileID: 4362348816139420719} - dragController: {fileID: 0} + dragController: {fileID: 894652719} dragControllerContent: {fileID: 155917792} uposManger: {fileID: 0} stagingPanel: {fileID: 803679558} @@ -218664,7 +218889,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1332666220982349661 RectTransform: m_ObjectHideFlags: 0 @@ -261003,6 +261228,7 @@ RectTransform: - {fileID: 2126159576776860642} - {fileID: 2126159577618464167} - {fileID: 2126159576206169266} + - {fileID: 633675351} m_Father: {fileID: 8170702882014044262} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -280650,6 +280876,11 @@ MonoBehaviour: red_alarm: {r: 0.9960785, g: 0.2509804, b: 0.25882354, a: 1} yellow_alarm: {r: 0.90196085, g: 0.5568628, b: 0.023529414, a: 1} blue_alarm: {r: 0, g: 0.91372555, b: 0.9176471, a: 1} + sb_xz_page: {fileID: 4362348815730404585} + sb_bj_page: {fileID: 4362348816834021968} + dk_xz_page: {fileID: 4362348817005860676} + dk_bj_page: {fileID: 2126159577475600051} + xianlan: {fileID: 1168817489} --- !u!114 &4362348816139420716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -301770,7 +302001,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &4362348817005860678 MonoBehaviour: m_ObjectHideFlags: 0 @@ -301827,6 +302058,7 @@ RectTransform: - {fileID: 4362348816894034811} - {fileID: 4362348815942925289} - {fileID: 4362348815749669862} + - {fileID: 1101723872} m_Father: {fileID: 8170702882014044262} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -311428,7 +311660,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!222 &5466601489381078698 CanvasRenderer: m_ObjectHideFlags: 0 @@ -311601,7 +311833,8 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 8357765580518675660, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} --- !u!1 &5769346755244574362 GameObject: diff --git a/GQ_TongXin/Assets/Scripts/Camera/CameraRT.cs b/GQ_TongXin/Assets/Scripts/Camera/CameraRT.cs index 46568a9ef..5f6f11a2b 100644 --- a/GQ_TongXin/Assets/Scripts/Camera/CameraRT.cs +++ b/GQ_TongXin/Assets/Scripts/Camera/CameraRT.cs @@ -215,10 +215,10 @@ public class CameraRT : MonoBehaviour GameManager.Inst.Cabinets_go[i].SetActive(true); GameManager.Inst.Cabinets_go[i].GetComponent().F2(); } - PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(false); + PatternChoose.Inst.dk_bj_page.SetActive(false); + PatternChoose.Inst.dk_xz_page.SetActive(false); GameManager.Inst.magnifyState = false; if (cam.transform.position == pos && cam.transform.eulerAngles == rot) @@ -294,10 +294,10 @@ public class CameraRT : MonoBehaviour GameManager.Inst.Cabinets_go[i].GetComponent().F2(); } - PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(false); + PatternChoose.Inst.dk_bj_page.SetActive(false); + PatternChoose.Inst.dk_xz_page.SetActive(false); GameManager.Inst.magnifyState = true; DOTween.To(() => x, (v) => x = v, _x, dotween_duration); diff --git a/GQ_TongXin/Assets/Scripts/SearchName.cs b/GQ_TongXin/Assets/Scripts/SearchName.cs index 0f4934f5c..5af432cce 100644 --- a/GQ_TongXin/Assets/Scripts/SearchName.cs +++ b/GQ_TongXin/Assets/Scripts/SearchName.cs @@ -207,7 +207,7 @@ public class SearchName : MonoBehaviour List transparentGlows = new List(); - var s = GameObject.Find("").GetComponentsInChildren(true); + var s = PatternChoose.Inst.xianlan.GetComponentsInChildren(true); Array.ForEach(s, (item) => { if (item.name == objs_str[co]) diff --git a/GQ_TongXin/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs b/GQ_TongXin/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs index ae24f35c2..f65653810 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs @@ -38,7 +38,7 @@ public class LineGroupManager : MonoBehaviour public void addxianlan() { - GameObject xianlan = GameObject.Find(""); + GameObject xianlan = PatternChoose.Inst.xianlan; GameManager.Inst.FindPortPos(); for (int i = 0; i < child_line_group_items.Count; i++) diff --git a/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs index 4de90bf98..21de7e2f8 100644 --- a/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs +++ b/GQ_TongXin/Assets/Scripts/WJ/UIToCabinet.cs @@ -192,7 +192,9 @@ public class UIToCabinet : MonoBehaviour init(Menu.M__); ExtendedFlycam.Inst.QuanJing(); GameManager.Inst.power_open(); - GameManager.Inst.objectToShow_add.SetActive(true); + //GameManager.Inst.objectToShow_add.SetActive(true); + var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); + SN1.hide_menu(); CabinetUIManager.ChangeMenu(Menu.M__); } break; @@ -290,7 +292,13 @@ public class UIToCabinet : MonoBehaviour public void UI_init() { GameManager.Inst.power_close(); - GameManager.Inst.objectToShow_add.SetActive(false); + + if (GameManager.Inst.objectToShow_add.activeSelf) + { + var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); + SN1.hide_menu(); + GameManager.Inst.objectToShow_add.SetActive(false); + } GameManager.Inst.stagingPanel.SetActive(false); GameManager.Inst.editorMenu.gameObject.SetActive(false); diff --git a/GQ_TongXin/Assets/script/GameManager.cs b/GQ_TongXin/Assets/script/GameManager.cs index ad12064b8..22fe8e769 100644 --- a/GQ_TongXin/Assets/script/GameManager.cs +++ b/GQ_TongXin/Assets/script/GameManager.cs @@ -115,7 +115,7 @@ public class GameManager : MonoBehaviour /// /// 场景方大状态 /// - [Header("----------场景方大状态--------------")] + [Header("----------场景放大状态--------------")] public bool magnifyState = false; [Header("----------是否在循环读取信息--------------")] @@ -124,6 +124,11 @@ public class GameManager : MonoBehaviour public EditorMenu editorMenu; public GameObject stagingPanel; + [Header("-------------- 搜索框------------------")] + public GameObject objectToShow; + + public GameObject objectToShow_add; + private void Awake() { if (Inst != this && Inst != null) @@ -148,13 +153,17 @@ public class GameManager : MonoBehaviour if (nowDevice.GetComponent() == null) return; if (string.IsNullOrEmpty(nowDeviceID)) { - PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(true);//√ - objectToShow_add.gameObject.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(true);//√ + //objectToShow_add.gameObject.SetActive(false); + var SN1= objectToShow_add.GetComponent(); + SN1.hide_menu(); } else { - PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(true);//√ - objectToShow_add.gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false);//√ + //objectToShow_add.gameObject.SetActive(false); + var SN1 = objectToShow_add.GetComponent(); + SN1.hide_menu(); } } }); @@ -1685,10 +1694,7 @@ public class GameManager : MonoBehaviour /// /// /// - [Header("-------------- 搜索框------------------")] - public GameObject objectToShow; - - public GameObject objectToShow_add; + diff --git a/GQ_TongXin/Assets/script/SearchName1.cs b/GQ_TongXin/Assets/script/SearchName1.cs index 0da5ddf49..4a581aa11 100644 --- a/GQ_TongXin/Assets/script/SearchName1.cs +++ b/GQ_TongXin/Assets/script/SearchName1.cs @@ -3,9 +3,11 @@ using System.Collections.Generic; using UnityEngine; using TMPro; using UnityEngine.UI; +using DG.Tweening; public class SearchName1 : MonoBehaviour { + public GameObject TZ; public GameObject scrollView; public Transform scrollViewContent; public TMP_InputField inputField; @@ -27,12 +29,23 @@ public class SearchName1 : MonoBehaviour public List devices = new List(); + public float initialHeight; + public RectTransform rectTransform; + + private void Awake() + { + rectTransform = scrollView.GetComponent(); + initialHeight = rectTransform.sizeDelta.y; + rectTransform.sizeDelta = new Vector2(rectTransform.sizeDelta.x, 0); + gameObject.SetActive(false); + } + void Start() { //scrollView.SetActive(false); InputFieldEvent(); dragController.gameObject.SetActive(false); - //OnClickSearchBtn(); + OnClickSearchBtn(); } void InputFieldEvent() @@ -64,14 +77,14 @@ public class SearchName1 : MonoBehaviour { for (int j = 0; j < objs.Count; j++) { - if(devices[i].ID.Equals (objs[j].name )) + if (devices[i].ID.Equals(objs[j].name)) { SearchObjects.Add(objs[j]); } } } - + for (int i = 0; i < devices.Count; i++) { @@ -93,14 +106,56 @@ public class SearchName1 : MonoBehaviour { serarchBtn.onClick.AddListener(() => { + show_menu(); + return; if (searchText.text != "") { scrollView.SetActive(true); - Serach(searchText.text.Trim()); + Serach(searchText.text.Trim()); } - else scrollView.SetActive(false); }); } + /// + /// ˵ + /// + public void hide_menu() + { + if (rectTransform.sizeDelta.y >= 0) + { + DOTween.Kill(rectTransform, false); + + TZ.SetActive(false); + + float targetHeight = 0; + float duration = 1f; + + rectTransform.DOSizeDelta(new Vector2(rectTransform.sizeDelta.x, targetHeight), duration).OnComplete(() => + { + scrollView.SetActive(false); + }); + } + } + + /// + /// ʾ˵ + /// + public void show_menu() + { + if (rectTransform.sizeDelta.y != initialHeight) + { + DOTween.Kill(rectTransform, false); + + scrollView.SetActive(true); + + float targetHeight = initialHeight; + float duration = 1f; + + rectTransform.DOSizeDelta(new Vector2(rectTransform.sizeDelta.x, targetHeight), duration).OnComplete(() => + { + TZ.SetActive(true); + }); + } + } } diff --git a/GQ_TongXin/Assets/script/UI/PatternChoose.cs b/GQ_TongXin/Assets/script/UI/PatternChoose.cs index cb3b424e8..fb2fae669 100644 --- a/GQ_TongXin/Assets/script/UI/PatternChoose.cs +++ b/GQ_TongXin/Assets/script/UI/PatternChoose.cs @@ -27,6 +27,28 @@ public class PatternChoose : MonoBehaviour [SerializeField] public Color red_alarm; [SerializeField] public Color yellow_alarm; [SerializeField] public Color blue_alarm; + + /// + /// 设备新增窗口 + /// + public GameObject sb_xz_page; + /// + /// 设备编辑窗口 + /// + public GameObject sb_bj_page; + /// + /// 端口新增窗口 + /// + public GameObject dk_xz_page; + /// + /// 端口编辑窗口 + /// + public GameObject dk_bj_page; + /// + /// 线缆 + /// + public GameObject xianlan; + private void Awake() { if (_inst != null && _inst != this) @@ -43,7 +65,7 @@ public class PatternChoose : MonoBehaviour } void Start() { - + } // Update is called once per frame diff --git a/GQ_TongXin/Assets/script/接口/修改/AddDevice.cs b/GQ_TongXin/Assets/script/接口/修改/AddDevice.cs index cc69895ab..976c9f771 100644 --- a/GQ_TongXin/Assets/script/接口/修改/AddDevice.cs +++ b/GQ_TongXin/Assets/script/接口/修改/AddDevice.cs @@ -169,7 +169,9 @@ public class AddDevice : MonoBehaviour { itme.gameObject.SetActive(false); }); - GameManager.Inst.objectToShow_add.gameObject.SetActive(true); + //GameManager.Inst.objectToShow_add.gameObject.SetActive(true); + var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); + SN1.hide_menu(); } })); diff --git a/GQ_TongXin/Assets/script/接口/修改/DeleteDevice.cs b/GQ_TongXin/Assets/script/接口/修改/DeleteDevice.cs index ec43433ae..103d456ab 100644 --- a/GQ_TongXin/Assets/script/接口/修改/DeleteDevice.cs +++ b/GQ_TongXin/Assets/script/接口/修改/DeleteDevice.cs @@ -29,7 +29,9 @@ public class DeleteDevice : MonoBehaviour { itme.gameObject.SetActive(false); }); - GameManager.Inst.objectToShow_add.gameObject.SetActive(true); + //GameManager.Inst.objectToShow_add.gameObject.SetActive(true); + var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); + SN1.hide_menu(); } })); } diff --git a/GQ_TongXin/Assets/script/接口/修改/RedactDevice.cs b/GQ_TongXin/Assets/script/接口/修改/RedactDevice.cs index ce71bc43b..77a5dfad1 100644 --- a/GQ_TongXin/Assets/script/接口/修改/RedactDevice.cs +++ b/GQ_TongXin/Assets/script/接口/修改/RedactDevice.cs @@ -160,7 +160,9 @@ public class RedactDevice : MonoBehaviour { itme.gameObject.SetActive(false); }); - GameManager.Inst.objectToShow_add.gameObject.SetActive(true); + //GameManager.Inst.objectToShow_add.gameObject.SetActive(true); + var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); + SN1.hide_menu(); } })); diff --git a/GQ_TongXin/Assets/script/接口/查询/LineQuery.cs b/GQ_TongXin/Assets/script/接口/查询/LineQuery.cs index d449e0dee..4febf9d77 100644 --- a/GQ_TongXin/Assets/script/接口/查询/LineQuery.cs +++ b/GQ_TongXin/Assets/script/接口/查询/LineQuery.cs @@ -222,7 +222,7 @@ public class LineQuery : MonoBehaviour // ɾ public IEnumerable deleteCableName(string cableGroupName, string CableName, Action callback = null) { - var xianlan = GameObject.Find("").GetComponentsInChildren(); + var xianlan = PatternChoose.Inst.xianlan.GetComponentsInChildren(); var info = Array.Find(xianlan, (item) => { return (item.cableGroupName == cableGroupName && item.cableName == CableName); diff --git a/GQ_TongXin/Assets/script/点击/ClickEvent.cs b/GQ_TongXin/Assets/script/点击/ClickEvent.cs index 2bf1c8d4e..ce039e97f 100644 --- a/GQ_TongXin/Assets/script/点击/ClickEvent.cs +++ b/GQ_TongXin/Assets/script/点击/ClickEvent.cs @@ -101,10 +101,10 @@ public class ClickEvent : MonoBehaviour GameManager.Inst.nowDevice = null; GameManager.Inst.nowDeviceID = null; Debug.Log("" + gameObject.name); - PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("˿/˿").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("˿/˿").gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(false); + PatternChoose.Inst.dk_bj_page.SetActive(false); + PatternChoose.Inst.dk_xz_page.SetActive(false); GameManager.Inst.search_box.SetActive(false); var d = gameObject.GetComponent(); @@ -138,7 +138,7 @@ public class ClickEvent : MonoBehaviour - //PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(true);// + //PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);// } if (drag) { @@ -164,11 +164,6 @@ public class ClickEvent : MonoBehaviour { Change_hide(gameObject, true, true); } - //С - else if (hit.collider.gameObject == gameObject && My_magnifyState) - { - Change_hide(gameObject, false, false); - } } } @@ -190,10 +185,10 @@ public class ClickEvent : MonoBehaviour GameManager.Inst.nowDevice = null; GameManager.Inst.nowDeviceID = null; Debug.Log("" + gameObject.name); - PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("˿/˿").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("˿/˿").gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(false); + PatternChoose.Inst.dk_bj_page.SetActive(false); + PatternChoose.Inst.dk_xz_page.SetActive(false); var p = gameObject.GetComponent(); @@ -293,7 +288,7 @@ public class ClickEvent : MonoBehaviour // GameManager.Inst.nowDeviceID = d.deviceList.id; // GameManager.Inst.nowDevice = gameObject; - // PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(true);// + // PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);// // } // } // } @@ -320,8 +315,8 @@ public class ClickEvent : MonoBehaviour // } // else // { - // PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(false); - // PatternChoose.Inst.transform.Find("˿/˿").gameObject.SetActive(false); + // PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(false); + // PatternChoose.Inst.dk_bj_page.SetActive(false); // } // } //} @@ -367,7 +362,6 @@ public class ClickEvent : MonoBehaviour // } //} #endregion - } } @@ -696,8 +690,8 @@ public class ClickEvent : MonoBehaviour { if (!GameManager.Inst.Racks_go[i].activeSelf) continue; - if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") - //GameManager.Inst.Racks_go[i].transform.Find("ǰ").DOLocalRotate(Vector3.right * 180, 1); + if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "6" || + GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") GameManager.Inst.Racks_go[i].transform.Find("ǰ").gameObject.SetActive(false); } } @@ -713,8 +707,8 @@ public class ClickEvent : MonoBehaviour } for (int i = 0; i < GameManager.Inst.Racks_go.Count; i++) { - if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") - //GameManager.Inst.Racks_go[i].transform.Find("ǰ").DOLocalRotate(Vector3.zero, 1); + if (GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "6" || + GameManager.Inst.Racks_go[i].GetComponent().deviceList.modelNum == "7") GameManager.Inst.Racks_go[i].transform.Find("ǰ").gameObject.SetActive(true); } } @@ -741,6 +735,14 @@ public class ClickEvent : MonoBehaviour itme.hight.SetActive(true); }); } + else if (Menu.M__ == CabinetUIManager.Instance.current_menu) + { + if (!GameManager.Inst.objectToShow_add.activeSelf) + { + GameManager.Inst.objectToShow_add.SetActive(true); + } + + } if (cabine.transform.Find("Uλ")) GameManager.Inst.gameObject.GetComponent().dragController.uPosManger = cabine.transform.Find("Uλ").GetComponent(); diff --git a/GQ_TongXin/Assets/script/画线/LineInfor.cs b/GQ_TongXin/Assets/script/画线/LineInfor.cs index 354cefeda..f4784f0d4 100644 --- a/GQ_TongXin/Assets/script/画线/LineInfor.cs +++ b/GQ_TongXin/Assets/script/画线/LineInfor.cs @@ -45,10 +45,10 @@ public class LineInfor : MonoBehaviour // 获取PlayerPrefs中所有的键 string[] keys = GetAllPlayerPrefsKeys(); - // 遍历所有的键，并打印对应的值 + // 遍历所有的键 foreach (string key in keys) { - string value = PlayerPrefs.GetString(key); // 或者使用对应的类型的Get方法，如GetInt(key), GetFloat(key)等 + string value = PlayerPrefs.GetString(key); Debug.Log("Key: " + key + ", Value: " + value); } } @@ -67,6 +67,16 @@ public class LineInfor : MonoBehaviour } + public float lineWidth = 0.01f; + + [ContextMenu("设置LineRenderer")] + public void setLineWidth() + { + LineRenderer lineRenderer=GetComponent(); + lineRenderer.startWidth = lineWidth; + lineRenderer.endWidth = lineWidth; + } + #region JSON [System.Serializable] public class Root diff --git a/GQ_TongXin/Assets/script/相机/ExtendedFlycam.cs b/GQ_TongXin/Assets/script/相机/ExtendedFlycam.cs index f33af25e5..505387940 100644 --- a/GQ_TongXin/Assets/script/相机/ExtendedFlycam.cs +++ b/GQ_TongXin/Assets/script/相机/ExtendedFlycam.cs @@ -152,7 +152,7 @@ public class ExtendedFlycam : MonoBehaviour isvalid = b; } - + void Update() { //if (mask_img.activeSelf) return; @@ -260,6 +260,13 @@ public class ExtendedFlycam : MonoBehaviour } CabinetUIManager.Instance.cabine_hights_now.Clear(); + if (GameManager.Inst.objectToShow_add.activeSelf) + { + var SN1 = GameManager.Inst.objectToShow_add.GetComponent(); + SN1.hide_menu(); + GameManager.Inst.objectToShow_add.SetActive(false); + } + CameraRtEnable(); CameraRT.InitPanoramic(); return; @@ -271,10 +278,10 @@ public class ExtendedFlycam : MonoBehaviour //{ // itme.F2(); //}); - PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(false); + PatternChoose.Inst.dk_bj_page.SetActive(false); + PatternChoose.Inst.dk_xz_page.SetActive(false); GameManager.Inst.magnifyState = false; Inst.init_mainCamera_rot(); @@ -298,10 +305,10 @@ public class ExtendedFlycam : MonoBehaviour { itme.My_magnifyState = false; }); - PatternChoose.Inst.transform.Find("设备类/设备配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("设备类/设备新增").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口配置").gameObject.SetActive(false); - PatternChoose.Inst.transform.Find("端口类/端口新增").gameObject.SetActive(false); + PatternChoose.Inst.sb_bj_page.SetActive(false); + PatternChoose.Inst.sb_xz_page.SetActive(false); + PatternChoose.Inst.dk_bj_page.SetActive(false); + PatternChoose.Inst.dk_xz_page.SetActive(false); GameManager.Inst.magnifyState = true; Inst.init_mainCamera_rot();