Commit f87ac405 authored by kgingras's avatar kgingras
Browse files

updated arena, CC, weapons and animations

parent 33729f32
fileFormatVersion: 2
guid: 272a6d36e93246146a690943583f87f1
timeCreated: 1455080187
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: db8a09106860ec64e8bf022596743969
timeCreated: 1455063631
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6ef64c5d32228714db3376d02f7236a6
timeCreated: 1455063799
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 2e189d282854d6f46b5e722eb23f5846
timeCreated: 1455156507
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -16,7 +16,7 @@
SubShader
{
Tags { "RenderType"="Opaque" }
Tags { "RenderType"="Diffuse" }
CGPROGRAM
#pragma surface surf Lambert
......
fileFormatVersion: 2
guid: 05cb529720a6c5c4097a458ce2f99cfb
timeCreated: 1455173193
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 649e860017079824bbc23d028d620f07
timeCreated: 1455161390
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
Shader "Custom/HeightDependentTintSF"
{
Properties
{
_MainTex ("Base (RGB)", 2D) = "white" {}
_HeightMin ("Height Min", Float) = -1
_HeightMax ("Height Max", Float) = 1
_ColorMin ("Tint Color At Min", Color) = (0,0,0,1)
_ColorLowQuart ("Tint Color At Low quarter", Color) = (1,1,1,1)
_ColorMid ("Tint Color At Mid", Color) = (1,1,1,1)
_ColorHighQuart ("Tint Color At High quarter", Color) = (1,1,1,1)
_ColorMax ("Tint Color At Max", Color) = (1,1,1,1)
}
SubShader
{
Tags { "RenderType"="Diffuse" }
CGPROGRAM
#pragma surface surf Lambert
sampler2D _MainTex;
fixed4 _ColorMin;
fixed4 _ColorMax;
fixed4 _ColorMid;
fixed4 _ColorLowQuart;
fixed4 _ColorHighQuart;
float _HeightMin;
float _HeightMax;
fixed4 tintColor;
struct Input
{
float2 uv_MainTex;
float3 worldPos;
};
void surf (Input IN, inout SurfaceOutput o)
{
half4 c = tex2D (_MainTex, IN.uv_MainTex);
// float h = (_HeightMax-IN.worldPos.y) / (_HeightMax-_HeightMin);
if(IN.worldPos.z<_HeightMax/4){
tintColor = lerp(_ColorLowQuart.rgba, _ColorMin.rgba, ((_HeightMax/4)-IN.worldPos.z) / ((_HeightMax/4)-_HeightMin));
}
else if(IN.worldPos.z<_HeightMax/2){
tintColor = lerp(_ColorMid.rgba, _ColorLowQuart.rgba, ((_HeightMax/2)-IN.worldPos.z) / ((_HeightMax/2)-_HeightMax/4));
}
else if(IN.worldPos.z<_HeightMax*3/4){
tintColor = lerp(_ColorHighQuart.rgba, _ColorMid.rgba, ((_HeightMax*3/4)-IN.worldPos.z) / ((_HeightMax*3/4)-(_HeightMax/2)));
}
else{
tintColor = lerp(_ColorMax.rgba, _ColorHighQuart.rgba, (_HeightMax-IN.worldPos.z) / (_HeightMax-(_HeightMax*3/4)));
}
// tintColor = ((h /_HeightMax) * 255, 1, (h /_HeightMax) * 255, 1.0);
o.Albedo = c.rgb * tintColor.rgb;
o.Alpha = c.a * tintColor.a;
}
ENDCG
}
Fallback "Diffuse"
}
fileFormatVersion: 2
guid: 93e87162b18c7bf4a8a65ca6093e98be
timeCreated: 1455161268
licenseType: Free
ShaderImporter:
defaultTextures: []
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9d96d18a2b8b8014b86781ebdccf4cbc
timeCreated: 1454988862
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 9dee7201bd1175f4d87a8eb6d0903b45
timeCreated: 1455155560
licenseType: Free
SubstanceImporter:
serializedVersion: 5
materialInstances:
- serializedVersion: 16
name: metal_plate_008
prototypeName: metal_plate_008
shader: {instanceID: 0}
shaderKeywords:
shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
shaderKeywords: _NORMALMAP _PARALLAXMAP _SPECGLOSSMAP
renderQueue: -1
lightmapFlags: 5
inputs: []
inputs:
- name: $normalformat
value:
scalar[0]: 0
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: $outputsize
value:
scalar[0]: 8
scalar[1]: 8
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: $randomseed
value:
scalar[0]: 0
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Depth
value:
scalar[0]: 0
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Relief_Balance
value:
scalar[0]: 32
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Normal
value:
scalar[0]: .5
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Emboss
value:
scalar[0]: .5
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Light_Angle
value:
scalar[0]: .125
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Hue_Shift
value:
scalar[0]: 0
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Saturation
value:
scalar[0]: .5
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Luminosity
value:
scalar[0]: .5
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Contrast
value:
scalar[0]: 0
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Rust
value:
scalar[0]: .5
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Metal_Rust_Drips
value:
scalar[0]: 1
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Rivet_Rust_Drips
value:
scalar[0]: 1
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Peeling
value:
scalar[0]: .5
scalar[1]: 0
scalar[2]: 0
scalar[3]: 0
texture: {instanceID: 0}
- name: Paint_Color
value:
scalar[0]: .835200012
scalar[1]: .450899988
scalar[2]: .35679999
scalar[3]: 0
texture: {instanceID: 0}
- name: Metal_Color
value:
scalar[0]: .372500002
scalar[1]: .360700011
scalar[2]: .352899998
scalar[3]: 0
texture: {instanceID: 0}
- name: Rust_Color
value:
scalar[0]: .286300004
scalar[1]: .168599993
scalar[2]: .101999998
scalar[3]: 0
texture: {instanceID: 0}
materialInformation:
serializedVersion: 5
offset: {x: 0, y: 0}
......@@ -20,9 +155,128 @@ SubstanceImporter:
animationUpdateRate: 0
materialProperties:
serializedVersion: 2
texEnvs: {}
floats: {}
colors: {}
texEnvs:
data:
first:
name: _MainTex
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _BumpMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _DetailNormalMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _EmissionMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _ParallaxMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _DetailMask
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _DetailAlbedoMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _OcclusionMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
data:
first:
name: _SpecGlossMap
second:
texture: {instanceID: 0}
scale: {x: 1, y: 1}
offset: {x: 0, y: 0}
floats:
data:
first:
name: _SrcBlend
second: 1
data:
first:
name: _DstBlend
second: 0
data:
first:
name: _Cutoff
second: .5
data:
first:
name: _Parallax
second: .0199999996
data:
first:
name: _ZWrite
second: 1
data:
first:
name: _Glossiness
second: .5
data:
first:
name: _BumpScale
second: 1
data:
first:
name: _OcclusionStrength
second: 1
data:
first:
name: _DetailNormalMapScale
second: 1
data:
first:
name: _UVSec
second: 0
data:
first:
name: _Mode
second: 0
colors:
data:
first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
data:
first:
name: _Color
second: {r: 0, g: 0, b: 0, a: 1}
data:
first:
name: _SpecColor
second: {r: .200000003, g: .200000003, b: .200000003, a: 1}
textureParameters:
- name: metal_plate_008_Diffuse
alphaSource: 5
......@@ -39,7 +293,28 @@ SubstanceImporter:
filterMode: 1
aniso: 1
wrapMode: 0
textureAssignments: []
- name: metal_plate_008_Height
alphaSource: 0
filterMode: 1
aniso: 1
wrapMode: 0
textureAssignments:
- shaderProp:
name: _MainTex
material: {instanceID: 0}
baseUID: 1954908224
- shaderProp:
name: _BumpMap
material: {instanceID: 0}
baseUID: 1954910816
- shaderProp:
name: _ParallaxMap
material: {instanceID: 0}
baseUID: 1954911128
- shaderProp:
name: _SpecGlossMap
material: {instanceID: 0}
baseUID: 1954911384
buildTargetSettings:
- serializedVersion: 2
buildTarget:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment