Skip to content

Commit

Permalink
HMM
Browse files Browse the repository at this point in the history
hmm :(
  • Loading branch information
aps16104 committed Apr 24, 2020
1 parent ab7d47c commit 8abb3c3
Show file tree
Hide file tree
Showing 21 changed files with 4,155 additions and 967 deletions.
7 changes: 4 additions & 3 deletions Platformer/Assets/PlatformController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void CalculatePassengerMovement(Vector3 velocity)
rayOrigin += Vector2.right * (verticalRaySpacing * i);
RaycastHit2D hit = Physics2D.Raycast(rayOrigin, Vector2.up * directionY, rayLength, passengerMask);

if (hit)
if (hit && hit.distance !=0) //&& player is not in platform
{
if (!movedPassengers.Contains(hit.transform))
{
Expand All @@ -150,7 +150,7 @@ void CalculatePassengerMovement(Vector3 velocity)
rayOrigin += Vector2.up * (horizontalRaySpacing * i);
RaycastHit2D hit = Physics2D.Raycast(rayOrigin, Vector2.right * directionX, rayLength, passengerMask);

if (hit)
if (hit && hit.distance != 0)
{
if (!movedPassengers.Contains(hit.transform))
{
Expand All @@ -174,7 +174,7 @@ void CalculatePassengerMovement(Vector3 velocity)
Vector2 rayOrigin = raycastOrigins.topLeft + Vector2.right * (verticalRaySpacing * i);
RaycastHit2D hit = Physics2D.Raycast(rayOrigin, Vector2.up, rayLength, passengerMask);

if (hit)
if (hit && hit.distance != 0)
{
if (!movedPassengers.Contains(hit.transform))
{
Expand Down Expand Up @@ -205,6 +205,7 @@ public PassengerMovement(Transform _transform, Vector3 _velocity, bool _standing
}
}

//Draw the little crosses so we can see
void OnDrawGizmos()
{
if (localWaypoints != null)
Expand Down
35 changes: 18 additions & 17 deletions Platformer/Assets/Prefabs/Bullet.prefab
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &776097286453626797
--- !u!1 &8433151850351439283
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 436132180871809603}
- component: {fileID: 4871894047047650787}
- component: {fileID: 2657745054146267846}
- component: {fileID: 4594351167933586053}
- component: {fileID: 114865570329940458}
- component: {fileID: 5332725016361681052}
- component: {fileID: 5493751806056483752}
- component: {fileID: 6001025085277983057}
- component: {fileID: 1260666552187725056}
- component: {fileID: 3103642779486891968}
m_Layer: 0
m_Name: Bullet
m_TagString: Bullet
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &436132180871809603
--- !u!4 &5332725016361681052
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776097286453626797}
m_GameObject: {fileID: 8433151850351439283}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -12.29, y: -2.211, z: -11.903397}
m_LocalScale: {x: 0.02429194, y: 0.02429194, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4871894047047650787
--- !u!212 &5493751806056483752
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776097286453626797}
m_GameObject: {fileID: 8433151850351439283}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
Expand Down Expand Up @@ -82,14 +82,14 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &2657745054146267846
--- !u!50 &6001025085277983057
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776097286453626797}
m_GameObject: {fileID: 8433151850351439283}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
Expand All @@ -103,13 +103,13 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 1
m_Constraints: 4
--- !u!70 &4594351167933586053
--- !u!70 &1260666552187725056
CapsuleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776097286453626797}
m_GameObject: {fileID: 8433151850351439283}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
Expand All @@ -119,17 +119,18 @@ CapsuleCollider2D:
m_Offset: {x: 0.0660354, y: -0.044630922}
m_Size: {x: 2.032612, y: 1.1240115}
m_Direction: 0
--- !u!114 &114865570329940458
--- !u!114 &3103642779486891968
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 776097286453626797}
m_GameObject: {fileID: 8433151850351439283}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c759eb7e680b5fd45a51d3fb3103ce66, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 15
rb: {fileID: 2657745054146267846}
rb: {fileID: 6001025085277983057}
facing: {fileID: 0}
7 changes: 4 additions & 3 deletions Platformer/Assets/Prefabs/alienBeige.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SpriteRenderer:
m_SortingLayerID: -1143351675
m_SortingLayer: 3
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: eac81aed8c380384f9428363d5defde5, type: 3}
m_Sprite: {fileID: 21300000, guid: ed5d1cf8f34360540ba3c4c39fcfd633, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -89,11 +89,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3304212844087796135}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eea1d95eef157be47b4969d1e9f8d444, type: 3}
m_Name:
m_EditorClassIdentifier:
player: {fileID: 0}
health: 100
death: {fileID: 3304212844087796135}
rb: {fileID: 50545078531212780}
Expand Down Expand Up @@ -136,7 +137,7 @@ BoxCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.66, y: 0.92}
oldSize: {x: 0.51, y: 0.73}
newSize: {x: 0.66, y: 0.92}
adaptiveTilingThreshold: 0.5
drawMode: 0
Expand Down
135 changes: 135 additions & 0 deletions Platformer/Assets/Prefabs/sign.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3898352850606742374
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3898352850606742375}
- component: {fileID: 3898352850606742372}
- component: {fileID: 5731649023866519366}
- component: {fileID: 9208802563446264276}
m_Layer: 0
m_Name: sign
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3898352850606742375
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3898352850606742374}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -6, y: 0.036, z: 0}
m_LocalScale: {x: 3, y: 3.5, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &3898352850606742372
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3898352850606742374}
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_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1143351675
m_SortingLayer: 3
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 42820af2772f24bda991ed7de294c2fd, 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.18, y: 0.2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &5731649023866519366
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3898352850606742374}
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.18, y: 0.2}
newSize: {x: 0.18, y: 0.2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.18, y: 0.2}
m_EdgeRadius: 0
--- !u!61 &9208802563446264276
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3898352850606742374}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: -0.003915623, y: 0.048651874}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.18, y: 0.2}
newSize: {x: 0.18, y: 0.2}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.46184543, y: 0.2973038}
m_EdgeRadius: 0
7 changes: 7 additions & 0 deletions Platformer/Assets/Prefabs/sign.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 8abb3c3

Please sign in to comment.