Merge pull request #12 from frizbee19/Rizzz

Worked on first level
This commit is contained in:
frizbee19 authored and GitHub committed 2022-02-24 22:47:43 -06:00
commit 0f18816951
10 files changed
+1051 -418

No files matched your search

@@ -41,7 +41,7 @@ Texture2D:
m_ColorSpace: 0 m_ColorSpace: 0
m_PlatformBlob: m_PlatformBlob:
image data: 1048576 image data: 1048576
_typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e11131310090907030608090d0f100f09090703030709090d0f0f0c070704010000000000000000000000000000000003060707070707070707070707070707070707070707070707070707070707070707070707070707070707060503000000000000000000000000000000000000000000000000030608090d101213131312100d0a07060300020507080a0706040000000000000000000000000000000000000000000000000000030709090d1012131312100e0b07060401000000000000000000000000000000000000000000000002070a0c0d13110e0807050200000000000000000000000000000306080911120f0807050200000000000000000000000000000000000000000000010507070f13110b0a080400000000000000000407090a0d0a0a0804000000000000000000000000000000000000000000000000000307090911130f07060400000000000000000000000105090b0b11100a090704000000000000000000000000000000000000000000000105070811120f090806030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010407070b0e1112131312110e0b08070502000000000000000000000000000000000000000000000000000000000000000005080a0b13110d080806020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000406070d100e080705020000000000000000000000000000000000000000000000000000000000020507080b0e101112131312100e0b0707040100000000000000000000000000000000000000000000000000050a0e10101109090703000000000000000000000000000000000000000000030608091113120e080705020000000000000000000000000000000000000000000000000000000000000000000406071013100a06050300000000000000000000000000000000000000000000000000000000000000000000000000000406070f12120a0a08040000000000000000000000000000000000000000010406070d11100908060300000000000000000000000000000000000306080912120e080705020000000000000000000000000407090a0c08070502000000000000000000000307090912120e080705020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002090e1214151b1e201f1d1615130f1215151a1c1d1c1615130f0f1315161a1b1c191413110d0801000000000000000000000000060c1012131414141414141414141414141414141414141414141414141414141414141414141414141414141413120f0b060000000000000000000000000000000000000000040a0f121515191c1e1f201f1e1c1a161312100c0e121415171413100c0701000000000000000000000000000000000000000000040a0f1315161a1d1f20201f1d1b181413100d07010000000000000000000000000000000000000000070d1316191a1f1e1b1514120e090300000000000000000000040a0f1315161e1f1c1414110e080200000000000000000000000000000000000002080d1113141c1f1e171714110c0500000000050b101316171a171614100b05000000000000000000000000000000000000000000040a0f1315161e1f1b1313100c070000000000000000060c111517181e1d171614100b0500000000000000000000000000000000000002080d1114141e1f1c1615130f0a04000000000000000000000000000000000000000000000000000000000000000000000000000000000208Line truncated _typelessdata: 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020507080e11131310090907030608090d0f100f09090703030709090d0f0f0c070704010000000000000000000000000000000003060707070707070707070707070707070707070707070707070707070707070707070707070707070707060503000000000000000000000000000000000000000000000000030608090d101213131312100d0a07060300020507080a0706040000000000000000000000000000000000000000000000000000030709090d1012131312100e0b07060401000000000000000000000000000000000000000000000002070a0c0d13110e0807050200000000000000000000000000000306080911120f0807050200000000000000000000000000000000000000000000010507070f13110b0a080400000000000000000407090a0d0a0a0804000000000000000000000000000000000000000000000000000307090911130f07060400000000000000000000000105090b0b11100a090704000000000000000000000000000000000000000000000105070811120f090806030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010407070b0e1112131312110e0b08070502000000000000000000000000000000000000000000000000000000000000000005080a0b13110d080806020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000406070d100e080705020000000000000000000000000000000000000000000000000000000000020507080b0e101112131312100e0b0707040100000000000000000000000000000000000000000000000000050a0e10101109090703000000000000000000000000000000000000000000030608091113120e080705020000000000000000000000000000000000000000000000000000000000000000000406071013100a06050300000000000000000000000000000000000000000000000000000000000000000000000000000406070f12120a0a08040000000000000000000000000000000000000000010406070d11100908060300000000000000000000000000000000000306080912120e080705020000000000000000000000000407090a0c08070502000000000000000000000307090912120e0807050200000000000000000000000000000000000000000105090b0b11130e060603000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002070a0c0d12120c0c0906010000000000000000000000000000000000000000000000000000000000000000000000000000000002090e1214151b1e201f1d1615130f1215151a1c1d1c1615130f0f1315161a1b1c191413110d0801000000000000000000000000060c1012131414141414141414141414141414141414141414141414141414141414141414141414141414141413120f0b060000000000000000000000000000000000000000040a0f121515191c1e1f201f1e1c1a161312100c0e121415171413100c0701000000000000000000000000000000000000000000040a0f1315161a1d1f20201f1d1b181413100d07010000000000000000000000000000000000000000070d1316191a1f1e1b1514120e090300000000000000000000040a0f1315161e1f1c1414110e080200000000000000000000000000000000000002080d1113141c1f1e171714110c0500000000050b101316171a171614100b05000000000000000000000000000000000000000000040a0f1315161e1f1b1313100c070000000000000000060c111517181e1d171614100b0500000000000000000000000000000000000002080d1114141e1f1c1615130f0a04000000000000000000000000000000000000000000000000000000000000000000000000000000000208Line truncated
m_StreamData: m_StreamData:
serializedVersion: 2 serializedVersion: 2
offset: 0 offset: 0
@@ -836,6 +836,20 @@ MonoBehaviour:
m_Height: 60 m_Height: 60
m_Scale: 1 m_Scale: 1
m_AtlasIndex: 0 m_AtlasIndex: 0
- m_Index: 192
m_Metrics:
m_Width: 6.859375
m_Height: 59.546875
m_HorizontalBearingX: 4.265625
m_HorizontalBearingY: 59.984375
m_HorizontalAdvance: 17.1875
m_GlyphRect:
m_X: 114
m_Y: 313
m_Width: 8
m_Height: 60
m_Scale: 1
m_AtlasIndex: 0
m_CharacterTable: m_CharacterTable:
- m_ElementType: 1 - m_ElementType: 1
m_Unicode: 32 m_Unicode: 32
@@ -1021,6 +1035,10 @@ MonoBehaviour:
m_Unicode: 68 m_Unicode: 68
m_GlyphIndex: 37 m_GlyphIndex: 37
m_Scale: 1 m_Scale: 1
- m_ElementType: 1
m_Unicode: 33
m_GlyphIndex: 192
m_Scale: 1
m_AtlasTextures: m_AtlasTextures:
- {fileID: -8080753185268747901} - {fileID: -8080753185268747901}
m_AtlasTextureIndex: 0 m_AtlasTextureIndex: 0
@@ -1207,6 +1225,10 @@ MonoBehaviour:
m_Y: 82 m_Y: 82
m_Width: 61 m_Width: 61
m_Height: 79 m_Height: 79
- m_X: 104
m_Y: 303
m_Width: 27
m_Height: 79
m_FreeGlyphRects: m_FreeGlyphRects:
- m_X: 101 - m_X: 101
m_Y: 24 m_Y: 24
@@ -1304,14 +1326,6 @@ MonoBehaviour:
m_Y: 231 m_Y: 231
m_Width: 26 m_Width: 26
m_Height: 29 m_Height: 29
- m_X: 0
m_Y: 349
m_Width: 1023
m_Height: 674
- m_X: 104
m_Y: 339
m_Width: 919
m_Height: 684
- m_X: 69 - m_X: 69
m_Y: 207 m_Y: 207
m_Width: 5 m_Width: 5
@@ -1324,14 +1338,47 @@ MonoBehaviour:
m_Y: 260 m_Y: 260
m_Width: 31 m_Width: 31
m_Height: 10 m_Height: 10
<<<<<<< HEAD
- m_X: 476
m_Y: 82
m_Width: 547
m_Height: 941
- m_X: 476
m_Y: 76
m_Width: 46
m_Height: 947
- m_X: 582
m_Y: 79
m_Width: 441
m_Height: 944
=======
- m_X: 104 - m_X: 104
m_Y: 303 m_Y: 303
m_Width: 29 m_Width: 29
m_Height: 720 m_Height: 720
>>>>>>> main
- m_X: 1004 - m_X: 1004
m_Y: 0 m_Y: 0
m_Width: 19 m_Width: 19
m_Height: 1023 m_Height: 1023
<<<<<<< HEAD
- m_X: 0
m_Y: 382
m_Width: 1023
m_Height: 641
- m_X: 0
m_Y: 349
m_Width: 104
m_Height: 674
- m_X: 131
m_Y: 339
m_Width: 892
m_Height: 684
- m_X: 131
m_Y: 303
m_Width: 2
m_Height: 720
=======
- m_X: 636 - m_X: 636
m_Y: 79 m_Y: 79
m_Width: 387 m_Width: 387
@@ -1356,6 +1403,7 @@ MonoBehaviour:
m_Y: 82 m_Y: 82
m_Width: 45 m_Width: 45
m_Height: 941 m_Height: 941
>>>>>>> main
m_fontInfo: m_fontInfo:
Name: Name:
PointSize: 0 PointSize: 0
+135
View File
@@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2242710701008615249
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2242710701008615245}
- component: {fileID: 2242710701008615244}
- component: {fileID: 2242710701008615247}
- component: {fileID: 2242710701008615246}
m_Layer: 0
m_Name: Collectible
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2242710701008615245
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.47, y: 2.09, z: 0}
m_LocalScale: {x: 1, y: 1.9308459, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2242710701008615244
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
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: 3625043607559282579, guid: 045b15ec09bba42448d89db77fa6f20a, type: 3}
m_Color: {r: 1, g: 0.9364519, b: 0, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 0.5}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &2242710701008615247
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: -1}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 0.5}
newSize: {x: 1, y: 0.5}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 2}
m_EdgeRadius: 0
--- !u!114 &2242710701008615246
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2242710701008615249}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 58ad46602c4301d47a7b6f71726a1cd9, type: 3}
m_Name:
m_EditorClassIdentifier:
forceInteract: 0
repeatable: 0
value: 0
TextBox: {fileID: 0}
pages:
- congrats, you did it!
emotes: 00000000
controller: {fileID: 0}
startSprite: {fileID: 3625043607559282579, guid: 045b15ec09bba42448d89db77fa6f20a, type: 3}
audioManager: {fileID: 0}
isTalking: 0
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d17fc3156a0dea745a31a3be8fff0e8e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+148
View File
@@ -0,0 +1,148 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2621127337476526745
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2621127337476526756}
- component: {fileID: 2621127337476526747}
- component: {fileID: 2621127337476526746}
- component: {fileID: 2621127337476526757}
- component: {fileID: 2621127337476526758}
m_Layer: 7
m_Name: Platform
m_TagString: Platform
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2621127337476526756
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.27, y: -1.78, z: 0}
m_LocalScale: {x: 3, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2621127337476526747
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
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: 7482667652216324306, guid: 48e93eef0688c4a259cb0eddcd8661f7, 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, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!114 &2621127337476526746
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 56977ce248620a94199b7ddedef0152e, type: 3}
m_Name:
m_EditorClassIdentifier:
isMoving: 0
positionToMoveTo: {x: 0, y: 0, z: 0}
length: 4
goThrough: 1
--- !u!61 &2621127337476526757
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 1
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, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.95, y: 0.8}
m_EdgeRadius: 0.15
--- !u!251 &2621127337476526758
PlatformEffector2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2621127337476526745}
m_Enabled: 1
m_UseColliderMask: 1
m_ColliderMask:
serializedVersion: 2
m_Bits: 8
m_RotationalOffset: 0
m_UseOneWay: 1
m_UseOneWayGrouping: 1
m_SurfaceArc: 90
m_UseSideFriction: 0
m_UseSideBounce: 0
m_SideArc: 1
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4847344a5a8497746b1fabd92e4360ea
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+1 -1
View File
@@ -19,7 +19,7 @@ public class Movement : MonoBehaviour
const float k_CeilingRadius = .2f; // Radius of the overlap circle to determine if the player can stand up const float k_CeilingRadius = .2f; // Radius of the overlap circle to determine if the player can stand up
private Rigidbody2D m_Rigidbody2D; private Rigidbody2D m_Rigidbody2D;
private bool m_FacingRight = true; // For determining which way the player is currently facing. private bool m_FacingRight = true; // For determining which way the player is currently facing.
private Vector3 m_Velocity = Vector3.zero; public Vector3 m_Velocity = Vector3.zero;
public static bool pause = false; public static bool pause = false;
private bool dj = false; private bool dj = false;
+27 -6
View File
@@ -4,13 +4,18 @@ using UnityEngine;
public class Platform : MonoBehaviour public class Platform : MonoBehaviour
{ {
public bool isMoving;
public Vector3 positionToMoveTo; public Vector3 positionToMoveTo;
public float length; public float length;
float prevY;
Vector3 startPos; Vector3 startPos;
void Start() void Start()
{ {
startPos = transform.position; if(isMoving)
StartCoroutine(LerpPosition(positionToMoveTo, length)); {
startPos = transform.position;
StartCoroutine(LerpPosition(positionToMoveTo, length));
}
} }
IEnumerator LerpPosition(Vector3 targetPosition, float duration) IEnumerator LerpPosition(Vector3 targetPosition, float duration)
{ {
@@ -35,11 +40,27 @@ public class Platform : MonoBehaviour
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
if(transform.position == positionToMoveTo) {
Switch(); if(isMoving) {
StartCoroutine(LerpPosition(positionToMoveTo, length)); if(transform.position == positionToMoveTo) {
Switch();
StartCoroutine(LerpPosition(positionToMoveTo, length));
}
} }
} }
// void OnCollisionEnter2D (Collision2D other) {
// if (other.gameObject.tag == "Player") {
// if(goThrough) {
// if(other.gameObject.GetComponent<Movement>().m_Velocity.y > 0.01f) {
// GetComponent<Collider2D>().isTrigger = true;
// }
// else
// {
// GetComponent<Collider2D>().isTrigger = false;
// }
// }
// }
// }
} }
+5
View File
@@ -397,6 +397,11 @@ BoxCollider2D:
serializedVersion: 2 serializedVersion: 2
m_Size: {x: 2, y: 12} m_Size: {x: 2, y: 12}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!95 &1124948658 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 5439994586602100319, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3}
m_PrefabInstance: {fileID: 5439994587558609906}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1336567756 --- !u!1 &1336567756
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
File diff suppressed because it is too large. Load diff
+26 -5
View File
@@ -6,12 +6,21 @@ EditorUserSettings:
serializedVersion: 4 serializedVersion: 4
m_ConfigSettings: m_ConfigSettings:
RecentlyUsedScenePath-0: RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
flags: 0 flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-2: RecentlyUsedScenePath-2:
<<<<<<< HEAD
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
=======
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0 flags: 0
RecentlyUsedScenePath-3: RecentlyUsedScenePath-3:
@@ -28,15 +37,27 @@ EditorUserSettings:
flags: 0 flags: 0
RecentlyUsedScenePath-7: RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
>>>>>>> main
flags: 0 flags: 0
RecentlyUsedScenePath-8: RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
flags: 0 flags: 0
RecentlyUsedScenePath-9: RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0 flags: 0
<<<<<<< HEAD
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
=======
RecentlyUsedScenePath-9: RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
>>>>>>> main
flags: 0 flags: 0
vcSharedLogLevel: vcSharedLogLevel:
value: 0d5e400f0650 value: 0d5e400f0650