diff --git a/RollABall/Assets/Materials/Pickup.mat b/RollABall/Assets/Materials/Pickup.mat new file mode 100644 index 0000000000000000000000000000000000000000..0d1503b1ab78a172da2c3bc5d460b56c4309bad4 --- /dev/null +++ b/RollABall/Assets/Materials/Pickup.mat @@ -0,0 +1,90 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pickup + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2050 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _Cull: 2 + - _Cutoff: 0.5 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.25 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0.78431374, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} +--- !u!114 &4250020158830062929 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 diff --git a/RollABall/Assets/Materials/Pickup.mat.meta b/RollABall/Assets/Materials/Pickup.mat.meta new file mode 100644 index 0000000000000000000000000000000000000000..13704ecc16822abddf4708141d772cb49c43ac2c --- /dev/null +++ b/RollABall/Assets/Materials/Pickup.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab048349529a686478b496939c8daafd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/RollABall/Assets/Prefabs.meta b/RollABall/Assets/Prefabs.meta new file mode 100644 index 0000000000000000000000000000000000000000..412d035c86d18507b8bf175de46ee9bfd8cc71e0 --- /dev/null +++ b/RollABall/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: aca941f12ab127f4b9c0db4860df6d8e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RollABall/Assets/Prefabs/Pickup.prefab b/RollABall/Assets/Prefabs/Pickup.prefab new file mode 100644 index 0000000000000000000000000000000000000000..853b644486eb81fdbbb5bdc850f76e7c348171f5 --- /dev/null +++ b/RollABall/Assets/Prefabs/Pickup.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7642175490724572390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7642175490724572385} + - component: {fileID: 7642175490724572386} + - component: {fileID: 7642175490724572387} + - component: {fileID: 7642175490724572388} + - component: {fileID: 7642175490724572389} + m_Layer: 0 + m_Name: Pickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7642175490724572385 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7642175490724572390} + m_LocalRotation: {x: 0.46193978, y: 0.19134173, z: 0.19134173, w: 0.84462327} + m_LocalPosition: {x: 0, y: 0.5, z: -1.63} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 45, y: 45, z: 45} +--- !u!33 &7642175490724572386 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7642175490724572390} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7642175490724572387 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7642175490724572390} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ab048349529a686478b496939c8daafd, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!65 &7642175490724572388 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7642175490724572390} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7642175490724572389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7642175490724572390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 44f66f77bed8ff641849409ff09c70b7, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/RollABall/Assets/Prefabs/Pickup.prefab.meta b/RollABall/Assets/Prefabs/Pickup.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..5815f7b0dab3a1de72fd8d77c2789d7defbfbefe --- /dev/null +++ b/RollABall/Assets/Prefabs/Pickup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 574bd8d579c7d5f42b903412f8a24c92 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/RollABall/Assets/Scenes/MiniGame.unity b/RollABall/Assets/Scenes/MiniGame.unity index ae962e6877d691cdbd15793449eb783de775c137..1752915f337c6a28221e09af9a474ad81348cabf 100644 --- a/RollABall/Assets/Scenes/MiniGame.unity +++ b/RollABall/Assets/Scenes/MiniGame.unity @@ -215,6 +215,113 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &752766630 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 802725517} + m_Modifications: + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.22 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalPosition.y + value: -4.67 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.73 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.84462327 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.46193978 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.19134173 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.19134173 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572390, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_Name + value: Pickup (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 574bd8d579c7d5f42b903412f8a24c92, type: 3} +--- !u!4 &752766631 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + m_PrefabInstance: {fileID: 752766630} + m_PrefabAsset: {fileID: 0} +--- !u!1 &802725516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 802725517} + m_Layer: 0 + m_Name: PickupParent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &802725517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 802725516} + 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: + - {fileID: 2048804918} + - {fileID: 752766631} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1154643324 GameObject: m_ObjectHideFlags: 0 @@ -750,6 +857,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1890301778} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2048804918 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + m_PrefabInstance: {fileID: 7642175489213981911} + m_PrefabAsset: {fileID: 0} --- !u!1 &2060902285 GameObject: m_ObjectHideFlags: 0 @@ -998,3 +1111,72 @@ MonoBehaviour: m_DefaultActionMap: Player m_SplitScreenIndex: -1 m_Camera: {fileID: 0} +--- !u!1001 &7642175489213981911 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 802725517} + m_Modifications: + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.12 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalPosition.y + value: -5.02 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.32 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.84462327 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.46193978 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.19134173 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.19134173 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572385, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 45 + objectReference: {fileID: 0} + - target: {fileID: 7642175490724572390, guid: 574bd8d579c7d5f42b903412f8a24c92, + type: 3} + propertyPath: m_Name + value: Pickup + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 574bd8d579c7d5f42b903412f8a24c92, type: 3} diff --git a/RollABall/Assets/Scripts/Rotator.cs b/RollABall/Assets/Scripts/Rotator.cs new file mode 100644 index 0000000000000000000000000000000000000000..8c29ca8bcf066f3cf5a39109c76eba8e3d565eb8 --- /dev/null +++ b/RollABall/Assets/Scripts/Rotator.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Rotator : MonoBehaviour +{ + // Update is called once per frame + void Update() + { + // Rotate the game object that this script is attached to by 15 in the X axis, + // 30 in the Y axis and 45 in the Z axis, multiplied by deltaTime in order to make it per second + // rather than per frame. + transform.Rotate(new Vector3(15, 30, 45) * Time.deltaTime); + } +} diff --git a/RollABall/Assets/Scripts/Rotator.cs.meta b/RollABall/Assets/Scripts/Rotator.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..5ecf71046ad45e11d2c1a8f0de0c44735d61ee3c --- /dev/null +++ b/RollABall/Assets/Scripts/Rotator.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 44f66f77bed8ff641849409ff09c70b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: