diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat index 458f8a4..e3b2576 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat and b/IronToad_UnityProject/Assets/Art/Models/Materials/No Name.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat new file mode 100644 index 0000000..8883f4e Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat.meta new file mode 100644 index 0000000..04b7825 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/light-gradient.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 159576e0f67c04fb490e030fa1db9948 +timeCreated: 1485006531 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat new file mode 100644 index 0000000..80e3465 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat differ diff --git a/IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb.meta~5def2651a9a68039ca23aa6ed804786939978fb1 b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat.meta similarity index 52% rename from IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb.meta~5def2651a9a68039ca23aa6ed804786939978fb1 rename to IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat.meta index 88320a9..06e5d2c 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb.meta~5def2651a9a68039ca23aa6ed804786939978fb1 +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/mat_Pier.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 64db7265c3846d248be342f1f51a334f -timeCreated: 1485006712 +guid: 6619186cf6e5b7845af3763cc9d5d97a +timeCreated: 1485008673 licenseType: Free -DefaultImporter: +NativeFormatImporter: userData: assetBundleName: assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/pCylinder3Mat.mat b/IronToad_UnityProject/Assets/Art/Models/Materials/pCylinder3Mat.mat new file mode 100644 index 0000000..a0eabc0 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/pCylinder3Mat.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/pCylinder3Mat.mat.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/pCylinder3Mat.mat.meta new file mode 100644 index 0000000..11cdad6 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/pCylinder3Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ddfaab50f2c398b40a3e2f6a70176e10 +timeCreated: 1485008851 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures.meta similarity index 58% rename from IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb.meta rename to IronToad_UnityProject/Assets/Art/Models/Materials/textures.meta index a966884..d893680 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb.meta +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: a0fba00d97ea52943ada2d1f8952c395 -timeCreated: 1485007137 +guid: 09711520b5e786041b9ba22371e0234d +folderAsset: yes +timeCreated: 1485010695 licenseType: Pro DefaultImporter: userData: diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/light-gradient.png b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/light-gradient.png new file mode 100644 index 0000000..f677743 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/light-gradient.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/light-gradient.png.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/light-gradient.png.meta new file mode 100644 index 0000000..8c64f9f --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/light-gradient.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 305e72dd963e54751b6faa9024c6ad0e +timeCreated: 1485006561 +licenseType: Pro +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/Materials/textures/spotlight-sprite.png b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/spotlight-sprite.png new file mode 100644 index 0000000..f1ea550 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/spotlight-sprite.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/Materials/textures/spotlight-sprite.png.meta b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/spotlight-sprite.png.meta new file mode 100644 index 0000000..71b68af --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/Materials/textures/spotlight-sprite.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 468f554d4b2714881b3a3531f1208ab2 +timeCreated: 1485008431 +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/Rocks/Materials/toonROCKS.mat b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat index 0ea7f0f..b97e329 100644 Binary files a/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat and b/IronToad_UnityProject/Assets/Art/Models/Rocks/Materials/toonROCKS.mat differ diff --git a/IronToad_UnityProject/Assets/Animations.meta b/IronToad_UnityProject/Assets/Art/Models/flag.meta similarity index 67% rename from IronToad_UnityProject/Assets/Animations.meta rename to IronToad_UnityProject/Assets/Art/Models/flag.meta index b2e446b..b1db67e 100644 --- a/IronToad_UnityProject/Assets/Animations.meta +++ b/IronToad_UnityProject/Assets/Art/Models/flag.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 653e5549e4b277c4facae79f936bb3e6 +guid: 0aed6f86d153135459bf5e1a0c24b940 folderAsset: yes -timeCreated: 1484972317 +timeCreated: 1485010923 licenseType: Free DefaultImporter: userData: diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagOrange.fbx b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagOrange.fbx new file mode 100644 index 0000000..80f6812 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagOrange.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagOrange.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagOrange.fbx.meta new file mode 100644 index 0000000..5e662d1 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagOrange.fbx.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: cad7042c28e276544becda8e89a30eaa +timeCreated: 1485010926 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: FlagOrange + 9500000: //RootNode + 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: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagRed.fbx b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagRed.fbx new file mode 100644 index 0000000..5100f9c Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagRed.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagRed.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagRed.fbx.meta new file mode 100644 index 0000000..f58bf9e --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/flag/flagFlagRed.fbx.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 3a762cbe22b16f744847a145feae589d +timeCreated: 1485010926 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: FlagRed + 9500000: //RootNode + 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: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flagflaGWhite.fbx b/IronToad_UnityProject/Assets/Art/Models/flag/flagflaGWhite.fbx new file mode 100644 index 0000000..0b06924 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/flag/flagflaGWhite.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flagflaGWhite.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/flag/flagflaGWhite.fbx.meta new file mode 100644 index 0000000..2398aa6 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/flag/flagflaGWhite.fbx.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: d75d259275864544eb6e5861b1861c54 +timeCreated: 1485010926 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: flaGWhite + 9500000: //RootNode + 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: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_C.png b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_C.png new file mode 100644 index 0000000..78369c4 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_C.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_C.png.meta b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_C.png.meta new file mode 100644 index 0000000..7d7f28b --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_C.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 5110f1acb2899f949b0ce5e54ba060d6 +timeCreated: 1485010933 +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/flag/flags_low_wire_087225087_D.png b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_D.png new file mode 100644 index 0000000..fe044f7 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_D.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_D.png.meta b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_D.png.meta new file mode 100644 index 0000000..3b5d684 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/flag/flags_low_wire_087225087_D.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 29a8504d803f1cd4ea5689e7bbfe1767 +timeCreated: 1485010933 +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/Sound/Music.meta b/IronToad_UnityProject/Assets/Art/Models/huts.meta similarity index 67% rename from IronToad_UnityProject/Assets/Sound/Music.meta rename to IronToad_UnityProject/Assets/Art/Models/huts.meta index 5559b43..c36ba6f 100644 --- a/IronToad_UnityProject/Assets/Sound/Music.meta +++ b/IronToad_UnityProject/Assets/Art/Models/huts.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: 1715d56e0d2b68246a82993db31014ab +guid: bedb0d0e02fa1c74eb9b2365c1e7f01b folderAsset: yes -timeCreated: 1485006712 +timeCreated: 1485006709 licenseType: Free DefaultImporter: userData: diff --git a/IronToad_UnityProject/Assets/Sound/SFX.meta b/IronToad_UnityProject/Assets/Art/Models/huts/Materials.meta similarity index 67% rename from IronToad_UnityProject/Assets/Sound/SFX.meta rename to IronToad_UnityProject/Assets/Art/Models/huts/Materials.meta index 5548a6b..98d322d 100644 --- a/IronToad_UnityProject/Assets/Sound/SFX.meta +++ b/IronToad_UnityProject/Assets/Art/Models/huts/Materials.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: de5a3adcedb96f64183518ac89622ade +guid: bc23e5aa55c7f5a49bb30f2e18cc71d3 folderAsset: yes -timeCreated: 1485006712 +timeCreated: 1485006718 licenseType: Free DefaultImporter: userData: diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_C.png b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_C.png new file mode 100644 index 0000000..d4505d7 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_C.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_C.png.meta b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_C.png.meta new file mode 100644 index 0000000..be2f1e9 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_C.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 3adcd496a3ebedc4bbebcaf78eca403d +timeCreated: 1485006806 +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/huts/Materials/huts_toSculpt_unwrapChekcerShader_D.png b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_D.png new file mode 100644 index 0000000..ca04d0d Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_D.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_D.png.meta b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_D.png.meta new file mode 100644 index 0000000..c71f628 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_D.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: 5d5a9361bdc7aa0459415048f1435acd +timeCreated: 1485006806 +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/huts/Materials/huts_toSculpt_unwrapChekcerShader_N.png b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_N.png new file mode 100644 index 0000000..9810f0e Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_N.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_N.png.meta b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_N.png.meta new file mode 100644 index 0000000..30fefb7 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/huts_toSculpt_unwrapChekcerShader_N.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: e2a878dc2de9506488996853f6df58dd +timeCreated: 1485006806 +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: 16 + 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/Models/huts/Materials/mat_hut.mat b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat new file mode 100644 index 0000000..8565014 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat.meta b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat.meta new file mode 100644 index 0000000..fbe3747 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/Materials/mat_hut.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40767ad5ca43cfa469d7e4e432aa5d00 +timeCreated: 1485006718 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/huthut1.fbx b/IronToad_UnityProject/Assets/Art/Models/huts/huthut1.fbx new file mode 100644 index 0000000..639cc91 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/huthut1.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/huthut1.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/huts/huthut1.fbx.meta new file mode 100644 index 0000000..46b919a --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/huthut1.fbx.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 9b4654684229cea458657f6333fa5598 +timeCreated: 1485006718 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: hut1 + 9500000: //RootNode + 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: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/huthut2.fbx b/IronToad_UnityProject/Assets/Art/Models/huts/huthut2.fbx new file mode 100644 index 0000000..0fc55fb Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/huthut2.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/huthut2.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/huts/huthut2.fbx.meta new file mode 100644 index 0000000..a5c08d5 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/huthut2.fbx.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 76baae564aea84041b01935489d4e46a +timeCreated: 1485006718 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: hut2 + 9500000: //RootNode + 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: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/huthut3.fbx b/IronToad_UnityProject/Assets/Art/Models/huts/huthut3.fbx new file mode 100644 index 0000000..45103af Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/huts/huthut3.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/huts/huthut3.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/huts/huthut3.fbx.meta new file mode 100644 index 0000000..58a95ad --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/huts/huthut3.fbx.meta @@ -0,0 +1,81 @@ +fileFormatVersion: 2 +guid: 1fe506f705dc80d4391efa4e8425159d +timeCreated: 1485006718 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: hut3 + 9500000: //RootNode + 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: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/light-cone-model.fbx b/IronToad_UnityProject/Assets/Art/Models/light-cone-model.fbx new file mode 100644 index 0000000..eb31359 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/light-cone-model.fbx differ diff --git a/IronToad_UnityProject/Assets/Art/Models/light-cone-model.fbx.meta b/IronToad_UnityProject/Assets/Art/Models/light-cone-model.fbx.meta new file mode 100644 index 0000000..e731400 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/light-cone-model.fbx.meta @@ -0,0 +1,80 @@ +fileFormatVersion: 2 +guid: 8c470e98dc147443d845ae84dffb6d9b +timeCreated: 1485007272 +licenseType: Pro +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: pCone5 + 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/lightHouse_LOW.obj.meta b/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta new file mode 100644 index 0000000..d94fc60 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 919eb0dba9aa0da44aec3a80f1cf98ea +timeCreated: 1485000000 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: lighthouse + 100002: //RootNode + 400000: lighthouse + 400002: //RootNode + 2300000: lighthouse + 3300000: lighthouse + 4300000: lighthouse + 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/pier.obj.meta b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta new file mode 100644 index 0000000..92a0183 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/pier.obj.meta @@ -0,0 +1,82 @@ +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/pier.prefab b/IronToad_UnityProject/Assets/Art/Models/pier.prefab new file mode 100644 index 0000000..580c402 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/pier.prefab differ diff --git a/IronToad_UnityProject/Assets/Art/Models/pier.prefab.meta b/IronToad_UnityProject/Assets/Art/Models/pier.prefab.meta new file mode 100644 index 0000000..328e389 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/pier.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f9849153128e444ca020e95f5ac94d6 +timeCreated: 1485008869 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_C.png b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_C.png new file mode 100644 index 0000000..3e255b0 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_C.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_C.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_C.png.meta new file mode 100644 index 0000000..9c3dffd --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_C.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: e421c761da7000c4a90c0fca796ee055 +timeCreated: 1485008694 +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/pier_Low_pierMat_D.png b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_D.png new file mode 100644 index 0000000..d653044 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_D.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_D.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_D.png.meta new file mode 100644 index 0000000..23cd1cd --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_D.png.meta @@ -0,0 +1,68 @@ +fileFormatVersion: 2 +guid: a6411944ca55ba44aa93607c9bdde174 +timeCreated: 1485008694 +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/pier_Low_pierMat_N.png b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_N.png new file mode 100644 index 0000000..727f474 Binary files /dev/null and b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_N.png differ diff --git a/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_N.png.meta b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_N.png.meta new file mode 100644 index 0000000..5cb66c7 --- /dev/null +++ b/IronToad_UnityProject/Assets/Art/Models/textures/pier_Low_pierMat_N.png.meta @@ -0,0 +1,76 @@ +fileFormatVersion: 2 +guid: 73e1d65ebae96e746bef845e6e547357 +timeCreated: 1485008694 +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/BansheeGz/BGCurve/Examples/Materials/BGTestLineRendererCheckerBox.mat b/IronToad_UnityProject/Assets/BansheeGz/BGCurve/Examples/Materials/BGTestLineRendererCheckerBox.mat index 7eb7c60..3417e9c 100644 Binary files a/IronToad_UnityProject/Assets/BansheeGz/BGCurve/Examples/Materials/BGTestLineRendererCheckerBox.mat and b/IronToad_UnityProject/Assets/BansheeGz/BGCurve/Examples/Materials/BGTestLineRendererCheckerBox.mat differ diff --git a/IronToad_UnityProject/Assets/New Terrain 1.asset b/IronToad_UnityProject/Assets/New Terrain 1.asset index 7ab83cb..4b56277 100644 Binary files a/IronToad_UnityProject/Assets/New Terrain 1.asset and b/IronToad_UnityProject/Assets/New Terrain 1.asset differ diff --git a/IronToad_UnityProject/Assets/Prefabs/Spotlight.prefab b/IronToad_UnityProject/Assets/Prefabs/Spotlight.prefab new file mode 100644 index 0000000..81738e2 Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/Spotlight.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/Spotlight.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/Spotlight.prefab.meta new file mode 100644 index 0000000..eb87b60 --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/Spotlight.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d81d1b6be27a45b9a4e899d392721f4 +timeCreated: 1485010473 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Prefabs/light-cone.prefab b/IronToad_UnityProject/Assets/Prefabs/light-cone.prefab new file mode 100644 index 0000000..31418d8 Binary files /dev/null and b/IronToad_UnityProject/Assets/Prefabs/light-cone.prefab differ diff --git a/IronToad_UnityProject/Assets/Prefabs/light-cone.prefab.meta b/IronToad_UnityProject/Assets/Prefabs/light-cone.prefab.meta new file mode 100644 index 0000000..937e7d6 --- /dev/null +++ b/IronToad_UnityProject/Assets/Prefabs/light-cone.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e78aa7f3018974a6fb386ecc8bfbb91a +timeCreated: 1485011269 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/AlertController.cs b/IronToad_UnityProject/Assets/Scripts/AlertController.cs new file mode 100644 index 0000000..605023d --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/AlertController.cs @@ -0,0 +1,56 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class AlertController : MonoBehaviour +{ + public Text text; + public Slider slider; + public float hideTime = 5f; + + private Vector3 originalPos; + private float lastSpotted; + + void Start () + { + NotificationServer.register("spotted boat", spottedBoat); + NotificationServer.register("lost boat", lostBoat); + originalPos = text.rectTransform.anchoredPosition3D; + } + + public void spottedBoat() + { + LeanTween.cancel(text.gameObject, false); + LeanTween.cancel(slider.gameObject, false); + lastSpotted = Time.timeSinceLevelLoad; + NotificationServer.notify("show AlertText"); + text.text = "hide!"; + setTimer(0f); + } + + public void lostBoat() + { + LeanTween.cancel(text.gameObject, false); + LeanTween.cancel(slider.gameObject, false); + NotificationServer.notify("show AlertText"); + NotificationServer.notify("show AlertTimer"); + text.text = "stay hidden"; + LeanTween.value(slider.gameObject, 0f, 1f, hideTime).setOnUpdate((float val)=>{ + setTimer(val); + }).setOnComplete(()=>{ + NotificationServer.notify("hide AlertTimer"); + NotificationServer.notify("statechange Searchlight returning"); + + text.text = "hidden..."; + LeanTween.delayedCall(text.gameObject, 2f, ()=>{ + NotificationServer.notify("hide AlertText"); + }); + }); + } + + public void setTimer(float val) + { + slider.value = val; + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/AlertController.cs.meta b/IronToad_UnityProject/Assets/Scripts/AlertController.cs.meta new file mode 100644 index 0000000..efb9868 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/AlertController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 89a715dd2260f413b89b4b9cdb979f3c +timeCreated: 1485005279 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Lighthouse.cs b/IronToad_UnityProject/Assets/Scripts/Lighthouse.cs similarity index 59% rename from IronToad_UnityProject/Assets/Lighthouse.cs rename to IronToad_UnityProject/Assets/Scripts/Lighthouse.cs index b7b2347..256ecf8 100644 --- a/IronToad_UnityProject/Assets/Lighthouse.cs +++ b/IronToad_UnityProject/Assets/Scripts/Lighthouse.cs @@ -15,12 +15,15 @@ public class Lighthouse : MonoBehaviour public AnimationCurve animationCurve; private BGCcCursor splineCursor; + private BGCcCursorObjectTranslate splineObjectTranslate; private int targetPoint = 0; private bool reverseDirection = false; + private bool midpoint = false; void Start() { splineCursor = splineCurve.GetComponent(); + splineObjectTranslate = splineCurve.GetComponent(); if (splineDistantPoints == null || splineDistantPoints.Count == 0) { @@ -36,6 +39,8 @@ public class Lighthouse : MonoBehaviour } splineCursor.Distance = 0f; moveToNextPoint(); + + NotificationServer.register("statechange Searchlight", searchlightStateChanged); } public void moveToNextPoint() @@ -59,12 +64,44 @@ public class Lighthouse : MonoBehaviour } } + midpoint = true; float start = splineCursor.Distance; float end = splineDistantPoints[targetPoint]; float distance = Mathf.Abs(end - start); LeanTween.value(gameObject, start, end, distance / speed + timePadding).setOnUpdate((float val)=>{ splineCursor.Distance = val; - }).setEase(animationCurve).setOnComplete(moveToNextPoint); + }).setEase(animationCurve).setOnComplete(()=>{ + midpoint = false; + moveToNextPoint(); + }); }); } + + public void searchlightStateChanged() + { + LeanTween.cancel(gameObject, false); + if (Searchlight.state == Searchlight.SearchState.Chasing) + { + splineObjectTranslate.enabled = false; + } + else if (Searchlight.state == Searchlight.SearchState.Returning) + { + splineObjectTranslate.enabled = false; + Vector3 start = splineObjectTranslate.ObjectToManipulate.position; + Vector3 end = splineCursor.CalculatePosition(); + float distance = (end - start).magnitude; + LeanTween.move(splineObjectTranslate.ObjectToManipulate.gameObject, end, distance / speed + timePadding).setEase(animationCurve).setOnComplete(()=>{ + splineObjectTranslate.enabled = true; + if (midpoint) + { + if (reverseDirection) + targetPoint++; + else + targetPoint--; + } + moveToNextPoint(); + NotificationServer.notify("statechange Searchlight safe"); + }); + } + } } diff --git a/IronToad_UnityProject/Assets/Lighthouse.cs.meta b/IronToad_UnityProject/Assets/Scripts/Lighthouse.cs.meta similarity index 100% rename from IronToad_UnityProject/Assets/Lighthouse.cs.meta rename to IronToad_UnityProject/Assets/Scripts/Lighthouse.cs.meta diff --git a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs new file mode 100644 index 0000000..f113fae --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs @@ -0,0 +1,115 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Searchlight : MonoBehaviour +{ + public enum SearchState + { + Spline, + Chasing, + Returning + } + + public float speed = 500f; + public float timePadding = 0.5f; + public float timeBetweenChase = 0.5f; + public float randomFactor = 50f; + public AnimationCurve animationCurve; + + [HideInInspector] + public bool isTriggering = false; + public static SearchState state = SearchState.Spline; + public static Collider chased; + + private static List instants = new List(); + + public static bool isTriggeringAtLeastOne() + { + foreach (Searchlight sl in instants) + { + if (sl.isTriggering) + return true; + } + return false; + } + + void Awake() + { + NotificationServer.register("statechange Searchlight", stateChanged); + NotificationServer.register("statechange Searchlight safe", stateSafe); + NotificationServer.register("statechange Searchlight returning", stateReturning); + if (!instants.Contains(this)) + instants.Add(this); + + } + + void OnTriggerEnter(Collider other) + { + if (other.tag != "Player") + return; + chased = other; + isTriggering = true; + if (state != SearchState.Chasing) + { + state = SearchState.Chasing; + NotificationServer.notify("statechange Searchlight"); + NotificationServer.notify("chasing boat"); + } + NotificationServer.notify("spotted boat"); + } + + void OnTriggerExit(Collider other) + { + if (other.tag != "Player") + return; + isTriggering = false; + if (state == SearchState.Chasing && !isTriggeringAtLeastOne()) + { +// chased = null; +// state = SearchState.Returning; +// NotificationServer.notify("statechange Searchlight"); + NotificationServer.notify("lost boat"); + } + } + + public void stateSafe() + { + state = SearchState.Spline; +// NotificationServer.notify("statechange Searchlight"); + } + + public void stateReturning() + { + state = SearchState.Returning; + NotificationServer.notify("statechange Searchlight"); + } + + public void stateChanged() + { + LeanTween.cancel(gameObject, false); + if (state == SearchState.Chasing) + LeanTween.move(gameObject, chased.transform.position, 0.5f).setEase(animationCurve).setOnComplete(chase); + } + + public void chase() + { + if (isTriggering) + { + LeanTween.delayedCall(gameObject, timeBetweenChase, chase); + } + else + { + LeanTween.delayedCall(gameObject, timeBetweenChase, ()=>{ + Vector3 start = transform.position; + Vector3 end = chased.transform.position + + Vector3.right * Random.Range(-randomFactor, randomFactor) + + Vector3.forward * Random.Range(-randomFactor, randomFactor); + float distance = (end - start).magnitude; + LeanTween.value(gameObject, 0f, 1f, distance / speed + timePadding).setOnUpdate((float val)=>{ + transform.position = start + (end-start)*val; + }).setEase(animationCurve).setOnComplete(chase); + }); + } + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/Searchlight.cs.meta b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs.meta new file mode 100644 index 0000000..d66b18e --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/Searchlight.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 51b93e628614140229e5d1f43186a375 +timeCreated: 1484985371 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs new file mode 100644 index 0000000..adf5328 --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs @@ -0,0 +1,20 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TestMoveController : MonoBehaviour +{ + public float speed = 100f; + + void Update () + { + if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow)) + transform.Translate(Vector3.back * Time.deltaTime * speed); + if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow)) + transform.Translate(Vector3.left * Time.deltaTime * speed); + if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow)) + transform.Translate(Vector3.forward * Time.deltaTime * speed); + if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow)) + transform.Translate(Vector3.right * Time.deltaTime * speed); + } +} diff --git a/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs.meta b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs.meta new file mode 100644 index 0000000..3331dbe --- /dev/null +++ b/IronToad_UnityProject/Assets/Scripts/TestMoveController.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 89a55db40871a4d4c920b5f69d6bfc03 +timeCreated: 1484997652 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs index 16c2886..5e7c4b1 100644 --- a/IronToad_UnityProject/Assets/Scripts/UIPanel.cs +++ b/IronToad_UnityProject/Assets/Scripts/UIPanel.cs @@ -30,6 +30,7 @@ public class UIPanel : MonoBehaviour private RectTransform rectTransform; private CanvasGroup canvasGroup; private Vector3 originalPos; + private bool isShowing = false; void Awake () { @@ -58,10 +59,13 @@ public class UIPanel : MonoBehaviour setShowState(); else setHideState(); + pauseGame(); } public void showPanel() { +// if (isShowing) +// return; float startAlpha = 0f; float endAlpha = 1f; Vector3 startPos = originalPos; @@ -92,11 +96,13 @@ public class UIPanel : MonoBehaviour canvasGroup.alpha = startAlpha + (endAlpha-startAlpha)*fadeCurve.Evaluate(val); rectTransform.anchoredPosition3D = startPos + (endPos-startPos)*showCurve.Evaluate(val); transform.localScale = startScale + (endScale-startScale)*showCurve.Evaluate(val); - }).setOnComplete(setShowState); + }).setOnComplete(setShowState).setIgnoreTimeScale(true); } public void hidePanel() { +// if (!isShowing) +// return; float startAlpha = 1f; float endAlpha = 0f; Vector3 startPos = originalPos; @@ -127,7 +133,7 @@ public class UIPanel : MonoBehaviour canvasGroup.alpha = startAlpha + (endAlpha-startAlpha)*fadeCurve.Evaluate(val); rectTransform.anchoredPosition3D = startPos + (endPos-startPos)*hideCurve.Evaluate(val); transform.localScale = startScale + (endScale-startScale)*hideCurve.Evaluate(val); - }).setOnComplete(setHideState); + }).setOnComplete(setHideState).setIgnoreTimeScale(true); } public void setShowState() @@ -137,6 +143,7 @@ public class UIPanel : MonoBehaviour canvasGroup.alpha = 1f; rectTransform.anchoredPosition3D = originalPos; transform.localScale = Vector3.one; + isShowing = true; } public void setHideState() @@ -144,6 +151,7 @@ public class UIPanel : MonoBehaviour canvasGroup.interactable = false; canvasGroup.blocksRaycasts = false; canvasGroup.alpha = 0f; + isShowing = false; } public void quitApplication() @@ -154,5 +162,16 @@ public class UIPanel : MonoBehaviour public void startGame() { NotificationServer.notify("show GameUI"); + unpauseGame(); + } + + public void pauseGame() + { + Time.timeScale = 0f; + } + + public void unpauseGame() + { + Time.timeScale = 1f; } } diff --git a/IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb b/IronToad_UnityProject/Assets/Standard Assets/Utility.meta similarity index 57% rename from IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb rename to IronToad_UnityProject/Assets/Standard Assets/Utility.meta index c6dafb0..17922e6 100644 --- a/IronToad_UnityProject/Assets/Sound.meta~33da7c3282ca6f5c80ab157e88e7a3f2b299d2eb +++ b/IronToad_UnityProject/Assets/Standard Assets/Utility.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 0fbabcae9313543ffbf1429aeac3664d +guid: 4539eb30e895bbb41b5eae6df2dde978 folderAsset: yes -timeCreated: 1484963877 -licenseType: Free +timeCreated: 1436977288 +licenseType: Pro DefaultImporter: userData: assetBundleName: diff --git a/IronToad_UnityProject/Assets/Standard Assets/Utility/SmoothFollow.cs b/IronToad_UnityProject/Assets/Standard Assets/Utility/SmoothFollow.cs new file mode 100644 index 0000000..01881dc --- /dev/null +++ b/IronToad_UnityProject/Assets/Standard Assets/Utility/SmoothFollow.cs @@ -0,0 +1,61 @@ +using UnityEngine; + +namespace UnityStandardAssets.Utility +{ + public class SmoothFollow : MonoBehaviour + { + + // The target we are following + [SerializeField] + private Transform target; + // The distance in the x-z plane to the target + [SerializeField] + private float distance = 10.0f; + // the height we want the camera to be above the target + [SerializeField] + private float height = 5.0f; + + [SerializeField] + private float rotationDamping; + [SerializeField] + private float heightDamping; + + // Use this for initialization + void Start() { } + + // Update is called once per frame + void LateUpdate() + { + // Early out if we don't have a target + if (!target) + return; + + // Calculate the current rotation angles + var wantedRotationAngle = target.eulerAngles.y; + var wantedHeight = target.position.y + height; + + var currentRotationAngle = transform.eulerAngles.y; + var currentHeight = transform.position.y; + + // Damp the rotation around the y-axis + currentRotationAngle = Mathf.LerpAngle(currentRotationAngle, wantedRotationAngle, rotationDamping * Time.deltaTime); + + // Damp the height + currentHeight = Mathf.Lerp(currentHeight, wantedHeight, heightDamping * Time.deltaTime); + + // Convert the angle into a rotation + var currentRotation = Quaternion.Euler(0, currentRotationAngle, 0); + + // Set the position of the camera on the x-z plane to: + // distance meters behind the target + transform.position = target.position; + transform.position -= currentRotation * Vector3.forward * distance; + + // Set the height of the camera + transform.position = new Vector3(transform.position.x ,currentHeight , transform.position.z); + + // Always look at the target + transform.LookAt(target); + } + } +} \ No newline at end of file diff --git a/IronToad_UnityProject/Assets/Standard Assets/Utility/SmoothFollow.cs.meta b/IronToad_UnityProject/Assets/Standard Assets/Utility/SmoothFollow.cs.meta new file mode 100644 index 0000000..8e0ee92 --- /dev/null +++ b/IronToad_UnityProject/Assets/Standard Assets/Utility/SmoothFollow.cs.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f76806479d916a64aa03f8e3eba7912f +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: diff --git a/IronToad_UnityProject/Assets/Textures.meta b/IronToad_UnityProject/Assets/Textures.meta deleted file mode 100644 index ffdd440..0000000 --- a/IronToad_UnityProject/Assets/Textures.meta +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 47507ca..0000000 --- a/IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta +++ /dev/null @@ -1,9 +0,0 @@ -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 e4a6330..7307103 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 adf24cc..a971ab3 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 0056219..faf0bbc 100644 Binary files a/IronToad_UnityProject/Assets/water/Water.mat and b/IronToad_UnityProject/Assets/water/Water.mat differ