huangjiayu
/
EnergyEfficiencyManagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交工具页面切换设备功能

This commit is contained in:
sizhongzhan 2026-04-10 10:22:50 +08:00
parent a38b5f33aa
commit 50c3cf8998
5 changed files with 309 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

221
Assets/Scenes/Models ppp.unity
View File

@ -242,6 +242,57 @@ Transform:
m_Father: {fileID: 1143766383}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &213221107
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 213221109}
- component: {fileID: 213221108}
m_Layer: 0
m_Name: "\u5E93\u5B58\u7BA1\u7406\u5668"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &213221108
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213221107}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a3da4d09dff18f242b3b7d40d5721d31, type: 3}
m_Name:
m_EditorClassIdentifier:
fileName: inventory.json
onInventoryLoaded:
m_PersistentCalls:
m_Calls: []
onInventoryUpdated:
m_PersistentCalls:
m_Calls: []
--- !u!4 &213221109
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 213221107}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.2514097, y: 0.6696475, z: -0.15979826}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &222722634
PrefabInstance:
m_ObjectHideFlags: 0
@ -1610,6 +1661,56 @@ Transform:
m_Father: {fileID: 1143766383}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &872142258
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 872142260}
- component: {fileID: 872142259}
m_Layer: 0
m_Name: "Modbus\u63A7\u5236\u5668"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &872142259
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 872142258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21766cb5ef385fb4ea8a5e28c36c993c, type: 3}
m_Name:
m_EditorClassIdentifier:
portName: COM3
baudRate: 9600
deviceList: []
enableDebug: 1
commandInterval: 0.1
deviceStatus: []
--- !u!4 &872142260
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 872142258}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.098803386, y: 1.045672, z: 0.118324734}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &918270854
GameObject:
m_ObjectHideFlags: 0
@ -1988,7 +2089,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1027018822}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f1c6ea55b26539849ac893385c9f79b4, type: 3}
m_Name:
@ -4388,6 +4489,50 @@ Transform:
m_Father: {fileID: 519640836}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1727190917
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1727190919}
- component: {fileID: 1727190918}
m_Layer: 0
m_Name: UIUtils
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1727190918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1727190917}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1ae149ee06340544ebab5db7719eff8f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1727190919
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1727190917}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.11419064, y: 0.110360235, z: -0.06653039}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1809386692
PrefabInstance:
m_ObjectHideFlags: 0
@ -4407,6 +4552,30 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 2575405121915875451, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2575405122300987958, guid: b6ada18f326c6ce42a0ba5a14fcc7bab, type: 3}
propertyPath: m_RootOrder
value: 4
@ -4528,6 +4697,54 @@ PrefabInstance:
propertyPath: m_Name
value: "\u529F\u7387\u5206\u6790\u4EEA"
objectReference: {fileID: 0}
- target: {fileID: 374605308445035511, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalScale.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalScale.y
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalScale.z
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalPosition.y
value: 2.31
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5122639689667783193, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 65b85753e53e4aa47aa5de69d225c66e, type: 3}
--- !u!1001 &1922206143
@ -5627,5 +5844,5 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

2
Assets/UIView/DiagnosticToolsView/Resources/DiagnosticToolsView.prefab
View File

@ -8505,7 +8505,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5037894687301674914}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:

46
Assets/Zion/Scripts/UIView/DiagnosticToolsView.cs
View File

@ -35,15 +35,37 @@ public class DiagnosticToolsView : UIView
private float typingSpeed = 0.05f;
#endregion
private List<GameObject> models = new List<GameObject>();
private EnhancedModelViewerOrbitCamera enhancedModelViewerOrbitCamera;
protected override void OnInit(IViewData data)
{
base.OnInit(data);
variables.Set<DiagnosticToolsView>("my_DiagnosticTools", this);
lineChart = variables.Get<RectTransform>("LineChart").GetComponent<LineChart>();
ModelsInit();
BtnInit();
InitLeftBtns();
}
void ModelsInit()
{
models.Clear();
GameObject trans = GameObject.Find("Tools");
if (trans != null)
{
for (int i = 0; i < trans.transform.childCount; i++)
{
models.Add(trans.transform.GetChild(i).gameObject);
models[i].SetActive(false);
}
}
models.RemoveAt(0);
models[0].Activate();
enhancedModelViewerOrbitCamera = Camera.main.GetComponent<EnhancedModelViewerOrbitCamera>();
enhancedModelViewerOrbitCamera.enabled = true;
}
void InitLeftBtns()
{
@ -86,6 +108,25 @@ public class DiagnosticToolsView : UIView
}
}
for (int i = 0; i < models.Count; i++)
{
if (i == index)
{
models[i].Activate();
enhancedModelViewerOrbitCamera.SetTarget(models[i].transform);
//modelSpreadController.SetTarget(models[i].transform);
}
else
{
models[i].Deactivate();
// 设置新按钮的选中
//SetSelectedButton(selectedButton);
}
}
//需要把模型加进来
//HideAllObjs();
//tools[index].Activate();
@ -155,10 +196,10 @@ public class DiagnosticToolsView : UIView
variables.Get<Button>("导入数据").onClick.AddListener(UploadFile);
}
/// <summary>
/// <summary>
/// 上传附件
/// </summary>
private void UploadFile()
@ -238,6 +279,7 @@ public class DiagnosticToolsView : UIView
/// </summary>
private void Return()
{
enhancedModelViewerOrbitCamera.enabled = false;
base.Unload();
Load<HighEnergyConsumptionSTView>();
}

16
UserSettings/EditorUserSettings.asset
View File

@ -12,26 +12,26 @@ EditorUserSettings:
value: 0001040353560b0c5c5d5520457506444e164e7f782973677e2c4435bab0316c
flags: 0
RecentlyUsedSceneGuid-2:
value: 0655560204535c595b0c5a264975084447151a73747e22682c7a4536b7b46d6c
flags: 0
RecentlyUsedSceneGuid-3:
value: 0009010551005859550d5c76417a0d44414e4b7e74297735742f1862e3b8673d
flags: 0
RecentlyUsedSceneGuid-4:
RecentlyUsedSceneGuid-3:
value: 5701055e57565e5e0f085d7344730644134f4b2e2d7a72322b784435b7b56c6b
flags: 0
RecentlyUsedSceneGuid-5:
RecentlyUsedSceneGuid-4:
value: 05030d5151000d0e085e547446710d444e151c2c787a73677f7c4931b0b56d3d
flags: 0
RecentlyUsedSceneGuid-6:
RecentlyUsedSceneGuid-5:
value: 5a53520253010a0b0f5d5870157b5d4441154e7b7b2a23667c2c4830b1e2606d
flags: 0
RecentlyUsedSceneGuid-7:
RecentlyUsedSceneGuid-6:
value: 5a54035507010c03545c5a2048750e4440164c787e7823627d2a4561e0b73568
flags: 0
RecentlyUsedSceneGuid-8:
RecentlyUsedSceneGuid-7:
value: 060607535d0d0a5d5b5a5e72497a0c44144e1a7c7b2e24647a7b4d32b7e56169
flags: 0
RecentlyUsedSceneGuid-8:
value: 0655560204535c595b0c5a264975084447151a73747e22682c7a4536b7b46d6c
flags: 0
RecentlyUsedSceneGuid-9:
value: 0202035457065d5e590d0f75477a0844144e4b727a7e76337e2b4560e7e16068
flags: 0

74
UserSettings/Layouts/CurrentMaximizeLayout.dwlt
View File

@ -25,7 +25,7 @@ MonoBehaviour:
m_MinSize: {x: 400, y: 200}
m_MaxSize: {x: 32384, y: 16192}
vertical: 0
controlID: 5474
controlID: 10316
--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
@ -47,9 +47,9 @@ MonoBehaviour:
m_Pos:
serializedVersion: 2
x: 0
y: 602
y: 674
width: 706
height: 407
height: 335
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -98,22 +98,22 @@ MonoBehaviour:
x: 0
y: 21
width: 706
height: 386
m_Scale: {x: 0.35740742, y: 0.35740742}
m_Translation: {x: 353, y: 193}
height: 314
m_Scale: {x: 0.29074073, y: 0.29074073}
m_Translation: {x: 353, y: 157}
m_MarginLeft: 0
m_MarginRight: 0
m_MarginTop: 0
m_MarginBottom: 0
m_LastShownAreaInsideMargins:
serializedVersion: 2
x: -987.66833
x: -1214.1401
y: -540
width: 1975.3367
width: 2428.2803
height: 1080
m_MinimalGUI: 1
m_defaultScale: 0.35740742
m_LastWindowPixelSize: {x: 706, y: 407}
m_defaultScale: 0.29074073
m_LastWindowPixelSize: {x: 706, y: 335}
m_ClearInEditMode: 1
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 00000000000000000000
@ -143,7 +143,7 @@ MonoBehaviour:
m_MinSize: {x: 100, y: 200}
m_MaxSize: {x: 8096, y: 16192}
vertical: 1
controlID: 5475
controlID: 10317
--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
@ -162,7 +162,7 @@ MonoBehaviour:
x: 0
y: 0
width: 707
height: 529
height: 601
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 5}
@ -194,7 +194,7 @@ MonoBehaviour:
x: 0
y: 73
width: 706
height: 508
height: 580
m_ViewDataDictionary: {fileID: 0}
m_OverlayCanvas:
m_LastAppliedPresetName: Default
@ -463,9 +463,9 @@ MonoBehaviour:
m_PlayAudio: 0
m_AudioPlay: 0
m_Position:
m_Target: {x: -1.4542392, y: -1.9387997, z: -7.739529}
m_Target: {x: -0.00000011920929, y: 2.54, z: -0.000087440014}
speed: 2
m_Value: {x: -1.4542392, y: -1.9387997, z: -7.739529}
m_Value: {x: -0.00000011920929, y: 2.54, z: -0.000087440014}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@ -512,13 +512,13 @@ MonoBehaviour:
m_GridAxis: 1
m_gridOpacity: 0.5
m_Rotation:
m_Target: {x: -0.0024754077, y: -0.98894346, z: 0.14734288, w: -0.016616998}
m_Target: {x: 0.075792566, y: 0.47633746, z: -0.04125933, w: 0.8750209}
speed: 2
m_Value: {x: -0.0024754063, y: -0.98894286, z: 0.14734279, w: -0.016616989}
m_Value: {x: 0.07579235, y: 0.4763361, z: -0.04125921, w: 0.8750184}
m_Size:
m_Target: 7.640584
m_Target: 3.8078005
speed: 2
m_Value: 7.640584
m_Value: 3.8078005
m_Ortho:
m_Target: 0
speed: 2
@ -624,9 +624,9 @@ MonoBehaviour:
m_Position:
serializedVersion: 2
x: 0
y: 529
y: 601
width: 707
height: 428
height: 356
m_MinSize: {x: 201, y: 221}
m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 2}
@ -658,7 +658,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
controlID: 5348
controlID: 10346
--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
@ -717,23 +717,23 @@ MonoBehaviour:
m_SceneHierarchy:
m_TreeViewState:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 806cfeff
m_LastClickedID: -103296
m_ExpandedIDs: 283afeffca81feff5696feff28b0feff2ab0feffb0e3feff56e5feffc6b0010000b30100
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: 1a92fdff5092fdff7e92fdff00cafdff9ecbfdff7ccffdff98fefdffca81feff5696feff28b0feff2ab0feffb0e3feff56e5fefff4ffffffc6b0010000b301001cf101008cf10100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name: "\u5E72\u71E5\u673A"
m_OriginalName: "\u5E72\u71E5\u673A"
m_Name:
m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
m_UserData: -116184
m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 9}
m_SearchString:
@ -809,7 +809,7 @@ MonoBehaviour:
m_SkipHidden: 0
m_SearchArea: 1
m_Folders:
- Assets/GameAssets/Prefabs
- Assets/UIView/DiagnosticToolsView/Resources
m_Globs: []
m_OriginalText:
m_FilterByTypeIntersection: 0
@ -824,7 +824,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs: 287a0300
m_LastClickedID: 227880
m_ExpandedIDs: ffffffff7aaf0100a0af0100aaaf01003ab401003eb4010050b40100
m_ExpandedIDs: ffffffff7aaf0100aaaf0100b8af0100c0af01003ab401003eb4010050b4010080d601008ad60100a8d70100a4de0100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -849,10 +849,10 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_AssetTreeState:
scrollPos: {x: 0, y: 54}
m_SelectedIDs: 806cfeff
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
m_ExpandedIDs: ffffffff7aaf0100a0af0100aaaf01003ab401003eb4010050b40100
m_ExpandedIDs: ffffffff7aaf0100aaaf0100b8af0100c0af01003ab401003eb4010050b4010080d601008ad60100a8d70100a4de0100
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@ -877,8 +877,8 @@ MonoBehaviour:
m_Icon: {fileID: 0}
m_ResourceFile:
m_ListAreaState:
m_SelectedInstanceIDs: 806cfeff
m_LastClickedInstanceID: -103296
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs:
m_RenameOverlay:
@ -968,7 +968,7 @@ MonoBehaviour:
m_ObjectsLockedBeforeSerialization: []
m_InstanceIDsLockedBeforeSerialization:
m_PreviewResizer:
m_CachedPref: 548
m_CachedPref: -524
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1