diff --git a/Assets/Materials/New Material 2.mat b/Assets/Materials/New Material 2.mat new file mode 100644 index 0000000..c2d8f45 Binary files /dev/null and b/Assets/Materials/New Material 2.mat differ diff --git a/Assets/Materials/New Material 2.mat.meta b/Assets/Materials/New Material 2.mat.meta new file mode 100644 index 0000000..596d661 --- /dev/null +++ b/Assets/Materials/New Material 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c562ed5f938434cf8a1eef2a8f3ad494 +timeCreated: 1466892802 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/New Material.mat b/Assets/Materials/New Material.mat index 30bad8d..3d32e53 100644 Binary files a/Assets/Materials/New Material.mat and b/Assets/Materials/New Material.mat differ diff --git a/Assets/Meshes.meta b/Assets/Meshes.meta new file mode 100644 index 0000000..afeaad4 --- /dev/null +++ b/Assets/Meshes.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 40f16acd477a3416f9547ca2119a9c76 +folderAsset: yes +timeCreated: 1466891699 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Materials.meta b/Assets/Meshes/Materials.meta new file mode 100644 index 0000000..6ac8237 --- /dev/null +++ b/Assets/Meshes/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 98eecaccb10704c39896107a5d965ddc +folderAsset: yes +timeCreated: 1466892454 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Materials/lambert1.mat b/Assets/Meshes/Materials/lambert1.mat new file mode 100644 index 0000000..a6ce8b3 Binary files /dev/null and b/Assets/Meshes/Materials/lambert1.mat differ diff --git a/Assets/Meshes/Materials/lambert1.mat.meta b/Assets/Meshes/Materials/lambert1.mat.meta new file mode 100644 index 0000000..46eef04 --- /dev/null +++ b/Assets/Meshes/Materials/lambert1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9b450fab698814ca4b9404910ebb9cd3 +timeCreated: 1466892966 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Materials/map.mat b/Assets/Meshes/Materials/map.mat new file mode 100644 index 0000000..2d3b942 Binary files /dev/null and b/Assets/Meshes/Materials/map.mat differ diff --git a/Assets/Meshes/Materials/map.mat.meta b/Assets/Meshes/Materials/map.mat.meta new file mode 100644 index 0000000..badc72b --- /dev/null +++ b/Assets/Meshes/Materials/map.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a8b4f81d450a4328bf6066fd2366c0b +timeCreated: 1466892454 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/Obstacles_blocks_fbx.fbx b/Assets/Meshes/Obstacles_blocks_fbx.fbx new file mode 100644 index 0000000..a585188 Binary files /dev/null and b/Assets/Meshes/Obstacles_blocks_fbx.fbx differ diff --git a/Assets/Meshes/Obstacles_blocks_fbx.fbx.meta b/Assets/Meshes/Obstacles_blocks_fbx.fbx.meta new file mode 100644 index 0000000..146d51b --- /dev/null +++ b/Assets/Meshes/Obstacles_blocks_fbx.fbx.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 78d2f3120b8c44c5783ad014c5b8afe5 +timeCreated: 1466892966 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: polySurface40 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleRotations: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/plane_obstacles.fbx b/Assets/Meshes/plane_obstacles.fbx new file mode 100644 index 0000000..8baf975 Binary files /dev/null and b/Assets/Meshes/plane_obstacles.fbx differ diff --git a/Assets/Meshes/plane_obstacles.fbx.meta b/Assets/Meshes/plane_obstacles.fbx.meta new file mode 100644 index 0000000..c440301 --- /dev/null +++ b/Assets/Meshes/plane_obstacles.fbx.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 77ca64888064b4240878d97e128decf8 +timeCreated: 1466892454 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: pPlane1 + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleRotations: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile.meta b/Assets/Meshes/tuile.meta new file mode 100644 index 0000000..d365ecc --- /dev/null +++ b/Assets/Meshes/tuile.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d21646d091cf9476eb7022d8e9959584 +folderAsset: yes +timeCreated: 1466899357 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/._tuile_L_initialShadingGroup_AlbedoTransparency.png b/Assets/Meshes/tuile/._tuile_L_initialShadingGroup_AlbedoTransparency.png new file mode 100755 index 0000000..4e9bfdf Binary files /dev/null and b/Assets/Meshes/tuile/._tuile_L_initialShadingGroup_AlbedoTransparency.png differ diff --git a/Assets/Meshes/tuile/Materials.meta b/Assets/Meshes/tuile/Materials.meta new file mode 100644 index 0000000..52426c5 --- /dev/null +++ b/Assets/Meshes/tuile/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 68d55559686424265b3d2f5c4af583fe +folderAsset: yes +timeCreated: 1466899360 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/Materials/tuile_LMat.mat b/Assets/Meshes/tuile/Materials/tuile_LMat.mat new file mode 100644 index 0000000..5952f89 Binary files /dev/null and b/Assets/Meshes/tuile/Materials/tuile_LMat.mat differ diff --git a/Assets/Meshes/tuile/Materials/tuile_LMat.mat.meta b/Assets/Meshes/tuile/Materials/tuile_LMat.mat.meta new file mode 100644 index 0000000..5f25c2c --- /dev/null +++ b/Assets/Meshes/tuile/Materials/tuile_LMat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 89a249c628929452c95ad631d545ab3d +timeCreated: 1466899360 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/tuile_L.fbx b/Assets/Meshes/tuile/tuile_L.fbx new file mode 100644 index 0000000..57de025 Binary files /dev/null and b/Assets/Meshes/tuile/tuile_L.fbx differ diff --git a/Assets/Meshes/tuile/tuile_L.fbx.meta b/Assets/Meshes/tuile/tuile_L.fbx.meta new file mode 100644 index 0000000..67505b2 --- /dev/null +++ b/Assets/Meshes/tuile/tuile_L.fbx.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 6573c68a8c06446b399aa012df3ab718 +timeCreated: 1466899756 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: tuile_L + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleRotations: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 0 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/tuile_L_AO.png b/Assets/Meshes/tuile/tuile_L_AO.png new file mode 100755 index 0000000..39b953d Binary files /dev/null and b/Assets/Meshes/tuile/tuile_L_AO.png differ diff --git a/Assets/Meshes/tuile/tuile_L_AO.png.meta b/Assets/Meshes/tuile/tuile_L_AO.png.meta new file mode 100644 index 0000000..96314b3 --- /dev/null +++ b/Assets/Meshes/tuile/tuile_L_AO.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 74a2109397acb4504beca4ad4e6de876 +timeCreated: 1466899357 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/tuile_L_initialShadingGroup_AlbedoTransparency.png b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_AlbedoTransparency.png new file mode 100755 index 0000000..6073f66 Binary files /dev/null and b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_AlbedoTransparency.png differ diff --git a/Assets/Meshes/tuile/tuile_L_initialShadingGroup_AlbedoTransparency.png.meta b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_AlbedoTransparency.png.meta new file mode 100644 index 0000000..485bc29 --- /dev/null +++ b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_AlbedoTransparency.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 98bb21bf7c03841d4899d9a151b82989 +timeCreated: 1466899358 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/tuile_L_initialShadingGroup_MetallicSmoothness.png b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_MetallicSmoothness.png new file mode 100755 index 0000000..d111671 Binary files /dev/null and b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_MetallicSmoothness.png differ diff --git a/Assets/Meshes/tuile/tuile_L_initialShadingGroup_MetallicSmoothness.png.meta b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_MetallicSmoothness.png.meta new file mode 100644 index 0000000..e074530 --- /dev/null +++ b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_MetallicSmoothness.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: c24bdabaec3984f3ab0a2ae5f56a51f0 +timeCreated: 1466899359 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Meshes/tuile/tuile_L_initialShadingGroup_Normal.png b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_Normal.png new file mode 100755 index 0000000..51c79a9 Binary files /dev/null and b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_Normal.png differ diff --git a/Assets/Meshes/tuile/tuile_L_initialShadingGroup_Normal.png.meta b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_Normal.png.meta new file mode 100644 index 0000000..f1d30df --- /dev/null +++ b/Assets/Meshes/tuile/tuile_L_initialShadingGroup_Normal.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: ebbdedbcfbe0c4bc28ad16bd7d63cb76 +timeCreated: 1466899435 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 1 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: 1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FloorTileGenerator.cs b/Assets/Scripts/FloorTileGenerator.cs index 1589c51..5416cb9 100644 --- a/Assets/Scripts/FloorTileGenerator.cs +++ b/Assets/Scripts/FloorTileGenerator.cs @@ -29,6 +29,7 @@ public class FloorTileGenerator : MonoBehaviour { floorArray[i] = (GameObject)Instantiate(tile, new Vector3(i / y, 0, i % y), new Quaternion()); floorArray[i].name = i / y + "," + i % y; floorArray[i].transform.parent = gameObject.transform; + floorArray[i].transform.position = new Vector3(floorArray[i].transform.position.x, 0, floorArray[i].transform.position.z); } #if UNITY_EDITOR Generated = true; @@ -45,8 +46,8 @@ public class FloorTileGenerator : MonoBehaviour { { for (int i = j*y; i < (j+1)*y; ++i) { - ((TileController)floorArray[i].GetComponent()).wasTouched = true; - //Destroy(floorArray[i],1); + // ((TileController)floorArray[i].GetComponent()).wasTouched = true; + Destroy(floorArray[i],3); } if (j>x) { diff --git a/Assets/Scripts/JumpingPlayer.cs b/Assets/Scripts/JumpingPlayer.cs index 247ae9b..9e72a95 100644 --- a/Assets/Scripts/JumpingPlayer.cs +++ b/Assets/Scripts/JumpingPlayer.cs @@ -23,8 +23,6 @@ public class JumpingPlayer : MonoBehaviour isGrounded = true; Debug.Log(isGrounded); } - Debug.LogWarning(isGrounded); - } // Update is called once per frame diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 227a285..942145e 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -6,6 +6,10 @@ public class PlayerMovement : MonoBehaviour { public float speed = 0f; public float turn = 0f; public Rigidbody characterRigidBody; + public float boostFactor = 1f; + public float seconds; + float initialTime; + bool SpeedBoostTimerStart; //private Rigidbody rb; @@ -15,20 +19,47 @@ public class PlayerMovement : MonoBehaviour { Vector3 fowardVector = new Vector3(Camera.main.transform.forward.x, 0, Camera.main.transform.forward.z); if (Input.GetAxis("Vertical")>0) { - - characterRigidBody.velocity = ( fowardVector * speed * Time.deltaTime); + characterRigidBody.velocity = ( fowardVector * speed * boostFactor * Time.deltaTime); } else if (Input.GetAxis("Vertical")<0) { - characterRigidBody.velocity = (-fowardVector * speed * Time.deltaTime); + characterRigidBody.velocity = (-fowardVector * speed * boostFactor * Time.deltaTime); } if (Input.GetAxis("Horizontal")<0) { - characterRigidBody.velocity = (Vector3.Cross(-transform.up, fowardVector) * speed * Time.deltaTime); + characterRigidBody.velocity = (Vector3.Cross(-transform.up, fowardVector) * speed * boostFactor * Time.deltaTime); } else if (Input.GetAxis("Horizontal") > 0) { - characterRigidBody.velocity = (Vector3.Cross(transform.up, fowardVector) * speed * Time.deltaTime); + characterRigidBody.velocity = (Vector3.Cross(transform.up, fowardVector) * speed * boostFactor * Time.deltaTime); + } + } + + void FixedUpdate() + { + SpeedBoostTimer(seconds); + } + + void OnTriggerEnter (Collider other) + { + if (other.gameObject.tag == "SpeedBoost") + { + other.gameObject.SetActive (false); + SpeedBoostTimerStart = true; + } + } + + private void SpeedBoostTimer(float seconds) + { + if (SpeedBoostTimerStart) + { + boostFactor = 8f; + initialTime = Time.realtimeSinceStartup + seconds; + SpeedBoostTimerStart = false; + } + if (Time.realtimeSinceStartup >= initialTime) + { + boostFactor = 1f; } } } diff --git a/Assets/Scripts/SlowdownScript.cs b/Assets/Scripts/SlowdownScript.cs index 906ed2a..5499775 100644 --- a/Assets/Scripts/SlowdownScript.cs +++ b/Assets/Scripts/SlowdownScript.cs @@ -4,35 +4,38 @@ using System.Collections; public class SlowdownScript : MonoBehaviour { private float duration = 5.0f; - private bool pickedUp = false; + private bool SlowmoActive = false; // Use this for initialization void Start () { } - - // Update is called once per frame - void Update() + + void FixedUpdate() { - if(pickedUp) + if (SlowmoActive) { - Time.timeScale = 0.5f; - StartCoroutine(Wait(duration)); - Time.timeScale = 1.0f; + SlowmoTimer(5.0f); } - } + } void OnTriggerEnter(Collider col) { if (col.gameObject.CompareTag("Player")) { - pickedUp = true; + SlowmoActive = true; gameObject.SetActive(false); } } - IEnumerator Wait(float seconds) + private void SlowmoTimer(float seconds) { - yield return new WaitForSeconds(seconds); + float initialTime = Time.realtimeSinceStartup + seconds; + Time.timeScale = 0.5f; + SlowmoActive = false; + if (initialTime + Time.deltaTime >= initialTime) + { + Time.timeScale = 1f; + } } } diff --git a/Assets/Scripts/SpeedBoost.cs b/Assets/Scripts/SpeedBoost.cs deleted file mode 100644 index dde355c..0000000 --- a/Assets/Scripts/SpeedBoost.cs +++ /dev/null @@ -1,68 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class PlayerMovement : MonoBehaviour { - - public float speed = 0f; - public float turn = 0f; - public float boostFactor = 1f; - public float seconds; - float initialTime; - bool SpeedBoostTimerStart; - public GameObject camera; - public Rigidbody characterRigidBody; - //private Rigidbody rb; - - - - // Update is called once per frame - void Update () { - Vector3 fowardVector = new Vector3(camera.transform.forward.x, 0, camera.transform.forward.z); - if (Input.GetAxis("Vertical")>0) - { - - characterRigidBody.velocity = ( fowardVector * speed * boostFactor * Time.deltaTime); - } - else if (Input.GetAxis("Vertical")<0) - { - characterRigidBody.velocity = (-fowardVector * speed * boostFactor * Time.deltaTime); - } - if (Input.GetAxis("Horizontal")<0) - { - characterRigidBody.velocity = (Vector3.Cross(-transform.up, fowardVector) * speed * boostFactor * Time.deltaTime); - } - else if (Input.GetAxis("Horizontal") > 0) - { - characterRigidBody.velocity = (Vector3.Cross(transform.up, fowardVector) * speed * boostFactor * Time.deltaTime); - } - } - - void FixedUpdate() - { - SpeedBoostTimer(seconds); - } - - void OnTriggerEnter (Collider other) - { - if (other.gameObject.tag == "SpeedBoost") - { - other.gameObject.SetActive (false); - SpeedBoostTimerStart = true; - } - } - - private void SpeedBoostTimer(float seconds) - { - if (SpeedBoostTimerStart) - { - boostFactor = 8f; - initialTime = Time.realtimeSinceStartup + seconds; - SpeedBoostTimerStart = false; - } - if (Time.realtimeSinceStartup >= initialTime) - { - boostFactor = 1f; - } - - } -} diff --git a/Assets/Scripts/SphereMover.cs b/Assets/Scripts/SphereMover.cs index 1ca2d56..2f49591 100644 --- a/Assets/Scripts/SphereMover.cs +++ b/Assets/Scripts/SphereMover.cs @@ -4,7 +4,7 @@ using System.Collections; public class SphereMover : MonoBehaviour { public float speed = 2.0f; - private bool bascule = false; + private bool goingRight = false; // Use this for initialization void Start () { @@ -14,17 +14,17 @@ public class SphereMover : MonoBehaviour { // Update is called once per frame void FixedUpdate() { - if (bascule) + if (goingRight) transform.Translate (Vector2.right * speed * Time.deltaTime); else transform.Translate (-Vector2.right * speed * Time.deltaTime); - if(transform.position.x >= 4.0f) { - bascule = false; + if(transform.position.x >= transform.position.x + 4.0f) { + goingRight = false; } - if(transform.position.x <= -4) { - bascule = true; + if(transform.position.x <= transform.position.x -4) { + goingRight = true; } } } diff --git a/Assets/Textures/13499994_10155119723714896_2123325080_o.jpg b/Assets/Textures/13499994_10155119723714896_2123325080_o.jpg new file mode 100644 index 0000000..d8966be Binary files /dev/null and b/Assets/Textures/13499994_10155119723714896_2123325080_o.jpg differ diff --git a/Assets/Textures/13499994_10155119723714896_2123325080_o.jpg.meta b/Assets/Textures/13499994_10155119723714896_2123325080_o.jpg.meta new file mode 100644 index 0000000..b6637f4 --- /dev/null +++ b/Assets/Textures/13499994_10155119723714896_2123325080_o.jpg.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: 14dd06e1ef7e2423dac4f46ada1e5bd4 +timeCreated: 1466892646 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/map.png b/Assets/Textures/map.png new file mode 100755 index 0000000..b77b0ad Binary files /dev/null and b/Assets/Textures/map.png differ diff --git a/Assets/Textures/map.png.meta b/Assets/Textures/map.png.meta new file mode 100644 index 0000000..bf21a94 --- /dev/null +++ b/Assets/Textures/map.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: fcad8b91a60a741978cec8057182be98 +timeCreated: 1466892769 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: