Created double jump powerup prefab, connected to museum art

main
Ivy 4 years ago
parent e77051ce92
commit ab14554d39

@ -1,6 +1,6 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1 &7047329146721016598 --- !u!1 &592821566632945315
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -8,38 +8,38 @@ GameObject:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 7047329146721016594} - component: {fileID: 592821566632945319}
- component: {fileID: 7047329146721016595} - component: {fileID: 592821566632945318}
- component: {fileID: 7047329146721016596} - component: {fileID: 592821566632945313}
- component: {fileID: 7047329146721016597} - component: {fileID: 592821566632945312}
m_Layer: 0 m_Layer: 0
m_Name: Blackburn-Abstract#2 Pixelart m_Name: DoubleJump art
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 1
--- !u!4 &7047329146721016594 --- !u!4 &592821566632945319
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047329146721016598} m_GameObject: {fileID: 592821566632945315}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.84, y: -1.9, z: 1} m_LocalPosition: {x: 7.96, y: -1.7576, z: 1}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1.5086, y: 1.5036777, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7047329146721016595 --- !u!212 &592821566632945318
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047329146721016598} m_GameObject: {fileID: 592821566632945315}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
@ -84,13 +84,13 @@ SpriteRenderer:
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0 m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!61 &7047329146721016596 --- !u!61 &592821566632945313
BoxCollider2D: BoxCollider2D:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047329146721016598} m_GameObject: {fileID: 592821566632945315}
m_Enabled: 1 m_Enabled: 1
m_Density: 1 m_Density: 1
m_Material: {fileID: 0} m_Material: {fileID: 0}
@ -110,16 +110,16 @@ BoxCollider2D:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 1.28, y: 1.28} m_Size: {x: 1.28, y: 1.28}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &7047329146721016597 --- !u!114 &592821566632945312
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047329146721016598} m_GameObject: {fileID: 592821566632945315}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cd4d5b992474f984fa6c9f579b861848, type: 3} m_Script: {fileID: 11500000, guid: cd4d5b992474f984fa6c9f579b861848, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
index: 0 index: 6

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3726d77edb33a453384117a0626cf7b9 guid: f2d6622f1f13a48a0ab7439c11de1dbf
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

@ -336,7 +336,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
canUnShrink: 1 canUnShrink: 1
canShrink: 0
isShrunk: 0 isShrunk: 0
minRbSize: {x: 0, y: 0, z: 0} minRbSize: {x: 0, y: 0, z: 0}
minColSize: {x: 0, y: 0} minColSize: {x: 0, y: 0}

@ -0,0 +1,139 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4981605622244191447
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4981605622244191441}
- component: {fileID: 4981605622244191446}
- component: {fileID: 4981605622244191443}
- component: {fileID: 7493837377559683526}
- component: {fileID: 7666799845934327191}
m_Layer: 0
m_Name: Double Jump Powerup
m_TagString: GliderPowerup
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4981605622244191441
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981605622244191447}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 24.06, y: -2.186037, z: 0}
m_LocalScale: {x: 1.7428, y: 1.5695, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4981605622244191446
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981605622244191447}
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: 7947595c5ebf72648aab3049c3c7f7bd, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.28, y: 1.28}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &4981605622244191443
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981605622244191447}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.28, y: 1.28}
newSize: {x: 1.28, y: 1.28}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1.28, y: 1.28}
m_EdgeRadius: 0
--- !u!114 &7493837377559683526
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981605622244191447}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b211c5a33678e544f8a025eda8fe81eb, type: 3}
m_Name:
m_EditorClassIdentifier:
artIndex: 6
powerup: 2
--- !u!114 &7666799845934327191
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4981605622244191447}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e402d22de9c73d5458840496e2d7d97e, type: 3}
m_Name:
m_EditorClassIdentifier:

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

@ -3518,6 +3518,10 @@ PrefabInstance:
propertyPath: m_Enabled propertyPath: m_Enabled
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 9001604349646828647, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
propertyPath: m_IsTrigger
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3}
--- !u!1 &1831256037 stripped --- !u!1 &1831256037 stripped

@ -13532,7 +13532,7 @@ Transform:
- {fileID: 993848333} - {fileID: 993848333}
- {fileID: 1620187171} - {fileID: 1620187171}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &993848332 --- !u!1 &993848332
GameObject: GameObject:
@ -87617,3 +87617,60 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 74bd19f26d283402f9ba1d330e1c1e96, type: 3}
--- !u!1001 &7635576743063053407
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 592821566632945315, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_Name
value: DoubleJump art
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalPosition.x
value: 15.9
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalPosition.y
value: -1.75
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalPosition.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 592821566632945319, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f2d6622f1f13a48a0ab7439c11de1dbf, type: 3}

@ -19,7 +19,8 @@ public class DoubleJumpPowerup : MonoBehaviour
private void OnTriggerEnter2D(Collider2D collision) private void OnTriggerEnter2D(Collider2D collision)
{ {
Debug.Log("DoubleJump Powerup Obtained"); Debug.Log("DoubleJump Powerup Obtained");
GameManager.Instance.enablePowerup(Powerup.DoubleJump);
GameManager.Instance.player.GetComponent<movement>().maxJumps = 2;
Destroy(gameObject); Destroy(gameObject);
} }
} }

@ -39,7 +39,6 @@ public class movement : MonoBehaviour
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
Debug.Log("glider.IsGliding" + glider.IsGliding);
animator.SetBool("isGliding", glider.IsGliding); animator.SetBool("isGliding", glider.IsGliding);
if (Input.GetKeyDown("space") && numJumps > 0 && !GameManager.Instance.isPaused()) if (Input.GetKeyDown("space") && numJumps > 0 && !GameManager.Instance.isPaused())

@ -5,6 +5,9 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1
path: Assets/Scenes/MainMenu.unity
guid: 0d91fd8700663154b83fa475b7aea9ef
- enabled: 1 - enabled: 1
path: Assets/Scenes/DemoLevels/Spawn.unity path: Assets/Scenes/DemoLevels/Spawn.unity
guid: eaf2cb5b0460c45979b9dbd52915e53e guid: eaf2cb5b0460c45979b9dbd52915e53e

@ -27,13 +27,13 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0
flags: 0 flags: 0
RecentlyUsedScenePath-7: RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0 flags: 0
RecentlyUsedScenePath-8: RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a value: 22424703114646680e0b0227036c72111f19352f223d68252320092a
flags: 0 flags: 0
RecentlyUsedScenePath-9: RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c72111f19352f223d68252320092a value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb
flags: 0 flags: 0
vcSharedLogLevel: vcSharedLogLevel:
value: 0d5e400f0650 value: 0d5e400f0650

Loading…
Cancel
Save