From 9f9b12d8d48f1d772d85c19cef93be4af6a73ee6 Mon Sep 17 00:00:00 2001 From: YDL <1368269699@qq.com> Date: Fri, 12 Apr 2024 14:58:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=95=B0=E6=8D=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=94=B9=E4=B8=BAUI=E8=8F=9C=E5=8D=95=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=B0=B1=E6=98=BE=E7=A4=BA,=E5=AE=8C=E4=BA=8B?= =?UTF-8?q?=E5=86=8D=E5=81=9A=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIViews/SmokeSystemMenuPanel.prefab | 237 ++- .../UIViews/WaterSystemMenuPanel.prefab | 1363 ++++++++++++++++- Assets/Scripts/ANet/DeviceBind.cs | 4 +- Assets/Scripts/ANet/DeviceInfo.cs | 21 +- Assets/Scripts/ANet/DeviceMenuToggle.cs | 29 + Assets/Scripts/ANet/DeviceMenuToggle.cs.meta | 11 + Assets/Scripts/ANet/DeviceObj.cs | 5 + Assets/Scripts/ANet/DevicePanelManager.cs | 288 ++-- Assets/Scripts/ANet/Prefabs.meta | 8 + .../ANet/{ => Prefabs}/DeviceInfo.prefab | 0 .../ANet/{ => Prefabs}/DeviceInfo.prefab.meta | 0 .../ANet/{ => Prefabs}/DeviceInfoItem.prefab | 0 .../{ => Prefabs}/DeviceInfoItem.prefab.meta | 0 .../ANet/{ => Prefabs}/DeviceItem.prefab | 0 .../ANet/{ => Prefabs}/DeviceItem.prefab.meta | 0 .../Scripts/ANet/{ => Prefabs}/Devices.prefab | 0 .../ANet/{ => Prefabs}/Devices.prefab.meta | 0 Assets/Scripts/EquipmentController.cs | 18 +- .../UIManager/View/WaterSystemMenuPanel.cs | 8 + 19 files changed, 1720 insertions(+), 272 deletions(-) create mode 100644 Assets/Scripts/ANet/DeviceMenuToggle.cs create mode 100644 Assets/Scripts/ANet/DeviceMenuToggle.cs.meta create mode 100644 Assets/Scripts/ANet/Prefabs.meta rename Assets/Scripts/ANet/{ => Prefabs}/DeviceInfo.prefab (100%) rename Assets/Scripts/ANet/{ => Prefabs}/DeviceInfo.prefab.meta (100%) rename Assets/Scripts/ANet/{ => Prefabs}/DeviceInfoItem.prefab (100%) rename Assets/Scripts/ANet/{ => Prefabs}/DeviceInfoItem.prefab.meta (100%) rename Assets/Scripts/ANet/{ => Prefabs}/DeviceItem.prefab (100%) rename Assets/Scripts/ANet/{ => Prefabs}/DeviceItem.prefab.meta (100%) rename Assets/Scripts/ANet/{ => Prefabs}/Devices.prefab (100%) rename Assets/Scripts/ANet/{ => Prefabs}/Devices.prefab.meta (100%) diff --git a/Assets/Common/UIViews/SmokeSystemMenuPanel.prefab b/Assets/Common/UIViews/SmokeSystemMenuPanel.prefab index db66fed..892b5a0 100644 --- a/Assets/Common/UIViews/SmokeSystemMenuPanel.prefab +++ b/Assets/Common/UIViews/SmokeSystemMenuPanel.prefab @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &8255146214669565358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4999091202410805330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 451 --- !u!1 &1284425863110501170 GameObject: m_ObjectHideFlags: 0 @@ -34,6 +47,7 @@ RectTransform: - {fileID: 1325331408989018968} - {fileID: 4626956716126372069} - {fileID: 7775960828792048586} + - {fileID: 6646158883303316946} m_Father: {fileID: 4605042051543821276} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -94,6 +108,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 1 +--- !u!114 &5608643362048250933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 850222240561995019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 453 --- !u!1 &5129777507806714983 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +184,19 @@ MonoBehaviour: AirVentToggle: {fileID: 7226065830476652015} SmokeExtractionFanToggle: {fileID: 3898676836414080594} SmokeVentToggle: {fileID: 2145228960572886397} +--- !u!114 &6553844113038112468 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1711717827286548540} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 452 --- !u!1001 &1043810148363852483 PrefabInstance: m_ObjectHideFlags: 0 @@ -326,6 +366,12 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!1 &4999091202410805330 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 1043810148363852483} + m_PrefabAsset: {fileID: 0} --- !u!224 &1339583546896267403 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, @@ -338,7 +384,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 1043810148363852483} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 4999091202410805330} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} @@ -531,6 +577,187 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &4670397351121174426 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u8865\u98CE\u673A" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u6392\u70DF\u53E3" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: BFJ + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!1 &850222240561995019 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 4670397351121174426} + m_PrefabAsset: {fileID: 0} +--- !u!224 &6646158883303316946 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 4670397351121174426} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6691561184422486701 PrefabInstance: m_ObjectHideFlags: 0 @@ -700,6 +927,12 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!1 &1711717827286548540 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 6691561184422486701} + m_PrefabAsset: {fileID: 0} --- !u!224 &4626956716126372069 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, @@ -712,7 +945,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 6691561184422486701} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1711717827286548540} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} diff --git a/Assets/Common/UIViews/WaterSystemMenuPanel.prefab b/Assets/Common/UIViews/WaterSystemMenuPanel.prefab index be6dbaf..7e8d7e9 100644 --- a/Assets/Common/UIViews/WaterSystemMenuPanel.prefab +++ b/Assets/Common/UIViews/WaterSystemMenuPanel.prefab @@ -1,5 +1,44 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &5216516200228197703 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5491878225740924494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 302 +--- !u!114 &5753718986114863029 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4999091202410805330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 258 +--- !u!114 &3712649281003440849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4918475016567026391} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 401 --- !u!1 &1284425863110501170 GameObject: m_ObjectHideFlags: 0 @@ -31,9 +70,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1339583546896267403} + - {fileID: 1420481211470459406} + - {fileID: 7766765614576806387} - {fileID: 1325331408989018968} - {fileID: 4626956716126372069} - {fileID: 7775960828792048586} + - {fileID: 1999718025723496087} + - {fileID: 3989003432800127749} + - {fileID: 5306286037919952516} + - {fileID: 7921042826123321904} - {fileID: 6575926235426472060} m_Father: {fileID: 4605042051543821276} m_RootOrder: 0 @@ -95,6 +140,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AllowSwitchOff: 1 +--- !u!114 &1645619344213886205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6966144664123591644} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 301 --- !u!1 &5129777507806714983 GameObject: m_ObjectHideFlags: 0 @@ -155,11 +213,52 @@ MonoBehaviour: m_EditorClassIdentifier: ViewType: 0 PumpRoomToggle: {fileID: 7258546201478757948} + SXToggle: {fileID: 7321218370966353081} + PLBToggle: {fileID: 2154331811248009028} IndoorHydrantToggle: {fileID: 7226065830476652015} PumpAdapterToggle: {fileID: 3898676836414080594} OutdoorHydrantToggle: {fileID: 2145228960572886397} DiagramToggle: {fileID: 3273768802211792587} ---- !u!1001 &1043810148363852483 +--- !u!114 &8189062273613189534 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2185593669033733725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 305 +--- !u!114 &3703972888256502666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4186743116913500905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 304 +--- !u!114 &4938949217699472038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4341020306209368362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3} + m_Name: + m_EditorClassIdentifier: + menuType: 256 +--- !u!1001 &516540790867535071 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -179,7 +278,7 @@ PrefabInstance: - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Text - value: "\u6CF5\u623F/\u6C34\u7BB1" + value: "\u6D88\u9632\u4E3B\u7BA1\u7F51" objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -194,7 +293,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_RootOrder - value: 0 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -319,7 +418,7 @@ PrefabInstance: - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Name - value: PumpRoom + value: XFGW objectReference: {fileID: 0} - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -328,25 +427,19 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} ---- !u!224 &1339583546896267403 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, +--- !u!1 &5491878225740924494 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 1043810148363852483} + m_PrefabInstance: {fileID: 516540790867535071} m_PrefabAsset: {fileID: 0} ---- !u!114 &7258546201478757948 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, +--- !u!224 &1999718025723496087 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 1043810148363852483} + m_PrefabInstance: {fileID: 516540790867535071} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1049327764297758992 +--- !u!1001 &1043810148363852483 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -366,7 +459,7 @@ PrefabInstance: - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Text - value: "\u5BA4\u5185\u6D88\u706B\u6813" + value: "\u6C34\u6CF5" objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -381,7 +474,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -406,7 +499,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -476,7 +569,7 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_text - value: "\u5BA4\u5185\u6D88\u706B\u6813" + value: "\u6CF5\u623F/\u6C34\u7BB1" objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -491,12 +584,12 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_textInfo.wordCount - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_textInfo.materialCount - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -506,7 +599,7 @@ PrefabInstance: - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Name - value: IndoorHydrant + value: ShuiBeng objectReference: {fileID: 0} - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -515,25 +608,31 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} ---- !u!224 &1325331408989018968 stripped +--- !u!1 &4999091202410805330 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 1043810148363852483} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1339583546896267403 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 1049327764297758992} + m_PrefabInstance: {fileID: 1043810148363852483} m_PrefabAsset: {fileID: 0} ---- !u!114 &7226065830476652015 stripped +--- !u!114 &7258546201478757948 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 1049327764297758992} + m_PrefabInstance: {fileID: 1043810148363852483} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 4999091202410805330} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &5163678229342265908 +--- !u!1001 &1049327764297758992 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -553,7 +652,7 @@ PrefabInstance: - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Text - value: "\u4F9B\u6C34\u5173\u7CFB\u56FE" + value: "\u5BA4\u5185\u6D88\u706B\u6813" objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -568,7 +667,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -663,7 +762,7 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_text - value: "\u4F9B\u6C34\u5173\u7CFB\u56FE" + value: "\u5BA4\u5185\u6D88\u706B\u6813" objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -693,7 +792,7 @@ PrefabInstance: - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Name - value: Diagram + value: IndoorHydrant objectReference: {fileID: 0} - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -702,17 +801,17 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} ---- !u!224 &6575926235426472060 stripped +--- !u!224 &1325331408989018968 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 5163678229342265908} + m_PrefabInstance: {fileID: 1049327764297758992} m_PrefabAsset: {fileID: 0} ---- !u!114 &3273768802211792587 stripped +--- !u!114 &7226065830476652015 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 5163678229342265908} + m_PrefabInstance: {fileID: 1049327764297758992} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -720,7 +819,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &6691561184422486701 +--- !u!1001 &1107291553049169990 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -740,7 +839,7 @@ PrefabInstance: - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Text - value: "\u6C34\u6CF5\u63A5\u5408\u5668" + value: "\u6C34\u7BB1" objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -755,7 +854,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -780,7 +879,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_SizeDelta.x - value: 120 + value: 80 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -850,7 +949,7 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_text - value: "\u6C34\u6CF5\u63A5\u5408\u5668" + value: "\u6CF5\u623F/\u6C34\u7BB1" objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -865,12 +964,12 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_textInfo.wordCount - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_textInfo.materialCount - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -880,7 +979,7 @@ PrefabInstance: - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Name - value: PumpAdapter + value: ShuiXiang objectReference: {fileID: 0} - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -889,25 +988,31 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} ---- !u!224 &4626956716126372069 stripped +--- !u!1 &4918475016567026391 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 1107291553049169990} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1420481211470459406 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 6691561184422486701} + m_PrefabInstance: {fileID: 1107291553049169990} m_PrefabAsset: {fileID: 0} ---- !u!114 &3898676836414080594 stripped +--- !u!114 &7321218370966353081 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 6691561184422486701} + m_PrefabInstance: {fileID: 1107291553049169990} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 4918475016567026391} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &8575610992201427330 +--- !u!1001 &3148221280227223885 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -927,7 +1032,7 @@ PrefabInstance: - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Text - value: "\u5BA4\u5916\u6D88\u706B\u6813" + value: "\u55B7\u6DCB\u4E3B\u7BA1\u7F51" objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -942,7 +1047,7 @@ PrefabInstance: - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_RootOrder - value: 3 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -1037,7 +1142,7 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_text - value: "\u5BA4\u5916\u6D88\u706B\u6813" + value: "\u6CF5\u623F/\u6C34\u7BB1" objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -1052,12 +1157,12 @@ PrefabInstance: - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_textInfo.wordCount - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_textInfo.materialCount - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -1067,7 +1172,7 @@ PrefabInstance: - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} propertyPath: m_Name - value: OutdoorHydrant + value: PLGW objectReference: {fileID: 0} - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} @@ -1076,21 +1181,1131 @@ PrefabInstance: objectReference: {fileID: 7264114960646921176} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} ---- !u!224 &7775960828792048586 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, +--- !u!1 &6966144664123591644 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 8575610992201427330} + m_PrefabInstance: {fileID: 3148221280227223885} m_PrefabAsset: {fileID: 0} ---- !u!114 &2145228960572886397 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, +--- !u!224 &3989003432800127749 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} - m_PrefabInstance: {fileID: 8575610992201427330} + m_PrefabInstance: {fileID: 3148221280227223885} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5163678229342265908 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u4F9B\u6C34\u5173\u7CFB\u56FE" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u4F9B\u6C34\u5173\u7CFB\u56FE" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: Diagram + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!114 &3273768802211792587 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 5163678229342265908} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &6575926235426472060 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 5163678229342265908} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6145378185267383500 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u6D88\u706B\u6813\u672B\u7AEF" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u6CF5\u623F/\u6C34\u7BB1" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: XHSMD + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!1 &2185593669033733725 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 6145378185267383500} + m_PrefabAsset: {fileID: 0} +--- !u!224 &5306286037919952516 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 6145378185267383500} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6691561184422486701 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u6C34\u6CF5\u63A5\u5408\u5668" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u6C34\u6CF5\u63A5\u5408\u5668" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: PumpAdapter + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!114 &3898676836414080594 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 6691561184422486701} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &4626956716126372069 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 6691561184422486701} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8144269081603063928 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u55B7\u6DCB\u672B\u7AEF" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u6CF5\u623F/\u6C34\u7BB1" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: PLMD + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!1 &4186743116913500905 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8144269081603063928} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7921042826123321904 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8144269081603063928} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8575610992201427330 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u5BA4\u5916\u6D88\u706B\u6813" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 120 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u5BA4\u5916\u6D88\u706B\u6813" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: OutdoorHydrant + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!114 &2145228960572886397 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8575610992201427330} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7775960828792048586 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8575610992201427330} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8584542324565527483 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3568763422270519259} + m_Modifications: + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 0} + - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 0} + - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Text + value: "\u55B7\u6DCB\u6CF5" + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.x + value: 80 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_SizeDelta.y + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_text + value: "\u6CF5\u623F/\u6C34\u7BB1" + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.lineCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.pageCount + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.wordCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.materialCount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_textInfo.characterCount + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Name + value: PenLinBeng + objectReference: {fileID: 0} + - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + propertyPath: m_Group + value: + objectReference: {fileID: 7264114960646921176} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3} +--- !u!114 &2154331811248009028 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8584542324565527483} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4341020306209368362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &7766765614576806387 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8584542324565527483} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4341020306209368362 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe, + type: 3} + m_PrefabInstance: {fileID: 8584542324565527483} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Scripts/ANet/DeviceBind.cs b/Assets/Scripts/ANet/DeviceBind.cs index 1db8002..73cc4ba 100644 --- a/Assets/Scripts/ANet/DeviceBind.cs +++ b/Assets/Scripts/ANet/DeviceBind.cs @@ -12,7 +12,7 @@ public class DeviceBind : MonoBehaviour public Text Title; public Button CloseBtn; - public void DataBind(DeviceType bindType, List binddata, string bindobj = null) + public void DataBind(DeviceType bindType, List binddata, string bindobjname = null) { Title.text = bindType.ToString() + "列表"; Binddata = binddata; @@ -35,7 +35,7 @@ public class DeviceBind : MonoBehaviour { if (de.DeviceId == item.deviceNo) { - if (de.ObjName == bindobj) + if (de.ObjName == bindobjname) { showColor = Color.red; } diff --git a/Assets/Scripts/ANet/DeviceInfo.cs b/Assets/Scripts/ANet/DeviceInfo.cs index 504c560..cbb4370 100644 --- a/Assets/Scripts/ANet/DeviceInfo.cs +++ b/Assets/Scripts/ANet/DeviceInfo.cs @@ -50,7 +50,7 @@ public class DeviceInfo : MonoBehaviour GameObject go = Instantiate(infoItem, infoParent); go.GetComponent().Bind("类型 : " + infobase.deviceTypeName); } - if (info.deviceType == 256 || info.deviceType == 258) + if (info.deviceType == (int)DeviceType.水泵 || info.deviceType == (int)DeviceType.喷淋泵) { PLInfo pinfo = JsonConvert.DeserializeObject(info.timelyData.ToString()); { @@ -71,7 +71,7 @@ public class DeviceInfo : MonoBehaviour go.GetComponent().Bind("启停状态 : " + (pinfo.startStopStatus == "0" ? "停止" : "启动")); } } - else if (info.deviceType == 401) + else if (info.deviceType == (int)DeviceType.水箱) { SXInfo pinfo = JsonConvert.DeserializeObject(info.timelyData.ToString()); { @@ -83,9 +83,10 @@ public class DeviceInfo : MonoBehaviour go.GetComponent().Bind("预警状态 : " + (pinfo.alarmStatus == "0" ? "正常" : "告警")); } } - else if (info.deviceType == 305) + else if (info.deviceType == (int)DeviceType.消火末端|| info.deviceType == (int)DeviceType.消防主管网 + || info.deviceType == (int)DeviceType.喷淋末端 || info.deviceType == (int)DeviceType.喷淋主管网) { - XHSInfo pinfo = JsonConvert.DeserializeObject(info.timelyData.ToString()); + XHSMDInfo pinfo = JsonConvert.DeserializeObject(info.timelyData.ToString()); { GameObject go = Instantiate(infoItem, infoParent); go.GetComponent().Bind("压力 : " + pinfo.pressure); @@ -104,6 +105,16 @@ public class DeviceInfo : MonoBehaviour go.GetComponent().Bind("描述 : " + infobase.descript); } gameObject.SetActive(true); + StopAllCoroutines(); + StartCoroutine(Refresh()); + } + IEnumerator Refresh() + { + DevicePanelManager.Instance.RefreshData(); + yield return new WaitForSeconds(5); + Debug.Log("刷新"); + var data = DevicePanelManager.Instance.GetDeviceData(bindInfo); + OnShow(data); } } public class InfoBase @@ -133,7 +144,7 @@ public class PLInfo : InfoBase public string powerState; public string manualAutomaticState; } -public class XHSInfo : InfoBase +public class XHSMDInfo : InfoBase { public string pressure; public string alarmStatus; diff --git a/Assets/Scripts/ANet/DeviceMenuToggle.cs b/Assets/Scripts/ANet/DeviceMenuToggle.cs new file mode 100644 index 0000000..2966892 --- /dev/null +++ b/Assets/Scripts/ANet/DeviceMenuToggle.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent(typeof(Toggle))] +public class DeviceMenuToggle : MonoBehaviour +{ + public DeviceType menuType; + private Toggle M_toggle; + void Start() + { + M_toggle = GetComponent(); + M_toggle.onValueChanged.AddListener(M_toggle_ValueChanged); + } + + private void M_toggle_ValueChanged(bool isOn) + { + if (isOn) + { + DevicePanelManager.Instance.ShowBindList(menuType); + } + else + { + DevicePanelManager.Instance.ShowBindList(DeviceType.空); + } + } +} diff --git a/Assets/Scripts/ANet/DeviceMenuToggle.cs.meta b/Assets/Scripts/ANet/DeviceMenuToggle.cs.meta new file mode 100644 index 0000000..b8f679e --- /dev/null +++ b/Assets/Scripts/ANet/DeviceMenuToggle.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d52e25c232aba6a42a4bd0e25637df8b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ANet/DeviceObj.cs b/Assets/Scripts/ANet/DeviceObj.cs index 64b89fb..fbcac55 100644 --- a/Assets/Scripts/ANet/DeviceObj.cs +++ b/Assets/Scripts/ANet/DeviceObj.cs @@ -20,4 +20,9 @@ public class DeviceObj : MonoBehaviour } DevicePanelManager.Instance.ShowBindList(BindType, this); } + public void ShowList() + { + DevicePanelManager.Instance.ShowBindList(BindType, this); + } } + diff --git a/Assets/Scripts/ANet/DevicePanelManager.cs b/Assets/Scripts/ANet/DevicePanelManager.cs index 66090c5..d04b58b 100644 --- a/Assets/Scripts/ANet/DevicePanelManager.cs +++ b/Assets/Scripts/ANet/DevicePanelManager.cs @@ -173,12 +173,16 @@ public class DeviceList public enum DeviceType { 空 = 0, - 水泵, - 水箱, - 消火栓, - 喷淋泵, - 排烟风机, - 送风机 + 水泵 = 258,// + 喷淋泵 = 256,// + 水箱 = 401,// + 消火末端 = 305,// + 喷淋末端 = 304,// + 喷淋主管网 = 301,// + 消防主管网 = 302,// + 送风机 = 451, + 排烟风机 = 452, + 补风机 = 453, } public class DevicePanelManager : MonoBehaviour { @@ -193,19 +197,14 @@ public class DevicePanelManager : MonoBehaviour private int pageSize = 100000; private long buildId = 1162809597414907904;//凯德虹口商业中心--大型城市综合体 private long buildId1 = 1162809590251036672;//凯德虹口商业中心-超高层 - //private string diveceId = "256"; - public List ShuiBengList = new List(); - public List ShuiXiangList = new List(); - public List XHSList = new List(); - public List PenLinBengList = new List(); - public List PaiYanJiList = new List(); - public List SongFengJiList = new List(); + //服务端获取全部数据 + public List>> AllData = new List>>(); + public DeviceType textType; #endregion #region 本地数据绑定 public List BindObjectList = new List(); public DeviceObj NowClickObject; public DeviceType NowType; - private string objPath = "/DeviceObj.json"; private string objId = "binddataid"; #endregion void Awake() @@ -217,90 +216,102 @@ public class DevicePanelManager : MonoBehaviour LoadDeciceData(); LoadDeviceObjConfig(); } - - private void LoadDeciceData() + public void RefreshData() { - ShuiBengList.Clear(); - ShuiXiangList.Clear(); - XHSList.Clear(); - PenLinBengList.Clear(); - PaiYanJiList.Clear(); - SongFengJiList.Clear(); - - LoadDiviceData(buildId, "258", DeviceType.水泵); - LoadDiviceData(buildId, "401", DeviceType.水箱); - LoadDiviceData(buildId, "305", DeviceType.消火栓); - LoadDiviceData(buildId, "256", DeviceType.喷淋泵); - LoadDiviceData(buildId, "452", DeviceType.排烟风机); - LoadDiviceData(buildId, "451", DeviceType.送风机); - - LoadDiviceData(buildId1, "258", DeviceType.水泵); - LoadDiviceData(buildId1, "401", DeviceType.水箱); - LoadDiviceData(buildId1, "305", DeviceType.消火栓); - LoadDiviceData(buildId1, "256", DeviceType.喷淋泵); - LoadDiviceData(buildId1, "452", DeviceType.排烟风机); - LoadDiviceData(buildId1, "451", DeviceType.送风机); + LoadDeciceData(); } - private void LateUpdate() + public DeviceList GetDeviceData(DeviceList data) { - //if (Input.GetKeyDown(KeyCode.L)) - //{ - // LoadDiviceData(buildId, "258", DeviceType.水泵); - //} - //if (Input.GetKeyDown(KeyCode.T)) - //{ - // StopAllCoroutines(); - // StartCoroutine(waitToBind(DeviceType.喷淋泵, PenLinBengList)); - //} - //if (Input.GetKeyDown(KeyCode.A)) - //{ - // StopAllCoroutines(); - // StartCoroutine(waitToBind(DeviceType.排烟风机, PaiYanJiList)); - //} - //if (Input.GetKeyDown(KeyCode.S)) - //{ - // StopAllCoroutines(); - // StartCoroutine(waitToBind(DeviceType.水泵, ShuiBengList)); - //} - //if (Input.GetKeyDown(KeyCode.D)) - //{ - // StopAllCoroutines(); - // StartCoroutine(waitToBind(DeviceType.水箱, ShuiXiangList)); - //} - //if (Input.GetKeyDown(KeyCode.F)) - //{ - // StopAllCoroutines(); - // StartCoroutine(waitToBind(DeviceType.消火栓, XHSList)); - //} + foreach (var item in AllData) + { + foreach (var value in item.Value) + { + if (value.deviceNo == data.deviceNo) + { + data = value; + break; + } + } + } + return data; } - public void ShowBindList(DeviceType type, DeviceObj selectObject) + private void LoadDeciceData() { - StopAllCoroutines(); - NowClickObject = selectObject; - NowType = type; - if (type == DeviceType.水泵) + AllData.Clear(); + foreach (DeviceType i in Enum.GetValues(typeof(DeviceType))) { - StartCoroutine(waitToBind(DeviceType.水泵, ShuiBengList)); + if (i != DeviceType.空) + { + KeyValuePair> info = new KeyValuePair>( + i, new List()); + AllData.Add(info); + } } - else if (type == DeviceType.水箱) + foreach (var item in AllData) { - StartCoroutine(waitToBind(DeviceType.水箱, ShuiXiangList)); + int iType = (int)item.Key; + LoadDiviceData(buildId, iType.ToString(), item.Key); + LoadDiviceData(buildId1, iType.ToString(), item.Key); } - else if (type == DeviceType.消火栓) + } + private void LateUpdate() + { + + if(Input.GetKeyDown(KeyCode.T)) { - StartCoroutine(waitToBind(DeviceType.消火栓, XHSList)); + ShowBindList(textType); } - else if (type == DeviceType.喷淋泵) + } + + public void ShowBindList(DeviceType type) + { + StopAllCoroutines(); + NowClickObject = null; + NowType = type; + if (type != DeviceType.空) { - StartCoroutine(waitToBind(DeviceType.喷淋泵, PenLinBengList)); + List infoList = new List(); + foreach (var item in AllData) + { + if (item.Key == type) + { + foreach (var value in item.Value) + { + infoList.Add(value); + } + break; + } + } + StartCoroutine(waitToBind(type, infoList)); } - else if (type == DeviceType.排烟风机) + else { - StartCoroutine(waitToBind(DeviceType.排烟风机, PaiYanJiList)); + foreach (Transform item in transform) + { + item.gameObject.SetActive(false); + } } - else if (type == DeviceType.送风机) + } + public void ShowBindList(DeviceType type, DeviceObj selectObject) + { + StopAllCoroutines(); + NowClickObject = selectObject; + NowType = type; + if (type != DeviceType.空) { - StartCoroutine(waitToBind(DeviceType.送风机, SongFengJiList)); + List infoList = new List(); + foreach (var item in AllData) + { + if (item.Key == type) + { + foreach (var value in item.Value) + { + infoList.Add(value); + } + break; + } + } + StartCoroutine(waitToBind(type, infoList)); } else { @@ -318,7 +329,7 @@ public class DevicePanelManager : MonoBehaviour { if (item.GetComponent() && item.GetComponent().BindType == type) { - item.GetComponent().DataBind(type, bindData, NowClickObject.name); + item.GetComponent().DataBind(type, bindData, null == NowClickObject ? null : NowClickObject.name); has = true; } else @@ -330,7 +341,7 @@ public class DevicePanelManager : MonoBehaviour { var go = Instantiate(DeviceBindPrefab, transform); go.name = type.ToString(); - go.GetComponent().DataBind(type, bindData, NowClickObject.name); + go.GetComponent().DataBind(type, bindData, null == NowClickObject ? null : NowClickObject.name); } } private void LoadDiviceData(long buildId, string diviceId, DeviceType type) @@ -357,55 +368,22 @@ public class DevicePanelManager : MonoBehaviour Post($"{baseHttpUrl}?appKey={key}", postData, (d) => { Debug.Log(d.code); - if (type == DeviceType.水泵) - { - foreach (var item in d.data.list) - { - ShuiBengList.Add(item); - } - } - else if (type == DeviceType.水箱) - { - //ShuiXiangList = d.data.list; - foreach (var item in d.data.list) - { - ShuiXiangList.Add(item); - } - } - else if (type == DeviceType.消火栓) + foreach (var item in d.data.list) { - //XHSList = d.data.list; - foreach (var item in d.data.list) + foreach (var data in AllData) { - XHSList.Add(item); - } - } - else if (type == DeviceType.喷淋泵) - { - //PenLinBengList = d.data.list; - foreach (var item in d.data.list) - { - PenLinBengList.Add(item); - } - } - else if (type == DeviceType.排烟风机) - { - //PaiYanJiList = d.data.list; - foreach (var item in d.data.list) - { - PaiYanJiList.Add(item); - } - } - else if (type == DeviceType.送风机) - { - foreach (var item in d.data.list) - { - SongFengJiList.Add(item); + if (data.Key == type) + { + if (!data.Value.Contains(item)) + { + data.Value.Add(item); + } + } } } }, (a, b) => { - Debug.Log(a + b); + Debug.LogError(a + b); }); } else @@ -413,55 +391,19 @@ public class DevicePanelManager : MonoBehaviour PostJson($"?appKey={key}", postData, (d) => { Debug.Log(d.code); - if (type == DeviceType.水泵) - { - foreach (var item in d.data.list) - { - ShuiBengList.Add(item); - } - } - else if (type == DeviceType.水箱) - { - //ShuiXiangList = d.data.list; - foreach (var item in d.data.list) - { - ShuiXiangList.Add(item); - } - } - else if (type == DeviceType.消火栓) - { - //XHSList = d.data.list; - foreach (var item in d.data.list) - { - XHSList.Add(item); - } - } - else if (type == DeviceType.喷淋泵) - { - //PenLinBengList = d.data.list; - foreach (var item in d.data.list) - { - PenLinBengList.Add(item); - } - } - else if (type == DeviceType.排烟风机) + foreach (var item in d.data.list) { - //PaiYanJiList = d.data.list; - foreach (var item in d.data.list) + foreach (var data in AllData) { - PaiYanJiList.Add(item); - } - } - else if (type == DeviceType.送风机) - { - foreach (var item in d.data.list) - { - SongFengJiList.Add(item); + if (data.Key == type) + { + data.Value.Add(item); + } } } }, (a, b) => { - Debug.Log(a + b); + Debug.LogError(a + b); }); } } @@ -576,13 +518,13 @@ public class DevicePanelManager : MonoBehaviour } HttpManager.Instance.Get(url, d => { - Debug.Log("aaaaaaaaaaaaaaaaaaaaaa:" + d); + //Debug.Log("aaaaaaaaaaaaaaaaaaaaaa:" + d); BindObjectList = JsonConvert.DeserializeObject>(d); }); } catch { - Debug.Log("暂无数据!"); + Debug.LogError("暂无数据!"); } } public void SaveDeviceObjConfig(DeviceObjConfig config) @@ -612,4 +554,6 @@ public class DevicePanelManager : MonoBehaviour ShowBindList(NowType, NowClickObject); }); } + + } diff --git a/Assets/Scripts/ANet/Prefabs.meta b/Assets/Scripts/ANet/Prefabs.meta new file mode 100644 index 0000000..60ed46a --- /dev/null +++ b/Assets/Scripts/ANet/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19d0b5cc55a8d514cbf750d03b546b34 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ANet/DeviceInfo.prefab b/Assets/Scripts/ANet/Prefabs/DeviceInfo.prefab similarity index 100% rename from Assets/Scripts/ANet/DeviceInfo.prefab rename to Assets/Scripts/ANet/Prefabs/DeviceInfo.prefab diff --git a/Assets/Scripts/ANet/DeviceInfo.prefab.meta b/Assets/Scripts/ANet/Prefabs/DeviceInfo.prefab.meta similarity index 100% rename from Assets/Scripts/ANet/DeviceInfo.prefab.meta rename to Assets/Scripts/ANet/Prefabs/DeviceInfo.prefab.meta diff --git a/Assets/Scripts/ANet/DeviceInfoItem.prefab b/Assets/Scripts/ANet/Prefabs/DeviceInfoItem.prefab similarity index 100% rename from Assets/Scripts/ANet/DeviceInfoItem.prefab rename to Assets/Scripts/ANet/Prefabs/DeviceInfoItem.prefab diff --git a/Assets/Scripts/ANet/DeviceInfoItem.prefab.meta b/Assets/Scripts/ANet/Prefabs/DeviceInfoItem.prefab.meta similarity index 100% rename from Assets/Scripts/ANet/DeviceInfoItem.prefab.meta rename to Assets/Scripts/ANet/Prefabs/DeviceInfoItem.prefab.meta diff --git a/Assets/Scripts/ANet/DeviceItem.prefab b/Assets/Scripts/ANet/Prefabs/DeviceItem.prefab similarity index 100% rename from Assets/Scripts/ANet/DeviceItem.prefab rename to Assets/Scripts/ANet/Prefabs/DeviceItem.prefab diff --git a/Assets/Scripts/ANet/DeviceItem.prefab.meta b/Assets/Scripts/ANet/Prefabs/DeviceItem.prefab.meta similarity index 100% rename from Assets/Scripts/ANet/DeviceItem.prefab.meta rename to Assets/Scripts/ANet/Prefabs/DeviceItem.prefab.meta diff --git a/Assets/Scripts/ANet/Devices.prefab b/Assets/Scripts/ANet/Prefabs/Devices.prefab similarity index 100% rename from Assets/Scripts/ANet/Devices.prefab rename to Assets/Scripts/ANet/Prefabs/Devices.prefab diff --git a/Assets/Scripts/ANet/Devices.prefab.meta b/Assets/Scripts/ANet/Prefabs/Devices.prefab.meta similarity index 100% rename from Assets/Scripts/ANet/Devices.prefab.meta rename to Assets/Scripts/ANet/Prefabs/Devices.prefab.meta diff --git a/Assets/Scripts/EquipmentController.cs b/Assets/Scripts/EquipmentController.cs index 6fb047b..97ab8b6 100644 --- a/Assets/Scripts/EquipmentController.cs +++ b/Assets/Scripts/EquipmentController.cs @@ -11,7 +11,7 @@ public class EquipmentController : MonoBehaviour // Start is called before the first frame update void Start() { - if (equipmentType == EquipmentType.SmokeVent) + if (equipmentType == EquipmentType.SmokeExtractionFan) { if (!GetComponent()) { @@ -27,22 +27,6 @@ public class EquipmentController : MonoBehaviour } GetComponent().BindType = DeviceType.送风机; } - else if (equipmentType == EquipmentType.OutdoorHydrant) - { - if (!GetComponent()) - { - gameObject.AddComponent(); - } - GetComponent().BindType = DeviceType.消火栓; - } - else if (equipmentType == EquipmentType.PumpRoomAndWaterTank) - { - if (!GetComponent()) - { - gameObject.AddComponent(); - } - GetComponent().BindType = DeviceType.水箱; - } } private void OnMouseDown() diff --git a/Assets/Scripts/UIManager/View/WaterSystemMenuPanel.cs b/Assets/Scripts/UIManager/View/WaterSystemMenuPanel.cs index 692f001..66fa4fd 100644 --- a/Assets/Scripts/UIManager/View/WaterSystemMenuPanel.cs +++ b/Assets/Scripts/UIManager/View/WaterSystemMenuPanel.cs @@ -5,6 +5,8 @@ using UniRx; public class WaterSystemMenuPanel : UIView { public Toggle PumpRoomToggle; + public Toggle SXToggle; + public Toggle PLBToggle; public Toggle IndoorHydrantToggle; public Toggle PumpAdapterToggle; public Toggle OutdoorHydrantToggle; @@ -15,6 +17,12 @@ public class WaterSystemMenuPanel : UIView //泵房水箱 PumpRoomToggle.OnValueChangedAsObservable() .Subscribe(Value => MainMenu.Instance.OnPumpRoom(Value)); + //水泵 + SXToggle.OnValueChangedAsObservable() + .Subscribe(Value => MainMenu.Instance.OnPumpRoom(Value)); + //喷淋泵 + PLBToggle.OnValueChangedAsObservable() + .Subscribe(Value => MainMenu.Instance.OnPumpRoom(Value)); //室内消火栓 IndoorHydrantToggle.OnValueChangedAsObservable() .Subscribe(Value => MainMenu.Instance.OnIndoorHydrant(Value));