Skip to content

Commit

Permalink
improve AIJumper
Browse files Browse the repository at this point in the history
  • Loading branch information
llafuente committed Jan 13, 2017
1 parent 399a7b9 commit 58a39bb
Show file tree
Hide file tree
Showing 11 changed files with 122 additions and 60 deletions.
41 changes: 25 additions & 16 deletions Assets/UnityPlatformer/Prefabs/BasicPlayer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ Rigidbody2D:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 175088}
m_BodyType: 0
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
Expand All @@ -741,7 +741,7 @@ Rigidbody2D:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 121632}
m_BodyType: 0
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
Expand All @@ -761,7 +761,7 @@ Rigidbody2D:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 190570}
m_BodyType: 0
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
Expand All @@ -781,7 +781,7 @@ Rigidbody2D:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 115894}
m_BodyType: 0
m_BodyType: 1
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
Expand Down Expand Up @@ -949,6 +949,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d73431d03012b7a4ba33787a81c2afd7, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMask:
serializedVersion: 2
m_Bits: 0
--- !u!114 &11409188
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -963,7 +966,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.8, y: 1.8}
--- !u!114 &11410450
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1042,9 +1044,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 1
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 843776
m_Bits: 0
owner: {fileID: 11429098}
type: 2
dealDamageToSelf: 0
Expand Down Expand Up @@ -1149,7 +1152,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.9, y: 1.6}
--- !u!114 &11435812
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1198,6 +1200,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d73431d03012b7a4ba33787a81c2afd7, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMask:
serializedVersion: 2
m_Bits: 0
--- !u!114 &11436890
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1236,7 +1241,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.9, y: 1}
--- !u!114 &11442048
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -1248,6 +1252,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d73431d03012b7a4ba33787a81c2afd7, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMask:
serializedVersion: 2
m_Bits: 0
--- !u!114 &11442472
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1460,9 +1467,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11429098}
type: 1
dealDamageToSelf: 0
Expand Down Expand Up @@ -1517,7 +1525,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.9, y: 0.25}
--- !u!114 &11479932
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -1545,9 +1552,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11429098}
type: 0
dealDamageToSelf: 0
Expand Down Expand Up @@ -1587,9 +1595,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 2101248
m_Bits: 0
owner: {fileID: 11429098}
type: 1
dealDamageToSelf: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/UnityPlatformer/Prefabs/Box.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.75, y: 0.2}
--- !u!114 &11484926
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -384,7 +383,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 0
owner: {fileID: 11496560}
Expand Down
26 changes: 15 additions & 11 deletions Assets/UnityPlatformer/Prefabs/EnemyAICannon3.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 2101760
velocity: {x: 5, y: 2}
gravity: {x: 0, y: -10}
gravity: {x: 0, y: 0}
destroyDelay: 0
--- !u!114 &114379516894106924
MonoBehaviour:
Expand All @@ -775,9 +775,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 1
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11446040}
type: 0
dealDamageToSelf: 0
Expand All @@ -794,9 +795,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 0
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 2101248
m_Bits: 0
owner: {fileID: 11446040}
type: 1
dealDamageToSelf: 0
Expand Down Expand Up @@ -828,7 +830,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 512
velocity: {x: 5, y: 8}
gravity: {x: 0, y: -10}
gravity: {x: 0, y: 0}
destroyDelay: 0
--- !u!114 &114562797961048934
MonoBehaviour:
Expand Down Expand Up @@ -872,7 +874,7 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 512
velocity: {x: 5, y: 5}
gravity: {x: 0, y: -10}
gravity: {x: 0, y: 0}
destroyDelay: 0
--- !u!114 &114636427575406580
MonoBehaviour:
Expand Down Expand Up @@ -913,9 +915,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 1
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11446040}
type: 0
dealDamageToSelf: 0
Expand Down Expand Up @@ -947,9 +950,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 1
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11446040}
type: 0
dealDamageToSelf: 0
Expand Down
18 changes: 9 additions & 9 deletions Assets/UnityPlatformer/Prefabs/EnemyAIGoomba.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.8, y: 1.8}
--- !u!114 &11405964
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -570,7 +569,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.9, y: 0.9}
--- !u!114 &11431076
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -583,9 +581,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11477932}
type: 0
dealDamageToSelf: 0
Expand All @@ -604,7 +603,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 1, y: 1}
--- !u!114 &11451492
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -642,9 +640,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 2101248
m_Bits: 0
owner: {fileID: 11477932}
type: 1
dealDamageToSelf: 0
Expand All @@ -661,9 +660,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 1
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 843776
m_Bits: 0
owner: {fileID: 11477932}
type: 2
dealDamageToSelf: 0
Expand Down
25 changes: 13 additions & 12 deletions Assets/UnityPlatformer/Prefabs/EnemyAIJumper.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -441,9 +441,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11484000}
type: 1
dealDamageToSelf: 0
Expand All @@ -462,7 +463,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.9, y: 0.9}
--- !u!114 &11416952
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -475,8 +475,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
amount: 1
type: 0
causer: {fileID: 0}
type: 1
causer: {fileID: 11484000}
direction: {x: 0, y: 0, z: 0}
--- !u!114 &11425964
MonoBehaviour:
Expand Down Expand Up @@ -554,7 +554,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 1, y: 1}
--- !u!114 &11441606
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -567,9 +566,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 4
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 4096
m_Bits: 0
owner: {fileID: 11484000}
type: 0
dealDamageToSelf: 0
Expand Down Expand Up @@ -635,7 +635,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b5fa7573398ecf468c5a90c9cecef15, type: 3}
m_Name:
m_EditorClassIdentifier:
alignment: 0
alignment: 4
friendlyFire: 0
startingHealth: 1
maxHealth: 1
startingLives: 1
Expand All @@ -659,7 +660,6 @@ MonoBehaviour:
collisionMask:
serializedVersion: 2
m_Bits: 0
_size: {x: 0.8, y: 1.8}
--- !u!114 &11487444
MonoBehaviour:
m_ObjectHideFlags: 1
Expand All @@ -685,9 +685,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
part: 1
collideWith:
useGlobalMask: 1
collisionMask:
serializedVersion: 2
m_Bits: 57344
m_Bits: 0
owner: {fileID: 11484000}
type: 2
dealDamageToSelf: 0
Expand Down
Loading

0 comments on commit 58a39bb

Please sign in to comment.