From 2cd21dc3291c690bec6c5b64529f7c7cc470b110 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Wed, 11 Apr 2018 00:17:42 +1000 Subject: [PATCH] Stuff --- Assets/Prefabs/Mothman.prefab | 146 +++++++++++++++++++++++++++++ Assets/Prefabs/Mothman.prefab.meta | 10 ++ Assets/Scenes/gameplay.unity | 135 +++++++++++++++++++++++++- Assets/Scripts/CameraController.cs | 2 +- 4 files changed, 289 insertions(+), 4 deletions(-) create mode 100644 Assets/Prefabs/Mothman.prefab create mode 100644 Assets/Prefabs/Mothman.prefab.meta diff --git a/Assets/Prefabs/Mothman.prefab b/Assets/Prefabs/Mothman.prefab new file mode 100644 index 0000000..4ff2fa2 --- /dev/null +++ b/Assets/Prefabs/Mothman.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: 1876593924556066} + m_IsPrefabParent: 1 +--- !u!1 &1876593924556066 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4658001970933510} + - component: {fileID: 212412342297678404} + - component: {fileID: 50344177225980310} + - component: {fileID: 61330599272013510} + - component: {fileID: 114791336521020886} + m_Layer: 0 + m_Name: Mothman + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4658001970933510 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876593924556066} + 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 &50344177225980310 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876593924556066} + 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 &61330599272013510 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876593924556066} + 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 &114791336521020886 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876593924556066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eac2f64158454a043b4b2ed57afad7de, type: 3} + m_Name: + m_EditorClassIdentifier: + value: 2 +--- !u!212 &212412342297678404 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1876593924556066} + 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: fb143031c71e7314ebdcc76df91dbbb8, 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/Mothman.prefab.meta b/Assets/Prefabs/Mothman.prefab.meta new file mode 100644 index 0000000..0f553b5 --- /dev/null +++ b/Assets/Prefabs/Mothman.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a3a482c56d8487d4182da0e0cb895726 +timeCreated: 1523369006 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/gameplay.unity b/Assets/Scenes/gameplay.unity index 42eb638..ce606bb 100644 --- a/Assets/Scenes/gameplay.unity +++ b/Assets/Scenes/gameplay.unity @@ -431,6 +431,73 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 +--- !u!1001 &471972135 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalPosition.x + value: 9.14 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalPosition.y + value: -7.91 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalPosition.z + value: -4.466797 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1049810975271280, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_Name + value: MonsterSpawner (2) + objectReference: {fileID: 0} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: motion.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: delay + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: monsterPrefab + value: + objectReference: {fileID: 1876593924556066, guid: a3a482c56d8487d4182da0e0cb895726, + type: 2} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: motion.y + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + m_IsPrefabParent: 0 --- !u!1 &541459442 GameObject: m_ObjectHideFlags: 0 @@ -654,7 +721,7 @@ Prefab: - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, type: 2} propertyPath: delay - value: 10 + value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} @@ -719,7 +786,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1453867828 GameObject: @@ -844,6 +911,68 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 +--- !u!1001 &1512958822 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalPosition.x + value: 22.58 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalPosition.y + value: -1.9 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalPosition.z + value: -4.466797 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4910612253286244, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1049810975271280, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + propertyPath: m_Name + value: MonsterSpawner (1) + objectReference: {fileID: 0} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: motion.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: delay + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 114508120021180596, guid: b16589ec086fe774ba4170ead0d42374, + type: 2} + propertyPath: monsterPrefab + value: + objectReference: {fileID: 1876593924556066, guid: a3a482c56d8487d4182da0e0cb895726, + type: 2} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: b16589ec086fe774ba4170ead0d42374, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1616901764 GameObject: m_ObjectHideFlags: 0 @@ -932,7 +1061,7 @@ RectTransform: - {fileID: 316885955} - {fileID: 181175713} m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs index 841efb7..b3a0edc 100644 --- a/Assets/Scripts/CameraController.cs +++ b/Assets/Scripts/CameraController.cs @@ -7,7 +7,7 @@ public class CameraController : MonoBehaviour { float speed; void Awake() { - speed = 0.1f; + speed = 0.05f; } void Update() {