diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat new file mode 100644 index 0000000..1f01387 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta new file mode 100644 index 0000000..0364b65 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9ac0ea32767bfe42aa7ce6753104e25 +timeCreated: 1485053650 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat new file mode 100644 index 0000000..cd6cd2c Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta new file mode 100644 index 0000000..51e2d57 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17ee00c36b59c344e83556e5bed577b6 +timeCreated: 1485052411 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png new file mode 100644 index 0000000..32d17dd Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta new file mode 100644 index 0000000..04dac77 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 9a81218b321cc42eba4dd59f9b513146 +timeCreated: 1485051858 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/shadows.png b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/shadows.png new file mode 100644 index 0000000..d3ac48a Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/shadows.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/shadows.png.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/shadows.png.meta new file mode 100644 index 0000000..e5e23b0 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/shadows.png.meta @@ -0,0 +1,118 @@ +fileFormatVersion: 2 +guid: 11a03cf810b734d53aaf004e9813f384 +timeCreated: 1485053643 +licenseType: Pro +TextureImporter: + fileIDToRecycleName: + 21300000: shadows_0 + 21300002: shadows_1 + 21300004: shadows_2 + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: shadows_0 + rect: + serializedVersion: 2 + x: 21 + y: 243 + width: 477 + height: 260 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: shadows_1 + rect: + serializedVersion: 2 + x: 241 + y: 0 + width: 262 + height: 262 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + tessellationDetail: 0 + - serializedVersion: 2 + name: shadows_2 + rect: + serializedVersion: 2 + x: 48 + y: 15 + width: 148 + height: 226 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + tessellationDetail: 0 + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat new file mode 100644 index 0000000..9ebccf5 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta new file mode 100644 index 0000000..9da6a59 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eb66aff512dcb4d07a63d2a8ecd24bde +timeCreated: 1485051885 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta b/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta similarity index 89% rename from IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta rename to IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta index d94fc60..47c11f1 100644 --- a/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta +++ b/IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta @@ -1,17 +1,17 @@ fileFormatVersion: 2 -guid: 919eb0dba9aa0da44aec3a80f1cf98ea -timeCreated: 1485000000 +guid: ab392ccfd0fbdbb419b0edd49d9ffe20 +timeCreated: 1485052411 licenseType: Free ModelImporter: serializedVersion: 19 fileIDToRecycleName: - 100000: lighthouse + 100000: Group48238 100002: //RootNode - 400000: lighthouse + 400000: Group48238 400002: //RootNode - 2300000: lighthouse - 3300000: lighthouse - 4300000: lighthouse + 2300000: Group48238 + 3300000: Group48238 + 4300000: Group48238 materials: importMaterials: 1 materialName: 0 @@ -36,7 +36,7 @@ ModelImporter: isReadable: 1 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 0.0666 meshCompression: 0 addColliders: 0 importBlendShapes: 1 diff --git a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta deleted file mode 100644 index 92a0183..0000000 --- a/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta +++ /dev/null @@ -1,82 +0,0 @@ -fileFormatVersion: 2 -guid: 37549450629db464abffe54861590cf3 -timeCreated: 1485008673 -licenseType: Free -ModelImporter: - serializedVersion: 19 - fileIDToRecycleName: - 100000: pCylinder3 - 100002: //RootNode - 400000: pCylinder3 - 400002: //RootNode - 2300000: pCylinder3 - 3300000: pCylinder3 - 4300000: pCylinder3 - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - resampleCurves: 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: - serializedVersion: 2 - human: [] - skeleton: [] - armTwist: 0.5 - foreArmTwist: 0.5 - upperLegTwist: 0.5 - legTwist: 0.5 - armStretch: 0.05 - legStretch: 0.05 - feetSpacing: 0 - rootMotionBoneName: - rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} - hasTranslationDoF: 0 - hasExtraRoot: 0 - skeletonHasParents: 1 - lastHumanDescriptionAvatarSource: {instanceID: 0} - animationType: 0 - humanoidOversampling: 1 - additionalBone: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png new file mode 100644 index 0000000..679c770 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta new file mode 100644 index 0000000..5ad478e --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 8108a8c7021f51f40b59580b43dbfd2a +timeCreated: 1485052499 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png new file mode 100644 index 0000000..7bf5d7c Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta new file mode 100644 index 0000000..11e6880 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 9b0ec7c3400bea04c94e9bd4d17a0ffc +timeCreated: 1485052499 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png new file mode 100644 index 0000000..7e6874b Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta new file mode 100644 index 0000000..daa9329 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 42574f2ff1b9d00479fce7fa9823e0ad +timeCreated: 1485052499 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + 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 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat b/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat index afc37ee..a84dc5a 100644 Binary files a/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat and b/IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/particle effects/shadow-fog-mat.mat b/IronToad_UnityProject/Assets/Art/particle effects/shadow-fog-mat.mat new file mode 100644 index 0000000..fcca70e Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/particle effects/shadow-fog-mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/particle effects/shadow-fog-mat.mat.meta b/IronToad_UnityProject/Assets/Art/particle effects/shadow-fog-mat.mat.meta new file mode 100644 index 0000000..1b21246 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/particle effects/shadow-fog-mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca5d73253182e408ca7ed18a9f88c137 +timeCreated: 1485000941 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab new file mode 100644 index 0000000..9cf4ece Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab differ diff --git a/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta new file mode 100644 index 0000000..ccfca2a --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15855eec8f44a48169b15f54f2988b2e +timeCreated: 1485052510 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab new file mode 100644 index 0000000..467dab9 Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta new file mode 100644 index 0000000..dd61e1b --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ff24e35626d4349e7be883de5e03e5b1 +timeCreated: 1485036737 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab new file mode 100644 index 0000000..337cfbd Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta new file mode 100644 index 0000000..72f985e --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93e56074113fd4131820ce9d0c7d6a77 +timeCreated: 1485040026 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Prefabs/shadow-sprite-1.prefab b/IronToad_UnityProject/Assets/Prefabs/shadow-sprite-1.prefab new file mode 100644 index 0000000..db4fd03 Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/shadow-sprite-1.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/shadow-sprite-1.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/shadow-sprite-1.prefab.meta new file mode 100644 index 0000000..3776c44 --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/shadow-sprite-1.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d7604cf4d94343189f9ca8fa401a92b +timeCreated: 1485054847 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/AudioController.cs b/IronToad_UnityProject/Assets/Scripts/AudioController.cs new file mode 100644 index 0000000..f3c18e2 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/AudioController.cs @@ -0,0 +1,272 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AudioController : MonoBehaviour +{ + public Transform objectA; + public Transform objectB; + + public AudioSource[] bgmSources; + public AudioSource[] ambSources; + public AudioSource[] sfxSources; + + public AudioClip[] bgmClips; + public AudioClip[] ambClips; + public AudioClip[] sfxClips; + + void Awake() + { + NotificationServer.register("play bgm", playBgm); + NotificationServer.register("play amb", playAmb); + NotificationServer.register("play sfx", playSfx); + + NotificationServer.register("fade bgm", fadeBgm); + NotificationServer.register("fade amb", fadeAmb); + + NotificationServer.register("statechange Searchlight", searchlightStateChanged); + } + + void Start() + { + foreach (AudioSource s in bgmSources) + s.volume = 0f; + foreach (AudioSource s in ambSources) + s.volume = 0f; + foreach (AudioSource s in sfxSources) + s.volume = 0f; + + NotificationServer.notify("play amb", "oceanAmbience:0.4"); + } + +// void Update() +// { +// doMusicMix(); +// } + + public void doMusicMix() + { + NotificationServer.notify("play bgm", "tense:0.75"); +// float distance = Vector3.Distance(objectA.position, objectB.position); +// Debug.LogWarning(distance); +// distance = Mathf.Clamp(1000f / distance, 0f, 1f); +// float tenseVol = 0.75f * distance; +// float spottedVol = 0.5f * (1f-distance); +// NotificationServer.notify("play bgm", "tense:"+tenseVol+"/spotted"+spottedVol); + } + + public void searchlightStateChanged() + { + if (Searchlight.state == Searchlight.SearchState.Chasing) + { + NotificationServer.notify("play sfx", "shipSpotted:0.5"); +// NotificationServer.notify("play sfx", "spottedDialogue"); + NotificationServer.notify("play bgm", "attack:9"); + } + else + { + doMusicMix(); + } + } + + + public void playAmb(object audioNameObj) + { + string audioName = audioNameObj as string; + if (audioName == null || audioName == "") + return; + + string[] tokens = audioName.ToLower().Split(':'); + audioName = tokens[0]; + float volume = 1f; + if (tokens.Length > 1) + float.TryParse(tokens[1], out volume); + + AudioClip clip = null; + foreach (AudioClip c in ambClips) + { + if (c.name.ToLower() == audioName) + { + clip = c; + break; + } + } + + if (clip == null) + return; + + bool foundEmpty = false; + foreach (AudioSource s in ambSources) + { + if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + else if (!foundEmpty) + { + LeanTween.cancel(s.gameObject); + foundEmpty = true; + s.clip = clip; + s.Play(); + LeanTween.value(s.gameObject, s.volume, volume, 1f).setOnUpdate((float val)=>{ + s.volume = val; + }).setIgnoreTimeScale(true); + } + } + } + + public void playSfx(object audioNameObj) + { + string audioName = audioNameObj as string; + if (audioName == null || audioName == "") + return; + + string[] tokens = audioName.ToLower().Split(':'); + audioName = tokens[0]; + float volume = 1f; + if (tokens.Length > 1) + float.TryParse(tokens[1], out volume); + + AudioClip clip = null; + foreach (AudioClip c in sfxClips) + { + if (c.name.ToLower() == audioName) + { + clip = c; + break; + } + } + + if (clip == null) + return; + + foreach (AudioSource s in sfxSources) + { + if (!s.isPlaying) + { + LeanTween.cancel(s.gameObject); + s.clip = clip; + s.volume = volume; + s.Play(); + } + } + } + + public void playBgm(object audioNameObj) + { + string audioNames = audioNameObj as string; + if (audioNames == null || audioNames == "") + return; + + audioNames = audioNames.ToLower(); + string[] tokens = audioNames.Split('/'); + if (tokens.Length > 1) + { + foreach (string t in tokens) + playBgm(t.Trim()); + return; + } + string[] tokens2 = audioNames.Split(':'); + string audioName = tokens2[0]; + float volume = 1f; + if (tokens2.Length > 1) + float.TryParse(tokens2[1], out volume); + + AudioClip clip = null; + foreach (AudioClip c in bgmClips) + { + if (c.name.ToLower() == audioName) + { + clip = c; + break; + } + } + + if (clip == null) + return; + + AudioSource foundEmpty = null; + int timeSamples = 0; + foreach (AudioSource s in bgmSources) + { + if (s.clip != null && s.clip == clip) + { + LeanTween.cancel(s.gameObject); + foundEmpty = s; + } + else if (s.isPlaying) + { + timeSamples = s.timeSamples; + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + else if (foundEmpty == null) + { + LeanTween.cancel(s.gameObject); + foundEmpty = s; + } + } + if (foundEmpty != null && !foundEmpty.isPlaying) + { + LeanTween.cancel(foundEmpty.gameObject); + foundEmpty.clip = clip; + foundEmpty.timeSamples = timeSamples; + foundEmpty.Play(); + LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 1f).setOnUpdate((float val)=>{ + foundEmpty.volume = val; + }).setIgnoreTimeScale(true); + } + else if (foundEmpty != null && foundEmpty.isPlaying) + { + LeanTween.cancel(foundEmpty.gameObject); + LeanTween.value(foundEmpty.gameObject, foundEmpty.volume, volume, 1f).setOnUpdate((float val)=>{ + foundEmpty.volume = val; + }).setIgnoreTimeScale(true); + } + } + + public void fadeBgm() + { + foreach (AudioSource s in bgmSources) + { + if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + } + } + + public void fadeAmb() + { + foreach (AudioSource s in ambSources) + { + if (s.isPlaying) + { + LeanTween.cancel(s.gameObject); + LeanTween.value(s.gameObject, s.volume, 0f, 1f).setOnUpdate((float val)=>{ + s.volume = val; + }).setOnComplete(()=>{ + s.Stop(); + s.clip = null; + }).setIgnoreTimeScale(true); + } + } + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta b/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta new file mode 100644 index 0000000..b4a3ecb --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/AudioController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 66e9541bf46304a888e3e492fda8055d +timeCreated: 1485043076 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/BoatController.cs b/IronToad_UnityProject/Assets/Scripts/BoatController.cs index 34d2718..b8aa89b 100644 --- a/IronToad_UnityProject/Assets/Scripts/BoatController.cs +++ b/IronToad_UnityProject/Assets/Scripts/BoatController.cs @@ -12,6 +12,7 @@ public class BoatController : BuoyantObject { private bool applyBreak = true; + // Use this for initialization void Start() { @@ -40,7 +41,7 @@ public class BoatController : BuoyantObject { Debug.Log("Forward hit:" + forwardHitSpeed); if (forwardHitSpeed > breakSpeed) { - NotificationServer.notify("show GameOverPanel"); + PlayerController.instance.takeOneDamage(); } } } diff --git a/IronToad_UnityProject/Assets/Scripts/Boulder.cs b/IronToad_UnityProject/Assets/Scripts/Boulder.cs index 6669270..55c5f3b 100644 --- a/IronToad_UnityProject/Assets/Scripts/Boulder.cs +++ b/IronToad_UnityProject/Assets/Scripts/Boulder.cs @@ -4,8 +4,9 @@ using UnityEngine; public class Boulder : HeavyObject { - - + public GameObject splash; + public GameObject Explosion; + public override void OnWaterStay(WaterController water,float waveHeight) { } @@ -13,4 +14,17 @@ public class Boulder : HeavyObject public override void OnWaterExit(WaterController water) { } + + void OnTriggerEnter(Collider other) { + if (other.gameObject.CompareTag("Water")) { + Destroy(Instantiate(splash, transform.position,Quaternion.identity), 2.5f); + }else { + Destroy(Instantiate(Explosion, transform.position, Quaternion.identity), 6); + } + } + + + + + } diff --git a/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs b/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs index 76a0265..ee23660 100644 --- a/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs +++ b/IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs @@ -42,7 +42,7 @@ public class CustomSmoothFollow : MonoBehaviour RaycastHit hitInfo; if (Physics.Raycast(wantedPos, target.position-wantedPos, out hitInfo, (target.position-wantedPos).magnitude * 2f)) { - Debug.LogWarning (hitInfo.collider.name + " -- " + hitInfo.collider.gameObject.layer + " -- " + layerMask); +// Debug.LogWarning (hitInfo.collider.name + " -- " + hitInfo.collider.gameObject.layer + " -- " + layerMask); if (hitInfo.collider.gameObject.layer == layerMask) isBlocked = true; } @@ -51,6 +51,8 @@ public class CustomSmoothFollow : MonoBehaviour { wantedPos.y = target.position.y + altHeight; wantedPos.z = target.position.z + altDistance; + wantedPos.x = target.position.x; + wantedPos = RotatePointAroundPivot(wantedPos, target.transform.position, offsetAngle); } float currentHeight = transform.position.y; @@ -73,7 +75,6 @@ public class CustomSmoothFollow : MonoBehaviour // Set the height of the camera transform.position = new Vector3(currentSide, currentHeight, currentDistance); - // Always look at the target Vector3 lookTarget = target.position; lookTarget.z = transform.position.z; diff --git a/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs new file mode 100644 index 0000000..b2877ea --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs @@ -0,0 +1,33 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(BoxCollider))] +public class HidingSpot : MonoBehaviour { + + + // Use this for initialization + void Start() { + GetComponent().isTrigger = true; + } + + // Update is called once per frame + void Update() { + + } + + void OnTriggerEnter(Collider other) { + if (other.gameObject.CompareTag("Player")) { + Searchlight.playerHidden = true; + Debug.Log("player here"); + } + + } + + void OnTriggerExit(Collider other) { + if (other.gameObject.CompareTag("Player")) { + Searchlight.playerHidden = false; + Debug.Log("player exit"); + } + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs.meta b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs.meta new file mode 100644 index 0000000..6192a30 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/HidingSpot.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 0a8ee24f913b2504385604346da773d7 +timeCreated: 1485054757 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/LighthouseLanding.cs b/IronToad_UnityProject/Assets/Scripts/LighthouseLanding.cs new file mode 100644 index 0000000..80827a0 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/LighthouseLanding.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LighthouseLanding : MonoBehaviour +{ + public bool switchedOff = false; + + private bool isTriggering = false; + + void Awake() + { + NotificationServer.register("statechange Searchlight", searchlightStateChanged); + } + + void OnTriggerEnter(Collider other) + { + if (switchedOff) + return; + if (other.tag != "Player") + return; + if (Searchlight.state == Searchlight.SearchState.Chasing) + return; + if (isTriggering) + return; + + isTriggering = true; + NotificationServer.notify("show TakeoverButton"); + } + + void OnTriggerExit(Collider other) + { + if (switchedOff) + return; + if (other.tag != "Player") + return; + if (!isTriggering) + return; + + isTriggering = false; + NotificationServer.notify("hide TakeoverButton"); + } + + void searchlightStateChanged() + { + if (switchedOff) + return; + if (isTriggering && Searchlight.state == Searchlight.SearchState.Chasing) + { + isTriggering = false; + NotificationServer.notify("hide TakeoverButton"); + } + } + + public void switchOff() + { + switchedOff = true; + NotificationServer.notify("hide TakeoverButton"); + NotificationServer.notify("play sfx", "assassination"); + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/LighthouseLanding.cs.meta b/IronToad_UnityProject/Assets/Scripts/LighthouseLanding.cs.meta new file mode 100644 index 0000000..8c04dbc --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/LighthouseLanding.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d48154a3b477045e68763f6fc4a168b7 +timeCreated: 1485057688 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/PlayerController.cs b/IronToad_UnityProject/Assets/Scripts/PlayerController.cs index a0b548e..4327d9a 100644 --- a/IronToad_UnityProject/Assets/Scripts/PlayerController.cs +++ b/IronToad_UnityProject/Assets/Scripts/PlayerController.cs @@ -12,11 +12,19 @@ public class PlayerController : MonoBehaviour { public GameObject waveRing; + public int life = 3; + public float lastDamageTime = 0; + + public static PlayerController instance; + + public GameObject[] lifeHearts; + void Start() { NotificationServer.register("show GameUI", showGameUI); NotificationServer.register("hide GameUI", hideGameUI); + instance = this; } @@ -48,6 +56,23 @@ public class PlayerController : MonoBehaviour { } + public void setLife(int life) { + for (int i = 0; i < lifeHearts.Length; i++) { + lifeHearts[i].SetActive((i < life)); + } + this.life = life; + } + + public void takeOneDamage() { + if (Time.time > lastDamageTime + 2 && life > 0) { + setLife(life - 1); + lastDamageTime = Time.time; + if (life == 0) + NotificationServer.notify("show GameOverPanel"); + } + } + + private void showGameUI() { Debug.Log("UI open"); isLocked = false; diff --git a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs index 0b1f08b..a2dce54 100644 --- a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs +++ b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs @@ -22,6 +22,8 @@ public class Searchlight : MonoBehaviour public static SearchState state = SearchState.Spline; public static Collider chased; + public static bool playerHidden = false; + private static List instants = new List(); public static bool isTriggeringAtLeastOne() @@ -45,7 +47,7 @@ public class Searchlight : MonoBehaviour void OnTriggerEnter(Collider other) { - if (other.tag != "Player") + if (other.tag != "Player" || playerHidden ) return; chased = other; isTriggering = true; @@ -62,7 +64,7 @@ public class Searchlight : MonoBehaviour void OnTriggerExit(Collider other) { - if (other.tag != "Player") + if (other.tag != "Player" ) return; isTriggering = false; if (state == SearchState.Chasing && !isTriggeringAtLeastOne()) diff --git a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs index adf5328..94168c6 100644 --- a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs +++ b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs @@ -9,12 +9,12 @@ public class TestMoveController : MonoBehaviour void Update () { if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow)) - transform.Translate(Vector3.back * Time.deltaTime * speed); + transform.Translate(Vector3.right * Time.deltaTime * speed); if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow)) - transform.Translate(Vector3.left * Time.deltaTime * speed); + transform.Translate(Vector3.back * Time.deltaTime * speed); if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow)) - transform.Translate(Vector3.forward * Time.deltaTime * speed); + transform.Translate(Vector3.left * Time.deltaTime * speed); if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow)) - transform.Translate(Vector3.right * Time.deltaTime * speed); + transform.Translate(Vector3.forward * Time.deltaTime * speed); } } diff --git a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs index 3135ea3..8df274b 100644 --- a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs +++ b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs @@ -162,6 +162,7 @@ public class UIPanel : MonoBehaviour public void startGame() { NotificationServer.notify("show GameUI"); + NotificationServer.notify("play bgm", "tense:0.75"); unpauseGame(); } diff --git a/IronToad_UnityProject/Assets/Sound.meta b/IronToad_UnityProject/Assets/Sound.meta index 9d54175..f9c1bfe 100644 --- a/IronToad_UnityProject/Assets/Sound.meta +++ b/IronToad_UnityProject/Assets/Sound.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: e3b0c439ea6f28c4fb3ce6bc58682b6b +guid: 0fbabcae9313543ffbf1429aeac3664d folderAsset: yes -timeCreated: 1485052873 -licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b b/IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d similarity index 100% rename from IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b rename to IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta b/IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta similarity index 53% rename from IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta rename to IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta index a8292de..4a5a01d 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540.meta +++ b/IronToad_UnityProject/Assets/Sound.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 599e1530282487c46b63fa0f00f5c846 -timeCreated: 1485039717 -licenseType: Pro +guid: 4f48e22f51b6449849bfe949e93bd014 +timeCreated: 1485054810 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta b/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta deleted file mode 100644 index dc8b858..0000000 --- a/IronToad_UnityProject/Assets/Sound.meta~HEAD.meta +++ /dev/null @@ -1,14 +0,0 @@ -fileFormatVersion: 2 -<<<<<<< HEAD -guid: 7562c5d08f15d254c92f6dbd50cd18c9 -timeCreated: 1485039339 -licenseType: Pro -======= -guid: 0fb49e3e0a97c2c4cb531c04d67f2615 -timeCreated: 1485038927 -licenseType: Free ->>>>>>> 927ced4c4317bc1f86f167c9b1594cec30b8e540 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~HEAD b/IronToad_UnityProject/Assets/Sound.meta~HEAD_0 similarity index 58% rename from IronToad_UnityProject/Assets/Sound.meta~HEAD rename to IronToad_UnityProject/Assets/Sound.meta~HEAD_0 index 0ebd43e..9d54175 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~HEAD +++ b/IronToad_UnityProject/Assets/Sound.meta~HEAD_0 @@ -1,6 +1,8 @@ fileFormatVersion: 2 -guid: 73fb9ee280b0c75439600b4d5c3a6a7d +guid: e3b0c439ea6f28c4fb3ce6bc58682b6b folderAsset: yes +timeCreated: 1485052873 +licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound/Music.meta b/IronToad_UnityProject/Assets/Sound/Music.meta index b4b7bbf..57e02b3 100644 --- a/IronToad_UnityProject/Assets/Sound/Music.meta +++ b/IronToad_UnityProject/Assets/Sound/Music.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f58a00a3100922d4288203443c54d1a5 folderAsset: yes timeCreated: 1485052873 licenseType: Pro +======= +guid: be2c14b0c562c483bbe057367939b479 +folderAsset: yes +timeCreated: 1485052376 +licenseType: Free +>>>>>>> 497ca195525b3f1160bab1491e71a9a013e118fb DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 b/IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d similarity index 70% rename from IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 rename to IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d index a809e82..b3ddd5b 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta~927ced4c4317bc1f86f167c9b1594cec30b8e540 +++ b/IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 7a2ebb0518fbb4d46a3aa17dac934dce +guid: 1715d56e0d2b68246a82993db31014ab +folderAsset: yes timeCreated: 1485038927 licenseType: Free DefaultImporter: diff --git a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta b/IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta similarity index 53% rename from IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta rename to IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta index 97e3f7f..2592808 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~4053ea0ea1489f4604c1626fb0538989dd66037b.meta +++ b/IronToad_UnityProject/Assets/Sound/Music.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 3c7e12539b1e2c048bbfe0734108abba -timeCreated: 1485039339 -licenseType: Pro +guid: cfbf35b0592f24a209aa5903d6a661ed +timeCreated: 1485054811 +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav b/IronToad_UnityProject/Assets/Sound/Music/attack.wav similarity index 100% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav rename to IronToad_UnityProject/Assets/Sound/Music/attack.wav diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta similarity index 92% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta rename to IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta index b58e257..a556686 100644 --- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(attack).wav.meta +++ b/IronToad_UnityProject/Assets/Sound/Music/attack.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav similarity index 100% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav rename to IronToad_UnityProject/Assets/Sound/Music/spotted.wav diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta similarity index 92% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta rename to IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta index 8a9a1eb..a4aa32b 100644 --- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(spotted).wav.meta +++ b/IronToad_UnityProject/Assets/Sound/Music/spotted.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav b/IronToad_UnityProject/Assets/Sound/Music/tense.wav similarity index 100% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav rename to IronToad_UnityProject/Assets/Sound/Music/tense.wav diff --git a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta b/IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta similarity index 92% rename from IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta rename to IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta index 7a09aec..be52b85 100644 --- a/IronToad_UnityProject/Assets/Sound/Music/22-1245ironToad(tense).wav.meta +++ b/IronToad_UnityProject/Assets/Sound/Music/tense.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta index a3165ee..fd92b5d 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX.meta @@ -1,8 +1,15 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: d96f9b1229b84cb41b71f2332674b8e1 folderAsset: yes timeCreated: 1485052873 licenseType: Pro +======= +guid: bb5698073b8d847298f0287fcfbdd0de +folderAsset: yes +timeCreated: 1485052376 +licenseType: Free +>>>>>>> 497ca195525b3f1160bab1491e71a9a013e118fb DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d b/IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d new file mode 100644 index 0000000..795aecf --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: de5a3adcedb96f64183518ac89622ade +folderAsset: yes +timeCreated: 1485038927 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta b/IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta new file mode 100644 index 0000000..4fbbee4 --- /dev/null +++ b/IronToad_UnityProject/Assets/Sound/SFX.meta~9aa76cf59aefcb5184922037951a67f20abdf40d.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e7fc7bcf373334aaba07b2047921a343 +timeCreated: 1485054811 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta index efbf86b..d6e8833 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/assassination.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta index ba6ea07..c28f259 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta index 90bcef1..5e664e8 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave_2.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta index 35d4d69..25a6976 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/createWave_3.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta index 465f525..3846181 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/oceanAmbience.wav.meta @@ -5,11 +5,11 @@ licenseType: Free AudioImporter: serializedVersion: 6 defaultSettings: - loadType: 0 + loadType: 2 sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta index 9472e49..00b8793 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_1.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta index a3e20ce..2d79e6c 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_2.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta index 44f4631..79c3a48 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/rockWater_3.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta index 61d8e34..0d018fd 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/runAground.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta index d4ebbdd..15eed3e 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/shipSpotted.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta index 148c11c..e6eafc3 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/sinkingShip.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta b/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta index cf7471b..fa08255 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta +++ b/IronToad_UnityProject/Assets/Sound/SFX/spottedDialogue.wav.meta @@ -9,12 +9,12 @@ AudioImporter: sampleRateSetting: 0 sampleRateOverride: 44100 compressionFormat: 1 - quality: 1 + quality: 0.7 conversionMode: 0 platformSettingOverrides: {} forceToMono: 0 normalize: 1 - preloadAudioData: 1 + preloadAudioData: 0 loadInBackground: 0 3D: 1 userData: diff --git a/IronToad_UnityProject/Assets/Textures.meta b/IronToad_UnityProject/Assets/Textures.meta new file mode 100644 index 0000000..ffdd440 --- /dev/null +++ b/IronToad_UnityProject/Assets/Textures.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 2a6e699820a38a544acfc0015eb679a2 +folderAsset: yes +timeCreated: 1484972317 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta new file mode 100644 index 0000000..47507ca --- /dev/null +++ b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 338533d5d159c00478a9fb5321b7d922 +folderAsset: yes +timeCreated: 1485007190 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity index 2831c53..ac1a0ba 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity and b/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity differ diff --git a/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity b/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity index 8303cde..a51988c 100644 Binary files a/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity and b/IronToad_UnityProject/Assets/_Scenes/LighthouseTestScene.unity differ diff --git a/IronToad_UnityProject/Assets/water/Water.mat b/IronToad_UnityProject/Assets/water/Water.mat index faf0bbc..d7600b2 100644 Binary files a/IronToad_UnityProject/Assets/water/Water.mat and b/IronToad_UnityProject/Assets/water/Water.mat differ diff --git a/IronToad_UnityProject/Assets/water/planeWater.prefab b/IronToad_UnityProject/Assets/water/planeWater.prefab index e0f40e6..7e18e2b 100644 Binary files a/IronToad_UnityProject/Assets/water/planeWater.prefab and b/IronToad_UnityProject/Assets/water/planeWater.prefab differ diff --git a/IronToad_UnityProject/ProjectSettings/TagManager.asset b/IronToad_UnityProject/ProjectSettings/TagManager.asset index de2d837..448c10c 100644 Binary files a/IronToad_UnityProject/ProjectSettings/TagManager.asset and b/IronToad_UnityProject/ProjectSettings/TagManager.asset differ