From 09b42d587aaeb3007b615d528a2867716d1fd635 Mon Sep 17 00:00:00 2001 From: YDL <1368269699@qq.com> Date: Mon, 22 Apr 2024 15:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E6=B0=B4=E7=B3=BB=E7=BB=9F=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5=E6=95=B0=E6=8D=AE=E5=A4=B4=E9=A1=B6=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E5=8F=98=E6=9B=B4,=E5=90=8C=E6=97=B6=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=A5=BC=E5=B1=82=E5=88=87=E6=8D=A2=E6=95=88=E6=9E=9C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/ANet/DeviceFollowTarget.cs | 17 +++ Assets/Scripts/ANet/DeviceInfo.cs | 2 +- Assets/Scripts/ANet/DeviceLumos.cs | 2 +- Assets/Scripts/ANet/DeviceObj.cs | 9 +- Assets/Scripts/ANet/DevicePanelManager.cs | 2 +- Assets/Scripts/ANet/Prefabs/Icon.prefab | 14 +- Assets/Scripts/ANet/UI.meta | 8 ++ Assets/Scripts/ANet/UI/喷淋主管网.png | Bin 0 -> 3903 bytes .../Scripts/ANet/UI/喷淋主管网.png.meta | 128 ++++++++++++++++++ Assets/Scripts/ANet/UI/喷淋末端.png | Bin 0 -> 3392 bytes Assets/Scripts/ANet/UI/喷淋末端.png.meta | 128 ++++++++++++++++++ Assets/Scripts/ANet/UI/喷淋泵.png | Bin 0 -> 3532 bytes Assets/Scripts/ANet/UI/喷淋泵.png.meta | 128 ++++++++++++++++++ Assets/Scripts/ANet/UI/水泵.png | Bin 0 -> 3199 bytes Assets/Scripts/ANet/UI/水泵.png.meta | 128 ++++++++++++++++++ Assets/Scripts/ANet/UI/水箱.png | Bin 0 -> 3261 bytes Assets/Scripts/ANet/UI/水箱.png.meta | 128 ++++++++++++++++++ Assets/Scripts/ANet/UI/消火栓末端.png | Bin 0 -> 2869 bytes .../Scripts/ANet/UI/消火栓末端.png.meta | 128 ++++++++++++++++++ Assets/Scripts/ANet/UI/消防主管网.png | Bin 0 -> 3906 bytes .../Scripts/ANet/UI/消防主管网.png.meta | 128 ++++++++++++++++++ Assets/Scripts/EquipmentController.cs | 17 +-- Assets/Scripts/FloorController.cs | 11 +- .../UIManager/View/FloorButtonsPanel.cs | 18 ++- 24 files changed, 967 insertions(+), 29 deletions(-) create mode 100644 Assets/Scripts/ANet/UI.meta create mode 100644 Assets/Scripts/ANet/UI/喷淋主管网.png create mode 100644 Assets/Scripts/ANet/UI/喷淋主管网.png.meta create mode 100644 Assets/Scripts/ANet/UI/喷淋末端.png create mode 100644 Assets/Scripts/ANet/UI/喷淋末端.png.meta create mode 100644 Assets/Scripts/ANet/UI/喷淋泵.png create mode 100644 Assets/Scripts/ANet/UI/喷淋泵.png.meta create mode 100644 Assets/Scripts/ANet/UI/水泵.png create mode 100644 Assets/Scripts/ANet/UI/水泵.png.meta create mode 100644 Assets/Scripts/ANet/UI/水箱.png create mode 100644 Assets/Scripts/ANet/UI/水箱.png.meta create mode 100644 Assets/Scripts/ANet/UI/消火栓末端.png create mode 100644 Assets/Scripts/ANet/UI/消火栓末端.png.meta create mode 100644 Assets/Scripts/ANet/UI/消防主管网.png create mode 100644 Assets/Scripts/ANet/UI/消防主管网.png.meta diff --git a/Assets/Scripts/ANet/DeviceFollowTarget.cs b/Assets/Scripts/ANet/DeviceFollowTarget.cs index db56483..7b64d69 100644 --- a/Assets/Scripts/ANet/DeviceFollowTarget.cs +++ b/Assets/Scripts/ANet/DeviceFollowTarget.cs @@ -19,6 +19,8 @@ public class DeviceFollowTarget : MonoBehaviour } public void ViewClick() { + if (FindObjectOfType()) + FindObjectOfType().ChangeFloor(target.GetComponent().floorId); Camera.main.GetComponent().SetCameraView(target.position, 15); if (target && target.GetComponent()) { @@ -65,6 +67,21 @@ public class DeviceFollowTarget : MonoBehaviour public void SetTarget(DeviceObj deviceObj) { target = deviceObj.transform; + if (deviceObj.BindType == DeviceType.排烟风机 || + deviceObj.BindType == DeviceType.补风机 || + deviceObj.BindType == DeviceType.送风机) + { + GetComponent().sprite = spList[spList.Count - 1]; + return; + } + foreach (var item in spList) + { + if (deviceObj.BindType.ToString() == item.name) + { + GetComponent().sprite = item; + break; + } + } } } diff --git a/Assets/Scripts/ANet/DeviceInfo.cs b/Assets/Scripts/ANet/DeviceInfo.cs index cbb4370..4d18fbc 100644 --- a/Assets/Scripts/ANet/DeviceInfo.cs +++ b/Assets/Scripts/ANet/DeviceInfo.cs @@ -83,7 +83,7 @@ public class DeviceInfo : MonoBehaviour go.GetComponent().Bind("预警状态 : " + (pinfo.alarmStatus == "0" ? "正常" : "告警")); } } - else if (info.deviceType == (int)DeviceType.消火末端|| info.deviceType == (int)DeviceType.消防主管网 + else if (info.deviceType == (int)DeviceType.消火栓末端|| info.deviceType == (int)DeviceType.消防主管网 || info.deviceType == (int)DeviceType.喷淋末端 || info.deviceType == (int)DeviceType.喷淋主管网) { XHSMDInfo pinfo = JsonConvert.DeserializeObject(info.timelyData.ToString()); diff --git a/Assets/Scripts/ANet/DeviceLumos.cs b/Assets/Scripts/ANet/DeviceLumos.cs index 2e834cc..c7951c5 100644 --- a/Assets/Scripts/ANet/DeviceLumos.cs +++ b/Assets/Scripts/ANet/DeviceLumos.cs @@ -21,7 +21,7 @@ public class DeviceLumos : MonoBehaviour else if (GetComponent()) { NormalColor = GetComponent().color; - TargetColor = Color.blue; + TargetColor = Color.green; } } private void LateUpdate() diff --git a/Assets/Scripts/ANet/DeviceObj.cs b/Assets/Scripts/ANet/DeviceObj.cs index 026714e..db9514c 100644 --- a/Assets/Scripts/ANet/DeviceObj.cs +++ b/Assets/Scripts/ANet/DeviceObj.cs @@ -26,7 +26,14 @@ public class DeviceObj : MonoBehaviour if (DevicePanelManager.Instance.MenuType == BindType) { int number = (int)obj.Data; - isShow = number == floorId ? true : false; + if (number == 10000) + { + isShow = true; + } + else + { + isShow = number == floorId ? true : false; + } if (tIconObj) tIconObj.gameObject.SetActive(isShow); gameObject.GetComponent().enabled = isShow; diff --git a/Assets/Scripts/ANet/DevicePanelManager.cs b/Assets/Scripts/ANet/DevicePanelManager.cs index da98e20..6e3c4bb 100644 --- a/Assets/Scripts/ANet/DevicePanelManager.cs +++ b/Assets/Scripts/ANet/DevicePanelManager.cs @@ -221,7 +221,7 @@ public enum DeviceType 水泵 = 258,// 喷淋泵 = 256,// 水箱 = 401,// - 消火末端 = 305,// + 消火栓末端 = 305,// 喷淋末端 = 304,// 喷淋主管网 = 301,// 消防主管网 = 302,// diff --git a/Assets/Scripts/ANet/Prefabs/Icon.prefab b/Assets/Scripts/ANet/Prefabs/Icon.prefab index 319654f..28f43d7 100644 --- a/Assets/Scripts/ANet/Prefabs/Icon.prefab +++ b/Assets/Scripts/ANet/Prefabs/Icon.prefab @@ -37,7 +37,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3463756388761933415 CanvasRenderer: @@ -60,7 +60,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -88,7 +88,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0526089f5df3b684ca63d3fcae2ba54f, type: 3} m_Name: m_EditorClassIdentifier: - spList: [] + spList: + - {fileID: 21300000, guid: acc463bc12b221448ad1f72c93785e76, type: 3} + - {fileID: 21300000, guid: e34e512074c238442b8228ff48916448, type: 3} + - {fileID: 21300000, guid: fad7e8fd47cabdb4caff327403271f6e, type: 3} + - {fileID: 21300000, guid: 09c34b9fa0cd3684e8fedd8004707e01, type: 3} + - {fileID: 21300000, guid: 3e158ba04da01aa4499e3d58f43f9ba0, type: 3} + - {fileID: 21300000, guid: 72e4ff129d0b8744cac46b9cf8e66b0d, type: 3} + - {fileID: 21300000, guid: 33c9bd86f022bdb4db075f0ac350e5ee, type: 3} + - {fileID: 6401494030821526862, guid: 9c517e9a3ef29554e970fb32457f8b90, type: 3} target: {fileID: 0} uiCamera: {fileID: 0} --- !u!114 &-3378482227028537232 diff --git a/Assets/Scripts/ANet/UI.meta b/Assets/Scripts/ANet/UI.meta new file mode 100644 index 0000000..1ec89eb --- /dev/null +++ b/Assets/Scripts/ANet/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da2013054d85edd469ebab8c2dab6ecf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ANet/UI/喷淋主管网.png b/Assets/Scripts/ANet/UI/喷淋主管网.png new file mode 100644 index 0000000000000000000000000000000000000000..101b7d6704eb8f1f36ba56d430388a04d7ed31ad GIT binary patch literal 3903 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 literal 0 HcmV?d00001 diff --git a/Assets/Scripts/ANet/UI/喷淋末端.png.meta b/Assets/Scripts/ANet/UI/喷淋末端.png.meta new file mode 100644 index 0000000..475ee21 --- /dev/null +++ b/Assets/Scripts/ANet/UI/喷淋末端.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: e34e512074c238442b8228ff48916448 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Lumin + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ANet/UI/喷淋泵.png b/Assets/Scripts/ANet/UI/喷淋泵.png new file mode 100644 index 0000000000000000000000000000000000000000..ae78bb7ec7b8664fc5e7b73ae4cba0fd4d3eca05 GIT binary patch literal 3532 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 literal 0 HcmV?d00001 diff --git a/Assets/Scripts/ANet/UI/喷淋泵.png.meta b/Assets/Scripts/ANet/UI/喷淋泵.png.meta new file mode 100644 index 0000000..2417ab3 --- /dev/null +++ b/Assets/Scripts/ANet/UI/喷淋泵.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: fad7e8fd47cabdb4caff327403271f6e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Lumin + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ANet/UI/水泵.png b/Assets/Scripts/ANet/UI/水泵.png new file mode 100644 index 0000000000000000000000000000000000000000..a156da6b4ac31de636080c302ceedbebbc9467af GIT binary patch literal 3199 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 literal 0 HcmV?d00001 diff --git a/Assets/Scripts/ANet/UI/水泵.png.meta b/Assets/Scripts/ANet/UI/水泵.png.meta new file mode 100644 index 0000000..199fe14 --- /dev/null +++ b/Assets/Scripts/ANet/UI/水泵.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 09c34b9fa0cd3684e8fedd8004707e01 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Lumin + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ANet/UI/水箱.png b/Assets/Scripts/ANet/UI/水箱.png new file mode 100644 index 0000000000000000000000000000000000000000..2f71da6518300486628cffdf91d120cf11a53c53 GIT binary patch literal 3261 zcmcInc~lek7ETD8C{+|>uOWZ}GGqr5b`v&B1R*Ml@*Yi%><3DfCnVH{j=DXkh?lSkB$qZW) zXlP(zfWcr4gM--N=-pRy>g%G{QY2vzz0H#aZB$?|F1DHzt3KtEgu&?CLAa61NKOb7 zl8RkGzLW>MsKqiAjlp>OsAV7&4=eFJI2Mt35uRVZM!+L{FTw^ohs2SwU?CEeB8MYV z)^MSec!@b4kYcrSvV#vwkE6NYC= zlG+{(FC?k?xNScslfgH|1L&f4bv_k2hgnF6L`l~RRJ`ZsaR zy`GCk#$?H1P$`vjrBcysp~7Za@GO?5FburI21LS_suYeIQ8P9$8&twx1PX~l14uN0 zLgA8WOd47{#!8YqlSKLe<)E#=2bJK*fu(#zko+-F4u=^mQ7AzP1P8Od2&gC*1mQDD z0utSwMuq?ZA8i1bM56)>1`PuEbl9Eb#)D}TnDJg0YR{HJiJA;*>_2oaUkafdb4g-? z6jvUFCvXGYC=>{wqm2si1P~7(Q5ifcg#^JMoifW7Do4fL|X+BgRwACCW$5B|Eq>26-nhB zDId)_RnyQYI~qk0qCl&cJoAY}zzH)e5rTi;cT5n{w7VAp($pE|6J{PGf04b9)A@l` zC4^DZe<=P3m_jO0sz5pH7mH^4WBQBucls4z(m$*JxZ3}J)z2gs5`vOg7@eR*f+ilK zX4ZTt4e@`g_Ws?U=F%)29d?@K+>}K(b8{M&pwx173h(bWslZ@#^McuaT=k*hVnoDU zXWX)ldaqqsJW8krj2)szwF<%(onOS`-sPTOuJ3dTtF3JlLvTp#$YAgEAJa{ZF+FAG zm}&o|a|0VWv-ns+p4Kkxrb_4VO_zLGQ65`s@4?LR;$-T%Q`h);?Zubh-X7gDHL#`q zN@?LQ*6Jc`JsWQngn6`Gh&S#iZlhrm>wzJH4C}t|EtZ=cap>rQUXG3cYp#Fd@G-Y- zyzL1CTQ6hYYCY9i({{!vryH9RV?-hgFk=NL$tVvc5?Ebye{m(Y* z{#Hac)@tfU>aF!|`7Q`RCX`R?@22t6U4w%X(hPbqPjL&vJzipU)4w+iQrm4#Ok3K6 zE6+LGHd5{@?79@*W1=VAj?0)zk%CKCeHXF9U4a_SJK2W6*?rRXf=8;=Ax4aKj{O0G z&JSANiQM{JTr_rlt5cx)U{gb1!x7wWt-dRSK=bcyL{*LZaol=IbKJAFHpXCnmpUe% zOw%juoIdXT!_gi6roq|sSGb)^@AtC*w2Y!1-@5Tv+U@MD>x-V=jcT(={Ayuq$~%Ya z!z$6V=RC4_uBljrFx%-CyB4e)TvW7X(zReE)X?A}raKW)18LGSe?uis=L>6S{i&(h{xPEq-h zVuSiG??a3#$NWEX8`i&C{Z-e6qL97Xp9y5yO~G+?jW<5IFW*9+rhnhkrq9CM zH=if$bc#M|5h^S3*&PGSr{v#1v~7RQ>8}Z4BQ14EW@^>sKL3HnJj;-S*N!?udL^&A z-N`>%9A3}jtMRu(&Dfi>Yuh##;)r_QEmomV#?r3WogT|x+x7cJX=~7~a2pt{dlcXmwapod6gedC zAs(OXCOJ5zQxBAqqt88Vd;U%kl4{qt@Q~u0uFdm%s zeB&~!XRo(R*Ib`)9p~(}6}iN1tF%9NVi{JjY9y+}%_Ygx-Z~w}O8}Gu+gA@K>7QLe zUTk(o_ekC*>aPjosuUu8+``PZdVRnqtF=acFWVB9_;@IcO@sc;I$3UKwD`&Gh2wWO z9-Op9G}Wq-$Lhf6zVYrG@2GfqZ-dmsOR?B1F1UcU@S))4w-< z=C_*MqXy@y81I~4O%($-y^E}_KN>w@cGTEEEN$6_vN6Zk(*}J8H%0A~&+XQlp%LOwBBx45M1 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 - { - gameObject.AddComponent(); - } - GetComponent().BindType = DeviceType.排烟风机; - } - else if(equipmentType == EquipmentType.ForcedDraftFan) - { - if (!GetComponent()) - { - gameObject.AddComponent(); - } - GetComponent().BindType = DeviceType.送风机; - } + } private void OnMouseDown() diff --git a/Assets/Scripts/FloorController.cs b/Assets/Scripts/FloorController.cs index c67446c..85e10ff 100644 --- a/Assets/Scripts/FloorController.cs +++ b/Assets/Scripts/FloorController.cs @@ -69,9 +69,6 @@ public class FloorController : MonoBehaviour InitData(value); else OnChange(value); - - - } private void OnChange(bool value) @@ -79,8 +76,14 @@ public class FloorController : MonoBehaviour OnFloorChanged(!value); FloorShortcuts.Instance.CurrentNumber = FloorNum; if (value) + { MessageDispatcher.SendMessage("FloorChanged", FloorNum); - + } + else + { + if (!GetComponent().group.AnyTogglesOn()) + MessageDispatcher.SendMessage("FloorChanged", 10000); + } //防火分区 if (isFireCompartment && FireCompartments != null) { diff --git a/Assets/Scripts/UIManager/View/FloorButtonsPanel.cs b/Assets/Scripts/UIManager/View/FloorButtonsPanel.cs index d306d42..b9765e0 100644 --- a/Assets/Scripts/UIManager/View/FloorButtonsPanel.cs +++ b/Assets/Scripts/UIManager/View/FloorButtonsPanel.cs @@ -3,7 +3,7 @@ using UnityEngine.UI; using UniRx; using System; -public class FloorButtonsPanel : UIView +public class FloorButtonsPanel : UIView { private GameObject Item; public FloorData Data = new FloorData(); @@ -13,7 +13,7 @@ public class FloorButtonsPanel : UIView Item = Find("Scroll View/Viewport/Content/Item"); var url = HttpManager.Instance.GetFloorButtons; - HttpManager.Instance.Get(url, data => + HttpManager.Instance.Get(url, data => { Data = data; FloorShortcuts.Instance.Highest = Data.Highest; @@ -48,4 +48,18 @@ public class FloorButtonsPanel : UIView go.GetComponent().isPumpRoom = floor.BFSX; } } + + public void ChangeFloor(int floorId) + { + foreach (Transform item in Item.transform.parent) + { + if (item.GetComponent() && item.GetComponent().FloorNum == floorId) + { + if (item.GetComponent()) + { + item.GetComponent().isOn = true; + } + } + } + } }