diff --git a/Assets/Backgrounds/Endscreen_Cover.png b/Assets/Backgrounds/Endscreen_Cover.png new file mode 100644 index 0000000..c664843 --- /dev/null +++ b/Assets/Backgrounds/Endscreen_Cover.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af05e93e1e17f8432d14b410e8a9e677b93ac9ffada20b14ca1f2a4138d9109d +size 23561435 diff --git a/Assets/Resources/photos/4.png.meta b/Assets/Backgrounds/Endscreen_Cover.png.meta similarity index 96% rename from Assets/Resources/photos/4.png.meta rename to Assets/Backgrounds/Endscreen_Cover.png.meta index 7efe7fa..2231367 100644 --- a/Assets/Resources/photos/4.png.meta +++ b/Assets/Backgrounds/Endscreen_Cover.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 4483fad09bfeb5a48b54951b45d166cc -timeCreated: 1523449943 +guid: d720afd4642aa1c4b82ca09fcc10ae02 +timeCreated: 1523462664 licenseType: Free TextureImporter: fileIDToRecycleName: {} diff --git a/Assets/Prefabs/Warewolf.prefab b/Assets/Prefabs/Warewolf.prefab new file mode 100644 index 0000000..0f7074b --- /dev/null +++ b/Assets/Prefabs/Warewolf.prefab @@ -0,0 +1,146 @@ +%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: 1503669499646732} + m_IsPrefabParent: 1 +--- !u!1 &1503669499646732 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4135964957763912} + - component: {fileID: 212896370426790238} + - component: {fileID: 50191400462606126} + - component: {fileID: 61216328960859172} + - component: {fileID: 114325404182818896} + m_Layer: 0 + m_Name: Warewolf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4135964957763912 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1503669499646732} + 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_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &50191400462606126 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1503669499646732} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &61216328960859172 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1503669499646732} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 5.24, y: 6.51} + newSize: {x: 5.24, y: 6.51} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 5.24, y: 6.51} + m_EdgeRadius: 0 +--- !u!114 &114325404182818896 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1503669499646732} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eac2f64158454a043b4b2ed57afad7de, type: 3} + m_Name: + m_EditorClassIdentifier: + value: 2 +--- !u!212 &212896370426790238 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1503669499646732} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1858500921 + m_SortingLayer: 1 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: b876f45cb5e392f4098915d4e5e295e4, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.24, y: 6.51} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 diff --git a/Assets/Prefabs/Warewolf.prefab.meta b/Assets/Prefabs/Warewolf.prefab.meta new file mode 100644 index 0000000..41cf554 --- /dev/null +++ b/Assets/Prefabs/Warewolf.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 88b248131befdce4fab5316917b64b6a +timeCreated: 1523461897 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/photos/4.png b/Assets/Resources/photos/4.png deleted file mode 100644 index dc285f4..0000000 --- a/Assets/Resources/photos/4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd -size 1926 diff --git a/Assets/Resources/photos/Warewolf.png b/Assets/Resources/photos/Warewolf.png new file mode 100644 index 0000000..015f69f --- /dev/null +++ b/Assets/Resources/photos/Warewolf.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b15ead8a06d3c209ef18cb265176673154cf35716b7d7cd6018a70b68bb5eb3 +size 3423 diff --git a/Assets/Resources/photos/Warewolf.png.meta b/Assets/Resources/photos/Warewolf.png.meta new file mode 100644 index 0000000..d4fb202 --- /dev/null +++ b/Assets/Resources/photos/Warewolf.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: 7106c6caf74d7b74a90400e3378808f9 +timeCreated: 1523462010 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/photos/mothman.png b/Assets/Resources/photos/mothman.png index dc285f4..21ffa14 100644 --- a/Assets/Resources/photos/mothman.png +++ b/Assets/Resources/photos/mothman.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd -size 1926 +oid sha256:4432a999e87b1a9e3caf46ec158cf6e73eecfbe1b3d3e73a15490076b4aae470 +size 731459 diff --git a/Assets/Resources/photos/nightcrawler.png b/Assets/Resources/photos/nightcrawler.png index dc285f4..88ec23d 100644 --- a/Assets/Resources/photos/nightcrawler.png +++ b/Assets/Resources/photos/nightcrawler.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1b4c60ba535a35176637452a63dcfcee5153114f947eff6f99cc1444217b0bd -size 1926 +oid sha256:16e4e3de9272d6a2371095169409ef45fd9a04c22da1da8cfdfebbdb3ae04a0e +size 893419 diff --git a/Assets/Scenes/gameover.unity b/Assets/Scenes/gameover.unity index 3839e3f..7a53b1a 100644 --- a/Assets/Scenes/gameover.unity +++ b/Assets/Scenes/gameover.unity @@ -180,7 +180,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 'Credits: + m_Text: 'Credits Karolin Hofmann - Character Art & Game Design @@ -227,9 +227,9 @@ RectTransform: m_Father: {fileID: 1115086973} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 80, y: -15} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -280, y: 25} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &182822589 @@ -253,10 +253,10 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: a0a598b59eefefb4fb076a84b543b7c9, type: 3} - m_FontSize: 14 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 0 m_MaxSize: 40 m_Alignment: 0 m_AlignByGeometry: 0 @@ -501,6 +501,7 @@ RectTransform: m_Children: - {fileID: 182822588} - {fileID: 44346590} + - {fileID: 1726320368} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -509,6 +510,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1726320367 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1726320368} + - component: {fileID: 1726320370} + - component: {fileID: 1726320369} + m_Layer: 5 + m_Name: ClickToOpen + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1726320368 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1726320367} + 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_Children: [] + m_Father: {fileID: 1115086973} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -70, y: -180} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1726320369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1726320367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, 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_FontData: + m_Font: {fileID: 12800000, guid: a0a598b59eefefb4fb076a84b543b7c9, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Click To Open +--- !u!222 &1726320370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1726320367} --- !u!1 &1850700145 GameObject: m_ObjectHideFlags: 0 @@ -537,6 +612,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: scoreText: {fileID: 182822589} + creditText: {fileID: 44346591} + clickText: {fileID: 1726320369} + background: {fileID: 0} --- !u!4 &1850700147 Transform: m_ObjectHideFlags: 0 @@ -550,3 +628,76 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2135767184 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2135767186} + - component: {fileID: 2135767185} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &2135767185 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2135767184} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: d720afd4642aa1c4b82ca09fcc10ae02, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 80, y: 45} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 +--- !u!4 &2135767186 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2135767184} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 1a9b0f7..063257d 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -799,11 +799,11 @@ Prefab: m_Modifications: - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} propertyPath: m_LocalPosition.x - value: -15.25 + value: -17.7 objectReference: {fileID: 0} - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} propertyPath: m_LocalPosition.y - value: 0.39 + value: -0.39 objectReference: {fileID: 0} - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} propertyPath: m_LocalPosition.z @@ -836,7 +836,7 @@ Prefab: - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, type: 2} propertyPath: motion.x - value: 0 + value: 2 objectReference: {fileID: 0} - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, type: 2} @@ -852,7 +852,7 @@ Prefab: - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, type: 2} propertyPath: motion.y - value: 2 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} @@ -1413,7 +1413,7 @@ Prefab: type: 2} propertyPath: monsterPrefab value: - objectReference: {fileID: 1876593924556066, guid: a3a482c56d8487d4182da0e0cb895726, + objectReference: {fileID: 1503669499646732, guid: 88b248131befdce4fab5316917b64b6a, type: 2} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 1bdacda..d8d1d3c 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -24,6 +24,11 @@ public class GameController : MonoBehaviour { SceneManager.LoadScene ("gameover"); } + //track this + if (Input.GetMouseButtonDown(0)) { + PersistentData.clicks++; + } + //update the texts timerText.text = "Time Remaining: " + PersistentData.timer; scoreText.text = "Score: " + PersistentData.score; diff --git a/Assets/Scripts/GameOverController.cs b/Assets/Scripts/GameOverController.cs index 4941c7a..1d1d4e8 100644 --- a/Assets/Scripts/GameOverController.cs +++ b/Assets/Scripts/GameOverController.cs @@ -6,13 +6,17 @@ using UnityEngine.SceneManagement; public class GameOverController : MonoBehaviour { public Text scoreText; - Dictionary spriteSet; + public Text creditText; + public Text clickText; + public GameObject background; - GameObject leftPage; - GameObject rightPage; + Dictionary objectSet; + + bool open = false; + int page = -1; void Awake() { - spriteSet = new Dictionary (); + objectSet = new Dictionary (); //prune "(clone)" from each monster name HashSet hs = new HashSet (); @@ -22,37 +26,66 @@ public class GameOverController : MonoBehaviour { PersistentData.monsterNames = hs; //load each image + float posX = 15f; foreach(string str in PersistentData.monsterNames) { Sprite spr = Resources.Load ("photos/" + str, typeof(Sprite)) as Sprite; - spriteSet.Add (str, spr); + GameObject obj = new GameObject (); + obj.AddComponent (); + obj.GetComponent ().sprite = spr; + obj.transform.localScale = new Vector3 (0.5f, 0.5f, 1f); + obj.transform.position = new Vector3 (posX, 0, 0); + objectSet.Add (str, obj); + + //increment + posX += 10f; //NOTE: code duplication } - - //configure the page objects - leftPage = new GameObject (); - rightPage = new GameObject (); - leftPage.AddComponent (); - rightPage.AddComponent (); - - leftPage.transform.localScale = new Vector3 (0.5f, 0.5f, 1f); - leftPage.transform.position = new Vector3 (-5f, 0, 0); - rightPage.transform.localScale = new Vector3 (0.5f, 0.5f, 1f); - rightPage.transform.position = new Vector3 (5f, 0, 0); - - //test - leftPage.GetComponent ().sprite = spriteSet["Nessie"] as Sprite; - rightPage.GetComponent ().sprite = spriteSet["Nessie"] as Sprite; } void Update() { + //get the x & y of the mouse as a ratio + float mouseX = Input.mousePosition.x / Screen.width; + float mouseY = Input.mousePosition.y / Screen.height; + if (Input.GetButtonDown ("Quit")) { Application.Quit (); } if (Input.GetMouseButtonDown(0)) { - SceneManager.LoadScene ("gameplay"); + if (mouseX < 0.5f && page > 0) { + JumpRight (); + page--; + } + if (mouseX >= 0.5f && page < (objectSet.Count -1)/2) { + if (open == false) { + open = true; + //TODO: animate the background + } + JumpLeft (); + page++; + } } //update the texts - scoreText.text = "Score: " + PersistentData.score; + if (open == false) { + scoreText.text = "Player's Score: " + PersistentData.score + "\n"; + scoreText.text += "Camera Clicks: " + PersistentData.clicks + "\n"; + scoreText.text += "Monsters Captured: " + PersistentData.monsterNames.Count + "/10"; + } else { + scoreText.enabled = false; + creditText.enabled = false; + clickText.enabled = false; + } + } + + void JumpLeft() { + foreach(KeyValuePair pair in objectSet) { + pair.Value.transform.position = new Vector3 (pair.Value.transform.position.x - 20f, 0, 0); + } + } + + void JumpRight() { + foreach(KeyValuePair pair in objectSet) { + pair.Value.transform.position = new Vector3 (pair.Value.transform.position.x + 20f, 0, 0); + } } } diff --git a/Assets/Scripts/PersistentData.cs b/Assets/Scripts/PersistentData.cs index ebb297c..bca2c57 100644 --- a/Assets/Scripts/PersistentData.cs +++ b/Assets/Scripts/PersistentData.cs @@ -3,6 +3,7 @@ public static class PersistentData { public static int timer; public static int score; + public static int clicks; public static HashSet monsterNames = new HashSet(); } \ No newline at end of file diff --git a/Assets/Sprites/werewolf.png b/Assets/Sprites/werewolf.png new file mode 100644 index 0000000..09bda1c --- /dev/null +++ b/Assets/Sprites/werewolf.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:357caa4227b0a32dcabc0739a3d2b2c0f6b29efd3998e8a553c9db1df8bdf78d +size 134584 diff --git a/Assets/Sprites/werewolf.png.meta b/Assets/Sprites/werewolf.png.meta new file mode 100644 index 0000000..7aba297 --- /dev/null +++ b/Assets/Sprites/werewolf.png.meta @@ -0,0 +1,77 @@ +fileFormatVersion: 2 +guid: b876f45cb5e392f4098915d4e5e295e4 +timeCreated: 1523461807 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: