From 9d40d6577e909be0cc43a8a8d4d34851a5bea9f4 Mon Sep 17 00:00:00 2001 From: MrJDunn Date: Sun, 31 Jan 2021 12:25:34 +1100 Subject: [PATCH 1/8] Added material field to line renderer --- Assets/Scripts/Behaviours/YeetController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/Scripts/Behaviours/YeetController.cs b/Assets/Scripts/Behaviours/YeetController.cs index aa47c65..ea38e32 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -14,6 +14,8 @@ public class YeetController : InputBehaviour [SerializeField] private Animator m_YeetAnimator; + public Material trajectoryLineMaterial; + public enum YeetState { Unheld, Held, Yeeting }; public YeetState yeetState { get; private set; } = YeetState.Unheld; @@ -41,6 +43,7 @@ public class YeetController : InputBehaviour yeetState = YeetState.Held; m_lineRenderer = gameObject.AddComponent(); + m_lineRenderer.material = trajectoryLineMaterial; m_YeetAnimator.SetBool("Carry", true); m_YeetAnimator.SetBool("Yeet", true); From 20166e1477aa8b2b8f44f42604cf81522cf40369 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 31 Jan 2021 12:40:14 +1100 Subject: [PATCH 2/8] SpeechBubble and package --- Assets/Player/Body.prefab | 104 ++++++++++++++++++++++ Assets/Player/Body.prefab.meta | 7 ++ Assets/Player/Leggies.prefab | 104 ++++++++++++++++++++++ Assets/Player/Leggies.prefab.meta | 7 ++ Assets/Speechbubble.png | 3 + Assets/Speechbubble.png.meta | 142 ++++++++++++++++++++++++++++++ Packages/manifest.json | 1 + Packages/packages-lock.json | 6 ++ 8 files changed, 374 insertions(+) create mode 100644 Assets/Player/Body.prefab create mode 100644 Assets/Player/Body.prefab.meta create mode 100644 Assets/Player/Leggies.prefab create mode 100644 Assets/Player/Leggies.prefab.meta create mode 100644 Assets/Speechbubble.png create mode 100644 Assets/Speechbubble.png.meta diff --git a/Assets/Player/Body.prefab b/Assets/Player/Body.prefab new file mode 100644 index 0000000..0875995 --- /dev/null +++ b/Assets/Player/Body.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2218554982969044169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2218554982969044170} + - component: {fileID: 2218554982969044171} + - component: {fileID: 2218554982969044168} + m_Layer: 0 + m_Name: Body + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2218554982969044170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2218554982969044169} + m_LocalRotation: {x: -0.3666959, y: -0, z: -0, w: 0.93034095} + m_LocalPosition: {x: -2.89, y: 7.221, z: 1.695} + m_LocalScale: {x: 0.09, y: 0.1275, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -43.024, y: 0, z: 0} +--- !u!212 &2218554982969044171 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2218554982969044169} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 0 + m_Sprite: {fileID: 21300000, guid: 7828493adb9df0c4dba3507fc5d88543, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9, y: 12.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &2218554982969044168 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2218554982969044169} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 13a2a9f986badba459f5a1e1eb21ab34, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Player/Body.prefab.meta b/Assets/Player/Body.prefab.meta new file mode 100644 index 0000000..a3ed727 --- /dev/null +++ b/Assets/Player/Body.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e6ed1101a908b248991fcc5ce3eb9ad +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Player/Leggies.prefab b/Assets/Player/Leggies.prefab new file mode 100644 index 0000000..0e58920 --- /dev/null +++ b/Assets/Player/Leggies.prefab @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2287730672849659586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2287730672849659591} + - component: {fileID: 2287730672849659588} + - component: {fileID: 2287730672849659589} + m_Layer: 0 + m_Name: Leggies + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2287730672849659591 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2287730672849659586} + m_LocalRotation: {x: -0.3666959, y: -0, z: -0, w: 0.93034095} + m_LocalPosition: {x: -2.89, y: 7.221, z: 1.695} + m_LocalScale: {x: 0.09, y: 0.1275, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -43.024, y: 0, z: 0} +--- !u!212 &2287730672849659588 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2287730672849659586} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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: 0 + m_Sprite: {fileID: 21300000, guid: b249bf06e141ffb45946004dda1c875d, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 9, y: 12.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &2287730672849659589 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2287730672849659586} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bedbeaccb77baa348a06697fa90713e0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Player/Leggies.prefab.meta b/Assets/Player/Leggies.prefab.meta new file mode 100644 index 0000000..6537086 --- /dev/null +++ b/Assets/Player/Leggies.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f5fa65482b8fe54ca6255359adffdc8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Speechbubble.png b/Assets/Speechbubble.png new file mode 100644 index 0000000..f2d8e0c --- /dev/null +++ b/Assets/Speechbubble.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5daf4d802a69c6d5f15b3206bdcbdc4286015b16308bbd1e9c830c3cd956cd5a +size 4669 diff --git a/Assets/Speechbubble.png.meta b/Assets/Speechbubble.png.meta new file mode 100644 index 0000000..4d41f82 --- /dev/null +++ b/Assets/Speechbubble.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: df9725fd82ab2c4458c4c22153defabd +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 30, y: 65, z: 121, w: 38} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index a3e7e69..338b987 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,6 +2,7 @@ "dependencies": { "com.dbrizov.naughtyattributes": "2.0.8", "com.jreason.scriptablevariables": "0.2.1", + "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.3.9", "com.unity.ide.rider": "1.2.1", "com.unity.ide.visualstudio": "2.0.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ccc7dcb..533f841 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -14,6 +14,12 @@ "dependencies": {}, "url": "https://package.openupm.com" }, + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "1.3.9", "depth": 0, From 921e3d3cd9f44dc0e055b45d75cf30d74bad214d Mon Sep 17 00:00:00 2001 From: MrJDunn Date: Sun, 31 Jan 2021 12:58:29 +1100 Subject: [PATCH 3/8] Babies are now held overhead --- Assets/Scenes/MainGameplayScene.unity | 4 +- Assets/Scenes/PlayerJoinScene.unity | 4 +- Assets/Scripts/Behaviours/YeetController.cs | 14 +- Assets/World Assets/Prefabs/Player.prefab | 39 ++++- .../Prefabs/YeetyPlayer Variant.prefab | 135 ------------------ .../Prefabs/YeetyPlayer Variant.prefab.meta | 7 - 6 files changed, 51 insertions(+), 152 deletions(-) delete mode 100644 Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab delete mode 100644 Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta diff --git a/Assets/Scenes/MainGameplayScene.unity b/Assets/Scenes/MainGameplayScene.unity index 7779a3d..30a44b4 100644 --- a/Assets/Scenes/MainGameplayScene.unity +++ b/Assets/Scenes/MainGameplayScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69828bf48a3e1b2ad75c94c5c7920507f8f8d7aa6f5483f47a889a2b527d942b -size 655013 +oid sha256:cff5435899d1eccf8fbba0724eed7fbf71d4920bbf35bd4168af93cb0918d851 +size 657501 diff --git a/Assets/Scenes/PlayerJoinScene.unity b/Assets/Scenes/PlayerJoinScene.unity index d5da38f..3410be3 100644 --- a/Assets/Scenes/PlayerJoinScene.unity +++ b/Assets/Scenes/PlayerJoinScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bbf138ceeb4fa2cf0afbe0709f0cd128e6f2199a5e6e909864e15c6ffec0a46 -size 40588 +oid sha256:50ef57180cb7e056bf7a20f27eada4434bdd64e9bb7120f0509ba56cdfd503e1 +size 40595 diff --git a/Assets/Scripts/Behaviours/YeetController.cs b/Assets/Scripts/Behaviours/YeetController.cs index ea38e32..c5e472c 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -5,6 +5,8 @@ using UnityEngine.InputSystem; public class YeetController : InputBehaviour { + [Tooltip("This is where the babies are held")] + public GameObject handCarryingPosition; public GameObject parent { get; set; } public float yeetVelocity = 5f; @@ -56,9 +58,9 @@ public class YeetController : InputBehaviour _child.transform.parent = null; _child.transform.rotation = parent.transform.rotation; - _child.GetComponent().held = true; + _child.GetComponent().held = false; - _child.GetComponent().velocity = _child.transform.forward * m_velocityWindup + _child.transform.up * m_velocityWindup; + _child.GetComponent().velocity = calculateVelocityVector(); yeetState = YeetState.Yeeting; m_time = yeetDuration; m_velocityWindup = 0; @@ -87,12 +89,13 @@ public class YeetController : InputBehaviour case YeetState.Held: // draw yeet lines + _child.transform.position = handCarryingPosition.transform.position; if(m_velocityWindup < yeetVelocity) { m_velocityWindup += windupSpeed; } - Vector3 velocity = parent.transform.forward * m_velocityWindup + parent.transform.up * m_velocityWindup; + Vector3 velocity = calculateVelocityVector(); float t; t = (-1f * velocity.y) / Physics.gravity.y; @@ -114,6 +117,11 @@ public class YeetController : InputBehaviour } } + private Vector3 calculateVelocityVector() + { + return parent.transform.forward * m_velocityWindup + parent.transform.up * m_velocityWindup; + } + private void OnTriggerEnter(Collider collider) { Debug.Log("PlayerInputController.OnTriggerEnter: arrived"); diff --git a/Assets/World Assets/Prefabs/Player.prefab b/Assets/World Assets/Prefabs/Player.prefab index df8222a..d882e4a 100644 --- a/Assets/World Assets/Prefabs/Player.prefab +++ b/Assets/World Assets/Prefabs/Player.prefab @@ -125,10 +125,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3} m_Name: m_EditorClassIdentifier: + handCarryingPosition: {fileID: 6686278636936064271} yeetVelocity: 20 yeetDuration: 2 windupSpeed: 0.05 m_YeetAnimator: {fileID: 7280267804803618209} + trajectoryLineMaterial: {fileID: 10301, guid: 0000000000000000f000000000000000, type: 0} --- !u!1 &6496616781582263990 GameObject: m_ObjectHideFlags: 0 @@ -158,7 +160,7 @@ Transform: m_LocalScale: {x: -1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7280267804154012179} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &9135536610966766493 SpriteRenderer: @@ -211,6 +213,36 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6686278636936064271 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6137936579796069125} + m_Layer: 0 + m_Name: HandCarryingPosition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6137936579796069125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6686278636936064271} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 12.99, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_Children: [] + m_Father: {fileID: 7280267804154012179} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7280267804154012178 GameObject: m_ObjectHideFlags: 0 @@ -239,6 +271,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: + - {fileID: 6137936579796069125} - {fileID: 7280267804702354914} - {fileID: 7280267804803618211} - {fileID: 5965212798371097713} @@ -289,7 +322,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7280267804154012179} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7280267804702354913 SpriteRenderer: @@ -391,7 +424,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7280267804154012179} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7280267804803618210 SpriteRenderer: diff --git a/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab b/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab deleted file mode 100644 index f15e3be..0000000 --- a/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab +++ /dev/null @@ -1,135 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &1051237570 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 33932531309654967} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 188bb300967eea14fb681a94fc31f911, type: 3} - m_Name: - m_EditorClassIdentifier: - yeetVelocity: 20 - yeetDuration: 2 - windupSpeed: 0.05 ---- !u!1001 &2714160732044909285 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2725293204815276921, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Convex - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276924, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_IsTrigger - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293204815276927, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Mesh - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018834, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_Name - value: YeetyPlayer Variant - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalScale.y - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalScale.z - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalPosition.x - value: 1.2684288 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalPosition.z - value: -6.7718506 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018844, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018845, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_DefaultActionMap - value: 63e31309-151e-48ff-854a-81cb2511f050 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018846, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_SlopeLimit - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: body - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: testChild - value: - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_playerSpeed - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2725293205319018847, guid: 47d3f018734864140ba302f6972ba575, type: 3} - propertyPath: m_rotationSpeed - value: 10 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 47d3f018734864140ba302f6972ba575, type: 3} ---- !u!1 &33932531309654967 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2725293205319018834, guid: 47d3f018734864140ba302f6972ba575, type: 3} - m_PrefabInstance: {fileID: 2714160732044909285} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta b/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta deleted file mode 100644 index f280892..0000000 --- a/Assets/World Assets/Prefabs/YeetyPlayer Variant.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c3cc089e72190e74aab4c6592121b553 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 696cb7eb1e421813d1a4f75b22c21c469aa1b0c0 Mon Sep 17 00:00:00 2001 From: MrJDunn Date: Sun, 31 Jan 2021 13:09:21 +1100 Subject: [PATCH 4/8] Player stops moving when yeeting --- Assets/Scripts/Behaviours/YeetController.cs | 33 ++++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Behaviours/YeetController.cs b/Assets/Scripts/Behaviours/YeetController.cs index c5e472c..ce2fc40 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -18,7 +18,7 @@ public class YeetController : InputBehaviour public Material trajectoryLineMaterial; - public enum YeetState { Unheld, Held, Yeeting }; + public enum YeetState { Unheld, Held, Preyeet, Yeeting }; public YeetState yeetState { get; private set; } = YeetState.Unheld; private GameObject _child; @@ -31,6 +31,8 @@ public class YeetController : InputBehaviour private LineRenderer m_lineRenderer; + private Vector3 preyeetPosition; + private void Awake() { m_body = this.gameObject; @@ -44,11 +46,17 @@ public class YeetController : InputBehaviour yeetState = YeetState.Held; + m_YeetAnimator.SetBool("Carry", true); + m_YeetAnimator.SetBool("Yeet", true); + } + + public void Preyeet() + { + preyeetPosition = parent.transform.position; m_lineRenderer = gameObject.AddComponent(); m_lineRenderer.material = trajectoryLineMaterial; - m_YeetAnimator.SetBool("Carry", true); - m_YeetAnimator.SetBool("Yeet", true); + yeetState = YeetState.Preyeet; } public void Yeet() @@ -86,11 +94,13 @@ public class YeetController : InputBehaviour yeetState = YeetState.Unheld; } break; - case YeetState.Held: - // draw yeet lines + case YeetState.Preyeet: + //TODO: Stop player + parent.transform.position = preyeetPosition; _child.transform.position = handCarryingPosition.transform.position; - if(m_velocityWindup < yeetVelocity) + + if (m_velocityWindup < yeetVelocity) { m_velocityWindup += windupSpeed; } @@ -111,6 +121,12 @@ public class YeetController : InputBehaviour m_lineRenderer.SetPosition(i, trajectoryPoint); } break; + case YeetState.Held: + //TODO: slow player + + // Stop child from wriggling + _child.transform.position = handCarryingPosition.transform.position; + break; case YeetState.Unheld: _child = null; break; @@ -143,9 +159,12 @@ public class YeetController : InputBehaviour Hold(m_child); // Grab nearest baby break; - case YeetController.YeetState.Held: + case YeetState.Preyeet: Yeet(); + break; + case YeetController.YeetState.Held: // Yeet baby + Preyeet(); break; case YeetController.YeetState.Yeeting: // Cooldown? From 399c6716e702a0b3c2ca86998e533f29a8d4c6fe Mon Sep 17 00:00:00 2001 From: MrJDunn Date: Sun, 31 Jan 2021 13:12:10 +1100 Subject: [PATCH 5/8] Added lastHeld property to YeetHandle, which tracks last GameObject that held it --- Assets/Scripts/Behaviours/YeetController.cs | 1 + Assets/Scripts/Behaviours/YeetHandle.cs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Assets/Scripts/Behaviours/YeetController.cs b/Assets/Scripts/Behaviours/YeetController.cs index ce2fc40..7fce9b9 100644 --- a/Assets/Scripts/Behaviours/YeetController.cs +++ b/Assets/Scripts/Behaviours/YeetController.cs @@ -43,6 +43,7 @@ public class YeetController : InputBehaviour _child = child; _child.transform.parent = parent.transform; _child.GetComponent().held = true; + _child.GetComponent().lastHeld = parent; yeetState = YeetState.Held; diff --git a/Assets/Scripts/Behaviours/YeetHandle.cs b/Assets/Scripts/Behaviours/YeetHandle.cs index e8165ce..0300fb9 100644 --- a/Assets/Scripts/Behaviours/YeetHandle.cs +++ b/Assets/Scripts/Behaviours/YeetHandle.cs @@ -8,6 +8,8 @@ public class YeetHandle : MonoBehaviour public bool held { get; set; } + public GameObject lastHeld { get; set; } + // Start is called before the first frame update void Start() { From 52985187c83e8cfe6119912d213b6f48d13da707 Mon Sep 17 00:00:00 2001 From: jordanci Date: Sun, 31 Jan 2021 13:58:36 +1100 Subject: [PATCH 6/8] parent visual stuff --- Assets/ParentBehaviour.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Assets/ParentBehaviour.cs b/Assets/ParentBehaviour.cs index 6f1fd55..839fffc 100644 --- a/Assets/ParentBehaviour.cs +++ b/Assets/ParentBehaviour.cs @@ -25,6 +25,15 @@ public class ParentBehaviour : MonoBehaviour public Texture2D parentFaceAngry; public Texture2D parentFaceTalk; + public GameObject parentBodyObj; + public GameObject parentFaceObj; + public GameObject parentDialougeObj; + + private void Start() + { + parentBodyObj.GetComponent().material.mainTexture = parentBases[Random.Range(0, parentBases.Length)]; + parentFaceObj.GetComponent().material.mainTexture = parentFaceNeutral; + } [ContextMenu("Get Random Child")] public void GetRandomChild() @@ -126,6 +135,7 @@ public class ParentBehaviour : MonoBehaviour { Texture _displayGraphic = GiveDetails(other.gameObject); //display the display graphic + parentDialougeObj.GetComponent().material.mainTexture = _displayGraphic; } } } From e33c7fa85a47a380f37f3ad24569063288cd990a Mon Sep 17 00:00:00 2001 From: MBranagan Date: Sun, 31 Jan 2021 14:53:06 +1100 Subject: [PATCH 7/8] Menu and UI Scenes --- Assets/Logo.png | 3 + Assets/Logo.png.meta | 142 ++++++++++++++++++ Assets/Scenes/Base Layout.unity | 4 +- Assets/Scenes/How to Play.unity | 3 + Assets/Scenes/How to Play.unity.meta | 7 + Assets/Scenes/Main Menu.unity | 3 + Assets/Scenes/Main Menu.unity.meta | 7 + Assets/UI Babies.meta | 8 + Assets/UI Babies/baby1.png | 3 + Assets/UI Babies/baby1.png.meta | 142 ++++++++++++++++++ Assets/UI Babies/baby2.png | 3 + Assets/UI Babies/baby2.png.meta | 142 ++++++++++++++++++ Assets/UI Babies/baby3.png | 3 + Assets/UI Babies/baby3.png.meta | 142 ++++++++++++++++++ .../Materials/Floor Texture.png.meta | 6 +- .../Materials/Wall Texture.png.meta | 16 +- .../Models/Wall Pictures/Tree.png | 4 +- 17 files changed, 623 insertions(+), 15 deletions(-) create mode 100644 Assets/Logo.png create mode 100644 Assets/Logo.png.meta create mode 100644 Assets/Scenes/How to Play.unity create mode 100644 Assets/Scenes/How to Play.unity.meta create mode 100644 Assets/Scenes/Main Menu.unity create mode 100644 Assets/Scenes/Main Menu.unity.meta create mode 100644 Assets/UI Babies.meta create mode 100644 Assets/UI Babies/baby1.png create mode 100644 Assets/UI Babies/baby1.png.meta create mode 100644 Assets/UI Babies/baby2.png create mode 100644 Assets/UI Babies/baby2.png.meta create mode 100644 Assets/UI Babies/baby3.png create mode 100644 Assets/UI Babies/baby3.png.meta diff --git a/Assets/Logo.png b/Assets/Logo.png new file mode 100644 index 0000000..24e9728 --- /dev/null +++ b/Assets/Logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c05a23a9ae65d4c195cbbdd7f381eb42671edae81f6302ed754affa8104c2f20 +size 198248 diff --git a/Assets/Logo.png.meta b/Assets/Logo.png.meta new file mode 100644 index 0000000..e8fb779 --- /dev/null +++ b/Assets/Logo.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 634cd96cfbb3dc3488b96a662e042dbc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Base Layout.unity b/Assets/Scenes/Base Layout.unity index 05b6e81..a24c1f7 100644 --- a/Assets/Scenes/Base Layout.unity +++ b/Assets/Scenes/Base Layout.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:470d2293644227a67039e5a0d6df798920cb109b6273b34bda780675c77b0e25 -size 648345 +oid sha256:57674b569230436bb1505db9c6def8aec25351634324bc5ee9c469c69b2843c5 +size 648347 diff --git a/Assets/Scenes/How to Play.unity b/Assets/Scenes/How to Play.unity new file mode 100644 index 0000000..da01e20 --- /dev/null +++ b/Assets/Scenes/How to Play.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a526d4bcf0f12b536669632421d65344953c07b0d0832a2f4e04f49bcce0745 +size 32784 diff --git a/Assets/Scenes/How to Play.unity.meta b/Assets/Scenes/How to Play.unity.meta new file mode 100644 index 0000000..9d24faa --- /dev/null +++ b/Assets/Scenes/How to Play.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 53fc305a86c9f9647960f3d2a281d3db +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity new file mode 100644 index 0000000..2d192c3 --- /dev/null +++ b/Assets/Scenes/Main Menu.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:207eaa29f188bd163dc9ed08123eca541916fde7d0c3f915d77a571392b383d7 +size 50491 diff --git a/Assets/Scenes/Main Menu.unity.meta b/Assets/Scenes/Main Menu.unity.meta new file mode 100644 index 0000000..039a744 --- /dev/null +++ b/Assets/Scenes/Main Menu.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 690d9ca9136832e4f86da8b577a14100 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Babies.meta b/Assets/UI Babies.meta new file mode 100644 index 0000000..c4b6e99 --- /dev/null +++ b/Assets/UI Babies.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c794f18e14f367e48aeb11459aa4f1b7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Babies/baby1.png b/Assets/UI Babies/baby1.png new file mode 100644 index 0000000..8480d9f --- /dev/null +++ b/Assets/UI Babies/baby1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b5b93e25ff8d310231c9809401efc6d563d4b667b6edbcbfbf66c01714c6a7b +size 59676 diff --git a/Assets/UI Babies/baby1.png.meta b/Assets/UI Babies/baby1.png.meta new file mode 100644 index 0000000..d3975a2 --- /dev/null +++ b/Assets/UI Babies/baby1.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 529f2e97227fe4c43ab84c3b511feaed +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Babies/baby2.png b/Assets/UI Babies/baby2.png new file mode 100644 index 0000000..f07566e --- /dev/null +++ b/Assets/UI Babies/baby2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5853dc0d2a5404b047c560c7090aecfbbf13b18d0d85855aca71a2ce8a798911 +size 75704 diff --git a/Assets/UI Babies/baby2.png.meta b/Assets/UI Babies/baby2.png.meta new file mode 100644 index 0000000..b74fb4b --- /dev/null +++ b/Assets/UI Babies/baby2.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 71f05cc1b7bddea47aa95a14e758b4ba +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UI Babies/baby3.png b/Assets/UI Babies/baby3.png new file mode 100644 index 0000000..1fc8561 --- /dev/null +++ b/Assets/UI Babies/baby3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db3b75097af3d206cb624a58f9102a358f702b8b0b78dd3e53122b98a030a0e4 +size 65738 diff --git a/Assets/UI Babies/baby3.png.meta b/Assets/UI Babies/baby3.png.meta new file mode 100644 index 0000000..8047420 --- /dev/null +++ b/Assets/UI Babies/baby3.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 0ab63573ee5605d4ab4756db7cd48272 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/World Assets/Materials/Floor Texture.png.meta b/Assets/World Assets/Materials/Floor Texture.png.meta index 4272e1d..36a624f 100644 --- a/Assets/World Assets/Materials/Floor Texture.png.meta +++ b/Assets/World Assets/Materials/Floor Texture.png.meta @@ -38,10 +38,10 @@ TextureImporter: wrapU: 0 wrapV: 0 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -127,7 +127,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/World Assets/Materials/Wall Texture.png.meta b/Assets/World Assets/Materials/Wall Texture.png.meta index 86d5ca8..f6c6966 100644 --- a/Assets/World Assets/Materials/Wall Texture.png.meta +++ b/Assets/World Assets/Materials/Wall Texture.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -35,13 +35,13 @@ TextureImporter: filterMode: -1 aniso: 2 mipBias: -100 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -50,9 +50,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -127,7 +127,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/World Assets/Models/Wall Pictures/Tree.png b/Assets/World Assets/Models/Wall Pictures/Tree.png index f7b491c..ba65658 100644 --- a/Assets/World Assets/Models/Wall Pictures/Tree.png +++ b/Assets/World Assets/Models/Wall Pictures/Tree.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92fc6746e583ed354c65aaf9c05f33bb244b09b8719669327246091a112b93bf -size 1513603 +oid sha256:5f7fe97d2920c2e20eeb3636bdf3a6a821fcce8c8ca161dea0e7d00faa956f69 +size 1599276 From 3b56e85e11537418f0e027316931ce1365af1ff8 Mon Sep 17 00:00:00 2001 From: jordanci Date: Sun, 31 Jan 2021 14:57:20 +1100 Subject: [PATCH 8/8] set up main game with parents new spawn locations --- Assets/Parent.meta | 8 ++ Assets/Parent/parent_angry.png | 3 + Assets/Parent/parent_angry.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_base1.png | 3 + Assets/Parent/parent_base1.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_base2.png | 3 + Assets/Parent/parent_base2.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_base3.png | 3 + Assets/Parent/parent_base3.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_happy1.png | 3 + Assets/Parent/parent_happy1.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_happy2.png | 3 + Assets/Parent/parent_happy2.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_neutral.png | 3 + Assets/Parent/parent_neutral.png.meta | 142 ++++++++++++++++++++++++++ Assets/Parent/parent_talk.png | 3 + Assets/Parent/parent_talk.png.meta | 142 ++++++++++++++++++++++++++ Assets/Scenes/MainGameplayScene.unity | 4 +- Assets/Scripts/spawner.cs | 18 +++- ProjectSettings/ProjectSettings.asset | 4 +- 20 files changed, 1187 insertions(+), 7 deletions(-) create mode 100644 Assets/Parent.meta create mode 100644 Assets/Parent/parent_angry.png create mode 100644 Assets/Parent/parent_angry.png.meta create mode 100644 Assets/Parent/parent_base1.png create mode 100644 Assets/Parent/parent_base1.png.meta create mode 100644 Assets/Parent/parent_base2.png create mode 100644 Assets/Parent/parent_base2.png.meta create mode 100644 Assets/Parent/parent_base3.png create mode 100644 Assets/Parent/parent_base3.png.meta create mode 100644 Assets/Parent/parent_happy1.png create mode 100644 Assets/Parent/parent_happy1.png.meta create mode 100644 Assets/Parent/parent_happy2.png create mode 100644 Assets/Parent/parent_happy2.png.meta create mode 100644 Assets/Parent/parent_neutral.png create mode 100644 Assets/Parent/parent_neutral.png.meta create mode 100644 Assets/Parent/parent_talk.png create mode 100644 Assets/Parent/parent_talk.png.meta diff --git a/Assets/Parent.meta b/Assets/Parent.meta new file mode 100644 index 0000000..7bf10cc --- /dev/null +++ b/Assets/Parent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 86dea80417377514892dcb55caa8a561 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_angry.png b/Assets/Parent/parent_angry.png new file mode 100644 index 0000000..5b1c8f3 --- /dev/null +++ b/Assets/Parent/parent_angry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a891fb7136c003006a3ab8428802fa55341b747efc117902472a05cc4560cc6 +size 8820 diff --git a/Assets/Parent/parent_angry.png.meta b/Assets/Parent/parent_angry.png.meta new file mode 100644 index 0000000..2d11385 --- /dev/null +++ b/Assets/Parent/parent_angry.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: b44a1ec83b8e25f4f84e7448636e0962 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_base1.png b/Assets/Parent/parent_base1.png new file mode 100644 index 0000000..c440ced --- /dev/null +++ b/Assets/Parent/parent_base1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:387b5c4d4a78847e0f70b5b36f68e0a6f66db3c93b15986a3157faa5a5f93ac2 +size 70755 diff --git a/Assets/Parent/parent_base1.png.meta b/Assets/Parent/parent_base1.png.meta new file mode 100644 index 0000000..99f5c7c --- /dev/null +++ b/Assets/Parent/parent_base1.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 217ec697db050644b86998d66e6d6080 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_base2.png b/Assets/Parent/parent_base2.png new file mode 100644 index 0000000..9925b33 --- /dev/null +++ b/Assets/Parent/parent_base2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fb4bfcccf00a4c1ba02e7c39a275aa2ed87ab06eec0e850c19b94aa86149482 +size 73647 diff --git a/Assets/Parent/parent_base2.png.meta b/Assets/Parent/parent_base2.png.meta new file mode 100644 index 0000000..3f78f42 --- /dev/null +++ b/Assets/Parent/parent_base2.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: b03e8399716300b45a98cdc1db74137a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_base3.png b/Assets/Parent/parent_base3.png new file mode 100644 index 0000000..5696321 --- /dev/null +++ b/Assets/Parent/parent_base3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a7ba6d104689232c590e2ec61614e8b27b853cc8b288b04df06148e1bc267a79 +size 73224 diff --git a/Assets/Parent/parent_base3.png.meta b/Assets/Parent/parent_base3.png.meta new file mode 100644 index 0000000..62bad1e --- /dev/null +++ b/Assets/Parent/parent_base3.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: a4a26c3b282c3644a811bbf39e8ea40c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_happy1.png b/Assets/Parent/parent_happy1.png new file mode 100644 index 0000000..4d28fd7 --- /dev/null +++ b/Assets/Parent/parent_happy1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bd3183f2abbac68a3061a75ad3baee0e2e62ac8e95f23ee64a9fb59410ffb4e +size 11733 diff --git a/Assets/Parent/parent_happy1.png.meta b/Assets/Parent/parent_happy1.png.meta new file mode 100644 index 0000000..9a6baa1 --- /dev/null +++ b/Assets/Parent/parent_happy1.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 86deeb1e1aeed23468d8bce9f8646769 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_happy2.png b/Assets/Parent/parent_happy2.png new file mode 100644 index 0000000..d4bad7e --- /dev/null +++ b/Assets/Parent/parent_happy2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7f37be57b94060d0caf751b43ec9b2d98c1ea540bbc21ceb13c91f002e93a7b +size 12764 diff --git a/Assets/Parent/parent_happy2.png.meta b/Assets/Parent/parent_happy2.png.meta new file mode 100644 index 0000000..05a514c --- /dev/null +++ b/Assets/Parent/parent_happy2.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 3c7af6298f256af408046a1107b078ad +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_neutral.png b/Assets/Parent/parent_neutral.png new file mode 100644 index 0000000..5f648e6 --- /dev/null +++ b/Assets/Parent/parent_neutral.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cda796bee8aa7f8be5e93e9404e9cffa4e20cb6ea30f18e23d1e3fd188bfd041 +size 5424 diff --git a/Assets/Parent/parent_neutral.png.meta b/Assets/Parent/parent_neutral.png.meta new file mode 100644 index 0000000..9c792c1 --- /dev/null +++ b/Assets/Parent/parent_neutral.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 5819a9fd766bfc840bd45455c763fff4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Parent/parent_talk.png b/Assets/Parent/parent_talk.png new file mode 100644 index 0000000..944c670 --- /dev/null +++ b/Assets/Parent/parent_talk.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85fe5796e1455bda799533a88891e8224cd737d7351941d2f1d89d770419713f +size 7560 diff --git a/Assets/Parent/parent_talk.png.meta b/Assets/Parent/parent_talk.png.meta new file mode 100644 index 0000000..0be0faa --- /dev/null +++ b/Assets/Parent/parent_talk.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: f0b160dc85c5bbd458e716ec5082e7e9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: 2 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainGameplayScene.unity b/Assets/Scenes/MainGameplayScene.unity index 30a44b4..fc3f45b 100644 --- a/Assets/Scenes/MainGameplayScene.unity +++ b/Assets/Scenes/MainGameplayScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cff5435899d1eccf8fbba0724eed7fbf71d4920bbf35bd4168af93cb0918d851 -size 657501 +oid sha256:cadc7b5a70415603f8b6c36fa4e9da5e781d7c951d222660b161fa8dfc4d80db +size 718598 diff --git a/Assets/Scripts/spawner.cs b/Assets/Scripts/spawner.cs index 81d8872..a1c5c28 100644 --- a/Assets/Scripts/spawner.cs +++ b/Assets/Scripts/spawner.cs @@ -10,6 +10,8 @@ public class spawner : MonoBehaviour private Dictionary babyCombos = new Dictionary(); + public Collider[] spawnVolumes; + void Start() { for (int x = 0; x < startingAmount; x++) @@ -20,10 +22,11 @@ public class spawner : MonoBehaviour public void SpawnBaby() { - float _x = Random.Range(-45, 45); - float _z = Random.Range(-35, 35); + Vector3 _spawnPoint = RandomPointInBounds(spawnVolumes[Random.Range(0, spawnVolumes.Length)].bounds); + + _spawnPoint.y = 1.5f; - var _newChild = Instantiate(childPrefab, new Vector3(_x, 1.5f, _z), Quaternion.identity); + var _newChild = Instantiate(childPrefab, _spawnPoint, Quaternion.identity); _newChild.transform.parent = this.transform; Randomizer _randomizer = _newChild.GetComponent(); @@ -50,4 +53,13 @@ public class spawner : MonoBehaviour } } } + + public static Vector3 RandomPointInBounds(Bounds bounds) + { + return new Vector3( + Random.Range(bounds.min.x, bounds.max.x), + Random.Range(bounds.min.y, bounds.max.y), + Random.Range(bounds.min.z, bounds.max.z) + ); + } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 655645a..5ec2a9f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6863636cef68eb4932202bae7fe8100a3b515e5abd4b8b312ee200f2be9406b3 -size 19478 +oid sha256:cfa00f978614a8162ec54ba46c54081ce759eaa79f92f6111fbb91b6e04ae1eb +size 19462