diff --git a/Assets/InputManagerScript.cs b/Assets/InputManagerScript.cs index 65e28f3..3a02668 100644 --- a/Assets/InputManagerScript.cs +++ b/Assets/InputManagerScript.cs @@ -123,10 +123,17 @@ public class InputManagerScript : MonoBehaviour { } else if (Input.GetKeyUp (KeyCode.Space) && actionOption > -1) { actionSelected = true; unitSelected = false; + showActions = false; + DestroyObject (i1); + DestroyObject (i2); } } + if (actionSelected) { + + } + } public void setTurnMan(TurnManagerScript tms) { diff --git a/Assets/lichModel.prefab b/Assets/lichModel.prefab deleted file mode 100644 index 99d9ffb..0000000 --- a/Assets/lichModel.prefab +++ /dev/null @@ -1,122 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1000013980076266} - m_IsPrefabParent: 1 ---- !u!1 &1000013980076266 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 4000013759539232} - - 33: {fileID: 33000012584896150} - - 136: {fileID: 136000012491019400} - - 23: {fileID: 23000010927721588} - - 114: {fileID: 114000011455505298} - m_Layer: 0 - m_Name: lichModel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4000013759539232 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013980076266} - 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: 0 ---- !u!23 &23000010927721588 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013980076266} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedWireframeHidden: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!33 &33000012584896150 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013980076266} - m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &114000011455505298 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013980076266} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f685a25083417604590f9afdb346f66f, type: 3} - m_Name: - m_EditorClassIdentifier: - actionsPerTurn: 2 - remainingActions: 0 - stepLength: 5 - precision: 50 - critChance: 10 - health: 4 - armour: 0 - mana: 0 - element: 0 - teamID: 1 - posX: 0 - posZ: 0 - attackRange: 1 - attackArea: 1 - attackDamage: 1 - attackActions: 2 - attackElem: 0 ---- !u!136 &136000012491019400 -CapsuleCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000013980076266} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/lichModel.prefab.meta b/Assets/lichModel.prefab.meta deleted file mode 100644 index dcaf00e..0000000 --- a/Assets/lichModel.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 055ce9e83be0bd140a3e7aa52d871817 -timeCreated: 1477697442 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: