diff --git a/Assets/Images/UI/Library/IMG_ScrollBarBackground.png b/Assets/Images/UI/Library/IMG_ScrollBarBackground.png new file mode 100644 index 00000000..ee7e518c Binary files /dev/null and b/Assets/Images/UI/Library/IMG_ScrollBarBackground.png differ diff --git a/Assets/Images/UI/Library/IMG_ScrollBarBackground.png.meta b/Assets/Images/UI/Library/IMG_ScrollBarBackground.png.meta new file mode 100644 index 00000000..1c71de6e --- /dev/null +++ b/Assets/Images/UI/Library/IMG_ScrollBarBackground.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: c6320b1563ed3634083b5e3e47a0fc6f +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/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab b/Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab index cd3d654b..b21c82f8 100644 --- a/Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab @@ -239,8 +239,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5.020111, y: -36.143616} - m_SizeDelta: {x: -33.04, y: -102.6729} + m_AnchoredPosition: {x: -0.74993896, y: -36.143616} + m_SizeDelta: {x: -21.5, y: -102.67291} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5875596559548039360 CanvasRenderer: @@ -380,7 +380,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: 302.11, y: -68.08} + m_AnchoredPosition: {x: 303.36, y: -68.08002} m_SizeDelta: {x: 59, y: 30.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7212672631472607743 @@ -517,7 +517,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: 47.8, y: -68.08} + m_AnchoredPosition: {x: 50, y: -68.08002} m_SizeDelta: {x: 59, y: 30.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6162548264558757194 @@ -655,7 +655,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 317.02} - m_SizeDelta: {x: 324, y: 1} + m_SizeDelta: {x: 324, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &353711557804667732 CanvasRenderer: @@ -766,8 +766,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 10, y: -5} - m_SizeDelta: {x: 3, y: -10} + m_AnchoredPosition: {x: 3, y: -5} + m_SizeDelta: {x: 3, y: -5} m_Pivot: {x: 1, y: 1} --- !u!222 &6985468642855541112 CanvasRenderer: @@ -890,7 +890,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: 210.6, y: -68.08} + m_AnchoredPosition: {x: 211.85013, y: -68.08002} m_SizeDelta: {x: 86, y: 30.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4688366276306100538 @@ -1027,7 +1027,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: 123.6, y: -68.08} + m_AnchoredPosition: {x: 125.45, y: -68.08} m_SizeDelta: {x: 59, y: 30.23} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9006764651283924087 @@ -1301,7 +1301,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000014305115} + m_AnchoredPosition: {x: 0, y: -0.000030517578} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &3918205260494339811 @@ -1317,7 +1317,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 10 + m_Left: 0 m_Right: 0 m_Top: 0 m_Bottom: 5 diff --git a/Assets/Prefabs/UI/Panel/Panel_Library.prefab b/Assets/Prefabs/UI/Panel/Panel_Library.prefab index a8fe6ab1..248a3ddc 100644 --- a/Assets/Prefabs/UI/Panel/Panel_Library.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_Library.prefab @@ -231,7 +231,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3348976819860926676 GameObject: @@ -269,8 +269,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -17, y: 20} + m_AnchoredPosition: {x: 0, y: 2.5} + m_SizeDelta: {x: 0, y: 8} m_Pivot: {x: 0, y: 0} --- !u!222 &3947235957534717292 CanvasRenderer: @@ -293,15 +293,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 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: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c6320b1563ed3634083b5e3e47a0fc6f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -636,10 +636,10 @@ RectTransform: - {fileID: 7061438123187250423} m_Father: {fileID: 2260595169506849184} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 960, y: -84.75} - m_SizeDelta: {x: 1882, y: 169.5} + 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: 1800, y: 169.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8170929965824760 CanvasRenderer: @@ -698,7 +698,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 15 m_Viewport: {fileID: 0} m_HorizontalScrollbar: {fileID: 3882603266565340892} m_VerticalScrollbar: {fileID: 0} @@ -881,7 +881,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4005995570624266384 CanvasRenderer: @@ -904,7 +904,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 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 @@ -1024,7 +1024,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: -940.9997, y: 84.75} + m_AnchoredPosition: {x: -900, y: 84.75} m_SizeDelta: {x: 0, y: 169.5} m_Pivot: {x: 0, y: 1} --- !u!114 &8013443592620472766 @@ -1040,7 +1040,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 2 + m_Left: 5 m_Right: 2 m_Top: 0 m_Bottom: 0 diff --git a/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab b/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab index 3682eac3..dc5f966d 100644 --- a/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab @@ -137,6 +137,132 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &374240164719472528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2373295430669314969} + - component: {fileID: 4443230295562324835} + - component: {fileID: 4868875436071978337} + - component: {fileID: 6330166687104186523} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2373295430669314969 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374240164719472528} + 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: 6054027936862035886} + m_Father: {fileID: 308582210859312442} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 3, y: 0} + m_SizeDelta: {x: 3, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4443230295562324835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374240164719472528} + m_CullTransparentMesh: 1 +--- !u!114 &4868875436071978337 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374240164719472528} + 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: 3f0a37fb6f408864f8aa3accde2030b2, 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 &6330166687104186523 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 374240164719472528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 348795728874197591} + m_HandleRect: {fileID: 281991142143517711} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &641274797475665684 GameObject: m_ObjectHideFlags: 0 @@ -562,12 +688,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3336037648759467369} + - {fileID: 1687546566577651007} m_Father: {fileID: 649763957245921010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 30.091995, y: -49} - m_SizeDelta: {x: -60.185, y: -98} + m_AnchoredPosition: {x: 23.5, y: -49} + m_SizeDelta: {x: -63, y: -98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8375527134909851511 CanvasRenderer: @@ -599,7 +726,7 @@ MonoBehaviour: m_ScrollSensitivity: 15 m_Viewport: {fileID: 3336037648759467369} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 4608616353749778647} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 @@ -693,6 +820,132 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 0 +--- !u!1 &1717644827867803668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1687546566577651007} + - component: {fileID: 8025265021713382827} + - component: {fileID: 3658183928478353924} + - component: {fileID: 4608616353749778647} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1687546566577651007 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717644827867803668} + 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: 2638508795513665785} + m_Father: {fileID: 6929596151034299155} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 3, y: 0} + m_SizeDelta: {x: 3, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8025265021713382827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717644827867803668} + m_CullTransparentMesh: 1 +--- !u!114 &3658183928478353924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717644827867803668} + 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: 3f0a37fb6f408864f8aa3accde2030b2, 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 &4608616353749778647 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1717644827867803668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, 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: 8287411967490212502} + m_HandleRect: {fileID: 2887134006863306462} + m_Direction: 2 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &2059055938171905991 GameObject: m_ObjectHideFlags: 0 @@ -888,6 +1141,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &2859244631360058208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2887134006863306462} + - component: {fileID: 8461702827876159389} + - component: {fileID: 8287411967490212502} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2887134006863306462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859244631360058208} + 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: 2638508795513665785} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8461702827876159389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859244631360058208} + m_CullTransparentMesh: 1 +--- !u!114 &8287411967490212502 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2859244631360058208} + 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: 8f8390105328a984a834455e208dbc01, 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 &2931896372481882582 GameObject: m_ObjectHideFlags: 0 @@ -1323,11 +1651,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: 0 + m_Right: -5 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: -0.5 + m_Spacing: -0.3 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1380,12 +1708,13 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2588290889824960605} + - {fileID: 2373295430669314969} m_Father: {fileID: 649763957245921010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 30.092, y: -49} - m_SizeDelta: {x: -60.185, y: -98} + m_AnchoredPosition: {x: 23.5, y: -49} + m_SizeDelta: {x: -63, y: -98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9183325893539719775 CanvasRenderer: @@ -1417,7 +1746,7 @@ MonoBehaviour: m_ScrollSensitivity: 15 m_Viewport: {fileID: 2588290889824960605} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 6330166687104186523} m_HorizontalScrollbarVisibility: 2 m_VerticalScrollbarVisibility: 2 m_HorizontalScrollbarSpacing: -3 @@ -1476,11 +1805,11 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: m_Left: 0 - m_Right: 0 + m_Right: -5 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: -0.1 + m_Spacing: -0.3 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -1537,9 +1866,9 @@ RectTransform: m_Father: {fileID: 6929596151034299155} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 7, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7965349635543274696 CanvasRenderer: @@ -1911,9 +2240,9 @@ RectTransform: m_Father: {fileID: 308582210859312442} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 7, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &5085626110739028832 CanvasRenderer: @@ -1966,6 +2295,42 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 +--- !u!1 &7984185676880859045 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2638508795513665785} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2638508795513665785 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7984185676880859045} + 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: 2887134006863306462} + m_Father: {fileID: 1687546566577651007} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8179427131857564794 GameObject: m_ObjectHideFlags: 0 @@ -2113,3 +2478,114 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9193723007725117293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 281991142143517711} + - component: {fileID: 7731526316882148811} + - component: {fileID: 348795728874197591} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &281991142143517711 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9193723007725117293} + 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: 6054027936862035886} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7731526316882148811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9193723007725117293} + m_CullTransparentMesh: 1 +--- !u!114 &348795728874197591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9193723007725117293} + 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: 8f8390105328a984a834455e208dbc01, 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 &9207499733040891821 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6054027936862035886} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6054027936862035886 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9207499733040891821} + 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: 281991142143517711} + m_Father: {fileID: 2373295430669314969} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab b/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab index cc5596fe..2bc60be6 100644 --- a/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 47.647232, y: -16.5} - m_SizeDelta: {x: 80.8683, y: 33} + m_AnchoredPosition: {x: 44.5, y: -16.5} + m_SizeDelta: {x: 80, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1194852462195827126 CanvasRenderer: @@ -93,8 +93,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -103,7 +103,7 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -4 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -171,8 +171,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 111, y: -16.5} - m_SizeDelta: {x: 31, y: 33} + m_AnchoredPosition: {x: 114.7, y: -16.5} + m_SizeDelta: {x: 35, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1030281007209076673 CanvasRenderer: @@ -230,8 +230,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -240,7 +240,7 @@ MonoBehaviour: m_HorizontalAlignment: 4 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -4 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -483,8 +483,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 201.00006, y: -16.5} - m_SizeDelta: {x: 134, y: 33} + m_AnchoredPosition: {x: 201.1, y: -16.5} + m_SizeDelta: {x: 125, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8433559242769484687 CanvasRenderer: @@ -542,8 +542,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -552,7 +552,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -4 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 @@ -621,7 +621,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 1} - m_SizeDelta: {x: 324, y: 2} + m_SizeDelta: {x: 326.5, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8375255472013704872 CanvasRenderer: @@ -695,8 +695,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 290.5, y: -16.5} - m_SizeDelta: {x: 45, y: 33} + m_AnchoredPosition: {x: 292.6099, y: -16.5} + m_SizeDelta: {x: 50, y: 33} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2595110930210117787 CanvasRenderer: @@ -754,8 +754,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 10 - m_fontSizeBase: 10 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -764,7 +764,7 @@ MonoBehaviour: m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -4 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 diff --git a/Assets/Resources/Prefabs/UI/PRF_UI_MachineInfoItem.prefab b/Assets/Resources/Prefabs/UI/PRF_UI_MachineInfoItem.prefab index 497c7bdc..f091d8b9 100644 --- a/Assets/Resources/Prefabs/UI/PRF_UI_MachineInfoItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_UI_MachineInfoItem.prefab @@ -33,8 +33,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 272.9599, y: -14} - m_SizeDelta: {x: 18, y: 18} + m_AnchoredPosition: {x: 268.49994, y: -15.5} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1536589396037807365 GameObject: @@ -70,7 +70,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: 58, y: -13.5} + m_AnchoredPosition: {x: 58, y: -15.5} m_SizeDelta: {x: 104.0584, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8307272532884670515 @@ -129,8 +129,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -139,21 +139,23 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -206,7 +208,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: 18, y: 18} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2081018320839908680 MonoBehaviour: @@ -516,7 +518,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: 188, y: -13.5} + m_AnchoredPosition: {x: 184.08, y: -15.5} m_SizeDelta: {x: 148.1, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7323315036349915373 @@ -575,8 +577,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 12 - m_fontSizeBase: 12 + m_fontSize: 14 + m_fontSizeBase: 14 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -585,21 +587,23 @@ MonoBehaviour: m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 - m_characterSpacing: 0 + m_characterSpacing: -3 m_wordSpacing: 0 m_lineSpacing: 0 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -655,7 +659,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 601.7218, y: 344.5} - m_SizeDelta: {x: 289.4436, y: 31} + m_SizeDelta: {x: 285, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1063964298621334676 MonoBehaviour: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 7a6c1b38..ee0f4e5e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -159760,11 +159760,6 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1664826789211949129, guid: 1fc88af379a7a364fb3d26a826fa4561, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -933.25 - objectReference: {fileID: 0} - target: {fileID: 2260595169506849184, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} propertyPath: m_Pivot.x @@ -159865,11 +159860,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3612442029170579425, guid: 1fc88af379a7a364fb3d26a826fa4561, - type: 3} - propertyPath: m_SizeDelta.x - value: 1866.5 - objectReference: {fileID: 0} - target: {fileID: 7133962274756680921, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} propertyPath: m_AnchorMax.x @@ -159880,11 +159870,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7133962274756680921, guid: 1fc88af379a7a364fb3d26a826fa4561, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 9054515635504360399, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} propertyPath: m_Name @@ -410213,20 +410198,20 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 2449789410797628947, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + - target: {fileID: 5035908290940686591, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 + propertyPath: m_SizeDelta.x + value: 90 objectReference: {fileID: 0} - - target: {fileID: 2975405984462419634, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + - target: {fileID: 5035908290940686591, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 + propertyPath: m_AnchoredPosition.x + value: -117 objectReference: {fileID: 0} - - target: {fileID: 4610205583130223525, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + - target: {fileID: 5035908290940686591, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 + propertyPath: m_AnchoredPosition.y + value: 380 objectReference: {fileID: 0} - target: {fileID: 5290342058106165413, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} @@ -410328,11 +410313,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5292785705023812001, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, - type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - target: {fileID: 5477525448751655022, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} propertyPath: m_AnchorMax.x @@ -410343,26 +410323,11 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 5477525448751655022, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5840782451572989804, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, - type: 3} - propertyPath: 'm_ActiveFontFeatures.Array.data[0]' - value: 1801810542 - objectReference: {fileID: 0} - target: {fileID: 8100983100533929295, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100983100533929295, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -0.000030517578 - objectReference: {fileID: 0} - target: {fileID: 9138834436198834237, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} propertyPath: m_AnchorMax.x @@ -410373,11 +410338,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 9138834436198834237, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/PGD/UI_Calendar.cs b/Assets/Scripts/PGD/UI_Calendar.cs index 586e5cf1..a2ddc8d0 100644 --- a/Assets/Scripts/PGD/UI_Calendar.cs +++ b/Assets/Scripts/PGD/UI_Calendar.cs @@ -64,6 +64,16 @@ public class UI_Calendar : UIBase { SetActive(false); } + void Update() + { + if (Input.GetMouseButtonDown(0)) + { + if (RectTransformUtility.RectangleContainsScreenPoint(rectTransform, Input.mousePosition)) + return; + + Close(); + } + } void SetCalendar() { diff --git a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs index 9651ceef..21f643ce 100644 --- a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs +++ b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs @@ -89,7 +89,7 @@ namespace CHN public void Close() { effect.DeactivePanel(); - ui_Calendar.SetActive(false); + ui_Calendar.Close(); gameObject.SetActive(false); gameObject.transform.localScale = Vector3.zero; } diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index 347c5b66..be543daa 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -30,7 +30,7 @@ "sttm": "0803", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 19:42:33", + "ptotm": "2025-04-09 19:56:47", "psttm": "2025-04-03 08:03:05" }, "isCheck": false @@ -65,7 +65,7 @@ "sttm": "0803", "totm": "", "goaltime": "718", - "ptotm": "2025-04-08 19:41:37", + "ptotm": "2025-04-09 19:55:50", "psttm": "2025-04-03 08:03:13" }, "isCheck": false @@ -100,7 +100,7 @@ "sttm": "0803", "totm": "", "goaltime": "718", - "ptotm": "2025-04-08 19:41:41", + "ptotm": "2025-04-09 19:55:53", "psttm": "2025-04-03 08:03:19" }, "isCheck": false @@ -135,10 +135,10 @@ "sttm": "0803", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 19:42:44", + "ptotm": "2025-04-09 19:56:56", "psttm": "2025-04-03 08:03:26" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -170,7 +170,7 @@ "sttm": "0818", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:42:48", + "ptotm": "2025-04-10 07:57:00", "psttm": "2025-04-03 08:18:18" }, "isCheck": false @@ -205,10 +205,10 @@ "sttm": "0803", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 19:42:51", + "ptotm": "2025-04-09 19:57:03", "psttm": "2025-04-03 08:03:34" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -240,7 +240,7 @@ "sttm": "0818", "totm": "", "goaltime": "718", - "ptotm": "2025-04-08 19:41:55", + "ptotm": "2025-04-09 19:56:07", "psttm": "2025-04-03 08:18:32" }, "isCheck": false @@ -275,10 +275,10 @@ "sttm": "0818", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 19:42:58", + "ptotm": "2025-04-09 19:57:10", "psttm": "2025-04-03 08:18:40" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -310,10 +310,10 @@ "sttm": "0818", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:02", + "ptotm": "2025-04-10 07:57:14", "psttm": "2025-04-03 08:18:46" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -345,7 +345,7 @@ "sttm": "0813", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 19:43:06", + "ptotm": "2025-04-09 19:57:18", "psttm": "2025-04-03 08:13:52" }, "isCheck": false @@ -380,10 +380,10 @@ "sttm": "0800", "totm": "", "goaltime": "1440", - "ptotm": "2025-04-09 07:44:10", + "ptotm": "2025-04-10 07:58:22", "psttm": "2025-04-03 08:00:35" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -415,10 +415,10 @@ "sttm": "0758", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:14", + "ptotm": "2025-04-10 07:57:28", "psttm": "2025-04-03 07:58:14" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -450,7 +450,7 @@ "sttm": "0819", "totm": "", "goaltime": "2879", - "ptotm": "2025-04-10 07:43:18", + "ptotm": "2025-04-11 07:57:36", "psttm": "2025-04-03 08:19:03" }, "isCheck": false @@ -485,7 +485,7 @@ "sttm": "0819", "totm": "", "goaltime": "1440", - "ptotm": "2025-04-09 07:43:22", + "ptotm": "2025-04-10 07:57:40", "psttm": "2025-04-03 08:19:09" }, "isCheck": false @@ -520,10 +520,10 @@ "sttm": "0804", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:26", + "ptotm": "2025-04-10 07:57:44", "psttm": "2025-04-03 08:04:14" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -555,7 +555,7 @@ "sttm": "0757", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:30", + "ptotm": "2025-04-10 07:58:48", "psttm": "2025-04-03 07:57:39" }, "isCheck": false @@ -590,7 +590,7 @@ "sttm": "0755", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:34", + "ptotm": "2025-04-10 07:57:52", "psttm": "2025-04-03 07:55:21" }, "isCheck": false @@ -625,7 +625,7 @@ "sttm": "0853", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 19:44:37", + "ptotm": "2025-04-09 19:54:04", "psttm": "2025-04-03 08:53:42" }, "isCheck": false @@ -660,7 +660,7 @@ "sttm": "0819", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:41", + "ptotm": "2025-04-10 07:58:01", "psttm": "2025-04-03 08:19:31" }, "isCheck": false @@ -695,10 +695,10 @@ "sttm": "0809", "totm": "", "goaltime": "2879", - "ptotm": "2025-04-09 07:43:45", + "ptotm": "2025-04-10 07:58:08", "psttm": "2025-04-03 08:09:08" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -730,7 +730,7 @@ "sttm": "0803", "totm": "", "goaltime": "720", - "ptotm": "2025-04-08 19:43:49", + "ptotm": "2025-04-11 07:59:12", "psttm": "2025-04-03 08:03:29" }, "isCheck": false @@ -765,10 +765,10 @@ "sttm": "0800", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:43:52", + "ptotm": "2025-04-10 07:58:16", "psttm": "2025-04-03 08:00:00" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -800,10 +800,10 @@ "sttm": "0819", "totm": "", "goaltime": "2879", - "ptotm": "2025-04-10 07:43:55", + "ptotm": "2025-04-11 07:58:20", "psttm": "2025-04-03 08:19:46" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -835,10 +835,10 @@ "sttm": "0806", "totm": "", "goaltime": "719", - "ptotm": "2025-04-08 20:07:55", + "ptotm": "2025-04-11 07:58:24", "psttm": "2025-04-03 08:06:39" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -870,10 +870,10 @@ "sttm": "0819", "totm": "", "goaltime": "1439", - "ptotm": "2025-04-09 07:44:04", + "ptotm": "2025-04-10 07:59:42", "psttm": "2025-04-03 08:19:54" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -905,7 +905,7 @@ "sttm": "0746", "totm": "", "goaltime": "529", - "ptotm": "2025-04-08 08:02:24", + "ptotm": "2025-04-09 07:53:54", "psttm": "2025-04-03 07:46:19" }, "isCheck": false @@ -940,7 +940,7 @@ "sttm": "0759", "totm": "", "goaltime": "691", - "ptotm": "2025-04-08 19:30:43", + "ptotm": "2025-04-09 19:29:18", "psttm": "2025-04-03 07:59:36" }, "isCheck": false @@ -957,7 +957,7 @@ "worknm": "GF9 C/VB LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24049859-GMA", "itemdesc": "COVER ASM-C/VLV BODY", "pjtcd": "GF9", @@ -975,7 +975,7 @@ "sttm": "0758", "totm": "", "goaltime": "691", - "ptotm": "2025-04-08 19:31:03", + "ptotm": "2025-04-09 19:29:03", "psttm": "2025-04-03 07:58:23" }, "isCheck": false @@ -992,7 +992,7 @@ "worknm": "CVT C/VB LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24052991", "itemdesc": "COVER ASM-C/VLV BODY", "pjtcd": "CVT", @@ -1010,7 +1010,7 @@ "sttm": "0820", "totm": "", "goaltime": "329", - "ptotm": "2025-04-08 13:29:18", + "ptotm": "2025-04-09 13:28:27", "psttm": "2025-04-03 08:20:17" }, "isCheck": false @@ -1027,7 +1027,7 @@ "worknm": "OIL DEFLECTOR", "workseq": "1", "status": "4", - "statusnm": "계획정지", + "statusnm": "가동중", "itemcd": "00000000", "itemdesc": "None", "pjtcd": "None", @@ -1045,7 +1045,7 @@ "sttm": "0752", "totm": "", "goaltime": "0", - "ptotm": "2025-04-08 07:55:38", + "ptotm": "2025-04-09 16:48:25", "psttm": "2025-04-03 07:52:26" }, "isCheck": false @@ -1080,7 +1080,7 @@ "sttm": "0758", "totm": "", "goaltime": "362", - "ptotm": "2025-04-08 14:01:39", + "ptotm": "2025-04-09 14:00:30", "psttm": "2025-04-03 07:58:05" }, "isCheck": false @@ -1115,7 +1115,7 @@ "sttm": "0759", "totm": "", "goaltime": "380", - "ptotm": "2025-04-08 14:27:44", + "ptotm": "2025-04-09 14:19:14", "psttm": "2025-04-03 07:59:09" }, "isCheck": false @@ -1150,10 +1150,10 @@ "sttm": "0758", "totm": "", "goaltime": "534", - "ptotm": "2025-04-08 16:54:49", + "ptotm": "2025-04-09 16:45:48", "psttm": "2025-04-03 07:58:53" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -1185,7 +1185,7 @@ "sttm": "0758", "totm": "", "goaltime": "686", - "ptotm": "2025-04-08 21:38:09", + "ptotm": "2025-04-09 19:13:40", "psttm": "2025-04-03 07:58:46" }, "isCheck": false @@ -1220,7 +1220,7 @@ "sttm": "0746", "totm": "", "goaltime": "307", - "ptotm": "2025-04-08 13:03:16", + "ptotm": "2025-04-09 13:02:54", "psttm": "2025-04-03 07:46:25" }, "isCheck": false @@ -1237,7 +1237,7 @@ "worknm": "INLET TUBE LINE", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "계획정지", "itemcd": "WP131-GE000", "itemdesc": "INLET-TUBE ASSY W/P", "pjtcd": "GME T4", @@ -1255,7 +1255,7 @@ "sttm": "0759", "totm": "", "goaltime": "538", - "ptotm": "2025-04-08 16:57:39", + "ptotm": "2025-04-09 07:58:21", "psttm": "2025-04-03 07:59:44" }, "isCheck": false @@ -1272,7 +1272,7 @@ "worknm": "INSULATOR-ENG FFRT CVR", "workseq": "1", "status": "4", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "00000000", "itemdesc": "None", "pjtcd": "None", @@ -1290,7 +1290,7 @@ "sttm": "0859", "totm": "", "goaltime": "0", - "ptotm": "2025-04-08 17:05:30", + "ptotm": "2025-04-09 16:57:23", "psttm": "2025-04-03 08:59:06" }, "isCheck": false @@ -1325,7 +1325,7 @@ "sttm": "0800", "totm": "", "goaltime": "500", - "ptotm": "2025-04-08 07:48:53", + "ptotm": "2025-04-09 07:57:47", "psttm": "2025-04-03 08:00:31" }, "isCheck": false @@ -1360,7 +1360,7 @@ "sttm": "0752", "totm": "", "goaltime": "0", - "ptotm": "2025-04-08 17:55:05", + "ptotm": "2025-04-09 18:04:02", "psttm": "2025-04-03 07:52:41" }, "isCheck": false @@ -1395,7 +1395,7 @@ "sttm": "0756", "totm": "", "goaltime": "560", - "ptotm": "2025-04-08 17:41:30", + "ptotm": "2025-04-09 17:14:31", "psttm": "2025-04-03 07:56:05" }, "isCheck": false @@ -1430,7 +1430,7 @@ "sttm": "0826", "totm": "", "goaltime": "214", - "ptotm": "2025-04-08 16:33:14", + "ptotm": "2025-04-09 10:15:18", "psttm": "2025-04-03 08:26:00" }, "isCheck": false @@ -1465,10 +1465,10 @@ "sttm": "1043", "totm": "", "goaltime": "299", - "ptotm": "2025-04-08 15:46:22", + "ptotm": "2025-04-09 12:32:17", "psttm": "2025-04-03 10:43:18" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -1500,7 +1500,7 @@ "sttm": "1039", "totm": "", "goaltime": "213", - "ptotm": "2025-04-08 16:55:50", + "ptotm": "2025-04-09 15:09:38", "psttm": "2025-04-03 10:39:06" }, "isCheck": false @@ -1535,10 +1535,10 @@ "sttm": "0858", "totm": "", "goaltime": "468", - "ptotm": "2025-04-08 15:26:10", + "ptotm": "2025-04-09 15:12:25", "psttm": "2025-04-03 08:58:56" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -1570,7 +1570,7 @@ "sttm": "0909", "totm": "", "goaltime": "426", - "ptotm": "2025-04-08 15:17:14", + "ptotm": "2025-04-09 15:10:33", "psttm": "2025-04-03 09:09:03" }, "isCheck": false @@ -1605,10 +1605,10 @@ "sttm": "0800", "totm": "", "goaltime": "468", - "ptotm": "2025-04-08 15:26:10", + "ptotm": "2025-04-09 15:25:34", "psttm": "2025-04-03 08:00:12" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -1640,7 +1640,7 @@ "sttm": "0755", "totm": "", "goaltime": "0", - "ptotm": "2025-04-08 11:27:59", + "ptotm": "2025-04-09 11:16:57", "psttm": "2025-04-04 07:55:27" }, "isCheck": false @@ -1675,7 +1675,7 @@ "sttm": "0905", "totm": "", "goaltime": "111", - "ptotm": "2025-04-08 17:23:59", + "ptotm": "2025-04-09 09:13:15", "psttm": "2025-04-07 09:05:21" }, "isCheck": false @@ -1710,10 +1710,10 @@ "sttm": "1022", "totm": "", "goaltime": "329", - "ptotm": "2025-04-08 15:24:11", + "ptotm": "2025-04-09 15:25:30", "psttm": "2025-04-07 10:22:51" }, - "isCheck": true + "isCheck": false }, { "completeInfo": { @@ -1745,7 +1745,7 @@ "sttm": "1515", "totm": "", "goaltime": "219", - "ptotm": "2025-04-08 18:25:14", + "ptotm": "2025-04-09 11:49:52", "psttm": "2025-04-08 15:15:55" }, "isCheck": false