RMIT
/
Pinata_Smackdown
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fixed being able to dash through walls. 

Started to fix animations
master
Joshua Reason 9 years ago
parent
a4b6c31cbd
commit
42abbc50cb
36 changed files with 226 additions and 538 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -42
      Pinata_Data/output_log.txt
  2. BIN
      playable/Assets/Lachlan_jump_work.unity
  3. +5
    -0
      playable/Assets/Objects.meta
  4. +0
    -0
      playable/Assets/Objects/Heart.png
  5. +0
    -0
      playable/Assets/Objects/Heart.png.meta
  6. +0
    -0
      playable/Assets/Objects/Horn1.fbx
  7. +0
    -0
      playable/Assets/Objects/Horn1.fbx.meta
  8. +0
    -0
      playable/Assets/Objects/Horn2.fbx
  9. +0
    -0
      playable/Assets/Objects/Horn2.fbx.meta
  10. +0
    -0
      playable/Assets/Objects/Platform_obj.fbx
  11. +0
    -0
      playable/Assets/Objects/Platform_obj.fbx.meta
  12. BIN
      playable/Assets/Objects/bullet.prefab
  13. +0
    -0
      playable/Assets/Objects/bullet.prefab.meta
  14. +0
    -0
      playable/Assets/Objects/chainsaw01.fbx
  15. +0
    -0
      playable/Assets/Objects/chainsaw01.fbx.meta
  16. +0
    -0
      playable/Assets/Objects/pillar_obj.fbx
  17. +0
    -0
      playable/Assets/Objects/pillar_obj.fbx.meta
  18. BIN
      playable/Assets/Pinata.controller
  19. BIN
      playable/Assets/Pinata/Armature.001Action.anim
  20. +4
    -0
      playable/Assets/Pinata/Armature.001Action.anim.meta
  21. BIN
      playable/Assets/Pinata/Idle.anim
  22. +4
    -0
      playable/Assets/Pinata/Idle.anim.meta
  23. BIN
      playable/Assets/Pinata/Pinata.fbx
  24. +198
    -2
      playable/Assets/Pinata/Pinata.fbx.meta
  25. BIN
      playable/Assets/Pinata/Pinata_Fall.fbx
  26. +0
    -244
      playable/Assets/Pinata/Pinata_Fall.fbx.meta
  27. BIN
      playable/Assets/Pinata/Pinata_Idle.fbx
  28. +0
    -244
      playable/Assets/Pinata/Pinata_Idle.fbx.meta
  29. +0
    -0
      playable/Assets/Scripts/Menu.cs
  30. +0
    -0
      playable/Assets/Scripts/Menu.cs.meta
  31. +9
    -6
      playable/Assets/Scripts/playerController.cs
  32. +5
    -0
      playable/Assets/Textures.meta
  33. +0
    -0
      playable/Assets/Textures/pillar_unrapped.jpg
  34. +0
    -0
      playable/Assets/Textures/pillar_unrapped.jpg.meta
  35. +0
    -0
      playable/Assets/Textures/platform_texture.jpg
  36. +0
    -0
      playable/Assets/Textures/platform_texture.jpg.meta

+ 1
- 42
Pinata_Data/output_log.txt View File

@ -12,48 +12,7 @@ Platform assembly: C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Manage
Loading C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\Assembly-CSharp.dll into Unity Child Domain
Platform assembly: C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\UnityEngine.UI.dll (this message is harmless)
Loading C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
- Completed reload, in 0.057 seconds
- Completed reload, in 0.203 seconds
desktop: 2160x1440 59Hz; virtual: 2160x1440 at 0,0
<RI> Initializing input.
<RI> Input initialized.
Platform assembly: C:\Users\Joshua\Documents\pi-ata-smackdown\Pinata_Data\Managed\System.Core.dll (this message is harmless)
Pinata_Player1spinning
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1End spin
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1spinning
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1End spin
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1spinning
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1End spin
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1spinning
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1End spin
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1spinning
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)
Pinata_Player1End spin
(Filename: C:/buildslave/unity/build/artifacts/StandalonePlayerGenerated/UnityEngineDebug.cpp Line: 56)

BIN
playable/Assets/Lachlan_jump_work.unity View File


+ 5
- 0
playable/Assets/Objects.meta View File

@ -0,0 +1,5 @@
fileFormatVersion: 2
guid: a23ade90423a80141bc60737874471c3
folderAsset: yes
DefaultImporter:
userData:

playable/Assets/Heart.png → playable/Assets/Objects/Heart.png View File


playable/Assets/Heart.png.meta → playable/Assets/Objects/Heart.png.meta View File


playable/Assets/Horn1.fbx → playable/Assets/Objects/Horn1.fbx View File


playable/Assets/Horn1.fbx.meta → playable/Assets/Objects/Horn1.fbx.meta View File


playable/Assets/Horn2.fbx → playable/Assets/Objects/Horn2.fbx View File


playable/Assets/Horn2.fbx.meta → playable/Assets/Objects/Horn2.fbx.meta View File


playable/Assets/Platform_obj.fbx → playable/Assets/Objects/Platform_obj.fbx View File


playable/Assets/Platform_obj.fbx.meta → playable/Assets/Objects/Platform_obj.fbx.meta View File


BIN
playable/Assets/bullet.prefab → playable/Assets/Objects/bullet.prefab View File


playable/Assets/bullet.prefab.meta → playable/Assets/Objects/bullet.prefab.meta View File


playable/Assets/chainsaw01.fbx → playable/Assets/Objects/chainsaw01.fbx View File


playable/Assets/chainsaw01.fbx.meta → playable/Assets/Objects/chainsaw01.fbx.meta View File


playable/Assets/pillar_obj.fbx → playable/Assets/Objects/pillar_obj.fbx View File


playable/Assets/pillar_obj.fbx.meta → playable/Assets/Objects/pillar_obj.fbx.meta View File


BIN
playable/Assets/Pinata.controller View File


BIN
playable/Assets/Pinata/Armature.001Action.anim View File


+ 4
- 0
playable/Assets/Pinata/Armature.001Action.anim.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 2abe50c5a0733c942b491d81c80f982a
NativeFormatImporter:
userData:

BIN
playable/Assets/Pinata/Idle.anim View File


+ 4
- 0
playable/Assets/Pinata/Idle.anim.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: a6edc704b1360754ba40616771666b9c
NativeFormatImporter:
userData:

BIN
playable/Assets/Pinata/Pinata.fbx View File


+ 198
- 2
playable/Assets/Pinata/Pinata.fbx.meta View File

@ -90,6 +90,10 @@ ModelImporter:
4300008: Back_Foot_R
4300010: Body
7400000: Pinata_Rig|Armature.001Action
7400002: Pinata_Rig|Running
7400004: Idle
7400006: Pinata_Rig|Armature.001Action.002
7400008: Armature.001Action
9500000: //RootNode
13700000: Body
materials:
@ -109,8 +113,8 @@ ModelImporter:
extraExposedTransformPaths: []
clipAnimations:
- serializedVersion: 16
name: Pinata_Rig|Armature.001Action
takeName: Pinata_Rig|Armature.001Action
name: Armature.001Action
takeName: Armature.001Action
firstFrame: 0
lastFrame: 20
wrapMode: 0
@ -204,6 +208,198 @@ ModelImporter:
weight: 1
maskType: 0
maskSource: {instanceID: 0}
- serializedVersion: 16
name: Idle
takeName: Idle
firstFrame: 0
lastFrame: 47
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Body
weight: 1
- path: Pinata_Rig
weight: 1
- path: Pinata_Rig/Pelvice.004
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.L/Back_Leg_IK.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.R/Back_Leg_IK.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.L/Front_Leg_IK.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.R/Front_Leg_IK.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Back_Foot_L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Back_Leg_Bottom.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Back_Foot_R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Back_Leg_Bottom.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Front_Foot_L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Front_Leg_Bottom.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Front_Foot_R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Front_Leg_Bottom.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Head
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Pelvice.003_end
weight: 1
maskType: 0
maskSource: {instanceID: 0}
- serializedVersion: 16
name: Pinata_Rig|Armature.001Action.002
takeName: Pinata_Rig|Armature.001Action.002
firstFrame: 0
lastFrame: 16
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Body
weight: 1
- path: Pinata_Rig
weight: 1
- path: Pinata_Rig/Pelvice.004
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.L/Back_Leg_IK.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Back_Leg_IK.R/Back_Leg_IK.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.L/Front_Leg_IK.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Front_Leg_IK.R/Front_Leg_IK.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Back_Foot_L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Back_Leg_Bottom.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Back_Foot_R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Back_Leg_Bottom.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Front_Foot_L
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Front_Leg_Bottom.L_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Front_Foot_R
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Front_Leg_Bottom.R_end
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Head
weight: 1
- path: Pinata_Rig/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Pelvice.003_end
weight: 1
maskType: 0
maskSource: {instanceID: 0}
isReadable: 1
meshes:
lODScreenPercentages: []

BIN
playable/Assets/Pinata/Pinata_Fall.fbx View File


+ 0
- 244
playable/Assets/Pinata/Pinata_Fall.fbx.meta View File

@ -1,244 +0,0 @@
fileFormatVersion: 2
guid: 3781d007919a3a747af2f70291d4c310
ModelImporter:
serializedVersion: 16
fileIDToRecycleName:
100000: Back_Leg_Bottom.L
100002: Back_Leg_Bottom.L_end
100004: Back_Leg_Bottom.R
100006: Back_Leg_Bottom.R_end
100008: Back_Leg_IK.L
100010: Back_Leg_IK.L_end
100012: Back_Leg_IK.R
100014: Back_Leg_IK.R_end
100016: Back_Leg_Top.L
100018: Back_Leg_Top.R
100020: Back_Pelvice
100022: Front_Leg_Bottom.L
100024: Front_Leg_Bottom.L_end
100026: Front_Leg_Bottom.R
100028: Front_Leg_Bottom.R_end
100030: Front_Leg_IK.L
100032: Front_Leg_IK.L_end
100034: Front_Leg_IK.R
100036: Front_Leg_IK.R_end
100038: Front_Leg_Top.L
100040: Front_Leg_Top.R
100042: Pelvice
100044: Pelvice.001
100046: Pelvice.002
100048: Pelvice.003
100050: Pelvice.003_end
100052: Pelvice.004
100054: //RootNode
100056: Armature.001
100058: Cube
100060: Cube.001
100062: Cube.002
100064: Cube.003
100066: Cube.004
100068: Cube.005
400000: Back_Leg_Bottom.L
400002: Back_Leg_Bottom.L_end
400004: Back_Leg_Bottom.R
400006: Back_Leg_Bottom.R_end
400008: Back_Leg_IK.L
400010: Back_Leg_IK.L_end
400012: Back_Leg_IK.R
400014: Back_Leg_IK.R_end
400016: Back_Leg_Top.L
400018: Back_Leg_Top.R
400020: Back_Pelvice
400022: Front_Leg_Bottom.L
400024: Front_Leg_Bottom.L_end
400026: Front_Leg_Bottom.R
400028: Front_Leg_Bottom.R_end
400030: Front_Leg_IK.L
400032: Front_Leg_IK.L_end
400034: Front_Leg_IK.R
400036: Front_Leg_IK.R_end
400038: Front_Leg_Top.L
400040: Front_Leg_Top.R
400042: Pelvice
400044: Pelvice.001
400046: Pelvice.002
400048: Pelvice.003
400050: Pelvice.003_end
400052: Pelvice.004
400054: //RootNode
400056: Armature.001
400058: Cube
400060: Cube.001
400062: Cube.002
400064: Cube.003
400066: Cube.004
400068: Cube.005
2300000: Cube.001
2300002: Cube.002
2300004: Cube.003
2300006: Cube.004
2300008: Cube.005
3300000: Cube.001
3300002: Cube.002
3300004: Cube.003
3300006: Cube.004
3300008: Cube.005
4300000: Cube.004
4300002: Cube.002
4300004: Cube.001
4300006: Cube.005
4300008: Cube.003
4300010: Cube
7400000: Armature.001|Armature.001Action.003
9500000: //RootNode
13700000: Cube
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
optimizeGameObjects: 0
motionNodeName:
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations:
- serializedVersion: 16
name: Armature.001|Armature.001Action.003
takeName: Armature.001|Armature.001Action.003
firstFrame: 0
lastFrame: 16
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Armature.001
weight: 1
- path: Armature.001/Pelvice.004
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.L
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.L/Back_Leg_IK.L_end
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.R
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.R/Back_Leg_IK.R_end
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.L
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.L/Front_Leg_IK.L_end
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.R
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.R/Front_Leg_IK.R_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Back_Leg_Bottom.L_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Cube.005
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Back_Leg_Bottom.R_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Cube.003
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Cube.002
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Front_Leg_Bottom.L_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Cube.004
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Front_Leg_Bottom.R_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Cube.001
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Pelvice.003_end
weight: 1
- path: Cube
weight: 1
maskType: 0
maskSource: {instanceID: 0}
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: .00999999978
meshCompression: 0
addColliders: 0
importBlendShapes: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
importAnimation: 1
copyAvatar: 0
humanDescription:
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
feetSpacing: 0
rootMotionBoneName:
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
additionalBone: 0
userData:

BIN
playable/Assets/Pinata/Pinata_Idle.fbx View File


+ 0
- 244
playable/Assets/Pinata/Pinata_Idle.fbx.meta View File

@ -1,244 +0,0 @@
fileFormatVersion: 2
guid: 8b6a076271735ce4b8ca99a47db3471d
ModelImporter:
serializedVersion: 16
fileIDToRecycleName:
100000: Armature.001
100002: Back_Leg_Bottom.L
100004: Back_Leg_Bottom.L_end
100006: Back_Leg_Bottom.R
100008: Back_Leg_Bottom.R_end
100010: Back_Leg_IK.L
100012: Back_Leg_IK.L_end
100014: Back_Leg_IK.R
100016: Back_Leg_IK.R_end
100018: Back_Leg_Top.L
100020: Back_Leg_Top.R
100022: Back_Pelvice
100024: Cube
100026: Cube.001
100028: Cube.002
100030: Cube.003
100032: Cube.004
100034: Cube.005
100036: Front_Leg_Bottom.L
100038: Front_Leg_Bottom.L_end
100040: Front_Leg_Bottom.R
100042: Front_Leg_Bottom.R_end
100044: Front_Leg_IK.L
100046: Front_Leg_IK.L_end
100048: Front_Leg_IK.R
100050: Front_Leg_IK.R_end
100052: Front_Leg_Top.L
100054: Front_Leg_Top.R
100056: Pelvice
100058: Pelvice.001
100060: Pelvice.002
100062: Pelvice.003
100064: Pelvice.003_end
100066: Pelvice.004
100068: //RootNode
400000: Armature.001
400002: Back_Leg_Bottom.L
400004: Back_Leg_Bottom.L_end
400006: Back_Leg_Bottom.R
400008: Back_Leg_Bottom.R_end
400010: Back_Leg_IK.L
400012: Back_Leg_IK.L_end
400014: Back_Leg_IK.R
400016: Back_Leg_IK.R_end
400018: Back_Leg_Top.L
400020: Back_Leg_Top.R
400022: Back_Pelvice
400024: Cube
400026: Cube.001
400028: Cube.002
400030: Cube.003
400032: Cube.004
400034: Cube.005
400036: Front_Leg_Bottom.L
400038: Front_Leg_Bottom.L_end
400040: Front_Leg_Bottom.R
400042: Front_Leg_Bottom.R_end
400044: Front_Leg_IK.L
400046: Front_Leg_IK.L_end
400048: Front_Leg_IK.R
400050: Front_Leg_IK.R_end
400052: Front_Leg_Top.L
400054: Front_Leg_Top.R
400056: Pelvice
400058: Pelvice.001
400060: Pelvice.002
400062: Pelvice.003
400064: Pelvice.003_end
400066: Pelvice.004
400068: //RootNode
2300000: Cube.001
2300002: Cube.002
2300004: Cube.003
2300006: Cube.004
2300008: Cube.005
3300000: Cube.001
3300002: Cube.002
3300004: Cube.003
3300006: Cube.004
3300008: Cube.005
4300000: Cube.004
4300002: Cube.002
4300004: Cube.001
4300006: Cube.005
4300008: Cube.003
4300010: Cube
7400000: Armature.001|Armature.001Action
9500000: //RootNode
13700000: Cube
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
optimizeGameObjects: 0
motionNodeName:
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations:
- serializedVersion: 16
name: Armature.001|Armature.001Action
takeName: Armature.001|Armature.001Action
firstFrame: 0
lastFrame: 74
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask:
- path:
weight: 1
- path: Armature.001
weight: 1
- path: Armature.001/Pelvice.004
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.L
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.L/Back_Leg_IK.L_end
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.R
weight: 1
- path: Armature.001/Pelvice.004/Back_Leg_IK.R/Back_Leg_IK.R_end
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.L
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.L/Front_Leg_IK.L_end
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.R
weight: 1
- path: Armature.001/Pelvice.004/Front_Leg_IK.R/Front_Leg_IK.R_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Back_Leg_Bottom.L_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.L/Back_Leg_Bottom.L/Cube.005
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Back_Leg_Bottom.R_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Back_Pelvice/Back_Leg_Top.R/Back_Leg_Bottom.R/Cube.003
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Cube.002
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.L/Front_Leg_Bottom.L/Front_Leg_Bottom.L_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Cube.004
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Front_Leg_Top.R/Front_Leg_Bottom.R/Front_Leg_Bottom.R_end
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Cube.001
weight: 1
- path: Armature.001/Pelvice.004/Pelvice/Pelvice.001/Pelvice.002/Pelvice.003/Pelvice.003_end
weight: 1
- path: Cube
weight: 1
maskType: 0
maskSource: {instanceID: 0}
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: .00999999978
meshCompression: 0
addColliders: 0
importBlendShapes: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
importAnimation: 1
copyAvatar: 0
humanDescription:
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
feetSpacing: 0
rootMotionBoneName:
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 2
additionalBone: 0
userData:

playable/Assets/Menu.cs → playable/Assets/Scripts/Menu.cs View File


playable/Assets/Menu.cs.meta → playable/Assets/Scripts/Menu.cs.meta View File


+ 9
- 6
playable/Assets/Scripts/playerController.cs View File

@ -196,7 +196,7 @@ public class playerController : MonoBehaviour {
}
transform.eulerAngles = new Vector3 (0,direction,0);
Debug.Log ("" + gameObject.name + "End spin");
//Debug.Log ("" + gameObject.name + "End spin");
isSpinning = false;
stick.isAttacking = false;
}
@ -215,19 +215,22 @@ public class playerController : MonoBehaviour {
Vector3 startPosition = transform.position;
Debug.Log ("rotation Y: " + transform.eulerAngles.y);
//Debug.Log ("rotation Y: " + transform.eulerAngles.y);
if (transform.eulerAngles.y >= 150)
dashDirection = -1;
else
dashDirection = 1;
endPosition = startPosition.x + (dashDirection * dashDistance);
Debug.Log ("Dash start: " + startPosition.x);
Debug.Log ("Dash Direction: " + (dashDirection ));
Debug.Log ("Dash end: " + endPosition);
//Debug.Log ("Dash start: " + startPosition.x);
//Debug.Log ("Dash Direction: " + (dashDirection ));
//Debug.Log ("Dash end: " + endPosition);
for (float i = 0; i < 1; i += Time.deltaTime/dashTime) {
transform.position = new Vector3(dashDirection * Mathf.Lerp((dashDirection)*startPosition.x, (dashDirection)* endPosition, i), startPosition.y, startPosition.z);
if ((transform.position.x < -30.5f && dashDirection == -1) || (transform.position.x > 26.5 && dashDirection == 1))
stopDash = true;
if (stopDash)
break;
@ -240,7 +243,7 @@ public class playerController : MonoBehaviour {
isDashing = false;
canDash = true;
stick.isAttacking = false;
Debug.Log ("" + gameObject.name + " finished Dashing");
//Debug.Log ("" + gameObject.name + " finished Dashing");
rigidbody2D.gravityScale = 4;
}

+ 5
- 0
playable/Assets/Textures.meta View File

@ -0,0 +1,5 @@
fileFormatVersion: 2
guid: 964288a0317270344b9612a50a9f93a7
folderAsset: yes
DefaultImporter:
userData:

playable/Assets/pillar_unrapped.jpg → playable/Assets/Textures/pillar_unrapped.jpg View File


playable/Assets/pillar_unrapped.jpg.meta → playable/Assets/Textures/pillar_unrapped.jpg.meta View File


playable/Assets/platform_texture.jpg → playable/Assets/Textures/platform_texture.jpg View File


playable/Assets/platform_texture.jpg.meta → playable/Assets/Textures/platform_texture.jpg.meta View File


Write Preview
Loading…
Cancel
Save