diff --git a/.vs/CultivationOfBrewing-2/v17/.suo b/.vs/CultivationOfBrewing-2/v17/.suo index bd54248..80ed3b0 100644 Binary files a/.vs/CultivationOfBrewing-2/v17/.suo and b/.vs/CultivationOfBrewing-2/v17/.suo differ diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=展开-悬浮@2x.png b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=展开-悬浮@2x.png new file mode 100644 index 0000000..e2c3812 Binary files /dev/null and b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=展开-悬浮@2x.png differ diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=展开-悬浮@2x.png.meta b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=展开-悬浮@2x.png.meta new file mode 100644 index 0000000..9643c2b --- /dev/null +++ b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=展开-悬浮@2x.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 625b20bbb1fc4a54489add9cef9458ef +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=收起-默认@2x.png b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=收起-默认@2x.png new file mode 100644 index 0000000..bf225d6 Binary files /dev/null and b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=收起-默认@2x.png differ diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=收起-默认@2x.png.meta b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=收起-默认@2x.png.meta new file mode 100644 index 0000000..32d0dd8 --- /dev/null +++ b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a0]=收起-默认@2x.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 9bb1e303f05731c42abd3cce1cbcbedb +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=展开-默认@2x.png b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=展开-默认@2x.png new file mode 100644 index 0000000..c5693b3 Binary files /dev/null and b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=展开-默认@2x.png differ diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=展开-默认@2x.png.meta b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=展开-默认@2x.png.meta new file mode 100644 index 0000000..639ccc8 --- /dev/null +++ b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=展开-默认@2x.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: ec8368489d70bd7438f1edc830840447 +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=默认-悬浮@2x.png b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=默认-悬浮@2x.png new file mode 100644 index 0000000..890c89c Binary files /dev/null and b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=默认-悬浮@2x.png differ diff --git a/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=默认-悬浮@2x.png.meta b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=默认-悬浮@2x.png.meta new file mode 100644 index 0000000..131db14 --- /dev/null +++ b/Assets/HQB/Texture/tsq/UI_MenuBar/属性 1[a1]=默认-悬浮@2x.png.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: eaffe5f6570534f4582e0835e691d608 +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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 2 + 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + 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: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + 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: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index 04e2018..096d0d5 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -2106,7 +2106,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 40, y: 72} + m_SizeDelta: {x: 32, y: 44} m_Pivot: {x: 1, y: 0.5} --- !u!222 &1027835946322391255 CanvasRenderer: @@ -2136,7 +2136,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 79f9b1d682f470f40ab600dade2c369d, type: 3} + m_Sprite: {fileID: 21300000, guid: 9bb1e303f05731c42abd3cce1cbcbedb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2923,8 +2923,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 545e1bf40c968b94d94dbd234fe1e530, type: 3} m_Name: m_EditorClassIdentifier: - ExpandSprite: {fileID: 21300000, guid: 4c690750a2bdfd846b732a727903f291, type: 3} - CollapseSprite: {fileID: 21300000, guid: 352fb2f67e1311f42a17d4be24bd51b6, type: 3} + ExpandSprite: {fileID: 21300000, guid: ec8368489d70bd7438f1edc830840447, type: 3} + CollapseSprite: {fileID: 21300000, guid: eaffe5f6570534f4582e0835e691d608, type: 3} closeDefaultBtn: {fileID: 0} toolRoomBtn: {fileID: 0} siteBtn: {fileID: 0} diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs index a9454d4..8c08f6d 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_GraphicRextualPanel.cs @@ -37,7 +37,7 @@ public class UI_GraphicRextualPanel : BasePanel public plantsInfo plantsInfo; - public void Init() + public void Init() { plantsInfo = JsonManager.Instance.LoadData("plantsInfo"); ToptextMeshProUGUI.text = ""; @@ -49,7 +49,8 @@ public class UI_GraphicRextualPanel : BasePanel ToptextMeshProUGUI.text = ""; ContentTextMeshProUGUI.text = ""; - plantsInfo.allPlants.ForEach(plant => { + plantsInfo.allPlants.ForEach(plant => + { if (partObj.transform.parent.gameObject.name == plant.plantName) { string title = plant.plantName + ":"; @@ -83,6 +84,15 @@ public class UI_GraphicRextualPanel : BasePanel switch (btnName) { case "returnBtn": + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, panel => { panel.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { panel.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, panel => + { + panel.Init + ( + GameManager.ProcessMgr.subProcessId + ); + }); GameManager.UIMgr.HidePanel(); GameManager.UIMgr.HidePanel(); GameObject SplitCamera = GameObject.Find("SplitCamera"); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs index d436f9e..b171c93 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_PlantComparisonPanel.cs @@ -32,7 +32,8 @@ public class UI_PlantComparisonPanel : BasePanel ToptextMeshProUGUI.text = ""; ContentTextMeshProUGUI.text = ""; - plantsInfo.allPlants.ForEach(plant => { + plantsInfo.allPlants.ForEach(plant => + { if (partObj.transform.parent.gameObject.name == plant.plantName) { string title = plant.plantName + ":"; @@ -66,6 +67,16 @@ public class UI_PlantComparisonPanel : BasePanel switch (btnName) { case "returnBtn": + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, panel => { panel.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { panel.Init(); }); + GameManager.UIMgr.ShowPanel(E_UI_Layer.Top, panel => + { + panel.Init + ( + GameManager.ProcessMgr.subProcessId + ); + }); + GameManager.UIMgr.HidePanel(); GameManager.UIMgr.HidePanel(); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9c9afc0..bbe6041 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -21,12 +21,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 2560 - height: 1307 + width: 1920 + height: 947 m_MinSize: {x: 400, y: 200} m_MaxSize: {x: 32384, y: 16192} vertical: 0 - controlID: 26583 + controlID: 40730 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -47,10 +47,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 923 - width: 1267 - height: 436 + x: 2560 + y: 591 + width: 910 + height: 408 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -98,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1267 - height: 415 - m_Scale: {x: 0.38425925, y: 0.38425925} - m_Translation: {x: 633.5, y: 207.5} + width: 910 + height: 387 + m_Scale: {x: 0.35833332, y: 0.35833332} + m_Translation: {x: 455, y: 193.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1648.6266 + x: -1269.7675 y: -540 - width: 3297.2532 + width: 2539.535 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.38425925 - m_LastWindowPixelSize: {x: 1267, y: 436} + m_defaultScale: 0.35833332 + m_LastWindowPixelSize: {x: 910, y: 408} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1268 - height: 1307 + width: 911 + height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 26584 + controlID: 40731 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -162,8 +162,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1268 - height: 850 + width: 911 + height: 518 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 5} @@ -191,10 +191,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 + x: 2560 y: 73 - width: 1267 - height: 829 + width: 910 + height: 497 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -226,7 +226,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 0} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: unity-scene-view-toolbar @@ -270,7 +270,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 67.5, y: 9} + snapOffset: {x: 67.5, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Orientation @@ -430,9 +430,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 764.72015, y: 782.3851, z: 5.64842} + m_Target: {x: 1297.3706, y: 602.8555, z: -2.94622} speed: 2 - m_Value: {x: 764.72015, y: 782.3851, z: 5.64842} + m_Value: {x: 1297.3706, y: 602.8555, z: -2.94622} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -483,9 +483,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 536.5591 + m_Target: 916.0593 speed: 2 - m_Value: 536.5591 + m_Value: 916.0593 m_Ortho: m_Target: 1 speed: 2 @@ -503,7 +503,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.33691344, y: 0.25151747, z: -0.09390435, w: 0.90244687} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -526,9 +526,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 850 - width: 1268 - height: 457 + y: 518 + width: 911 + height: 429 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 2} @@ -551,10 +551,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1268 + x: 911 y: 0 - width: 352 - height: 1307 + width: 304 + height: 947 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 8} @@ -582,10 +582,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1268 + x: 3471 y: 73 - width: 350 - height: 1286 + width: 302 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -596,21 +596,21 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 14e87afe18e87afe1ce87afe20e87afe2ae87afe821f7bfe881f7bfe32237bfe8ea38cfeb6aa8cfebaaa8cfebeaa8cfec2aa8cfeccaa8cfec0be8cfe80449efe84449efe96449efe58cdaffe5ccdaffe60cdaffe64cdaffe6ecdaffebad3d2febed3d2fec2d3d2fec6d3d2fed0d3d2fe72d9d2fe76d9d2fe84d9d2feecddd2fe22e0d2fe26e0d2fe2ae0d2fe34e0d2fec6eaf5fec2edf5fec6edf5fecaedf5feceedf5fed8edf5fed67c07ffda7c07ffde7c07ffe27c07ffec7c07ff1e7e07ffd88f07ff009b07ffd41919ffd81c19ffdc1c19ffe01c19ffea1c19ff1c1e19ff762e19fff03019ffa6da2affc2dd2afff2de2afff6f02aff868e3cff36933cffa2ab3cffbcab3cff84b03cffb6b03cff0cb13cff76b13cff747f3dff2a893dff68144fff36b660ff3cb660ff1e3772ff2c3772ffee3872ff4c4a72ffda05a7ffe805a7ff484aa7ffb6f8beffe6f8beff42f9beff4cf9beffb0fbbeffca00bfff8203bfff9003bfff3e5feeff485feeff7e5feeffa45feeffae5feeff7268eeff2a69eeff8c6deeffcc80fdffd680fdffcc52ffffe657ffff3c67fffff4fffffff07a0100528501005c860100228e0100ac540200b4540200ca5502005c5b0200d45d020024630200086502001065020014650200266602002c690200506a0200626b0200c26d020022730200 + m_ExpandedIDs: 628334fe668334fe748334fee48934fef48934fefa8934fe802f46fe8e2f46fe42c757fe46c757fe4ac757fe54c757fee25369fee65369feea5369fef45369fe14e87afe18e87afe1ce87afe20e87afe2ae87afe821f7bfe881f7bfe32237bfe8ea38cfeb6aa8cfebaaa8cfebeaa8cfec2aa8cfeccaa8cfec0be8cfe80449efe84449efe96449efe58cdaffe5ccdaffe60cdaffe64cdaffe6ecdaffebad3d2febed3d2fec2d3d2fec6d3d2fed0d3d2fe72d9d2fe76d9d2fe84d9d2feecddd2fe22e0d2fe26e0d2fe2ae0d2fe34e0d2fec6eaf5fec2edf5fec6edf5fecaedf5feceedf5fed8edf5fed67c07ffda7c07ffde7c07ffe27c07ffec7c07ff1e7e07ffd88f07ff009b07ffd41919ffd81c19ffdc1c19ffe01c19ffea1c19ff1c1e19ff762e19fff03019ffa6da2affc2dd2afff2de2afff6f02aff868e3cff36933cffa2ab3cffbcab3cff84b03cffb6b03cff0cb13cff76b13cff747f3dff2a893dff68144fff36b660ff3cb660ff1e3772ff2c3772ffee3872ff4c4a72ffda05a7ffe805a7ff484aa7ffb6f8beffe6f8beff42f9beff4cf9beffb0fbbeffca00bfff8203bfff9003bfff3e5feeff485feeff7e5feeffa45feeffae5feeff7268eeff2a69eeff8c6deeffcc80fdffd680fdffcc52ffffe657ffff3c67fffff4fffffff07a0100528501005c860100228e0100ac540200b4540200ca5502005c5b0200d45d020024630200086502001065020014650200266602002c690200506a0200626b0200c26d02001e730200 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: MenuBar + m_OriginalName: MenuBar m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 190980 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 7} m_SearchString: @@ -635,10 +635,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1620 + x: 1215 y: 0 - width: 367 - height: 1307 + width: 275 + height: 947 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 10} @@ -666,10 +666,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1620 + x: 3775 y: 73 - width: 365 - height: 1286 + width: 273 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -686,7 +686,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/UI/UI_Panel + - Assets/HQB/Texture/tsq/UI_MenuBar m_Globs: [] m_OriginalText: m_FilterByTypeIntersection: 0 @@ -727,10 +727,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_AssetTreeState: - scrollPos: {x: 0, y: 2264} + scrollPos: {x: 0, y: 960} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: ffffffff0000000082700000887000008a7000008c7000008e70000090700000947000009670000098700000a4700000a6700000a8700000ae700000b0700000b2700000e4700000e6700000e8700000ea700000f2700000c0f10000e48101009e970100a0970100a2970100b697010062980100649801007498010000ca9a3bffffff7f + m_ExpandedIDs: ffffffff0000000082700000887000008a7000008c7000008e70000090700000947000009670000098700000a4700000a6700000a8700000ae700000b0700000b2700000b4700000c0700000ca700000e4700000e6700000e8700000ea700000f2700000f88d0000c0f10000e48101009e970100a0970100a2970100b6970100629801008e98010028e9020000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -761,18 +761,18 @@ MonoBehaviour: m_ExpandedInstanceIDs: 62980100 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: UI_MenuBar + m_OriginalName: UI_MenuBar m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 190760 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 9} m_CreateAssetUtility: @@ -801,12 +801,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1987 + x: 1490 y: 0 - width: 573 - height: 1307 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 430 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -832,10 +832,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1987 + x: 4050 y: 73 - width: 572 - height: 1286 + width: 429 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -844,7 +844,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: -160 + m_CachedPref: 261 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1