diff --git a/Assets/Images/UI/Library/IMG_Active.png b/Assets/Images/UI/Library/IMG_Active.png new file mode 100644 index 00000000..884bebdd Binary files /dev/null and b/Assets/Images/UI/Library/IMG_Active.png differ diff --git a/Assets/Images/UI/Library/IMG_Active.png.meta b/Assets/Images/UI/Library/IMG_Active.png.meta new file mode 100644 index 00000000..14c3fd90 --- /dev/null +++ b/Assets/Images/UI/Library/IMG_Active.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: bc3ffc026caae814fbb79e8a5d5badb1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Library/Rectangle 5969.png b/Assets/Images/UI/Library/IMG_ActiveButton.png similarity index 100% rename from Assets/Images/UI/Library/Rectangle 5969.png rename to Assets/Images/UI/Library/IMG_ActiveButton.png diff --git a/Assets/Images/UI/Library/IMG_ActiveButton.png.meta b/Assets/Images/UI/Library/IMG_ActiveButton.png.meta new file mode 100644 index 00000000..fe021786 --- /dev/null +++ b/Assets/Images/UI/Library/IMG_ActiveButton.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 0eec9c7b5c741324b90261f3da6fafb8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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: 4 + 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: 4 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Images/UI/Library/IMG_LibraryFilter.png b/Assets/Images/UI/Library/IMG_LibraryFilter.png new file mode 100644 index 00000000..fe6283f2 Binary files /dev/null and b/Assets/Images/UI/Library/IMG_LibraryFilter.png differ diff --git a/Assets/Images/UI/Library/Rectangle 5969.png.meta b/Assets/Images/UI/Library/IMG_LibraryFilter.png.meta similarity index 100% rename from Assets/Images/UI/Library/Rectangle 5969.png.meta rename to Assets/Images/UI/Library/IMG_LibraryFilter.png.meta diff --git a/Assets/Images/UI/Library/heroicons_square-3-stack-3d.png b/Assets/Images/UI/Library/IMG_LibraryIcon.png similarity index 100% rename from Assets/Images/UI/Library/heroicons_square-3-stack-3d.png rename to Assets/Images/UI/Library/IMG_LibraryIcon.png diff --git a/Assets/Images/UI/Library/heroicons_square-3-stack-3d.png.meta b/Assets/Images/UI/Library/IMG_LibraryIcon.png.meta similarity index 100% rename from Assets/Images/UI/Library/heroicons_square-3-stack-3d.png.meta rename to Assets/Images/UI/Library/IMG_LibraryIcon.png.meta diff --git a/Assets/Prefabs/UI/Panel/Panel_Library.prefab b/Assets/Prefabs/UI/Panel/Panel_Library.prefab index 7a400939..cce5b4d0 100644 --- a/Assets/Prefabs/UI/Panel/Panel_Library.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_Library.prefab @@ -1,5 +1,202 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &307590263817697629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1614873544233035548} + - component: {fileID: 1978407283722962643} + - component: {fileID: 1773026857127005632} + - component: {fileID: 7112797374850532829} + m_Layer: 5 + m_Name: Button_Active + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1614873544233035548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307590263817697629} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7385112521956963146} + - {fileID: 3825687667800802442} + m_Father: {fileID: 2260595169506849184} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -930, y: 103.75} + m_SizeDelta: {x: 60, y: 38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1978407283722962643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307590263817697629} + m_CullTransparentMesh: 1 +--- !u!114 &1773026857127005632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307590263817697629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 0eec9c7b5c741324b90261f3da6fafb8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7112797374850532829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 307590263817697629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1773026857127005632} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2828945020252778806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3825687667800802442} + - component: {fileID: 2908859125319060618} + - component: {fileID: 8881242136247546141} + m_Layer: 5 + m_Name: Image_Open + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3825687667800802442 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2828945020252778806} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1614873544233035548} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + 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: 31, y: 31} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2908859125319060618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2828945020252778806} + m_CullTransparentMesh: 1 +--- !u!114 &8881242136247546141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2828945020252778806} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bc3ffc026caae814fbb79e8a5d5badb1, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &3001052261906860265 GameObject: m_ObjectHideFlags: 0 @@ -162,6 +359,81 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &4027268043193960323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7385112521956963146} + - component: {fileID: 6563631020347130013} + - component: {fileID: 2590103186708037879} + m_Layer: 5 + m_Name: Image_Close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7385112521956963146 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4027268043193960323} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1614873544233035548} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + 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: 31, y: 31} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6563631020347130013 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4027268043193960323} + m_CullTransparentMesh: 1 +--- !u!114 &2590103186708037879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4027268043193960323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bc3ffc026caae814fbb79e8a5d5badb1, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4075416811203310998 GameObject: m_ObjectHideFlags: 0 @@ -173,9 +445,8 @@ GameObject: - component: {fileID: 5023803985922606735} - component: {fileID: 7823915848098642691} - component: {fileID: 5355827985704296790} - - component: {fileID: 1970522937417353987} m_Layer: 5 - m_Name: Button_Library + m_Name: Title_Library m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -199,7 +470,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -871.2, y: 103.75} + m_AnchoredPosition: {x: -828, y: 103.75} m_SizeDelta: {x: 141, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7823915848098642691 @@ -240,50 +511,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &1970522937417353987 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4075416811203310998} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5355827985704296790} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &4076765753988843891 GameObject: m_ObjectHideFlags: 0 @@ -728,7 +955,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 406, y: 19} + m_AnchoredPosition: {x: 449.5, y: 19} m_SizeDelta: {x: 490, y: 38} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5033316336920581460 @@ -763,126 +990,6 @@ MonoBehaviour: m_Spacing: {x: 2, y: 0} m_Constraint: 0 m_ConstraintCount: 2 ---- !u!1 &7040175788823016260 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 558144679444701959} - - component: {fileID: 830914660027679133} - - component: {fileID: 7907894762522915208} - - component: {fileID: 5339564918217622391} - m_Layer: 5 - m_Name: Button_Close - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &558144679444701959 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7040175788823016260} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2260595169506849184} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -22, y: -22} - m_SizeDelta: {x: 24, y: 24} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &830914660027679133 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7040175788823016260} - m_CullTransparentMesh: 1 ---- !u!114 &7907894762522915208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7040175788823016260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f99b279092f1c004188b0dde12e026c9, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5339564918217622391 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7040175788823016260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7907894762522915208} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &8322504074463499819 GameObject: m_ObjectHideFlags: 0 @@ -1066,10 +1173,10 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1614873544233035548} - {fileID: 5023803985922606735} - {fileID: 4645497323649417197} - {fileID: 3612442029170579425} - - {fileID: 558144679444701959} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1131,4 +1238,5 @@ MonoBehaviour: pre_libraryButton: {fileID: 0} originPos: {x: 0, y: 0, z: 0} downPos: {x: 0, y: 0, z: 0} - fadeTime: 1 + fadeTime: 0.5 + isActive: 0 diff --git a/Assets/Scripts/UI/Panel_Library.cs b/Assets/Scripts/UI/Panel_Library.cs index afc93508..3f31e7f1 100644 --- a/Assets/Scripts/UI/Panel_Library.cs +++ b/Assets/Scripts/UI/Panel_Library.cs @@ -14,8 +14,9 @@ namespace CHN { private GridLayoutGroup Panel_MachineFilter; private ScrollRect ScrollView_MachineList; - private Button Button_Library; - private Button Button_Close; + private Button Button_Active; + private Image Image_Open; + private Image Image_Close; private UI_LibraryButton prf_LibraryButton; private UI_FilterButton prf_FilterToggle; @@ -38,16 +39,17 @@ namespace CHN public Vector3 downPos; public float fadeTime; + public bool isActive; public override void AfterAwake() { prf_LibraryButton = Resources.Load("Prefabs/UI/PRF_UI_LibraryButton"); prf_FilterToggle = Resources.Load("Prefabs/UI/PRF_UI_FilterButton"); - Button_Library.onClick.AddListener(OnClickLibraryButton); - Button_Close.onClick.AddListener(OnClickCloseButton); + Button_Active.onClick.AddListener(OnClickActiveButton); originPos = rectTransform.position; downPos = new Vector3(originPos.x, originPos.y - rectTransform.rect.height, originPos.z); + isActive = true; } public void UpdateFileterList(string[] filters) @@ -87,21 +89,32 @@ namespace CHN onClickLabelButton?.Invoke(pre_labelButton.label); } - public void OnClickLibraryButton() + public void OnClickActiveButton() { - onClickLibraryOpenButton?.Invoke("̺귯"); - } - public void OnClickCloseButton() - { - onClickLibraryCloseButton?.Invoke("̺귯"); + if (!isActive) + { + onClickLibraryOpenButton?.Invoke("̺귯"); + } + else + { + onClickLibraryCloseButton?.Invoke("̺귯"); + } } public void Open() { + isActive = true; + Image_Open.gameObject.SetActive(false); + Image_Close.gameObject.SetActive(true); + StopAllCoroutines(); StartCoroutine(MoveAnimation(originPos)); } public void Close() { + isActive = false; + Image_Open.gameObject.SetActive(true); + Image_Close.gameObject.SetActive(false); + onClose?.Invoke(); StopAllCoroutines(); StartCoroutine(MoveAnimation(downPos)); diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index 6842cf9e..2fe368f6 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -240,7 +240,7 @@ "sttm": "0804", "totm": "", "goaltime": "718", - "ptotm": "2025-03-27 07:55:55", + "ptotm": "2025-03-27 21:54:20", "psttm": "2025-03-26 08:04:35" }, "isCheck": false @@ -922,7 +922,7 @@ "worknm": "CVT C/VB LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "계획정지", "itemcd": "24052991", "itemdesc": "COVER ASM-C/VLV BODY", "pjtcd": "CVT", @@ -940,7 +940,7 @@ "sttm": "0800", "totm": "", "goaltime": "329", - "ptotm": "2025-03-26 13:29:47", + "ptotm": "2025-03-27 09:52:29", "psttm": "2025-03-26 08:00:47" }, "isCheck": false @@ -1132,7 +1132,7 @@ "worknm": "OILSUCTION PIPE", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "비가동", "itemcd": "55511445", "itemdesc": "PIPE ASM-O/PMP SUC", "pjtcd": "CSS 50V LM2", @@ -1167,7 +1167,7 @@ "worknm": "INSULATOR-ENG FFRT CVR", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "계획정지", "itemcd": "12713791", "itemdesc": "INSULATOR-ENG FFRT CVR", "pjtcd": "CSS PRIME", @@ -1185,7 +1185,7 @@ "sttm": "0758", "totm": "", "goaltime": "530", - "ptotm": "2025-03-26 16:48:58", + "ptotm": "2025-03-27 09:51:54", "psttm": "2025-03-26 07:58:58" }, "isCheck": false @@ -1202,7 +1202,7 @@ "worknm": "CAP FILL O-Ring & Printing", "workseq": "1", "status": "4", - "statusnm": "비가동", + "statusnm": "계획정지", "itemcd": "00000000", "itemdesc": "None", "pjtcd": "None",