Skip to content

Commit

Permalink
Added zoom toggle to liberal management board
Browse files Browse the repository at this point in the history
  • Loading branch information
@Alex-McClelland
Alex-McClelland committed Jun 30, 2024
1 parent e926afb commit 30cb1cc
Show file tree
Hide file tree
Showing 2 changed files with 255 additions and 1 deletion.
229 changes: 228 additions & 1 deletion Assets/Game.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6648,6 +6648,83 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
mouseOverText:
--- !u!1 &155482632
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 155482633}
- component: {fileID: 155482635}
- component: {fileID: 155482634}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &155482633
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155482632}
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_Children: []
m_Father: {fileID: 1936071310}
m_RootOrder: 0
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!114 &155482634
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155482632}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Toggle Zoom (.)
--- !u!222 &155482635
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 155482632}
m_CullTransparentMesh: 0
--- !u!1001 &157607160
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -9451,6 +9528,7 @@ RectTransform:
- {fileID: 1242073934}
- {fileID: 625480217}
- {fileID: 742706975}
- {fileID: 1936071310}
m_Father: {fileID: 316243349}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -9513,7 +9591,7 @@ MonoBehaviour:
m_Elasticity: 0.1
m_Inertia: 0
m_DecelerationRate: 0.135
m_ScrollSensitivity: 1
m_ScrollSensitivity: 0
m_Viewport: {fileID: 812038523}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
Expand Down Expand Up @@ -87602,6 +87680,155 @@ RectTransform:
m_AnchoredPosition: {x: 89.5, y: -30.000004}
m_SizeDelta: {x: 120, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1936071309
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1936071310}
- component: {fileID: 1936071314}
- component: {fileID: 1936071313}
- component: {fileID: 1936071312}
- component: {fileID: 1936071311}
m_Layer: 5
m_Name: Toggle Zoom
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1936071310
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936071309}
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_Children:
- {fileID: 155482633}
m_Father: {fileID: 218443554}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 120, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1936071311
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936071309}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 055f0cad6c2c99245853c44f8e66e461, type: 3}
m_Name:
m_EditorClassIdentifier:
key: 46
altKey: 0
inputFields:
- {fileID: 1522214235}
blockers:
- {fileID: 188795061}
- {fileID: 1871538580}
- {fileID: 1144809721}
repeats: 0
repeatTime: 0
initialWaitTime: 1
--- !u!114 &1936071312
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936071309}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
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_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_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 1936071313}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 218443558}
m_MethodName: toggleZoom
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!114 &1936071313
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936071309}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0.19607843, b: 0.6862745, a: 1}
m_RaycastTarget: 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
--- !u!222 &1936071314
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1936071309}
m_CullTransparentMesh: 0
--- !u!1001 &1946641024
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
27 changes: 27 additions & 0 deletions Assets/Scripts/UI/Base Screen/LiberalManagementBoard.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class LiberalManagementBoard : MonoBehaviour, OrganizationManagement {
public Color buttonIllegalUnselected;

public bool expanded = false;
private bool zoomed = true;
public GameObject squadActivityButtons;

private OrganizationManagementActions actions;
Expand All @@ -71,6 +72,8 @@ public void init(OrganizationManagementActions actions)

public void show()
{
zoomIn();

if (lcsMembers == null) lcsMembers = new Dictionary<Entity, OrgPortrait>();

uiController.addCurrentScreen(this);
Expand Down Expand Up @@ -200,6 +203,30 @@ public void setSelectMode(string mode)
}
}

public void toggleZoom()
{
if (zoomed)
{
zoomOut();
}
else
{
zoomIn();
}
}

private void zoomIn()
{
zoomed = true;
content.transform.localScale = new Vector3(1, 1, 1);
}

private void zoomOut()
{
zoomed = false;
content.transform.localScale = new Vector3(0.5f, 0.5f, 1);
}

private void unselectButtons()
{
b_Activism.GetComponent<Image>().color = buttonUnselected;
Expand Down

0 comments on commit 30cb1cc

Please sign in to comment.