diff --git a/Assets/Generator.cs b/Assets/Generator.cs index 1f6f3b4..dd78431 100644 --- a/Assets/Generator.cs +++ b/Assets/Generator.cs @@ -6,9 +6,11 @@ public class Generator : MonoBehaviour { public GameObject tmanager; public GameObject mcreator; public GameObject ucreator; + public GameObject imanager; TurnManagerScript tScript; MapCreation mScript; UnitCreator uScript; + InputManagerScript iScript; // Use this for initialization void Start () { @@ -18,9 +20,11 @@ public class Generator : MonoBehaviour { GameObject turnMan = Instantiate (tmanager); GameObject mapCreator = Instantiate (mcreator); GameObject unitCreator = Instantiate (ucreator); + GameObject inputMan = Instantiate (imanager); tScript = turnMan.GetComponent (); mScript = mapCreator.GetComponent (); uScript = unitCreator.GetComponent (); + iScript = inputMan.GetComponent (); uScript.mapSize = new Vector2 (20, 40); int[,] map = new int [x, y]; @@ -40,6 +44,7 @@ public class Generator : MonoBehaviour { uScript.tutorialUnits (); turnMan.GetComponent ().unitMap = uScript.getUnitMap (); turnMan.GetComponent ().unitList = uScript.getUnitLists (); + inputMan.GetComponent ().setTurnMan(tScript); } // Update is called once per frame diff --git a/Assets/TurnManager.prefab b/Assets/TurnManager.prefab index ffa46a2..a182a1f 100644 --- a/Assets/TurnManager.prefab +++ b/Assets/TurnManager.prefab @@ -56,6 +56,9 @@ MonoBehaviour: iaNum: 0 inTurn: 1 terrain: - charMap: [] mapSize: {x: 0, y: 0} cursor: {fileID: 1000012666769054, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + image_move: {fileID: 114000013716489878, guid: d80ae4a7a1bea5d48b549fbf1ef3f3f5, + type: 2} + image_attack: {fileID: 114000012902201940, guid: 8b74ce38e76531b42a1b0af65416b73a, + type: 2} diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs index ed71076..4628525 100644 --- a/Assets/TurnManagerScript.cs +++ b/Assets/TurnManagerScript.cs @@ -20,21 +20,7 @@ public class TurnManagerScript : MonoBehaviour { private int actualNumChars; private int actualNumFinishedChars; - public GameObject cursor; - public Image image_move; - public Image image_attack; - private float accTime; - private float timeStep; - private float timeExp; - private float timeExpStep; - private float timeExpLimit; - - - private bool unitSelected; - private bool showActions; - private Image i1; - private Image i2; // Use this for initialization void Start () { @@ -46,91 +32,12 @@ public class TurnManagerScript : MonoBehaviour { // Characters that have finished its actions actualNumFinishedChars = 0; - timeStep = 0.3f; - timeExp = 0.0f; - timeExpStep = 0.02f; - timeExpLimit = 0.15f; - cursor = Instantiate (cursor, new Vector3 (1.0f, 1.5f, 1.0f), Quaternion.identity) as GameObject; - cursor.transform.Rotate (new Vector3(90, 0, 0)); - - unitSelected = false; - showActions = false; } // Update is called once per frame void Update () { - accTime += Time.deltaTime; - - if (!showActions) { - if (Input.GetKey (KeyCode.A) && accTime > (timeStep - timeExp)) { - accTime -= (timeStep - timeExp); - if (timeExp < timeExpLimit) - timeExp += timeExpStep; - cursor.transform.Translate (-1f, 0, 0); - } else if (Input.GetKeyUp (KeyCode.LeftArrow)) { - timeExp = 0.0f; - } - - if (Input.GetKey (KeyCode.D) && accTime > (timeStep - timeExp)) { - accTime -= (timeStep - timeExp); - if (timeExp < timeExpLimit) - timeExp += timeExpStep; - cursor.transform.Translate (1f, 0, 0); - } else if (Input.GetKeyUp (KeyCode.D)) { - timeExp = 0.0f; - } - - if (Input.GetKey (KeyCode.W) && accTime > (timeStep - timeExp)) { - accTime -= (timeStep - timeExp); - if (timeExp < timeExpLimit) - timeExp += timeExpStep; - cursor.transform.Translate (0, 1f, 0); - } else if (Input.GetKeyUp (KeyCode.W)) { - timeExp = 0.0f; - } - - if (Input.GetKey (KeyCode.S) && accTime > (timeStep - timeExp)) { - accTime -= (timeStep - timeExp); - if (timeExp < timeExpLimit) - timeExp += timeExpStep; - cursor.transform.Translate (0, -1f, 0); - } else if (Input.GetKeyUp (KeyCode.S)) { - timeExp = 0.0f; - } - } else if (showActions) { - if (Input.GetKey (KeyCode.Escape)) { - showActions = false; - unitSelected = false; - DestroyObject (i1); - DestroyObject (i2); - } - - } - - - if (Input.GetKeyUp(KeyCode.Space) && !unitSelected) { - Vector3 tilePosition = cursor.transform.position; - int ipos = (int)tilePosition.z; - int jpos = (int)tilePosition.x; - GameObject c = unitMap [ipos, jpos]; - //UnitBehaviour ub = c.GetComponent (); - if (c != null) { - unitSelected = true; - showActions = true; - GameObject canv = GameObject.Find ("Canvas"); - i1 = Instantiate (image_move); - i1.transform.SetParent (canv.transform, false); - i2 = Instantiate (image_attack); - i2.transform.SetParent (canv.transform, false); - } - - //Obtener GameObject de la matriz luego extraer sus funciones - //Mostrar opciones y elegir una - //Ejecutar acción - //Profit - } if (actualNumFinishedChars == actualNumChars) { changeTeam ((actualPlayer + 1) % playerNum); @@ -157,6 +64,10 @@ public class TurnManagerScript : MonoBehaviour { actualNumFinishedChars = 0; } + public GameObject getUnitAtTile(int i, int j) { + return unitMap [i, j]; + } + /*void OnGUI(){ if (showActions) { GUI.Box (new Rect(0, 0, 100, 100), "Move"); diff --git a/Assets/scene1.unity b/Assets/scene1.unity index c783cd5..22e6bf4 100644 --- a/Assets/scene1.unity +++ b/Assets/scene1.unity @@ -90,168 +90,68 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &277070167 +--- !u!1 &140467947 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 277070168} - - 222: {fileID: 277070170} - - 114: {fileID: 277070169} - m_Layer: 5 - m_Name: Attack + - 4: {fileID: 140467950} + - 114: {fileID: 140467949} + - 114: {fileID: 140467948} + m_Layer: 0 + m_Name: EventSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &277070168 -RectTransform: +--- !u!114 &140467948 +MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 277070167} + m_GameObject: {fileID: 140467947} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &140467949 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 140467947} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 5 +--- !u!4 &140467950 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 140467947} 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] - m_Father: {fileID: 637320887} - m_RootOrder: 0 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -50, y: -50} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &277070169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 277070167} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5f0caba200e13ac4c997dd0bf79b6a3d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &277070170 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 277070167} ---- !u!1 &637320883 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 637320887} - - 223: {fileID: 637320886} - - 114: {fileID: 637320885} - - 114: {fileID: 637320884} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &637320884 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 637320883} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &637320885 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 637320883} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &637320886 -Canvas: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 637320883} - m_Enabled: 1 - serializedVersion: 2 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &637320887 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 637320883} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 277070168} - - {fileID: 1214687734} m_Father: {fileID: 0} - m_RootOrder: 2 - 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, y: 0} + m_RootOrder: 3 --- !u!1 &798253252 GameObject: m_ObjectHideFlags: 0 @@ -295,136 +195,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!1 &1214687733 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1214687734} - - 222: {fileID: 1214687736} - - 114: {fileID: 1214687735} - m_Layer: 5 - m_Name: Move - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1214687734 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1214687733} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 637320887} - m_RootOrder: 1 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: -50} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1214687735 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1214687733} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 75003bf962c59ea4c991a11cc50f31cf, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1214687736 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1214687733} ---- !u!1 &1372172833 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1372172836} - - 114: {fileID: 1372172835} - - 114: {fileID: 1372172834} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1372172834 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1372172833} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1372172835 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1372172833} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 5 ---- !u!4 &1372172836 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1372172833} - 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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 --- !u!1 &1478118646 GameObject: m_ObjectHideFlags: 0 @@ -491,6 +261,98 @@ Light: m_BounceIntensity: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &1634495340 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1634495344} + - 223: {fileID: 1634495343} + - 114: {fileID: 1634495342} + - 114: {fileID: 1634495341} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1634495341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1634495340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1634495342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1634495340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1634495343 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1634495340} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1634495344 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1634495340} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + 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, y: 0} --- !u!1 &1724536056 GameObject: m_ObjectHideFlags: 0