Compare commits

...

3 Commits

Author SHA1 Message Date
  Lachlan d58f4d33bf Prototype 10 years ago
  Lachlan 5f8300a7ef added katana 10 years ago
  Lachlan 6d742d7ae4 Added weapons 10 years ago
264 changed files with 45160 additions and 768 deletions
Split View
  1. BIN
      IMG_20150506_203308.jpg
  2. +0
    -0
      Pinata Smackdown/.DS_Store
  3. BIN
      Pinata Smackdown/._Mac_Build_01.app
  4. BIN
      Pinata Smackdown/._PC_pinatasmackdown_Data
  5. +0
    -0
      Pinata Smackdown/Assets/.DS_Store
  6. BIN
      Pinata Smackdown/Assets/HammerWeapon01.fbx
  7. +25
    -40
      Pinata Smackdown/Assets/HammerWeapon01.fbx.meta
  8. +0
    -0
      Pinata Smackdown/Assets/Heart.png
  9. +0
    -0
      Pinata Smackdown/Assets/Heart.png.meta
  10. BIN
      Pinata Smackdown/Assets/Horn1.fbx
  11. +65
    -43
      Pinata Smackdown/Assets/Horn1.fbx.meta
  12. BIN
      Pinata Smackdown/Assets/Horn2.fbx
  13. +127
    -0
      Pinata Smackdown/Assets/Horn2.fbx.meta
  14. BIN
      Pinata Smackdown/Assets/KatanaWeapon01.fbx
  15. +86
    -0
      Pinata Smackdown/Assets/KatanaWeapon01.fbx.meta
  16. BIN
      Pinata Smackdown/Assets/Lachlan_jump_work.unity
  17. +0
    -0
      Pinata Smackdown/Assets/Lachlan_jump_work.unity.meta
  18. +0
    -0
      Pinata Smackdown/Assets/Main Camera.prefab
  19. +0
    -0
      Pinata Smackdown/Assets/Main Camera.prefab.meta
  20. +0
    -0
      Pinata Smackdown/Assets/Materials.meta
  21. BIN
      Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat
  22. +4
    -0
      Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta
  23. +0
    -0
      Pinata Smackdown/Assets/Materials/No Name.mat
  24. +0
    -0
      Pinata Smackdown/Assets/Materials/No Name.mat.meta
  25. BIN
      Pinata Smackdown/Assets/Materials/blade 1.mat
  26. +4
    -0
      Pinata Smackdown/Assets/Materials/blade 1.mat.meta
  27. BIN
      Pinata Smackdown/Assets/Materials/blade 2.mat
  28. +4
    -0
      Pinata Smackdown/Assets/Materials/blade 2.mat.meta
  29. BIN
      Pinata Smackdown/Assets/Materials/blade.mat
  30. +4
    -0
      Pinata Smackdown/Assets/Materials/blade.mat.meta
  31. BIN
      Pinata Smackdown/Assets/Materials/blinn1.mat
  32. +4
    -0
      Pinata Smackdown/Assets/Materials/blinn1.mat.meta
  33. BIN
      Pinata Smackdown/Assets/Materials/blinn2.mat
  34. +4
    -0
      Pinata Smackdown/Assets/Materials/blinn2.mat.meta
  35. BIN
      Pinata Smackdown/Assets/Materials/blinn5.mat
  36. +4
    -0
      Pinata Smackdown/Assets/Materials/blinn5.mat.meta
  37. BIN
      Pinata Smackdown/Assets/Materials/katanaHandle 1.mat
  38. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 1.mat.meta
  39. BIN
      Pinata Smackdown/Assets/Materials/katanaHandle 2.mat
  40. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 2.mat.meta
  41. BIN
      Pinata Smackdown/Assets/Materials/katanaHandle 3.mat
  42. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 3.mat.meta
  43. BIN
      Pinata Smackdown/Assets/Materials/katanaHandle 4.mat
  44. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta
  45. BIN
      Pinata Smackdown/Assets/Materials/katanaHandle.mat
  46. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle.mat.meta
  47. BIN
      Pinata Smackdown/Assets/Materials/katanaHolder 1.mat
  48. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 1.mat.meta
  49. BIN
      Pinata Smackdown/Assets/Materials/katanaHolder 2.mat
  50. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta
  51. BIN
      Pinata Smackdown/Assets/Materials/katanaHolder 3.mat
  52. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta
  53. BIN
      Pinata Smackdown/Assets/Materials/katanaHolder.mat
  54. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder.mat.meta
  55. +0
    -0
      Pinata Smackdown/Assets/Materials/lambert1.mat
  56. +0
    -0
      Pinata Smackdown/Assets/Materials/lambert1.mat.meta
  57. BIN
      Pinata Smackdown/Assets/Materials/lambert2.mat
  58. +4
    -0
      Pinata Smackdown/Assets/Materials/lambert2.mat.meta
  59. BIN
      Pinata Smackdown/Assets/Materials/leather_texture1.mat
  60. +4
    -0
      Pinata Smackdown/Assets/Materials/leather_texture1.mat.meta
  61. BIN
      Pinata Smackdown/Assets/Materials/mallet_texture.mat
  62. +4
    -0
      Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta
  63. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat
  64. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat.meta
  65. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped.mat
  66. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped.mat.meta
  67. +0
    -0
      Pinata Smackdown/Assets/Materials/platform_texture.mat
  68. +0
    -0
      Pinata Smackdown/Assets/Materials/platform_texture.mat.meta
  69. +119
    -0
      Pinata Smackdown/Assets/Menu.cs
  70. +1
    -1
      Pinata Smackdown/Assets/Menu.cs.meta
  71. +1
    -1
      Pinata Smackdown/Assets/Music.meta
  72. BIN
      Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3
  73. +12
    -0
      Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3.meta
  74. BIN
      Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3
  75. +12
    -0
      Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta
  76. +0
    -0
      Pinata Smackdown/Assets/New Terrain.asset
  77. +0
    -0
      Pinata Smackdown/Assets/New Terrain.asset.meta
  78. +0
    -0
      Pinata Smackdown/Assets/Pinata.anim
  79. +0
    -0
      Pinata Smackdown/Assets/Pinata.anim.meta
  80. BIN
      Pinata Smackdown/Assets/Pinata.controller
  81. +0
    -0
      Pinata Smackdown/Assets/Pinata.controller.meta
  82. +0
    -0
      Pinata Smackdown/Assets/Pinata.meta
  83. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata.fbx
  84. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata.fbx.meta
  85. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx
  86. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx.meta
  87. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx
  88. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx.meta
  89. +0
    -0
      Pinata Smackdown/Assets/Platform_obj.fbx
  90. +0
    -0
      Pinata Smackdown/Assets/Platform_obj.fbx.meta
  91. +5
    -0
      Pinata Smackdown/Assets/Prefabs.meta
  92. BIN
      Pinata Smackdown/Assets/Prefabs/Confetti.prefab
  93. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Confetti.prefab.meta
  94. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart 1.prefab
  95. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart 1.prefab.meta
  96. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart.prefab
  97. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart.prefab.meta
  98. BIN
      Pinata Smackdown/Assets/Prefabs/candy.prefab
  99. +4
    -0
      Pinata Smackdown/Assets/Prefabs/candy.prefab.meta
  100. +0
    -0
      Pinata Smackdown/Assets/Scripts.meta

BIN
IMG_20150506_203308.jpg View File

Before After
Width: 3264  |  Height: 1836  |  Size: 830 KiB

PinataSmackdown_unity/.DS_Store → Pinata Smackdown/.DS_Store View File


BIN
playable/ProjectSettings/TimeManager.asset → Pinata Smackdown/._Mac_Build_01.app View File


BIN
PinataSmackdown_unity/ProjectSettings/TimeManager.asset → Pinata Smackdown/._PC_pinatasmackdown_Data View File


PinataSmackdown_unity/Assets/.DS_Store → Pinata Smackdown/Assets/.DS_Store View File


BIN
Pinata Smackdown/Assets/HammerWeapon01.fbx View File


playable/Assets/Platform_obj.fbx.meta → Pinata Smackdown/Assets/HammerWeapon01.fbx.meta View File

@ -1,47 +1,32 @@
fileFormatVersion: 2
guid: 96897ea8068e16045a2b6b10cf1b62dd
guid: 2694ee955a23d77468182051fc36deaf
ModelImporter:
serializedVersion: 16
fileIDToRecycleName:
100000: pCube1
100002: pCylinder1
100004: //RootNode
100006: polySurface2
100008: polySurface3
100010: polySurface4
100012: polySurface5
100014: polySurface6
100016: polySurface7
100018: polySurface9
100020: transform1
100022: transform2
100024: transform3
100026: transform4
100028: transform5
100030: transform6
100032: transform7
100034: transform8
400000: pCube1
400002: pCylinder1
400004: //RootNode
400006: polySurface2
400008: polySurface3
400010: polySurface4
400012: polySurface5
400014: polySurface6
400016: polySurface7
400018: polySurface9
400020: transform1
400022: transform2
400024: transform3
400026: transform4
400028: transform5
400030: transform6
400032: transform7
400034: transform8
2300000: polySurface9
3300000: polySurface9
4300000: polySurface9
100000: //RootNode
100002: Katana_output01:pCylinder1
100004: Katana_output01:pCylinder2
100006: locator1
100008: pCube2
100010: pCylinder2
400000: //RootNode
400002: Katana_output01:pCylinder1
400004: Katana_output01:pCylinder2
400006: locator1
400008: pCube2
400010: pCylinder2
2300000: Katana_output01:pCylinder1
2300002: Katana_output01:pCylinder2
2300004: pCube2
2300006: pCylinder2
3300000: Katana_output01:pCylinder1
3300002: Katana_output01:pCylinder2
3300004: pCube2
3300006: pCylinder2
4300000: pCylinder2
4300002: pCube2
4300004: Katana_output01:pCylinder1
4300006: Katana_output01:pCylinder2
9500000: //RootNode
materials:
importMaterials: 1

playable/Assets/Heart.png → Pinata Smackdown/Assets/Heart.png View File


playable/Assets/Heart.png.meta → Pinata Smackdown/Assets/Heart.png.meta View File


BIN
Pinata Smackdown/Assets/Horn1.fbx View File


playable/Assets/floating_platform_02.mb.meta → Pinata Smackdown/Assets/Horn1.fbx.meta View File

@ -1,53 +1,75 @@
fileFormatVersion: 2
guid: 46d43006d4940ab48a54b4aff194420e
guid: 971b971310a3d5a48941c88f65fde32c
ModelImporter:
serializedVersion: 16
fileIDToRecycleName:
100000: //RootNode
100002: pCube1
100004: pCylinder1
100006: polySurface2
100008: polySurface3
100010: polySurface4
100012: polySurface5
100014: polySurface6
100016: polySurface7
100018: polySurface8
100020: polySurface9
100022: transform1
100024: transform2
100026: transform3
100028: transform4
100030: transform5
100032: transform6
100034: transform7
100004: pTorus1
100006: pTorus10
100008: pTorus11
100010: pTorus12
100012: pTorus13
100014: pTorus2
100016: pTorus3
100018: pTorus4
100020: pTorus5
100022: pTorus6
100024: pTorus8
100026: pTorus9
400000: //RootNode
400002: pCube1
400004: pCylinder1
400006: polySurface2
400008: polySurface3
400010: polySurface4
400012: polySurface5
400014: polySurface6
400016: polySurface7
400018: polySurface8
400020: polySurface9
400022: transform1
400024: transform2
400026: transform3
400028: transform4
400030: transform5
400032: transform6
400034: transform7
2300000: pCylinder1
2300002: polySurface8
2300004: polySurface9
3300000: pCylinder1
3300002: polySurface8
3300004: polySurface9
4300000: polySurface8
4300002: polySurface9
4300004: pCylinder1
400004: pTorus1
400006: pTorus10
400008: pTorus11
400010: pTorus12
400012: pTorus13
400014: pTorus2
400016: pTorus3
400018: pTorus4
400020: pTorus5
400022: pTorus6
400024: pTorus8
400026: pTorus9
2300000: pCube1
2300002: pTorus1
2300004: pTorus10
2300006: pTorus11
2300008: pTorus12
2300010: pTorus13
2300012: pTorus2
2300014: pTorus3
2300016: pTorus4
2300018: pTorus5
2300020: pTorus6
2300022: pTorus8
2300024: pTorus9
3300000: pCube1
3300002: pTorus1
3300004: pTorus10
3300006: pTorus11
3300008: pTorus12
3300010: pTorus13
3300012: pTorus2
3300014: pTorus3
3300016: pTorus4
3300018: pTorus5
3300020: pTorus6
3300022: pTorus8
3300024: pTorus9
4300000: pCube1
4300002: pTorus1
4300004: pTorus2
4300006: pTorus3
4300008: pTorus4
4300010: pTorus5
4300012: pTorus6
4300014: pTorus8
4300016: pTorus9
4300018: pTorus10
4300020: pTorus11
4300022: pTorus12
4300024: pTorus13
9500000: //RootNode
materials:
importMaterials: 1
@ -68,7 +90,7 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
globalScale: .00999999978
meshCompression: 0
addColliders: 0
importBlendShapes: 1

BIN
Pinata Smackdown/Assets/Horn2.fbx View File


+ 127
- 0
Pinata Smackdown/Assets/Horn2.fbx.meta View File

@ -0,0 +1,127 @@
fileFormatVersion: 2
guid: 23756e737f935a140810973e4e080871
ModelImporter:
serializedVersion: 16
fileIDToRecycleName:
100000: //RootNode
100002: pCube1
100004: pTorus1
100006: pTorus10
100008: pTorus11
100010: pTorus12
100012: pTorus13
100014: pTorus2
100016: pTorus3
100018: pTorus4
100020: pTorus5
100022: pTorus6
100024: pTorus8
100026: pTorus9
400000: //RootNode
400002: pCube1
400004: pTorus1
400006: pTorus10
400008: pTorus11
400010: pTorus12
400012: pTorus13
400014: pTorus2
400016: pTorus3
400018: pTorus4
400020: pTorus5
400022: pTorus6
400024: pTorus8
400026: pTorus9
2300000: pCube1
2300002: pTorus1
2300004: pTorus10
2300006: pTorus11
2300008: pTorus12
2300010: pTorus13
2300012: pTorus2
2300014: pTorus3
2300016: pTorus4
2300018: pTorus5
2300020: pTorus6
2300022: pTorus8
2300024: pTorus9
3300000: pCube1
3300002: pTorus1
3300004: pTorus10
3300006: pTorus11
3300008: pTorus12
3300010: pTorus13
3300012: pTorus2
3300014: pTorus3
3300016: pTorus4
3300018: pTorus5
3300020: pTorus6
3300022: pTorus8
3300024: pTorus9
4300000: pCube1
4300002: pTorus1
4300004: pTorus2
4300006: pTorus3
4300008: pTorus4
4300010: pTorus5
4300012: pTorus6
4300014: pTorus8
4300016: pTorus9
4300018: pTorus10
4300020: pTorus11
4300022: pTorus12
4300024: pTorus13
9500000: //RootNode
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: []
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
Pinata Smackdown/Assets/KatanaWeapon01.fbx View File


+ 86
- 0
Pinata Smackdown/Assets/KatanaWeapon01.fbx.meta View File

@ -0,0 +1,86 @@
fileFormatVersion: 2
guid: 47c11f074930c2249815746fa4a878f8
ModelImporter:
serializedVersion: 16
fileIDToRecycleName:
100000: curve2
100002: //RootNode
100004: locator1
100006: pCube1
100008: pCube2
100010: pCylinder1
100012: pCylinder2
400000: curve2
400002: //RootNode
400004: locator1
400006: pCube1
400008: pCube2
400010: pCylinder1
400012: pCylinder2
2300000: pCube1
2300002: pCube2
2300004: pCylinder1
2300006: pCylinder2
3300000: pCube1
3300002: pCube2
3300004: pCylinder1
3300006: pCylinder2
4300000: pCylinder1
4300002: pCube1
4300004: pCylinder2
4300006: pCube2
9500000: //RootNode
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: []
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
Pinata Smackdown/Assets/Lachlan_jump_work.unity View File


PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta → Pinata Smackdown/Assets/Lachlan_jump_work.unity.meta View File


PinataSmackdown_unity/Assets/Main Camera.prefab → Pinata Smackdown/Assets/Main Camera.prefab View File


PinataSmackdown_unity/Assets/Main Camera.prefab.meta → Pinata Smackdown/Assets/Main Camera.prefab.meta View File


PinataSmackdown_unity/Assets/Materials.meta → Pinata Smackdown/Assets/Materials.meta View File


BIN
Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta View File

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

playable/Assets/Materials/No Name.mat → Pinata Smackdown/Assets/Materials/No Name.mat View File


playable/Assets/Materials/No Name.mat.meta → Pinata Smackdown/Assets/Materials/No Name.mat.meta View File


BIN
Pinata Smackdown/Assets/Materials/blade 1.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/blade 1.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/blade 2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/blade 2.mat.meta View File

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

BIN
playable/Assets/Materials/lambert1.mat → Pinata Smackdown/Assets/Materials/blade.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/blade.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/blinn1.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/blinn1.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/blinn2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/blinn2.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/blinn5.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/blinn5.mat.meta View File

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

BIN
playable/Assets/Materials/platform_texture.mat → Pinata Smackdown/Assets/Materials/katanaHandle 1.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHandle 1.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHandle 2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHandle 2.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHandle 3.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHandle 3.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHandle 4.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHandle.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHandle.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHolder 1.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHolder 1.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHolder 2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHolder 3.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/katanaHolder.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHolder.mat.meta View File

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

PinataSmackdown_unity/Assets/Materials/lambert1.mat → Pinata Smackdown/Assets/Materials/lambert1.mat View File


PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta → Pinata Smackdown/Assets/Materials/lambert1.mat.meta View File


BIN
Pinata Smackdown/Assets/Materials/lambert2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/lambert2.mat.meta View File

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

BIN
playable/Assets/Materials/pillar_unrapped.mat → Pinata Smackdown/Assets/Materials/leather_texture1.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/leather_texture1.mat.meta View File

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

BIN
Pinata Smackdown/Assets/Materials/mallet_texture.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta View File

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

PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat → Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat View File


PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta → Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat.meta View File


PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat → Pinata Smackdown/Assets/Materials/pillar_unrapped.mat View File


PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta → Pinata Smackdown/Assets/Materials/pillar_unrapped.mat.meta View File


PinataSmackdown_unity/Assets/Materials/platform_texture.mat → Pinata Smackdown/Assets/Materials/platform_texture.mat View File


PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta → Pinata Smackdown/Assets/Materials/platform_texture.mat.meta View File


+ 119
- 0
Pinata Smackdown/Assets/Menu.cs View File

@ -0,0 +1,119 @@
using UnityEngine;
using System.Collections;
public class Menu : MonoBehaviour {
public GameObject player1;
public GameObject player2;
public GameObject player3;
public GameObject player4;
public GameObject musicTrad;
public GameObject musicEpic;
private bool start = false;
private bool menu = true;
private float goreCount = 20;
private string music = "Traditional";
// Use this for initialization
void Start () {
}
// Update is called once per frame
void Update () {
player1.GetComponent<playerController> ().confettiOnHit = (int) goreCount;
player2.GetComponent<playerController> ().confettiOnHit = (int) goreCount;
player3.GetComponent<playerController> ().confettiOnHit = (int) goreCount;
player4.GetComponent<playerController> ().confettiOnHit = (int) goreCount;
if (Input.GetKeyDown ("escape")) {
if (menu)
start = false;
else
start = !start;
menu = false;
}
}
void OnGUI ()
{
if (start) {
// Make a background box
GUI.Box (new Rect (Screen.width / 2 - 100, Screen.height / 2 - 150, 200, 300), "Menu");
// Make the first button.
if (GUI.Button (new Rect (Screen.width / 2 - 90, Screen.height / 2 - 130, 180, 80), "Options")) {
start = false;
menu = true;
}
// Make the second button.
if (GUI.Button (new Rect (Screen.width / 2 - 90, Screen.height / 2 - 40, 180, 80), "Reset Level")) {
Application.LoadLevel ("Lachlan_jump_work");
start = false;
}
// Make the second button.
if (GUI.Button (new Rect (Screen.width / 2 - 90, Screen.height / 2 + 50, 180, 80), "Exit")) {
Application.Quit ();
}
}
if (menu) {
GUI.Box (new Rect (Screen.width / 2 - 100, Screen.height / 2 - 150, 200, 300), "Options");
if (GUI.Button (new Rect (Screen.width / 2 - 95, Screen.height / 2 - 120, 90, 30), "1 Player")) {
player1.SetActive(true);
player2.SetActive(false);
player3.SetActive(false);
player4.SetActive(false);
}
if (GUI.Button (new Rect (Screen.width / 2+ 5 , Screen.height / 2 - 120, 90, 30), "2 Players")) {
player1.SetActive(true);
player2.SetActive(true);
player3.SetActive(false);
player4.SetActive(false);
}
if (GUI.Button (new Rect (Screen.width / 2 - 95, Screen.height / 2 - 85, 90, 30), "3 Players")) {
player1.SetActive(true);
player2.SetActive(true);
player3.SetActive(true);
player4.SetActive(false);
}
if (GUI.Button (new Rect (Screen.width / 2+ 5 , Screen.height / 2 - 85, 90, 30), "4 Players")) {
player1.SetActive(true);
player2.SetActive(true);
player3.SetActive(true);
player4.SetActive(true);
}
goreCount= (int) GUI.HorizontalSlider(new Rect(Screen.width/2 -90, Screen.height/2 - 10, 180, 20), goreCount, 0.0F, 200);
GUI.Label(new Rect(Screen.width/2 - 11, Screen.height/2 +5, 200, 70), "" +goreCount);
GUI.Label(new Rect(Screen.width/2 - 30, Screen.height/2 -30, 200, 70), "Confetti Count");
if (GUI.Button (new Rect (Screen.width / 2-90 , Screen.height / 2 +50, 90, 30), "Music")) {
if (music =="Epic"){
music = "Traditional";
musicEpic.SetActive(false);
musicTrad.SetActive(true);
}
else if (music =="Traditional"){
music = "Epic";
musicEpic.SetActive(true);
musicTrad.SetActive(false);
}
}
GUI.Label(new Rect(Screen.width/2 +5, Screen.height/2 +55, 90, 30), "" +music);
if (GUI.Button (new Rect (Screen.width / 2-90 , Screen.height / 2 +90, 180, 30), "Exit Menu")) {
menu = false;
}
}
}
}

PinataSmackdown_unity/Assets/P1weapon.cs.meta → Pinata Smackdown/Assets/Menu.cs.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 048f4317d0f555545a68dd6b84173109
guid: 51bd03614bbc4d242a42043d8016e14a
MonoImporter:
serializedVersion: 2
defaultReferences: []

playable/Assets/Materials.meta → Pinata Smackdown/Assets/Music.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 334a07353496b3f4682903e0a28dbad0
guid: 639bb09c03739e2449cdf431087bcab1
folderAsset: yes
DefaultImporter:
userData:

BIN
Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3 View File


+ 12
- 0
Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3.meta View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 698c3669e90531842bf622cf2732efdc
AudioImporter:
serializedVersion: 4
format: 0
quality: .5
stream: 1
3D: 0
forceToMono: 0
useHardware: 0
loopable: 0
userData:

BIN
Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 View File


+ 12
- 0
Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: ff28080003db6994c9c887188bac2d7f
AudioImporter:
serializedVersion: 4
format: 0
quality: .5
stream: 1
3D: 0
forceToMono: 0
useHardware: 0
loopable: 0
userData:

PinataSmackdown_unity/Assets/New Terrain.asset → Pinata Smackdown/Assets/New Terrain.asset View File


PinataSmackdown_unity/Assets/New Terrain.asset.meta → Pinata Smackdown/Assets/New Terrain.asset.meta View File


playable/Assets/Pinata.anim → Pinata Smackdown/Assets/Pinata.anim View File


playable/Assets/Pinata.anim.meta → Pinata Smackdown/Assets/Pinata.anim.meta View File


BIN
playable/Assets/Pinata.controller → Pinata Smackdown/Assets/Pinata.controller View File


playable/Assets/Pinata.controller.meta → Pinata Smackdown/Assets/Pinata.controller.meta View File


playable/Assets/Pinata.meta → Pinata Smackdown/Assets/Pinata.meta View File


playable/Assets/Pinata/Pinata.fbx → Pinata Smackdown/Assets/Pinata/Pinata.fbx View File


playable/Assets/Pinata/Pinata.fbx.meta → Pinata Smackdown/Assets/Pinata/Pinata.fbx.meta View File


playable/Assets/Pinata/Pinata_Fall.fbx → Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx View File


playable/Assets/Pinata/Pinata_Fall.fbx.meta → Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx.meta View File


playable/Assets/Pinata/Pinata_Idle.fbx → Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx View File


playable/Assets/Pinata/Pinata_Idle.fbx.meta → Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx.meta View File


PinataSmackdown_unity/Assets/Platform_obj.fbx → Pinata Smackdown/Assets/Platform_obj.fbx View File


PinataSmackdown_unity/Assets/Platform_obj.fbx.meta → Pinata Smackdown/Assets/Platform_obj.fbx.meta View File


+ 5
- 0
Pinata Smackdown/Assets/Prefabs.meta View File

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

BIN
playable/Assets/Confetti.prefab → Pinata Smackdown/Assets/Prefabs/Confetti.prefab View File


playable/Assets/Confetti.prefab.meta → Pinata Smackdown/Assets/Prefabs/Confetti.prefab.meta View File


playable/Assets/Heart 1.prefab → Pinata Smackdown/Assets/Prefabs/Heart 1.prefab View File


playable/Assets/Heart 1.prefab.meta → Pinata Smackdown/Assets/Prefabs/Heart 1.prefab.meta View File


playable/Assets/Heart.prefab → Pinata Smackdown/Assets/Prefabs/Heart.prefab View File


playable/Assets/Heart.prefab.meta → Pinata Smackdown/Assets/Prefabs/Heart.prefab.meta View File


BIN
playable/Assets/bullet.prefab → Pinata Smackdown/Assets/Prefabs/candy.prefab View File


+ 4
- 0
Pinata Smackdown/Assets/Prefabs/candy.prefab.meta View File

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

playable/Assets/Scripts.meta → Pinata Smackdown/Assets/Scripts.meta View File


Some files were not shown because too many files changed in this diff

|||||||
x
 
000:0
Loading…
Cancel
Save