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 0000000..101b7d6 Binary files /dev/null and b/Assets/Scripts/ANet/UI/喷淋主管网.png differ diff --git a/Assets/Scripts/ANet/UI/喷淋主管网.png.meta b/Assets/Scripts/ANet/UI/喷淋主管网.png.meta new file mode 100644 index 0000000..5c51026 --- /dev/null +++ b/Assets/Scripts/ANet/UI/喷淋主管网.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: acc463bc12b221448ad1f72c93785e76 +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 0000000..4fbb3af Binary files /dev/null and b/Assets/Scripts/ANet/UI/喷淋末端.png differ 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 0000000..ae78bb7 Binary files /dev/null and b/Assets/Scripts/ANet/UI/喷淋泵.png differ 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 0000000..a156da6 Binary files /dev/null and b/Assets/Scripts/ANet/UI/水泵.png differ 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 0000000..2f71da6 Binary files /dev/null and b/Assets/Scripts/ANet/UI/水箱.png differ diff --git a/Assets/Scripts/ANet/UI/水箱.png.meta b/Assets/Scripts/ANet/UI/水箱.png.meta new file mode 100644 index 0000000..18f8dfa --- /dev/null +++ b/Assets/Scripts/ANet/UI/水箱.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 3e158ba04da01aa4499e3d58f43f9ba0 +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 0000000..57de742 Binary files /dev/null and b/Assets/Scripts/ANet/UI/消火栓末端.png differ diff --git a/Assets/Scripts/ANet/UI/消火栓末端.png.meta b/Assets/Scripts/ANet/UI/消火栓末端.png.meta new file mode 100644 index 0000000..9d8755e --- /dev/null +++ b/Assets/Scripts/ANet/UI/消火栓末端.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 72e4ff129d0b8744cac46b9cf8e66b0d +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 0000000..bf923f5 Binary files /dev/null and b/Assets/Scripts/ANet/UI/消防主管网.png differ diff --git a/Assets/Scripts/ANet/UI/消防主管网.png.meta b/Assets/Scripts/ANet/UI/消防主管网.png.meta new file mode 100644 index 0000000..1baf461 --- /dev/null +++ b/Assets/Scripts/ANet/UI/消防主管网.png.meta @@ -0,0 +1,128 @@ +fileFormatVersion: 2 +guid: 33c9bd86f022bdb4db075f0ac350e5ee +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/EquipmentController.cs b/Assets/Scripts/EquipmentController.cs index 97ab8b6..56aa7d1 100644 --- a/Assets/Scripts/EquipmentController.cs +++ b/Assets/Scripts/EquipmentController.cs @@ -11,22 +11,7 @@ public class EquipmentController : MonoBehaviour // Start is called before the first frame update void Start() { - if (equipmentType == EquipmentType.SmokeExtractionFan) - { - if (!GetComponent()) - { - 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; + } + } + } + } }