From 3e259dfb9c0448001c6e558d483e57e0e03ab8cc Mon Sep 17 00:00:00 2001 From: RosimInc Date: Sat, 30 Jan 2016 13:59:24 -0500 Subject: [PATCH] Added a collider to the tiles, and created a makeshift player controller to test it. Changed the level generation to be centered. --- Assets/art/Resources/runic_a.png | Bin 24566 -> 22036 bytes Assets/art/Resources/runic_a.png.meta | 4 +- Assets/art/Resources/runic_b.png.meta | 2 +- Assets/art/Resources/runic_c.png.meta | 2 +- Assets/art/Resources/runic_d.png.meta | 2 +- Assets/art/Resources/runic_e.png.meta | 2 +- Assets/art/Resources/runic_f.png.meta | 2 +- Assets/art/Resources/runic_g.png.meta | 2 +- Assets/art/Resources/runic_h.png.meta | 2 +- Assets/art/Resources/runic_i.png.meta | 2 +- Assets/art/Resources/runic_j.png.meta | 2 +- Assets/art/Resources/runic_k.png.meta | 2 +- Assets/art/Resources/runic_l.png.meta | 2 +- Assets/art/Resources/runic_m.png.meta | 2 +- Assets/art/Resources/runic_n.png.meta | 2 +- Assets/art/Resources/runic_o.png.meta | 2 +- Assets/art/Resources/runic_p.png.meta | 2 +- Assets/art/Resources/runic_q.png.meta | 2 +- Assets/art/Resources/runic_r.png.meta | 2 +- Assets/art/Resources/runic_s.png.meta | 2 +- Assets/art/Resources/runic_t.png.meta | 2 +- Assets/art/Resources/runic_u.png.meta | 2 +- Assets/art/Resources/runic_v.png.meta | 2 +- Assets/art/Resources/runic_w.png.meta | 2 +- Assets/art/Resources/runic_x.png.meta | 2 +- Assets/art/Resources/runic_y.png.meta | 2 +- Assets/art/Resources/runic_z.png.meta | 2 +- Assets/prefabs/HexSprite.prefab | 14 + Assets/scenes/gameplay_01.unity | 371 ++++++++++++++++++++++ Assets/scenes/gameplay_01.unity.meta | 8 + Assets/scripts/HexSpawner.cs | 18 +- Assets/scripts/PlayerControllerSR.cs | 33 ++ Assets/scripts/PlayerControllerSR.cs.meta | 12 + Assets/scripts/RuneBehaviour.cs | 2 +- 34 files changed, 478 insertions(+), 34 deletions(-) create mode 100644 Assets/scenes/gameplay_01.unity create mode 100644 Assets/scenes/gameplay_01.unity.meta create mode 100644 Assets/scripts/PlayerControllerSR.cs create mode 100644 Assets/scripts/PlayerControllerSR.cs.meta diff --git a/Assets/art/Resources/runic_a.png b/Assets/art/Resources/runic_a.png index 2c87ad064ef482c0a2d7cd3db25ef0a7e1407840..70b4a655d8db646729b8990f04db01cda4dc65c3 100644 GIT binary patch delta 2135 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 aKoV4T%5nOdzo$0{7^cRSMimBbG5-b1?85f| diff --git a/Assets/art/Resources/runic_a.png.meta b/Assets/art/Resources/runic_a.png.meta index 5c49323..b077b6d 100644 --- a/Assets/art/Resources/runic_a.png.meta +++ b/Assets/art/Resources/runic_a.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 66dd4c2892ce4c740a86a6aa21f4f4b7 -timeCreated: 1454150346 +guid: bd4033904c00e7e459e6c2b5b6885440 +timeCreated: 1454180206 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/art/Resources/runic_b.png.meta b/Assets/art/Resources/runic_b.png.meta index e676ce1..35f4bc8 100644 --- a/Assets/art/Resources/runic_b.png.meta +++ b/Assets/art/Resources/runic_b.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_c.png.meta b/Assets/art/Resources/runic_c.png.meta index b805b6c..86fd105 100644 --- a/Assets/art/Resources/runic_c.png.meta +++ b/Assets/art/Resources/runic_c.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_d.png.meta b/Assets/art/Resources/runic_d.png.meta index 364727e..50dfe60 100644 --- a/Assets/art/Resources/runic_d.png.meta +++ b/Assets/art/Resources/runic_d.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_e.png.meta b/Assets/art/Resources/runic_e.png.meta index 63ef036..5c24a42 100644 --- a/Assets/art/Resources/runic_e.png.meta +++ b/Assets/art/Resources/runic_e.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_f.png.meta b/Assets/art/Resources/runic_f.png.meta index c111d17..b0224ef 100644 --- a/Assets/art/Resources/runic_f.png.meta +++ b/Assets/art/Resources/runic_f.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_g.png.meta b/Assets/art/Resources/runic_g.png.meta index f4aa2ad..101357f 100644 --- a/Assets/art/Resources/runic_g.png.meta +++ b/Assets/art/Resources/runic_g.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_h.png.meta b/Assets/art/Resources/runic_h.png.meta index 6b3f8a8..fa9b280 100644 --- a/Assets/art/Resources/runic_h.png.meta +++ b/Assets/art/Resources/runic_h.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_i.png.meta b/Assets/art/Resources/runic_i.png.meta index 1e9b83d..5031901 100644 --- a/Assets/art/Resources/runic_i.png.meta +++ b/Assets/art/Resources/runic_i.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_j.png.meta b/Assets/art/Resources/runic_j.png.meta index d28f503..56c3cd3 100644 --- a/Assets/art/Resources/runic_j.png.meta +++ b/Assets/art/Resources/runic_j.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_k.png.meta b/Assets/art/Resources/runic_k.png.meta index 1e66978..9981fb7 100644 --- a/Assets/art/Resources/runic_k.png.meta +++ b/Assets/art/Resources/runic_k.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_l.png.meta b/Assets/art/Resources/runic_l.png.meta index f51989c..bc1c4a6 100644 --- a/Assets/art/Resources/runic_l.png.meta +++ b/Assets/art/Resources/runic_l.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_m.png.meta b/Assets/art/Resources/runic_m.png.meta index d49e3a9..87bfdcc 100644 --- a/Assets/art/Resources/runic_m.png.meta +++ b/Assets/art/Resources/runic_m.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_n.png.meta b/Assets/art/Resources/runic_n.png.meta index 47b220e..f5f5d48 100644 --- a/Assets/art/Resources/runic_n.png.meta +++ b/Assets/art/Resources/runic_n.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_o.png.meta b/Assets/art/Resources/runic_o.png.meta index 75af061..8a14707 100644 --- a/Assets/art/Resources/runic_o.png.meta +++ b/Assets/art/Resources/runic_o.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_p.png.meta b/Assets/art/Resources/runic_p.png.meta index 1b36350..cc28529 100644 --- a/Assets/art/Resources/runic_p.png.meta +++ b/Assets/art/Resources/runic_p.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_q.png.meta b/Assets/art/Resources/runic_q.png.meta index 6ff43ab..fd42505 100644 --- a/Assets/art/Resources/runic_q.png.meta +++ b/Assets/art/Resources/runic_q.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_r.png.meta b/Assets/art/Resources/runic_r.png.meta index 391391b..77b7167 100644 --- a/Assets/art/Resources/runic_r.png.meta +++ b/Assets/art/Resources/runic_r.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_s.png.meta b/Assets/art/Resources/runic_s.png.meta index 99a139f..09ae0dc 100644 --- a/Assets/art/Resources/runic_s.png.meta +++ b/Assets/art/Resources/runic_s.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_t.png.meta b/Assets/art/Resources/runic_t.png.meta index 0c699d2..3efa094 100644 --- a/Assets/art/Resources/runic_t.png.meta +++ b/Assets/art/Resources/runic_t.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_u.png.meta b/Assets/art/Resources/runic_u.png.meta index b789a4d..fde4b2f 100644 --- a/Assets/art/Resources/runic_u.png.meta +++ b/Assets/art/Resources/runic_u.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_v.png.meta b/Assets/art/Resources/runic_v.png.meta index 81c3de5..97e809d 100644 --- a/Assets/art/Resources/runic_v.png.meta +++ b/Assets/art/Resources/runic_v.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_w.png.meta b/Assets/art/Resources/runic_w.png.meta index 3fdad3d..3d15ae1 100644 --- a/Assets/art/Resources/runic_w.png.meta +++ b/Assets/art/Resources/runic_w.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_x.png.meta b/Assets/art/Resources/runic_x.png.meta index c9ed537..79c5298 100644 --- a/Assets/art/Resources/runic_x.png.meta +++ b/Assets/art/Resources/runic_x.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_y.png.meta b/Assets/art/Resources/runic_y.png.meta index a9e57bb..9f5eacf 100644 --- a/Assets/art/Resources/runic_y.png.meta +++ b/Assets/art/Resources/runic_y.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/art/Resources/runic_z.png.meta b/Assets/art/Resources/runic_z.png.meta index 986fe85..a89466d 100644 --- a/Assets/art/Resources/runic_z.png.meta +++ b/Assets/art/Resources/runic_z.png.meta @@ -30,7 +30,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: filterMode: -1 - aniso: -1 + aniso: 16 mipBias: -1 wrapMode: 1 nPOTScale: 0 diff --git a/Assets/prefabs/HexSprite.prefab b/Assets/prefabs/HexSprite.prefab index 2e0a789..aee9102 100644 --- a/Assets/prefabs/HexSprite.prefab +++ b/Assets/prefabs/HexSprite.prefab @@ -10,6 +10,7 @@ GameObject: - 4: {fileID: 401170} - 212: {fileID: 21265262} - 114: {fileID: 11401426} + - 135: {fileID: 13500080} m_Layer: 0 m_Name: HexSprite m_TagString: Untagged @@ -70,6 +71,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: symbol: {fileID: 21241768} + letterNum: 0 +--- !u!135 &13500080 +SphereCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 118646} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: .319999993 + m_Center: {x: 0, y: 0, z: 0} --- !u!212 &21241768 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/scenes/gameplay_01.unity b/Assets/scenes/gameplay_01.unity new file mode 100644 index 0000000..f1d68ad --- /dev/null +++ b/Assets/scenes/gameplay_01.unity @@ -0,0 +1,371 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: .25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 6 + m_Fog: 0 + m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogMode: 3 + m_FogDensity: .00999999978 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} + m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} + m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: .5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_GIWorkflowMode: 1 + m_LightmapsMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 3 + m_Resolution: 2 + m_BakeResolution: 40 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_AOMaxDistance: 1 + m_Padding: 2 + m_CompAOExponent: 0 + m_LightmapParameters: {fileID: 0} + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 + m_LightmapSnapshot: {fileID: 0} + m_RuntimeCPUUsage: 25 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentRadius: .5 + agentHeight: 2 + agentSlope: 45 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + cellSize: .166666672 + manualCellSize: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &132542564 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 132542565} + - 33: {fileID: 132542568} + - 136: {fileID: 132542567} + - 23: {fileID: 132542566} + - 114: {fileID: 132542569} + - 54: {fileID: 132542570} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &132542565 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132542564} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: 0, y: 0, z: -.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1624102091} + m_RootOrder: 0 +--- !u!23 &132542566 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132542564} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!136 &132542567 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132542564} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: .5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &132542568 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132542564} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &132542569 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132542564} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b33743cc22e241142886a7758ce5dc74, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!54 &132542570 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 132542564} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .0500000007 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &478275693 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 478275698} + - 20: {fileID: 478275697} + - 92: {fileID: 478275696} + - 124: {fileID: 478275695} + - 81: {fileID: 478275694} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &478275694 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478275693} + m_Enabled: 1 +--- !u!124 &478275695 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478275693} + m_Enabled: 1 +--- !u!92 &478275696 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478275693} + m_Enabled: 1 +--- !u!20 &478275697 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478275693} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: .300000012 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + 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: .0219999999 + m_StereoMirrorMode: 0 +--- !u!4 &478275698 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 478275693} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: 0, y: 10, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!1 &1624102089 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1624102091} + - 114: {fileID: 1624102090} + m_Layer: 0 + m_Name: Level + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1624102090 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1624102089} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc18b8c2e3daedc418978ae09dd589d6, type: 3} + m_Name: + m_EditorClassIdentifier: + numRows: 9 + numColumns: 4 + xScale: 1 + yScale: 1 + dimension: .680000007 + hexagon: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} +--- !u!4 &1624102091 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1624102089} + m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 132542565} + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1001 &1944944027 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 401170, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_Name + value: RuneTile + objectReference: {fileID: 0} + - target: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 950731e814d3ade4c91c128681c35ce2, type: 2} + m_IsPrefabParent: 0 diff --git a/Assets/scenes/gameplay_01.unity.meta b/Assets/scenes/gameplay_01.unity.meta new file mode 100644 index 0000000..4db9be0 --- /dev/null +++ b/Assets/scenes/gameplay_01.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9c3ca496461d394ab2950948321a11d +timeCreated: 1454171695 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/HexSpawner.cs b/Assets/scripts/HexSpawner.cs index aa33953..43b1fd0 100644 --- a/Assets/scripts/HexSpawner.cs +++ b/Assets/scripts/HexSpawner.cs @@ -29,17 +29,23 @@ public class HexSpawner : MonoBehaviour { GameObject hex; RuneBehaviour rune; int index = 0; + + float xOffset = numColumns * 1.5f * dimension / 2f; + float yOffset = numRows * 1f * ratio * dimension / 2f; + for (int row = 0; row < numRows; row++) { for (int col = 0; col < numColumns; col++) { - hex = GameObject.Instantiate(hexagon, transform.position + - new Vector3( - (3f*dimension*col + 1.5f*dimension * (row%2)) * xScale, - (row * ratio * dimension) * yScale, 0f), - Quaternion.identity) as GameObject; - hex.transform.localScale = new Vector3(xScale, yScale, 1f); + hex = GameObject.Instantiate(hexagon) as GameObject; hex.transform.parent = transform; + hex.transform.localScale = new Vector3(xScale, yScale, 1f); + + hex.transform.localPosition = new Vector3( + (3f * dimension * col + 1.5f * dimension * (row % 2)) * xScale - xOffset, + (row * ratio * dimension) * yScale - yOffset, 0f); + + hex.transform.localRotation = Quaternion.identity; rune = hex.GetComponent(); rune.SetSymbol(randomNums[index++]); diff --git a/Assets/scripts/PlayerControllerSR.cs b/Assets/scripts/PlayerControllerSR.cs new file mode 100644 index 0000000..18625bf --- /dev/null +++ b/Assets/scripts/PlayerControllerSR.cs @@ -0,0 +1,33 @@ +using UnityEngine; +using System.Collections; + +public class PlayerControllerSR : MonoBehaviour { + + private Rigidbody rb; + + // Use this for initialization + void Start () { + rb = GetComponent(); + } + + // Update is called once per frame + void Update () { + } + + void FixedUpdate() + { + if (Input.GetKey(KeyCode.A)) + rb.AddForce(-transform.right * 5); + if (Input.GetKey(KeyCode.D)) + rb.AddForce(transform.right * 5); + if (Input.GetKey(KeyCode.S)) + rb.AddForce(transform.forward * 5); + if (Input.GetKey(KeyCode.W)) + rb.AddForce(-transform.forward * 5); + } + + void OnTriggerEnter(Collider col) + { + Debug.Log(col.gameObject.GetComponent().letterNum); + } +} diff --git a/Assets/scripts/PlayerControllerSR.cs.meta b/Assets/scripts/PlayerControllerSR.cs.meta new file mode 100644 index 0000000..37e224f --- /dev/null +++ b/Assets/scripts/PlayerControllerSR.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b33743cc22e241142886a7758ce5dc74 +timeCreated: 1454177489 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/scripts/RuneBehaviour.cs b/Assets/scripts/RuneBehaviour.cs index fe2f31d..18983da 100644 --- a/Assets/scripts/RuneBehaviour.cs +++ b/Assets/scripts/RuneBehaviour.cs @@ -5,7 +5,7 @@ public class RuneBehaviour : MonoBehaviour { public static float range; public SpriteRenderer symbol; - private int letterNum; + public int letterNum; // Use this for initialization void Start () {