diff --git a/playable/Assets/Materials/No Name.mat b/playable/Assets/Materials/No Name.mat index 39825b4..e86bcc1 100644 Binary files a/playable/Assets/Materials/No Name.mat and b/playable/Assets/Materials/No Name.mat differ diff --git a/playable/Assets/Objects/Countdown_1.fbx.meta b/playable/Assets/Objects/Countdown_1.fbx.meta new file mode 100644 index 0000000..6c7167e --- /dev/null +++ b/playable/Assets/Objects/Countdown_1.fbx.meta @@ -0,0 +1,65 @@ +fileFormatVersion: 2 +guid: 8c350c922b7608343a1f4e553af7240e +ModelImporter: + serializedVersion: 16 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Text + 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: diff --git a/playable/Assets/Objects/Countdown_2.fbx.meta b/playable/Assets/Objects/Countdown_2.fbx.meta new file mode 100644 index 0000000..c608769 --- /dev/null +++ b/playable/Assets/Objects/Countdown_2.fbx.meta @@ -0,0 +1,65 @@ +fileFormatVersion: 2 +guid: c495b284dbc0b374fa69f355483dbec4 +ModelImporter: + serializedVersion: 16 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Text + 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: diff --git a/playable/Assets/Objects/Countdown_3.fbx.meta b/playable/Assets/Objects/Countdown_3.fbx.meta new file mode 100644 index 0000000..46a48c1 --- /dev/null +++ b/playable/Assets/Objects/Countdown_3.fbx.meta @@ -0,0 +1,65 @@ +fileFormatVersion: 2 +guid: 9338731d744d84d4790473a240e07284 +ModelImporter: + serializedVersion: 16 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Text + 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: diff --git a/playable/Assets/Objects/Countdown_4.fbx.meta b/playable/Assets/Objects/Countdown_4.fbx.meta new file mode 100644 index 0000000..64b95f5 --- /dev/null +++ b/playable/Assets/Objects/Countdown_4.fbx.meta @@ -0,0 +1,65 @@ +fileFormatVersion: 2 +guid: 83429f0a18df9ff4f8a7e7732ef2204a +ModelImporter: + serializedVersion: 16 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Text + 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: diff --git a/playable/Assets/Objects/Countdown_5.fbx.meta b/playable/Assets/Objects/Countdown_5.fbx.meta new file mode 100644 index 0000000..c2fb266 --- /dev/null +++ b/playable/Assets/Objects/Countdown_5.fbx.meta @@ -0,0 +1,65 @@ +fileFormatVersion: 2 +guid: 6871591022858454eb16b08fef93dc8d +ModelImporter: + serializedVersion: 16 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Text + 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: diff --git a/playable/Assets/Scenes/Level2.unity b/playable/Assets/Scenes/Level2.unity index 2c4a596..b6057e8 100644 Binary files a/playable/Assets/Scenes/Level2.unity and b/playable/Assets/Scenes/Level2.unity differ diff --git a/playable/Assets/Scripts/CDscript.cs b/playable/Assets/Scripts/CDscript.cs index f70f52e..934360f 100644 --- a/playable/Assets/Scripts/CDscript.cs +++ b/playable/Assets/Scripts/CDscript.cs @@ -5,7 +5,11 @@ public class CDscript : MonoBehaviour { public bool pause = true; public float startCount = 5.0f; - + public GameObject num1; + public GameObject num2; + public GameObject num3; + public GameObject num4; + public GameObject num5; // Use this for initialization void Start () { pause = true; @@ -18,22 +22,48 @@ public class CDscript : MonoBehaviour { Time.timeScale = 0; Debug.Log ("cd"); } - /*if (startCount >=4.0f && <4.9f){ - + if (startCount >=4.0f && startCount <= 4.9f){ + num5.SetActive(true); + num4.SetActive(false); + num3.SetActive(false); + num2.SetActive(false); + num1.SetActive(false); } - if (startCount >=3.0f && <3.9f){ - + if (startCount >=3.0f && startCount <= 3.9f){ + num5.SetActive(false); + num4.SetActive(true); + num3.SetActive(false); + num2.SetActive(false); + num1.SetActive(false); } - if (startCount >=2.0f && <2.9f){ - + if (startCount >=2.0f && startCount <= 2.9f){ + num5.SetActive(false); + num4.SetActive(false); + num3.SetActive(true); + num2.SetActive(false); + num1.SetActive(false); } - if (startCount >=1.0f && <1.9f){ - + if (startCount >=1.0f && startCount <= 1.9f){ + num5.SetActive(false); + num4.SetActive(false); + num3.SetActive(false); + num2.SetActive(true); + num1.SetActive(false); } - if (startCount >=0.0f && <0.9f){ - - }*/ + if (startCount >=0.0f && startCount <= 0.9f){ + num5.SetActive(false); + num4.SetActive(false); + num3.SetActive(false); + num2.SetActive(false); + num1.SetActive(true); + } + if (startCount <=0){ + num5.SetActive(false); + num4.SetActive(false); + num3.SetActive(false); + num2.SetActive(false); + num1.SetActive(false); pause = false; Time.timeScale = 1; startCount = startCount + 5.0f; diff --git a/playable/Assets/Scripts/playerController.cs b/playable/Assets/Scripts/playerController.cs index cd3c353..2e666af 100644 --- a/playable/Assets/Scripts/playerController.cs +++ b/playable/Assets/Scripts/playerController.cs @@ -49,7 +49,7 @@ public class playerController : MonoBehaviour { private bool isSpinning = false; //checks if player is spin attacking private float lastHit; private float lastAttack; - private int score; + public int score; private bool isDashing =false; private bool canDash = true; private float lastDash = 0.0f; diff --git a/playable/Assets/flameColor.cs b/playable/Assets/flameColor.cs new file mode 100644 index 0000000..eb8455a --- /dev/null +++ b/playable/Assets/flameColor.cs @@ -0,0 +1,51 @@ +using UnityEngine; +using System.Collections; + +public class flameColor : MonoBehaviour { + public playerController player1; + public playerController player2; + public playerController player3; + public playerController player4; + private int playerLeader; + private int topscore; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + playerLeader = 1; + topscore = player1.score; + + if (player2.score > topscore) { + playerLeader = 2; + topscore = player2.score; + } + if (player3.score > topscore) { + playerLeader = 3; + topscore = player3.score; + } + if (player4.score > topscore) { + playerLeader = 4; + topscore = player4.score; + } + + + if (playerLeader == 1){ + gameObject.GetComponent().startColor = new Color(0, 255, 255); + } + if (playerLeader == 2){ + gameObject.GetComponent().startColor = new Color(255, 255, 0); + } + if (playerLeader == 3){ + gameObject.GetComponent().startColor = new Color(255, 0, 255); + } + if (playerLeader == 4){ + gameObject.GetComponent().startColor = new Color(0, 255, 0); + } + } + + +} diff --git a/playable/Assets/flameColor.cs.meta b/playable/Assets/flameColor.cs.meta new file mode 100644 index 0000000..1fbd6dc --- /dev/null +++ b/playable/Assets/flameColor.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 735b9b50a67deaf459049f02587c52ed +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: