Skip to content

Commit

Permalink
Merge pull request #131 from bjmendez/develop
Browse files Browse the repository at this point in the history 
Official release
  • Loading branch information
@jnboyd
jnboyd authored May 1, 2018
2 parents ed43c6f + e4383c5 commit e77f38d
Show file tree
Hide file tree
Showing 23 changed files with 260 additions and 44 deletions.
46 changes: 18 additions & 28 deletions Assets/Pesadilla_Data/Prefabs/Enemy1.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ GameObject:
- component: {fileID: 21295068}
- component: {fileID: 9595068}
- component: {fileID: 5095068}
- component: {fileID: 6195068}
- component: {fileID: 114000344714459876}
- component: {fileID: 11495068}
- component: {fileID: 58440905939311488}
m_Layer: 8
m_Name: Enemy1
m_TagString: Enemy
Expand Down Expand Up @@ -46,39 +46,14 @@ Rigidbody2D:
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 250
m_LinearDrag: 0
m_AngularDrag: 0
m_LinearDrag: 0.5
m_AngularDrag: 0.5
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!61 &6195068
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195068}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 1
m_Offset: {x: -0.05, y: -0.18}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2, y: 2}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.8, y: 1.35}
m_EdgeRadius: 0
--- !u!95 &9595068
Animator:
serializedVersion: 3
Expand Down Expand Up @@ -168,6 +143,21 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 195068}
m_IsPrefabParent: 1
--- !u!58 &58440905939311488
CircleCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 195068}
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.15}
serializedVersion: 2
m_Radius: 0.7
--- !u!114 &114000344714459876
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
2 changes: 1 addition & 1 deletion Assets/Pesadilla_Data/Prefabs/Floor1.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SpriteRenderer:
m_SortingLayerID: -1162973713
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300008, guid: 4ef8fcea41460614cad9544e8fcf5560, type: 3}
m_Sprite: {fileID: 21301246, guid: 4ef8fcea41460614cad9544e8fcf5560, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Pesadilla_Data/Prefabs/Floor5.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ SpriteRenderer:
m_SortingLayerID: -1162973713
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300402, guid: 4ef8fcea41460614cad9544e8fcf5560, type: 3}
m_Sprite: {fileID: 21300070, guid: fbe1e7b94bb1a4a099d5bcb15a00141c, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand Down
144 changes: 144 additions & 0 deletions Assets/Pesadilla_Data/Scenes/StartMenu.unity
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,75 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 859146693}
--- !u!1 &880944873
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 880944874}
- component: {fileID: 880944876}
- component: {fileID: 880944875}
m_Layer: 5
m_Name: 'ALT Attack '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &880944874
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 880944873}
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:
- {fileID: 1996298517}
m_Father: {fileID: 1250114340}
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: 204.70021, y: -86.82536}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &880944875
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 880944873}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 2dc2debc04e560b498efb93991f9d168, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &880944876
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 880944873}
--- !u!1 &908975133
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -2101,6 +2170,7 @@ RectTransform:
- {fileID: 567646087}
- {fileID: 1023131215}
- {fileID: 631182787}
- {fileID: 880944874}
m_Father: {fileID: 382543850}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -3183,6 +3253,80 @@ CanvasRenderer:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1887834162}
--- !u!1 &1996298516
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 5
m_Component:
- component: {fileID: 1996298517}
- component: {fileID: 1996298519}
- component: {fileID: 1996298518}
m_Layer: 5
m_Name: PlayerAttack
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1996298517
RectTransform:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1996298516}
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: 880944874}
m_RootOrder: 0
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: -14, y: 24}
m_SizeDelta: {x: 104.96, y: 24.56}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1996298518
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1996298516}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.41176474, g: 0.25882354, b: 0.13333334, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: a5b0320639308cf40ac81248ab676e50, type: 3}
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: Player Alternative Attack
--- !u!222 &1996298519
CanvasRenderer:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1996298516}
--- !u!1 &2013227251
GameObject:
m_ObjectHideFlags: 0
Expand Down
4 changes: 3 additions & 1 deletion Assets/Pesadilla_Data/Scripts/BoardCreator.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ void SetTilesValuesForCorridors ()
void InstantiateTiles ()
{
int temp = 0;
temp = Random.Range (0, 4);
temp = Random.Range (0, 5);
Debug.Log (temp);
if (temp == 0) {
floorTile = floorTiles [0];
} else if (temp == 1) {
Expand All @@ -311,6 +312,7 @@ void InstantiateTiles ()
} else {
floorTile = floorTiles [4];
}

// Go through all the tiles in the jagged array...
for (int i = 0; i < tiles.Length; i++)
{
Expand Down
18 changes: 9 additions & 9 deletions Assets/Pesadilla_Data/Scripts/Player.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,55 +173,55 @@ private void Update ()


//If player is moving and 'A' is pressed trigger left walking animation and set direction to left
if (Input.GetKeyDown (KeyCode.A) && isMoving) {
if ((Input.GetKeyDown (KeyCode.A) ||Input.GetKeyDown (KeyCode.LeftArrow) ) && isMoving) {
animator.SetTrigger ("playerLeft");
Direction = "LEFT";


}
//If player is moving and 'D' is pressed trigger right walking animation and set direction to right
else if (Input.GetKeyDown (KeyCode.D) && isMoving) {
else if ((Input.GetKeyDown (KeyCode.D) ||Input.GetKeyDown (KeyCode.RightArrow) ) && isMoving) {
animator.SetTrigger ("playerRight");
Direction = "RIGHT";


}
//If player is moving and 'W' is pressed trigger back walking animation and set direction to back
else if (Input.GetKeyDown (KeyCode.W) && isMoving) {
else if ((Input.GetKeyDown (KeyCode.W) ||Input.GetKeyDown (KeyCode.UpArrow) ) && isMoving) {
animator.SetTrigger ("playerBack");
Direction = "BACK";

}
//If player is movign and 'S' is pressed trigger front walking animation and set direction to front
else if (Input.GetKeyDown (KeyCode.S) && isMoving) {
else if ((Input.GetKeyDown (KeyCode.S) ||Input.GetKeyDown (KeyCode.DownArrow) )&& isMoving) {
animator.SetTrigger ("playerFoward");
Direction = "FRONT";

}

//If player lets go of 'A' and isn't moving play left idle animation and set direction to left
if (Input.GetKeyUp (KeyCode.A) && !isMoving) {
if ((Input.GetKeyUp (KeyCode.A) ||Input.GetKeyUp (KeyCode.LeftArrow)) && !isMoving) {

animator.SetTrigger ("playerLIdle");
Direction = "LEFT";


}
//If player lets go of 'D' and isn't moving play right idle animation and set direction to right
else if (Input.GetKeyUp (KeyCode.D) && !isMoving) {
else if ((Input.GetKeyUp (KeyCode.D) ||Input.GetKeyUp (KeyCode.RightArrow)) && !isMoving) {
animator.SetTrigger ("playerRIdle");
Direction = "RIGHT";

}
//If player lets go of 'W' and isn't moving play back idle animation and set direction to back
else if (Input.GetKeyUp (KeyCode.W) && !isMoving) {
else if ((Input.GetKeyUp (KeyCode.W) ||Input.GetKeyUp (KeyCode.UpArrow) )&& !isMoving) {
animator.SetTrigger ("playerBIdle");
Direction = "BACK";


}
//If player lets go of 'S' and isn't moving player front idle animation and set direction to front
else if (Input.GetKeyUp (KeyCode.S) && !isMoving) {
else if ((Input.GetKeyUp (KeyCode.S) ||Input.GetKeyUp (KeyCode.DownArrow) )&& !isMoving) {
animator.SetTrigger ("playerFIdle");
Direction = "FRONT";

Expand All @@ -230,7 +230,7 @@ private void Update ()


//If player pressed left mouse button
if (Input.GetMouseButtonDown (0)) {
if (Input.GetMouseButtonDown (0) || Input.GetKeyDown(KeyCode.Space)) {

SoundManager.instance.PlaySingle (attacking);
//If player is facing right attack in that direction
Expand Down
Binary file added Assets/Pesadilla_Data/Sprites/pixil-frame-0 (2).png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e77f38d

Please sign in to comment.