From d1bbc1cfd89871aba34b1058dfa47110fc9911c8 Mon Sep 17 00:00:00 2001 From: "falc@null.net" Date: Sat, 29 Oct 2016 05:20:21 +0200 Subject: [PATCH] lmao --- Assets/Cursor.prefab | 219 ++++++++++++++++++++++++++++++++---- Assets/Cursor.prefab.meta | 2 +- Assets/TurnManager.prefab | 2 +- Assets/TurnManagerScript.cs | 10 +- Assets/scene1.unity | 151 ------------------------- 5 files changed, 206 insertions(+), 178 deletions(-) diff --git a/Assets/Cursor.prefab b/Assets/Cursor.prefab index cdc22d6..bc883ae 100644 --- a/Assets/Cursor.prefab +++ b/Assets/Cursor.prefab @@ -9,19 +9,54 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1000010503850698} + m_RootGameObject: {fileID: 1000014036820566} m_IsPrefabParent: 1 ---- !u!1 &1000010503850698 +--- !u!1 &1000011460200154 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 4000010888676870} + - 108: {fileID: 108000012217359278} + m_Layer: 0 + m_Name: Directional light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1000012648281776 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 4000010883015132} - - 33: {fileID: 33000013312812012} - - 65: {fileID: 65000010217207502} - - 23: {fileID: 23000013083048714} + - 4: {fileID: 4000012458436486} + - 20: {fileID: 20000011826888576} + - 124: {fileID: 124000011538612066} + - 92: {fileID: 92000013113978152} + - 81: {fileID: 81000012413522894} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1000014036820566 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 4000011296888044} + - 65: {fileID: 65000014085508008} + - 23: {fileID: 23000012198927780} + - 108: {fileID: 108000013905963112} m_Layer: 0 m_Name: Cursor m_TagString: Untagged @@ -29,25 +64,87 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4000010883015132 +--- !u!4 &4000010888676870 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010503850698} + m_GameObject: {fileID: 1000011460200154} + 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: 50, y: -30, z: 0} + m_Children: [] + m_Father: {fileID: 4000012458436486} + m_RootOrder: 0 +--- !u!4 &4000011296888044 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000014036820566} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.5, y: 1.25, z: 0.5} m_LocalScale: {x: 1, y: 0.25, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: [] + m_Children: + - {fileID: 4000012458436486} m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!23 &23000013083048714 +--- !u!4 &4000012458436486 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012648281776} + 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: 5.6875005, z: 1.421875} + m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} + m_Children: + - {fileID: 4000010888676870} + m_Father: {fileID: 4000011296888044} + m_RootOrder: 0 +--- !u!20 &20000011826888576 +Camera: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012648281776} + 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!23 &23000012198927780 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010503850698} + m_GameObject: {fileID: 1000014036820566} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -71,22 +168,104 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!33 &33000013312812012 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010503850698} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &65000010217207502 +--- !u!65 &65000014085508008 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1000010503850698} + m_GameObject: {fileID: 1000014036820566} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!81 &81000012413522894 +AudioListener: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012648281776} + m_Enabled: 1 +--- !u!92 &92000013113978152 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012648281776} + m_Enabled: 1 +--- !u!108 &108000012217359278 +Light: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000011460200154} + m_Enabled: 1 + serializedVersion: 7 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!108 &108000013905963112 +Light: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000014036820566} + m_Enabled: 1 + serializedVersion: 7 + m_Type: 0 + m_Color: {r: 0.36445722, g: 0.7692899, b: 0.78676474, a: 1} + m_Intensity: 1 + m_Range: 30 + m_SpotAngle: 89 + m_CookieSize: 10 + m_Shadows: + m_Type: 0 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 1 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!124 &124000011538612066 +Behaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1000012648281776} + m_Enabled: 1 diff --git a/Assets/Cursor.prefab.meta b/Assets/Cursor.prefab.meta index 4800a6e..9c46dc9 100644 --- a/Assets/Cursor.prefab.meta +++ b/Assets/Cursor.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 5fe675c564d71cc44945f6ca7e09e827 -timeCreated: 1477706648 +timeCreated: 1477709249 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/TurnManager.prefab b/Assets/TurnManager.prefab index da17ad2..ae4e4b6 100644 --- a/Assets/TurnManager.prefab +++ b/Assets/TurnManager.prefab @@ -58,4 +58,4 @@ MonoBehaviour: terrain: charMap: [] mapSize: {x: 0, y: 0} - cursor: {fileID: 1000010503850698, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} + cursor: {fileID: 1000014036820566, guid: 5fe675c564d71cc44945f6ca7e09e827, type: 2} diff --git a/Assets/TurnManagerScript.cs b/Assets/TurnManagerScript.cs index cb1466f..5d6dffe 100644 --- a/Assets/TurnManagerScript.cs +++ b/Assets/TurnManagerScript.cs @@ -31,7 +31,7 @@ public class TurnManagerScript : MonoBehaviour { // Characters that have finished its actions actualNumFinishedChars = 0; - cursor = Instantiate (cursor, new Vector3 (1.5f, 1.0f, 1.5f), Quaternion.identity) as GameObject; + cursor = Instantiate (cursor, new Vector3 (1.0f, 1.0f, 1.0f), Quaternion.identity) as GameObject; } @@ -39,19 +39,19 @@ public class TurnManagerScript : MonoBehaviour { void Update () { if (Input.GetKey (KeyCode.LeftArrow)) { - cursor.transform.Translate (-1, 0, 0); + cursor.transform.Translate (-0.25f, 0, 0); } if (Input.GetKey (KeyCode.RightArrow)) { - cursor.transform.Translate (1, 0, 0); + cursor.transform.Translate (0.25f, 0, 0); } if (Input.GetKey (KeyCode.UpArrow)) { - cursor.transform.Translate (0, 0, 1); + cursor.transform.Translate (0, 0, 0.25f); } if (Input.GetKey (KeyCode.DownArrow)) { - cursor.transform.Translate (0, 0, -1); + cursor.transform.Translate (0, 0, -0.25f); } if (actualNumFinishedChars == actualNumChars) { diff --git a/Assets/scene1.unity b/Assets/scene1.unity index 06f855c..a8bff21 100644 --- a/Assets/scene1.unity +++ b/Assets/scene1.unity @@ -132,155 +132,4 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 ---- !u!1 &1043481070 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1043481071} - - 108: {fileID: 1043481072} - m_Layer: 0 - m_Name: Directional light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1043481071 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1043481070} - 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: 50, y: -30, z: 0} - m_Children: [] - m_Father: {fileID: 1287475203} m_RootOrder: 0 ---- !u!108 &1043481072 -Light: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1043481070} - m_Enabled: 1 - serializedVersion: 7 - m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 0 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 1 - m_Bias: 0.05 - m_NormalBias: 0.4 - m_NearPlane: 0.2 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 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.5, y: 5, z: -4.5} - m_LocalScale: {x: 1, y: 1.7500004, z: 0.8124999} - m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} - m_Children: - - {fileID: 1043481071} - m_Father: {fileID: 0} - 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