diff --git a/GlobalGameJam2017/Assets/Animations/FurbyAnimationController.controller b/GlobalGameJam2017/Assets/Animations/FurbyAnimationController.controller index 537cc99..4ae2881 100644 --- a/GlobalGameJam2017/Assets/Animations/FurbyAnimationController.controller +++ b/GlobalGameJam2017/Assets/Animations/FurbyAnimationController.controller @@ -13,13 +13,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Attack m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -197,7 +197,7 @@ AnimatorState: m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 - m_Motion: {fileID: 7400000, guid: dbca7b72d39979a4588951eb0fbd587b, type: 3} + m_Motion: {fileID: 7400000, guid: c623e184f74f52b4e86a0de021bfc275, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/GlobalGameJam2017/Assets/Meshes/furby/attack2.fbx.meta b/GlobalGameJam2017/Assets/Meshes/furby/attack2.fbx.meta index f5727fb..734886f 100644 --- a/GlobalGameJam2017/Assets/Meshes/furby/attack2.fbx.meta +++ b/GlobalGameJam2017/Assets/Meshes/furby/attack2.fbx.meta @@ -43,7 +43,7 @@ ModelImporter: 400032: LeftHand1 400034: LeftHandEnd 400036: LeftHandEnd1 - 7400000: Take 001 + 7400000: attack02 9500000: //RootNode materials: importMaterials: 1 @@ -65,7 +65,73 @@ ModelImporter: animationScaleError: 0.5 animationWrapMode: 0 extraExposedTransformPaths: [] - clipAnimations: [] + clipAnimations: + - serializedVersion: 16 + name: attack02 + takeName: Take 001 + firstFrame: 1 + lastFrame: 60 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 0 + 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: enemy_furball + weight: 1 + - path: enemy_furball/enemey_l_leg + weight: 1 + - path: enemy_furball/enemy_head + weight: 1 + - path: enemy_furball/enemy_l_hand + weight: 1 + - path: enemy_furball/enemy_r_hand + weight: 1 + - path: enemy_furball/enemy_r_leg + weight: 1 + - path: Furby_Rig + weight: 1 + - path: Hips + weight: 1 + - path: Hips/joint4 + weight: 1 + - path: Hips/joint4/HeadEnd + weight: 1 + - path: Hips/joint4/LeftHand + weight: 1 + - path: Hips/joint4/LeftHand/LeftHandEnd + weight: 1 + - path: Hips/joint4/LeftHand1 + weight: 1 + - path: Hips/joint4/LeftHand1/LeftHandEnd1 + weight: 1 + - path: Hips/LeftFoot + weight: 1 + - path: Hips/LeftFoot/LeftFootEnd + weight: 1 + - path: Hips/LeftFoot1 + weight: 1 + - path: Hips/LeftFoot1/LeftFootEnd1 + weight: 1 + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/GlobalGameJam2017/Assets/Prefabs/PillarSpell.prefab b/GlobalGameJam2017/Assets/Prefabs/PillarSpell.prefab index 9f2eb84..833177e 100644 --- a/GlobalGameJam2017/Assets/Prefabs/PillarSpell.prefab +++ b/GlobalGameJam2017/Assets/Prefabs/PillarSpell.prefab @@ -930,9 +930,9 @@ MonoBehaviour: spellIndicator: {fileID: 4048869843626402} maxRangeIndicator: {fileID: 4918547187786372} effect: {fileID: 1788884006698586} - baseDamage: 35 - minRadius: 3 - maxRadius: 9 + baseDamage: 100 + minRadius: 4 + maxRadius: 15 --- !u!136 &136081171881451814 CapsuleCollider: m_ObjectHideFlags: 1 diff --git a/GlobalGameJam2017/Assets/Prefabs/ShockwaveSpell.prefab b/GlobalGameJam2017/Assets/Prefabs/ShockwaveSpell.prefab index 94b657c..f3161be 100644 --- a/GlobalGameJam2017/Assets/Prefabs/ShockwaveSpell.prefab +++ b/GlobalGameJam2017/Assets/Prefabs/ShockwaveSpell.prefab @@ -284,7 +284,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: maxChannelingTime: 2 - maxCastRange: 12 + maxCastRange: 20 channelingTimeBonus: 0.5 spellIndicator: {fileID: 4040182738994348} spellMaxRangeIndicator: {fileID: 4528620190204752}