diff --git a/playable/Assets/Lachlan_jump_work.unity b/playable/Assets/Lachlan_jump_work.unity index cc72bc5..f5e0318 100644 Binary files a/playable/Assets/Lachlan_jump_work.unity and b/playable/Assets/Lachlan_jump_work.unity differ diff --git a/playable/Assets/Materials/No Name.mat b/playable/Assets/Materials/No Name.mat new file mode 100644 index 0000000..f2d739b Binary files /dev/null and b/playable/Assets/Materials/No Name.mat differ diff --git a/playable/Assets/Materials/No Name.mat.meta b/playable/Assets/Materials/No Name.mat.meta new file mode 100644 index 0000000..0316de0 --- /dev/null +++ b/playable/Assets/Materials/No Name.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 4eb8ffcea1506e24fa3805f7c25f61b2 +NativeFormatImporter: + userData: diff --git a/playable/Assets/Pinata.anim b/playable/Assets/Pinata.anim new file mode 100644 index 0000000..5858e29 Binary files /dev/null and b/playable/Assets/Pinata.anim differ diff --git a/playable/Assets/Pinata.anim.meta b/playable/Assets/Pinata.anim.meta new file mode 100644 index 0000000..9b493b4 --- /dev/null +++ b/playable/Assets/Pinata.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 906a210681b4f7a4a80f20436ff57f90 +NativeFormatImporter: + userData: diff --git a/playable/Assets/Pinata.controller b/playable/Assets/Pinata.controller new file mode 100644 index 0000000..71ca7b0 Binary files /dev/null and b/playable/Assets/Pinata.controller differ diff --git a/playable/Assets/Pinata.controller.meta b/playable/Assets/Pinata.controller.meta new file mode 100644 index 0000000..f098a8b --- /dev/null +++ b/playable/Assets/Pinata.controller.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 5b9aa3b318c073f4f9863b260f658eec +NativeFormatImporter: + userData: diff --git a/playable/Assets/Pinata.meta b/playable/Assets/Pinata.meta new file mode 100644 index 0000000..502e017 --- /dev/null +++ b/playable/Assets/Pinata.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 2defbc5c42e9edb43af919a3c59ff515 +folderAsset: yes +DefaultImporter: + userData: diff --git a/playable/Assets/Pinata/Pinata.fbx b/playable/Assets/Pinata/Pinata.fbx new file mode 100644 index 0000000..d735374 Binary files /dev/null and b/playable/Assets/Pinata/Pinata.fbx differ diff --git a/playable/Assets/Pinata/Pinata.fbx.meta b/playable/Assets/Pinata/Pinata.fbx.meta new file mode 100644 index 0000000..70bfd0c --- /dev/null +++ b/playable/Assets/Pinata/Pinata.fbx.meta @@ -0,0 +1,244 @@ +fileFormatVersion: 2 +guid: c26f8799074864d4aa932edf4426477a +ModelImporter: + serializedVersion: 16 + fileIDToRecycleName: + 100000: Back_Foot_L + 100002: Back_Foot_R + 100004: Back_Leg_Bottom.L + 100006: Back_Leg_Bottom.L_end + 100008: Back_Leg_Bottom.R + 100010: Back_Leg_Bottom.R_end + 100012: Back_Leg_IK.L + 100014: Back_Leg_IK.L_end + 100016: Back_Leg_IK.R + 100018: Back_Leg_IK.R_end + 100020: Back_Leg_Top.L + 100022: Back_Leg_Top.R + 100024: Back_Pelvice + 100026: Body + 100028: Front_Foot_L + 100030: Front_Foot_R + 100032: Front_Leg_Bottom.L + 100034: Front_Leg_Bottom.L_end + 100036: Front_Leg_Bottom.R + 100038: Front_Leg_Bottom.R_end + 100040: Front_Leg_IK.L + 100042: Front_Leg_IK.L_end + 100044: Front_Leg_IK.R + 100046: Front_Leg_IK.R_end + 100048: Front_Leg_Top.L + 100050: Front_Leg_Top.R + 100052: Head + 100054: Pelvice + 100056: Pelvice.001 + 100058: Pelvice.002 + 100060: Pelvice.003 + 100062: Pelvice.003_end + 100064: Pelvice.004 + 100066: //RootNode + 100068: Pinata_Rig + 400000: Back_Foot_L + 400002: Back_Foot_R + 400004: Back_Leg_Bottom.L + 400006: Back_Leg_Bottom.L_end + 400008: Back_Leg_Bottom.R + 400010: Back_Leg_Bottom.R_end + 400012: Back_Leg_IK.L + 400014: Back_Leg_IK.L_end + 400016: Back_Leg_IK.R + 400018: Back_Leg_IK.R_end + 400020: Back_Leg_Top.L + 400022: Back_Leg_Top.R + 400024: Back_Pelvice + 400026: Body + 400028: Front_Foot_L + 400030: Front_Foot_R + 400032: Front_Leg_Bottom.L + 400034: Front_Leg_Bottom.L_end + 400036: Front_Leg_Bottom.R + 400038: Front_Leg_Bottom.R_end + 400040: Front_Leg_IK.L + 400042: Front_Leg_IK.L_end + 400044: Front_Leg_IK.R + 400046: Front_Leg_IK.R_end + 400048: Front_Leg_Top.L + 400050: Front_Leg_Top.R + 400052: Head + 400054: Pelvice + 400056: Pelvice.001 + 400058: Pelvice.002 + 400060: Pelvice.003 + 400062: Pelvice.003_end + 400064: Pelvice.004 + 400066: //RootNode + 400068: Pinata_Rig + 2300000: Back_Foot_L + 2300002: Back_Foot_R + 2300004: Front_Foot_L + 2300006: Front_Foot_R + 2300008: Head + 3300000: Back_Foot_L + 3300002: Back_Foot_R + 3300004: Front_Foot_L + 3300006: Front_Foot_R + 3300008: Head + 4300000: Front_Foot_R + 4300002: Front_Foot_L + 4300004: Head + 4300006: Back_Foot_L + 4300008: Back_Foot_R + 4300010: Body + 7400000: Pinata_Rig|Armature.001Action + 9500000: //RootNode + 13700000: Body + 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: Pinata_Rig|Armature.001Action + takeName: Pinata_Rig|Armature.001Action + firstFrame: 0 + lastFrame: 20 + 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: [] + 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: diff --git a/playable/Assets/Pinata/Pinata_Fall.fbx b/playable/Assets/Pinata/Pinata_Fall.fbx new file mode 100644 index 0000000..3ea6570 Binary files /dev/null and b/playable/Assets/Pinata/Pinata_Fall.fbx differ diff --git a/playable/Assets/Pinata/Pinata_Fall.fbx.meta b/playable/Assets/Pinata/Pinata_Fall.fbx.meta new file mode 100644 index 0000000..dce67fb --- /dev/null +++ b/playable/Assets/Pinata/Pinata_Fall.fbx.meta @@ -0,0 +1,244 @@ +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: diff --git a/playable/Assets/Pinata/Pinata_Idle.fbx b/playable/Assets/Pinata/Pinata_Idle.fbx new file mode 100644 index 0000000..3dfc85f Binary files /dev/null and b/playable/Assets/Pinata/Pinata_Idle.fbx differ diff --git a/playable/Assets/Pinata/Pinata_Idle.fbx.meta b/playable/Assets/Pinata/Pinata_Idle.fbx.meta new file mode 100644 index 0000000..28745ac --- /dev/null +++ b/playable/Assets/Pinata/Pinata_Idle.fbx.meta @@ -0,0 +1,244 @@ +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: diff --git a/playable/Assets/Scripts.meta b/playable/Assets/Scripts.meta new file mode 100644 index 0000000..356bd84 --- /dev/null +++ b/playable/Assets/Scripts.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: bf3543996fda37e42902b8f2424f0d78 +folderAsset: yes +DefaultImporter: + userData: diff --git a/playable/Assets/P2_weapon.cs b/playable/Assets/Scripts/P2_weapon.cs similarity index 100% rename from playable/Assets/P2_weapon.cs rename to playable/Assets/Scripts/P2_weapon.cs diff --git a/playable/Assets/P2_weapon.cs.meta b/playable/Assets/Scripts/P2_weapon.cs.meta similarity index 100% rename from playable/Assets/P2_weapon.cs.meta rename to playable/Assets/Scripts/P2_weapon.cs.meta diff --git a/playable/Assets/PlayerControler.cs b/playable/Assets/Scripts/PlayerControler.cs similarity index 68% rename from playable/Assets/PlayerControler.cs rename to playable/Assets/Scripts/PlayerControler.cs index 6bc63a0..6f77311 100644 --- a/playable/Assets/PlayerControler.cs +++ b/playable/Assets/Scripts/PlayerControler.cs @@ -3,6 +3,8 @@ using System.Collections; public class PlayerControler : MonoBehaviour { + + public Animator animator; // Use this for initialization void Start () { } @@ -18,6 +20,10 @@ public class PlayerControler : MonoBehaviour { Vector2 velo = rigidbody2D.velocity; velo.x = Input.GetAxis ("Horizontal_P1") * speed; rigidbody2D.velocity = velo; + animator.SetFloat("Velocity",velo.magnitude); + animator.SetBool ("Fall", !canJump); + applyPlayerDirection (Input.GetAxisRaw ("Horizontal_P1")); + if (Input.GetKey (KeyCode.UpArrow)){ if (canJump == true){ @@ -32,6 +38,17 @@ public class PlayerControler : MonoBehaviour { //bulletGO.transform.position = transform.position; //} } + + private void applyPlayerDirection(float moveHorizontal) + { + if (moveHorizontal != 0) + { + Vector3 scale = transform.localScale; + scale.x = -moveHorizontal * Mathf.Abs(scale.x); + transform.localScale = scale; + } + } + void OnCollisionEnter2D(Collision2D col){ if (col.collider.tag == "ground") canJump = true; diff --git a/playable/Assets/PlayerControler.cs.meta b/playable/Assets/Scripts/PlayerControler.cs.meta similarity index 100% rename from playable/Assets/PlayerControler.cs.meta rename to playable/Assets/Scripts/PlayerControler.cs.meta diff --git a/playable/Assets/bulletScript.cs b/playable/Assets/Scripts/bulletScript.cs similarity index 100% rename from playable/Assets/bulletScript.cs rename to playable/Assets/Scripts/bulletScript.cs diff --git a/playable/Assets/bulletScript.cs.meta b/playable/Assets/Scripts/bulletScript.cs.meta similarity index 100% rename from playable/Assets/bulletScript.cs.meta rename to playable/Assets/Scripts/bulletScript.cs.meta diff --git a/playable/Assets/camera_controls.cs b/playable/Assets/Scripts/camera_controls.cs similarity index 100% rename from playable/Assets/camera_controls.cs rename to playable/Assets/Scripts/camera_controls.cs diff --git a/playable/Assets/camera_controls.cs.meta b/playable/Assets/Scripts/camera_controls.cs.meta similarity index 100% rename from playable/Assets/camera_controls.cs.meta rename to playable/Assets/Scripts/camera_controls.cs.meta diff --git a/playable/Assets/player2_controls.cs b/playable/Assets/Scripts/player2_controls.cs similarity index 58% rename from playable/Assets/player2_controls.cs rename to playable/Assets/Scripts/player2_controls.cs index 0db15b6..4707768 100644 --- a/playable/Assets/player2_controls.cs +++ b/playable/Assets/Scripts/player2_controls.cs @@ -3,6 +3,8 @@ using System.Collections; public class player2_controls : MonoBehaviour { + public Animator animator; + void Start () { } @@ -19,21 +21,35 @@ public class player2_controls : MonoBehaviour { Vector2 velo = rigidbody2D.velocity; velo.x = Input.GetAxis ("Horizontal_P2") * speed; rigidbody2D.velocity = velo; + animator.SetFloat("Velocity",velo.magnitude); + animator.SetBool ("Fall", !canJump); + applyPlayerDirection (Input.GetAxisRaw ("Horizontal_P2")); if (Input.GetKey (KeyCode.W)){ if (canJump == true){ rigidbody2D.velocity = jumpVector; - canJump = false; + canJump = false; } } //if (Input.GetKey (KeyCode.Space)){ //shoot //GameObject bulletGO = Instantiate (bullet) as GameObject; - //bulletGO.transform.position = transform.position; + //bulletGO.transform.posplayteition = transform.position; //} } + //Changes direction of sprite according to key pressed + private void applyPlayerDirection(float moveHorizontal) + { + if (moveHorizontal != 0) + { + Vector3 scale = transform.localScale; + scale.x = moveHorizontal * Mathf.Abs(scale.x); + transform.localScale = scale; + } + } + void OnCollisionEnter2D(Collision2D col){ if (col.collider.tag == "ground") canJump = true; diff --git a/playable/Assets/player2_controls.cs.meta b/playable/Assets/Scripts/player2_controls.cs.meta similarity index 100% rename from playable/Assets/player2_controls.cs.meta rename to playable/Assets/Scripts/player2_controls.cs.meta diff --git a/playable/Assets/sc.cs b/playable/Assets/Scripts/sc.cs similarity index 100% rename from playable/Assets/sc.cs rename to playable/Assets/Scripts/sc.cs diff --git a/playable/Assets/sc.cs.meta b/playable/Assets/Scripts/sc.cs.meta similarity index 100% rename from playable/Assets/sc.cs.meta rename to playable/Assets/Scripts/sc.cs.meta