diff --git a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab index 1aa3472e..1ab0dba3 100644 --- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab +++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab @@ -1633,7 +1633,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8410584963409699975 RectTransform: m_ObjectHideFlags: 0 diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器无盖模型.png b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器无盖模型.png new file mode 100644 index 00000000..822e3971 Binary files /dev/null and b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器无盖模型.png differ diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器无盖模型.png.meta b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器无盖模型.png.meta new file mode 100644 index 00000000..f3689a93 --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器无盖模型.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 12c83a4685638194a920f5d109cf2030 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器盖子模型.png b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器盖子模型.png new file mode 100644 index 00000000..5be7d4c4 Binary files /dev/null and b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器盖子模型.png differ diff --git a/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器盖子模型.png.meta b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器盖子模型.png.meta new file mode 100644 index 00000000..77b8b8ab --- /dev/null +++ b/SXElectricityInformationAcquisition/Assets/Resources/ToolsPack/UI/集中器盖子模型.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 7a2156ed2900f9347abbc92e01304b95 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs index 08a831cd..b0ab5d0d 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackGameObjectComponent.cs @@ -44,14 +44,15 @@ namespace ToolsPack } - if (_toolsPackScene == ToolsPackScene.工具间) + if ( MotionEngine.GetModule().GetToolsPackScene() == ToolsPackScene.工具间) { MotionEngine.GetModule().HandleClick(this.gameObject); if (IsClick) MotionEngine.GetModule().AddToolsPack(this.name, this.gameObject); + this.gameObject.SetActive(false); } - this.gameObject.SetActive(false); + } private void OnMouseEnter() diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs index 798aaa52..c48eceea 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPack/ToolsPackWindowItemBtComponent.cs @@ -50,7 +50,7 @@ namespace ToolsPack this.btName = btName; this.index = index; _modelTypeEnum = modelTypeEnum; - ico.texture = MotionEngine.GetModule().GetToolsPackWindowBtImage(btName); + ico.texture = MotionEngine.GetModule().GetToolsPackWindowBtImage(gName); if (MotionEngine.GetModule().GetToolsPackScene() == ToolsPackScene.工具间) { closeBt.SetActive(true); diff --git a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPackSceneManager.cs b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPackSceneManager.cs index 20a87bc3..b0412543 100644 --- a/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPackSceneManager.cs +++ b/SXElectricityInformationAcquisition/Assets/Scripts/ToolsPackSceneManager.cs @@ -11,7 +11,7 @@ namespace DefaultNamespace { [SerializeField] private ToolsPackScene toolsPackScene; - private void Awake() + private void Start() { MotionEngine.GetModule().SetToolsPackScene(toolsPackScene); }