Browse Source

Merge

master
Joshua Reason 7 years ago
parent
commit
88320a33bc
13 changed files with 243 additions and 47 deletions
  1. +82
    -0
      IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta
  2. +82
    -0
      IronToad_UnityProject/Assets/Art/Models/pier.obj.meta
  3. BIN
      IronToad_UnityProject/Assets/Art/boat-icon.png
  4. +76
    -0
      IronToad_UnityProject/Assets/Art/boat-icon.png.meta
  5. +3
    -2
      IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs
  6. +0
    -9
      IronToad_UnityProject/Assets/Sound.meta
  7. +0
    -9
      IronToad_UnityProject/Assets/Sound/Music.meta
  8. +0
    -9
      IronToad_UnityProject/Assets/Sound/SFX.meta
  9. BIN
      IronToad_UnityProject/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLit.mat
  10. +0
    -9
      IronToad_UnityProject/Assets/Textures.meta
  11. +0
    -9
      IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta
  12. BIN
      IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity
  13. BIN
      IronToad_UnityProject/Assets/water/WaterWave.mat

+ 82
- 0
IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta View File

@ -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:

+ 82
- 0
IronToad_UnityProject/Assets/Art/Models/pier.obj.meta View File

@ -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:

BIN
IronToad_UnityProject/Assets/Art/boat-icon.png View File

Before After
Width: 544  |  Height: 577  |  Size: 21 KiB

+ 76
- 0
IronToad_UnityProject/Assets/Art/boat-icon.png.meta View File

@ -0,0 +1,76 @@
fileFormatVersion: 2
guid: 0c63f020ea1c10744b8dc3bd1faef02f
timeCreated: 1485049074
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:

+ 3
- 2
IronToad_UnityProject/Assets/Scripts/CustomSmoothFollow.cs View File

@ -42,14 +42,15 @@ 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);
if (hitInfo.collider.gameObject.layer == layerMask)
isBlocked = true;
}
if (isBlocked)
{
wantedHeight = target.position.y + altHeight;
wantedDistance = target.position.z + altDistance;
wantedPos.y = target.position.y + altHeight;
wantedPos.z = target.position.z + altDistance;
}
float currentHeight = transform.position.y;

+ 0
- 9
IronToad_UnityProject/Assets/Sound.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 844c4f25011b45348a5db5bc5b4f956e
folderAsset: yes
timeCreated: 1485037848
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 9
IronToad_UnityProject/Assets/Sound/Music.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 1715d56e0d2b68246a82993db31014ab
folderAsset: yes
timeCreated: 1485038927
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 9
IronToad_UnityProject/Assets/Sound/SFX.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: de5a3adcedb96f64183518ac89622ade
folderAsset: yes
timeCreated: 1485038927
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Standard Assets/Effects/ToonShading/Materials/ToonLit.mat View File


+ 0
- 9
IronToad_UnityProject/Assets/Textures.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 2a6e699820a38a544acfc0015eb679a2
folderAsset: yes
timeCreated: 1484972317
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 9
IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 338533d5d159c00478a9fb5321b7d922
folderAsset: yes
timeCreated: 1485007190
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.unity View File


BIN
IronToad_UnityProject/Assets/water/WaterWave.mat View File


Loading…
Cancel
Save