diff --git a/Assets/Prefabs/ImagePrefab.prefab b/Assets/Prefabs/ImagePrefab.prefab index 74253ba..fb0a0ba 100644 --- a/Assets/Prefabs/ImagePrefab.prefab +++ b/Assets/Prefabs/ImagePrefab.prefab @@ -95,7 +95,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} diff --git a/Assets/Prefabs/SampleChild.prefab b/Assets/Prefabs/SampleChild.prefab index d122cd6..1dd43de 100644 --- a/Assets/Prefabs/SampleChild.prefab +++ b/Assets/Prefabs/SampleChild.prefab @@ -11,9 +11,8 @@ GameObject: - component: {fileID: 8377239034391175029} - component: {fileID: 9139133142503423203} - component: {fileID: 3009414327569646558} - - component: {fileID: 2005664997886428897} m_Layer: 5 - m_Name: InsideButton + m_Name: InsideTexture m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -76,62 +75,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &2005664997886428897 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1693331782008995342} - 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: 3009414327569646558} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 3265764588146964386} - m_TargetAssemblyTypeName: InterfaceOff.WindowInteractions, Assembly-CSharp - m_MethodName: WindowClicked - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!1 &3890928559484794403 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/WindowBase.cs b/Assets/Scripts/WindowBase.cs index 1e09108..3834bf8 100644 --- a/Assets/Scripts/WindowBase.cs +++ b/Assets/Scripts/WindowBase.cs @@ -1,4 +1,3 @@ -using System; using UnityEngine; namespace InterfaceOff diff --git a/Assets/Scripts/Windows/ImageWindow.cs b/Assets/Scripts/Windows/ImageWindow.cs index 8a8a6a7..f2a44d2 100644 --- a/Assets/Scripts/Windows/ImageWindow.cs +++ b/Assets/Scripts/Windows/ImageWindow.cs @@ -24,6 +24,8 @@ namespace InterfaceOff new(-45, -45), new(45f, -45) }; + + private int m_TilesRotatedCorrectly; public override void OnWindowInstantiation() { @@ -36,7 +38,7 @@ namespace InterfaceOff t.sizeDelta = new Vector2(80, 80); t.localPosition = Positions[i]; - t.eulerAngles = new Vector3(0, 0, Random.Range(0, 4) * 90); + t.eulerAngles = new Vector3(0, 0, Random.Range(1, 4) * 90); Image img = go.GetComponent(); img.material = new Material(Shader.Find("UI/Default")); @@ -54,8 +56,22 @@ namespace InterfaceOff rect.rotation = Quaternion.Euler(rot); } + + if (rect.rotation.eulerAngles.z < 45 && rect.rotation.eulerAngles.z > -45) + { + m_TilesRotatedCorrectly++; + button.interactable = false; + } }); } } + + private void Update() + { + if (m_TilesRotatedCorrectly == 4) + { + Destroy(gameObject); + } + } } } \ No newline at end of file