From 66db2b66d9e9f5651c5039c10931fd870a731a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Sch=C3=B6ner?= <tobias.stonehead@gmail.com> Date: Fri, 24 Mar 2023 14:20:26 +0100 Subject: [PATCH] feat: FactScreen visibility can be toggled Moved FactScreen to top right corner Default visibility is off Only for Desktop UI (not Android) right now --- Assets/Images/Triangle.png | 3 + Assets/Images/Triangle.png.meta | 134 +++++++ Assets/Resources/Prefabs/Stage_Default.prefab | 332 +++++++++++++++++- .../InventoryStuff/ToggleFactscreen.cs | 22 ++ .../InventoryStuff/ToggleFactscreen.cs.meta | 11 + 5 files changed, 496 insertions(+), 6 deletions(-) create mode 100644 Assets/Images/Triangle.png create mode 100644 Assets/Images/Triangle.png.meta create mode 100644 Assets/Scripts/InventoryStuff/ToggleFactscreen.cs create mode 100644 Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta diff --git a/Assets/Images/Triangle.png b/Assets/Images/Triangle.png new file mode 100644 index 00000000..9052861c --- /dev/null +++ b/Assets/Images/Triangle.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb765faf74cf104e6bb6341be6f2e47206e5d0648b79024ed7d88b53491f1b8b +size 1586 diff --git a/Assets/Images/Triangle.png.meta b/Assets/Images/Triangle.png.meta new file mode 100644 index 00000000..babd948f --- /dev/null +++ b/Assets/Images/Triangle.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: c18c9993be7216f4da0c3f1f5b1f4b2f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + 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: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + 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: 2048 + 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/Prefabs/Stage_Default.prefab b/Assets/Resources/Prefabs/Stage_Default.prefab index c3a99c68..4172763d 100644 --- a/Assets/Resources/Prefabs/Stage_Default.prefab +++ b/Assets/Resources/Prefabs/Stage_Default.prefab @@ -138,6 +138,82 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4759014320482245552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3351256321594382437} + - component: {fileID: 9091113729331777899} + - component: {fileID: 2282555796035280519} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3351256321594382437 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759014320482245552} + 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: 3601710781356316471} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9091113729331777899 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759014320482245552} + m_CullTransparentMesh: 1 +--- !u!114 &2282555796035280519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4759014320482245552} + 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: 0.7735849, g: 0.7735849, b: 0.7735849, 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: c18c9993be7216f4da0c3f1f5b1f4b2f, 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 &5271626897556190298 GameObject: m_ObjectHideFlags: 0 @@ -508,6 +584,158 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 +--- !u!1 &6415516954892544643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3601710781356316471} + - component: {fileID: 6924270970807637233} + - component: {fileID: 1755233973806084716} + - component: {fileID: 3683008829118992766} + - component: {fileID: 19084044747743094} + m_Layer: 5 + m_Name: ToggleFactscreen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3601710781356316471 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + 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: 3351256321594382437} + m_Father: {fileID: 3231672575207917310} + m_RootOrder: 8 + 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: -59.9, y: 244.5} + m_SizeDelta: {x: 23.7241, y: 591.02} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6924270970807637233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + m_CullTransparentMesh: 1 +--- !u!114 &1755233973806084716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + 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: 0.9622642, g: 0.9622642, b: 0.9622642, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &3683008829118992766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 0, g: 0, b: 0, a: 0.27450982} + m_HighlightedColor: {r: 0, g: 0, b: 0, a: 0.39215687} + m_PressedColor: {r: 0, g: 0, b: 0, a: 0.50980395} + m_SelectedColor: {r: 0, g: 0, b: 0, a: 0.27450982} + 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: 5419392060038334562} + toggleTransition: 0 + graphic: {fileID: 0} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 444088929240414686} + m_TargetAssemblyTypeName: ToggleFactscreen, Assembly-CSharp + m_MethodName: ToggleActive + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 3683008829118992766} + m_ObjectArgumentAssemblyTypeName: UnityEngine.UI.Toggle, UnityEngine.UI + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_IsOn: 0 +--- !u!114 &19084044747743094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6415516954892544643} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7206e8172594200478e26a3e33882072, type: 3} + m_Name: + m_EditorClassIdentifier: + targetGraphic: {fileID: 3351256321594382437} --- !u!1001 &442227395851957050 PrefabInstance: m_ObjectHideFlags: 0 @@ -1978,7 +2206,17 @@ PrefabInstance: - target: {fileID: 722122376462753113, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.00047302246 + value: 0.00048828125 + objectReference: {fileID: 0} + - target: {fileID: 861183261329167868, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 1080 + objectReference: {fileID: 0} + - target: {fileID: 861183261329167868, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 540 objectReference: {fileID: 0} - target: {fileID: 861183262247596663, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -1998,7 +2236,7 @@ PrefabInstance: - target: {fileID: 861183262295209870, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.000030517578 + value: 0 objectReference: {fileID: 0} - target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -2008,7 +2246,7 @@ PrefabInstance: - target: {fileID: 861183262417667852, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_Value - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 861183262417667854, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -2595,6 +2833,16 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5279394910857840864, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: -60 + objectReference: {fileID: 0} + - target: {fileID: 5279394910857840864, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -30.000008 + objectReference: {fileID: 0} - target: {fileID: 5880767994834397926, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y @@ -2628,12 +2876,12 @@ PrefabInstance: - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -2648,7 +2896,7 @@ PrefabInstance: - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} propertyPath: m_AnchoredPosition.x - value: 940 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6244008554354758921, guid: b996060e27da25c498842defc1996d84, type: 3} @@ -2770,6 +3018,36 @@ PrefabInstance: propertyPath: m_FlexibleHeight value: 5 objectReference: {fileID: 0} + - target: {fileID: 8689405068913440417, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440420, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.x + value: 890 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_SizeDelta.y + value: 580 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1353 + objectReference: {fileID: 0} + - target: {fileID: 8689405068913440423, guid: b996060e27da25c498842defc1996d84, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -295.4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b996060e27da25c498842defc1996d84, type: 3} --- !u!114 &3020720018354060034 stripped @@ -2824,6 +3102,48 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2822275412857346440} m_PrefabAsset: {fileID: 0} +--- !u!114 &5419392060038334562 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7790999573849575914, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6898471569945669420 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8689405068913440420, guid: b996060e27da25c498842defc1996d84, + type: 3} + m_PrefabInstance: {fileID: 2822275412857346440} + m_PrefabAsset: {fileID: 0} +--- !u!225 &8486908058320627190 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6898471569945669420} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 +--- !u!114 &444088929240414686 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6898471569945669420} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 686d83dd60fa23f4d8b9610c69b02992, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4633513391531001248 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs new file mode 100644 index 00000000..adc37814 --- /dev/null +++ b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent(typeof(CanvasGroup))] +public class ToggleFactscreen : MonoBehaviour +{ + CanvasGroup cg; + void Start() + { + cg = transform.GetComponent<CanvasGroup>(); + } + + public void ToggleActive(Toggle t) + { + bool isActive = t.isOn; + cg.alpha = isActive ? 1 : 0; + cg.interactable = isActive; + cg.blocksRaycasts = isActive; + } +} diff --git a/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta new file mode 100644 index 00000000..41651de6 --- /dev/null +++ b/Assets/Scripts/InventoryStuff/ToggleFactscreen.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 686d83dd60fa23f4d8b9610c69b02992 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: -- GitLab