Compare commits

..

1 commit

Author SHA1 Message Date
7e3beefb2f
Added Shooting and Pizza 2019-10-02 23:48:41 +01:00
26 changed files with 1324 additions and 16 deletions

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ContentModelStore"> <component name="ContentModelStore">
<e p="C:\Users\Tom\.Rider2019.2\system\extResources" t="IncludeRecursive" /> <e p="C:\Users\Tom\.Rider2019.2\system\extResources" t="IncludeRecursive" />
@ -8,7 +8,11 @@
<e p="Assets" t="Include"> <e p="Assets" t="Include">
<e p="Scripts" t="Include"> <e p="Scripts" t="Include">
<e p="CameraController.cs" t="Include" /> <e p="CameraController.cs" t="Include" />
<e p="CollisionWallProjectile.cs" t="Include" />
<e p="pickupBounce.cs" t="Include" />
<e p="PickupType.cs" t="Include" />
<e p="PlayerController.cs" t="Include" /> <e p="PlayerController.cs" t="Include" />
<e p="PlayerWeapon.cs" t="Include" />
</e> </e>
</e> </e>
<e p="Devtober Apocalypse 2019.sln" t="IncludeFlat" /> <e p="Devtober Apocalypse 2019.sln" t="IncludeFlat" />

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ContentModelUserStore"> <component name="ContentModelUserStore">
<attachedFolders /> <attachedFolders />

8
Assets/Prefabs.meta Normal file
View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d973fc733ea2d14459ed1d6b29c2c7f2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5fd7c2960395f804596e11d57e2842eb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7185915641230361858
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7185915641230361916}
- component: {fileID: 7185915641230361917}
- component: {fileID: 7185915641230361919}
- component: {fileID: 6200319544780353047}
m_Layer: 0
m_Name: pizza
m_TagString: Pickup
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7185915641230361916
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7185915641230361858}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.206, y: 0.681, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7185915641230361917
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7185915641230361858}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
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: 961b2e16cbfe62c4791a1daa9ecec796, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.39, y: 0.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &7185915641230361919
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7185915641230361858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 776990f0ee5b56a4da5ac3389b49b670, type: 3}
m_Name:
m_EditorClassIdentifier:
floatStrength: 0.1
type: 1
--- !u!61 &6200319544780353047
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7185915641230361858}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.39, y: 0.44}
newSize: {x: 0.39, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.39, y: 0.44}
m_EdgeRadius: 0

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 72cc02795b7b43d438003d83fb54daf3
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -693,7 +693,7 @@ Transform:
- {fileID: 1996942970} - {fileID: 1996942970}
- {fileID: 1924543932} - {fileID: 1924543932}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &131721774 --- !u!1001 &131721774
PrefabInstance: PrefabInstance:
@ -770,6 +770,75 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1203834331} m_PrefabInstance: {fileID: 1203834331}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &197386915
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7185915641230361858, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_Name
value: pizza (5)
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.x
value: 4.932619
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.96192396
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cc02795b7b43d438003d83fb54daf3, type: 3}
--- !u!1001 &202278862 --- !u!1001 &202278862
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1751,6 +1820,83 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3}
--- !u!1 &746361707
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 746361708}
- component: {fileID: 746361710}
- component: {fileID: 746361709}
m_Layer: 5
m_Name: PlayerPosition
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &746361708
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 746361707}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1965906123}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 522, y: -264}
m_SizeDelta: {x: 73.8, y: 20.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &746361709
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 746361707}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0.7803583, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Player
--- !u!222 &746361710
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 746361707}
m_CullTransparentMesh: 0
--- !u!4 &754069117 stripped --- !u!4 &754069117 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5064625949789858433, guid: 3a62fb0083adba449ad20ea4e2634233, m_CorrespondingSourceObject: {fileID: 5064625949789858433, guid: 3a62fb0083adba449ad20ea4e2634233,
@ -2213,6 +2359,75 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 900114526} m_PrefabInstance: {fileID: 900114526}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &939898656
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7185915641230361858, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_Name
value: pizza (1)
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.x
value: -5.356322
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.21363717
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cc02795b7b43d438003d83fb54daf3, type: 3}
--- !u!1 &965714102 --- !u!1 &965714102
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3087,6 +3302,83 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3}
--- !u!1 &1181330404
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1181330405}
- component: {fileID: 1181330407}
- component: {fileID: 1181330406}
m_Layer: 5
m_Name: MousePosition
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1181330405
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1181330404}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1965906123}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 522, y: -284.40002}
m_SizeDelta: {x: 73.8, y: 20.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1181330406
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1181330404}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0.7803583, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Mouse
--- !u!222 &1181330407
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1181330404}
m_CullTransparentMesh: 0
--- !u!1001 &1203834331 --- !u!1001 &1203834331
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3358,7 +3650,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1287880615 --- !u!1001 &1287880615
PrefabInstance: PrefabInstance:
@ -3603,6 +3895,144 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3}
--- !u!1001 &1445341259
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7185915641230361858, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_Name
value: pizza (4)
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.x
value: 7.1507545
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.9087925
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cc02795b7b43d438003d83fb54daf3, type: 3}
--- !u!1001 &1483247611
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7185915641230361858, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_Name
value: pizza (3)
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.0692058
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.93551713
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cc02795b7b43d438003d83fb54daf3, type: 3}
--- !u!1001 &1505046078 --- !u!1001 &1505046078
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3911,6 +4341,75 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 899012402} m_PrefabInstance: {fileID: 899012402}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &1639134856
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7185915641230361858, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_Name
value: pizza (2)
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.x
value: -8.696887
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.1757197
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cc02795b7b43d438003d83fb54daf3, type: 3}
--- !u!4 &1655818157 stripped --- !u!4 &1655818157 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5064625949789858433, guid: 3a62fb0083adba449ad20ea4e2634233, m_CorrespondingSourceObject: {fileID: 5064625949789858433, guid: 3a62fb0083adba449ad20ea4e2634233,
@ -3927,12 +4426,13 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 1658863097} - component: {fileID: 1658863097}
- component: {fileID: 1658863096} - component: {fileID: 1658863096}
- component: {fileID: 1658863095}
- component: {fileID: 1658863094} - component: {fileID: 1658863094}
- component: {fileID: 1658863098} - component: {fileID: 1658863098}
- component: {fileID: 1658863095}
- component: {fileID: 1658863099}
m_Layer: 0 m_Layer: 0
m_Name: player-testing m_Name: player-testing
m_TagString: Untagged m_TagString: Player
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@ -3974,6 +4474,7 @@ MonoBehaviour:
speed: 10 speed: 10
runMultiplier: 1.5 runMultiplier: 1.5
movementType: {fileID: 1902661110} movementType: {fileID: 1902661110}
pizzaCountDisplay: {fileID: 1770290537}
--- !u!212 &1658863096 --- !u!212 &1658863096
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4035,7 +4536,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &1658863098 --- !u!61 &1658863098
BoxCollider2D: BoxCollider2D:
@ -4063,6 +4564,22 @@ BoxCollider2D:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1} m_Size: {x: 1, y: 1}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &1658863099
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1658863093}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a89a27595e4353b43b0f1a9fb74fdb9a, type: 3}
m_Name:
m_EditorClassIdentifier:
sceneCamera: {fileID: 965714104}
bullet: {fileID: 6244070996435270729, guid: 7c404e7abc222314a94e0afa26a3e75c, type: 3}
attackSpeed: 0.5
bulletSpeed: 600
--- !u!4 &1659665676 stripped --- !u!4 &1659665676 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 5064625949789858433, guid: 3a62fb0083adba449ad20ea4e2634233, m_CorrespondingSourceObject: {fileID: 5064625949789858433, guid: 3a62fb0083adba449ad20ea4e2634233,
@ -4282,6 +4799,83 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3}
--- !u!1 &1770290536
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1770290539}
- component: {fileID: 1770290538}
- component: {fileID: 1770290537}
m_Layer: 5
m_Name: PizzaCounter
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1770290537
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770290536}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0.7803583, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: Walking
--- !u!222 &1770290538
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770290536}
m_CullTransparentMesh: 0
--- !u!224 &1770290539
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1770290536}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1965906123}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -383.4, y: -277.65}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &1775708115 --- !u!1001 &1775708115
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4449,7 +5043,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 0 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: New Text m_Text: Walking
--- !u!222 &1902661111 --- !u!222 &1902661111
CanvasRenderer: CanvasRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4562,8 +5156,11 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1515687699} - {fileID: 1515687699}
- {fileID: 1902661109} - {fileID: 1902661109}
- {fileID: 746361708}
- {fileID: 1181330405}
- {fileID: 1770290539}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 1 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
@ -4969,3 +5566,72 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 3a62fb0083adba449ad20ea4e2634233, type: 3}
--- !u!1001 &7185915639235738973
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7185915641230361858, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_Name
value: pizza
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.x
value: 2.206
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.681
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7185915641230361916, guid: 72cc02795b7b43d438003d83fb54daf3,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72cc02795b7b43d438003d83fb54daf3, type: 3}

View file

@ -3,15 +3,15 @@
public class CameraController : MonoBehaviour public class CameraController : MonoBehaviour
{ {
public GameObject player; public GameObject player;
private Vector3 offset; private Vector3 _offset;
void Start() private void Start()
{ {
offset = transform.position - player.transform.position; _offset = transform.position - player.transform.position;
} }
void LateUpdate() private void LateUpdate()
{ {
transform.position = player.transform.position + offset; transform.position = player.transform.position + _offset;
} }
} }

View file

@ -0,0 +1,14 @@

using System;
using UnityEngine;
public class CollisionWallProjectile : MonoBehaviour
{
private void OnCollisionEnter2D(Collision2D collision2D)
{
if (collision2D.gameObject.tag.Equals("Projectile"))
{
Destroy(collision2D.gameObject);
}
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 8851f5d3616762c42a30d2d39968fec1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,22 @@
using System;
using UnityEngine;
public class PickupBounce : MonoBehaviour
{
public float floatStrength = 0.1f;
public PlayerController.PickupType type;
private float _originalY;
private void Start()
{
_originalY = transform.position.y;
}
void FixedUpdate()
{
transform.position = new Vector2(
transform.position.x,
_originalY + ((float) Math.Sin(Time.time) * floatStrength)
);
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 776990f0ee5b56a4da5ac3389b49b670
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,4 @@
public enum PickupType
{
PizzaPickup = 1
}

View file

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 3786f419564b4f3583e50b6b6a4fbfc0
timeCreated: 1570054838

View file

@ -1,13 +1,22 @@
using UnityEngine; using System;
using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
public class PlayerController : MonoBehaviour public class PlayerController : MonoBehaviour
{ {
public enum PickupType
{
PizzaPickup = 1
};
public Rigidbody2D player; public Rigidbody2D player;
public float speed = 10f; public float speed = 10f;
public float runMultiplier = 1.5f; public float runMultiplier = 1.5f;
public Text movementType; public Text movementType;
public Text pizzaCountDisplay;
private int _pizzaCount = 0;
private void Start() private void Start()
{ {
movementType.text = "Walking"; movementType.text = "Walking";
@ -32,4 +41,29 @@ public class PlayerController : MonoBehaviour
player.velocity = movement * speed; player.velocity = movement * speed;
} }
private void OnCollisionEnter2D(Collision2D other)
{
Debug.Log(other.gameObject.tag);
if (other.gameObject.tag.Equals("Pickup"))
{
Destroy(other.gameObject);
GivePickup(other.gameObject.GetComponent<PickupBounce>().type);
}
}
private void GivePickup(PickupType type)
{
Debug.Log(type.ToString());
switch (type)
{
case PickupType.PizzaPickup:
_pizzaCount++;
pizzaCountDisplay.text = $"Pizza Count: {_pizzaCount.ToString()}";
break;
default:
Debug.LogWarning($"Unrecognised PickupType: {type.ToString()}");
break;
}
}
} }

View file

@ -0,0 +1,42 @@
using System;
using UnityEngine;
using UnityEngine.UI;
public class PlayerWeapon : MonoBehaviour
{
// Copied and modified from https://answers.unity.com/questions/696001/how-to-make-bullet-shoot-in-same-direction-as-play.html
public Camera sceneCamera;
public Rigidbody2D bullet;
public float attackSpeed = 0.5f;
public float bulletSpeed = 600;
private Rigidbody2D _player;
private float _cooldown;
private void Start()
{
_player = GetComponent<Rigidbody2D>();
}
private void Update()
{
Vector2 mousePosition = sceneCamera.ScreenToWorldPoint(Input.mousePosition);
Vector2 playerPosition = _player.position;
if (!(Time.time >= _cooldown) || !Input.GetMouseButton(0)) return;
Fire(playerPosition, mousePosition);
}
private void Fire(Vector2 from, Vector2 towards)
{
Rigidbody2D firingBullet = Instantiate(bullet, _player.transform);
// TODO does it matter that GetComponent is expensive?
Physics2D.IgnoreCollision(firingBullet.GetComponent<Collider2D>(), _player.GetComponent<Collider2D>());
Vector2 direction = towards - from;
firingBullet.AddForce(direction.normalized * bulletSpeed + _player.velocity);
_cooldown = Time.time + attackSpeed;
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: a89a27595e4353b43b0f1a9fb74fdb9a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprites/bullet-testing.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,91 @@
fileFormatVersion: 2
guid: 2fa7adb610674af48bb868d9aa1dfca1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
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:

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1e7b3fcc31460294c9c55557867d44f0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Sprites/pickups/pizza.png (Stored with Git LFS) Normal file

Binary file not shown.

View file

@ -0,0 +1,91 @@
fileFormatVersion: 2
guid: 961b2e16cbfe62c4791a1daa9ecec796
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
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
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
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:

View file

@ -0,0 +1,121 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4108446066110553420
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 975319316475090039}
- component: {fileID: 2414019498655829040}
- component: {fileID: 6244070996435270729}
- component: {fileID: 7577485387881536711}
m_Layer: 0
m_Name: bullet-testing
m_TagString: Projectile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &975319316475090039
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4108446066110553420}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2414019498655829040
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4108446066110553420}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
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: 2fa7adb610674af48bb868d9aa1dfca1, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.1, y: 0.1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &6244070996435270729
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4108446066110553420}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!58 &7577485387881536711
CircleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4108446066110553420}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 0.05

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7c404e7abc222314a94e0afa26a3e75c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 5064625949789858433} - component: {fileID: 5064625949789858433}
- component: {fileID: 8536214089394525523} - component: {fileID: 8536214089394525523}
- component: {fileID: 4317457422259149156} - component: {fileID: 4317457422259149156}
- component: {fileID: 2808258016843424288}
m_Layer: 0 m_Layer: 0
m_Name: wall-testing m_Name: wall-testing
m_TagString: Untagged m_TagString: Untagged
@ -107,3 +108,15 @@ BoxCollider2D:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1, y: 1} m_Size: {x: 1, y: 1}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &2808258016843424288
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8681226398974794901}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8851f5d3616762c42a30d2d39968fec1, type: 3}
m_Name:
m_EditorClassIdentifier:

View file

@ -3,7 +3,9 @@
--- !u!78 &1 --- !u!78 &1
TagManager: TagManager:
serializedVersion: 2 serializedVersion: 2
tags: [] tags:
- Projectile
- Pickup
layers: layers:
- Default - Default
- TransparentFX - TransparentFX