diff --git a/Assets/Generator.cs b/Assets/Generator.cs index 6914bf4..ade6612 100644 --- a/Assets/Generator.cs +++ b/Assets/Generator.cs @@ -3,9 +3,9 @@ using System.Collections; public class Generator : MonoBehaviour { - GameObject tmanager; - GameObject mcreator; - GameObject ucreator; + public GameObject tmanager; + public GameObject mcreator; + public GameObject ucreator; TurnManagerScript tScript; MapCreation mScript; UnitCreator uScript; diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs index 1148849..8fd80c4 100644 --- a/Assets/TurnManagerScript.cs +++ b/Assets/TurnManagerScript.cs @@ -30,6 +30,7 @@ public class TurnManagerScript : MonoBehaviour { actualNumChars = 1;//charList [actualPlayer].Count; // Characters that have finished its actions actualNumFinishedChars = 0; + } // Update is called once per frame diff --git a/Assets/UnitCreator.cs b/Assets/UnitCreator.cs index c0e3809..22e9b4b 100644 --- a/Assets/UnitCreator.cs +++ b/Assets/UnitCreator.cs @@ -5,7 +5,6 @@ using System.Collections.Generic; public class UnitCreator : MonoBehaviour { public GameObject lichObject; - public UnitBehaviour playerLich; public GameObject skeletonObject; public List units; @@ -36,7 +35,7 @@ public class UnitCreator : MonoBehaviour { lich.GetComponent ().SetupBaseAttack (4, 2, 3); if (team == UnitBehaviour.Team.Player) - playerLich = lich.GetComponent (); + script = lich.GetComponent (); } else if (type == UnitType.Skeleton) { GameObject skeleton; skeleton = Instantiate (skeletonObject, posVec3, Quaternion.identity) as GameObject; diff --git a/Assets/scene1.unity b/Assets/scene1.unity index 5ec876b..253229f 100644 --- a/Assets/scene1.unity +++ b/Assets/scene1.unity @@ -90,3 +90,137 @@ NavMeshSettings: cellSize: 0.16666667 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &1287475202 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1287475203} + - 20: {fileID: 1287475207} + - 124: {fileID: 1287475206} + - 92: {fileID: 1287475205} + - 81: {fileID: 1287475204} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1287475203 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1287475202} + m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} + m_LocalPosition: {x: 0, y: 15, z: -5} + m_LocalScale: {x: 1, y: 4, z: 1} + m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 2032841070} + m_RootOrder: 0 +--- !u!81 &1287475204 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1287475202} + m_Enabled: 1 +--- !u!92 &1287475205 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1287475202} + m_Enabled: 1 +--- !u!124 &1287475206 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1287475202} + m_Enabled: 1 +--- !u!20 &1287475207 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1287475202} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 + m_StereoMirrorMode: 0 +--- !u!1001 &2032841069 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalPosition.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalPosition.y + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalPosition.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &2032841070 stripped +Transform: + m_PrefabParentObject: {fileID: 4000010883015132, guid: 5fe675c564d71cc44945f6ca7e09e827, + type: 2} + m_PrefabInternal: {fileID: 2032841069}