Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Push 
Push
  • Loading branch information
@aps16104
aps16104 committed Apr 29, 2020
1 parent 85846d3 commit 3016e56
Show file tree
Hide file tree
Showing 5 changed files with 1,609 additions and 742 deletions.
115 changes: 70 additions & 45 deletions ...former/Assets/Prefabs/ghost_normal.prefab → ...rmer/Assets/Prefabs/ghost_normal 1.prefab
View file
@@ -1,47 +1,48 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &7795080802805081906
--- !u!1 &4127191465823587049
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7795080802805081913}
- component: {fileID: 7795080802805081918}
- component: {fileID: 7795080802805081919}
- component: {fileID: 7795080802805081916}
- component: {fileID: 7795080802805081917}
- component: {fileID: 7795080802805081912}
- component: {fileID: 4127191465823587042}
- component: {fileID: 4127191465823587045}
- component: {fileID: 4127191465823587047}
- component: {fileID: 4127191465823587046}
- component: {fileID: 4127191465823587043}
- component: {fileID: 5570057932834763756}
m_Layer: 11
m_Name: ghost_normal
m_Name: ghost_normal 1
m_TagString: Enemy
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7795080802805081913
--- !u!4 &4127191465823587042
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7795080802805081906}
m_GameObject: {fileID: 4127191465823587049}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -43.1, y: -1.3, z: 0}
m_LocalPosition: {x: 7.91, y: 9.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 8663920221879662139}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7795080802805081918
--- !u!212 &4127191465823587045
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7795080802805081906}
m_GameObject: {fileID: 4127191465823587049}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
Expand Down Expand Up @@ -69,8 +70,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1914031289
m_SortingLayer: 2
m_SortingLayerID: -1143351675
m_SortingLayer: 3
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 2b815501e23b3314cabb1171ac77e46d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
Expand All @@ -83,34 +84,13 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &7795080802805081919
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7795080802805081906}
m_BodyType: 1
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: 1
m_Constraints: 0
--- !u!61 &7795080802805081916
--- !u!61 &4127191465823587047
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7795080802805081906}
m_GameObject: {fileID: 4127191465823587049}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
Expand All @@ -130,30 +110,30 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 0.51, y: 0.75746167}
m_EdgeRadius: 0
--- !u!114 &7795080802805081917
--- !u!114 &4127191465823587046
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7795080802805081906}
m_GameObject: {fileID: 4127191465823587049}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: eea1d95eef157be47b4969d1e9f8d444, type: 3}
m_Name:
m_EditorClassIdentifier:
animator: {fileID: 7795080802805081912}
animator: {fileID: 4127191465823587043}
currentHealth: 0
enemie: {fileID: 7795080802805081906}
enemie: {fileID: 4127191465823587049}
Shurikendamage: 10
--- !u!95 &7795080802805081912
--- !u!95 &4127191465823587043
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7795080802805081906}
m_GameObject: {fileID: 4127191465823587049}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: b997f823007043a43878113456f411e3, type: 2}
Expand All @@ -165,3 +145,48 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &5570057932834763756
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4127191465823587049}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bd30fd3935a0fef4987201d6ee4d6154, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 2
distance: 10
groundDetection: {fileID: 8663920221879662139}
--- !u!1 &8663920221879662138
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8663920221879662139}
m_Layer: 11
m_Name: GD
m_TagString: Untagged
m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8663920221879662139
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8663920221879662138}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.313, y: -0.302, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4127191465823587042}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2 changes: 1 addition & 1 deletion ...r/Assets/Prefabs/ghost_normal.prefab.meta → ...Assets/Prefabs/ghost_normal 1.prefab.meta
View file

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

6 changes: 6 additions & 0 deletions Platformer/Assets/Scripts/Player&Enemy/Player.cs
View file
Expand Up @@ -43,6 +43,7 @@ public class Player : MonoBehaviour
bool crouch = false;

public GameObject door; //Public so I could drag door in
public GameObject door2; //WallJump Door

bool wallSliding;//need access to these in OnJump methods
int wallDirX;
Expand Down Expand Up @@ -184,6 +185,11 @@ public class Player : MonoBehaviour
other.gameObject.SetActive(false); //key is not actice
door.SetActive(false); // Door is accessible
}
if (other.gameObject.CompareTag("Key2")) //If you got the key
{
other.gameObject.SetActive(false); //key is not actice
door2.SetActive(false); // Door is accessible
}

if (other.gameObject.CompareTag("Heart"))
{
Expand Down

0 comments on commit 3016e56

Please sign in to comment.