Browse Source

Added rock material

master
Joshua Reason 7 years ago
parent
commit
9dabc30e3b
32 changed files with 405 additions and 92 deletions
  1. BIN
      IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat
  2. +8
    -0
      IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta
  3. BIN
      IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat
  4. +8
    -0
      IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta
  5. BIN
      IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png
  6. +76
    -0
      IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta
  7. BIN
      IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat
  8. +8
    -0
      IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta
  9. +8
    -8
      IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta
  10. +0
    -82
      IronToad_UnityProject/Assets/Art/Models/pier.obj.meta
  11. BIN
      IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png
  12. +68
    -0
      IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta
  13. BIN
      IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png
  14. +68
    -0
      IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta
  15. BIN
      IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png
  16. +76
    -0
      IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta
  17. BIN
      IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat
  18. BIN
      IronToad_UnityProject/Assets/Art/particle effects/splash.prefab
  19. +8
    -0
      IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta
  20. BIN
      IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab
  21. +8
    -0
      IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta
  22. BIN
      IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab
  23. +8
    -0
      IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta
  24. +16
    -2
      IronToad_UnityProject/Assets/Scripts/Boulder.cs
  25. +9
    -0
      IronToad_UnityProject/Assets/Sound.meta
  26. +9
    -0
      IronToad_UnityProject/Assets/Sound/Music.meta
  27. +9
    -0
      IronToad_UnityProject/Assets/Sound/SFX.meta
  28. +9
    -0
      IronToad_UnityProject/Assets/Textures.meta
  29. +9
    -0
      IronToad_UnityProject/Assets/_Scenes/GreyBox_Prototype.meta
  30. BIN
      IronToad_UnityProject/Assets/water/planeWater.prefab
  31. BIN
      IronToad_UnityProject/ProjectSettings/QualitySettings.asset
  32. BIN
      IronToad_UnityProject/ProjectSettings/TagManager.asset

BIN
IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat View File


+ 8
- 0
IronToad_UnityProject/Assets/Art/Models/Materials/Group48238Mat.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a9ac0ea32767bfe42aa7ce6753104e25
timeCreated: 1485053650
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat View File


+ 8
- 0
IronToad_UnityProject/Assets/Art/Models/Materials/mat_rockBoulder.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 17ee00c36b59c344e83556e5bed577b6
timeCreated: 1485052411
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png View File

Before After
Width: 512  |  Height: 512  |  Size: 11 KiB

+ 76
- 0
IronToad_UnityProject/Assets/Art/Models/Materials/textures/circle-MAT.png.meta View File

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

BIN
IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat View File


+ 8
- 0
IronToad_UnityProject/Assets/Art/Models/Materials/textures/splash-sprite.mat.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: eb66aff512dcb4d07a63d2a8ecd24bde
timeCreated: 1485051885
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

IronToad_UnityProject/Assets/Art/Models/lightHouse_LOW.obj.meta → IronToad_UnityProject/Assets/Art/Models/catapult_rock.OBJ.meta View File

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

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

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

BIN
IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png View File

Before After
Width: 256  |  Height: 256  |  Size: 32 KiB

+ 68
- 0
IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_C.png.meta View File

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

BIN
IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png View File

Before After
Width: 256  |  Height: 256  |  Size: 30 KiB

+ 68
- 0
IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_D.png.meta View File

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

BIN
IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png View File

Before After
Width: 256  |  Height: 256  |  Size: 76 KiB

+ 76
- 0
IronToad_UnityProject/Assets/Art/Models/textures/low_rock_default_N.png.meta View File

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

BIN
IronToad_UnityProject/Assets/Art/particle effects/fog-mat.mat View File


BIN
IronToad_UnityProject/Assets/Art/particle effects/splash.prefab View File


+ 8
- 0
IronToad_UnityProject/Assets/Art/particle effects/splash.prefab.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 15855eec8f44a48169b15f54f2988b2e
timeCreated: 1485052510
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab View File


+ 8
- 0
IronToad_UnityProject/Assets/Prefabs/catapult-projectile.prefab.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ff24e35626d4349e7be883de5e03e5b1
timeCreated: 1485036737
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab View File


+ 8
- 0
IronToad_UnityProject/Assets/Prefabs/catapultExplosion.prefab.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 93e56074113fd4131820ce9d0c7d6a77
timeCreated: 1485040026
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

+ 16
- 2
IronToad_UnityProject/Assets/Scripts/Boulder.cs View File

@ -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);
}
}
}

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

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

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

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

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

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

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

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

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

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

BIN
IronToad_UnityProject/Assets/water/planeWater.prefab View File


BIN
IronToad_UnityProject/ProjectSettings/QualitySettings.asset View File


BIN
IronToad_UnityProject/ProjectSettings/TagManager.asset View File


Loading…
Cancel
Save