Skip to content

Commit

Permalink
Tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
keijiro committed Aug 20, 2017
1 parent 9a4534b commit 25b8d73
Show file tree
Hide file tree
Showing 9 changed files with 348 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Blue Particles
m_Name: NoiseBall White
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
Expand Down Expand Up @@ -73,4 +73,4 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0.29519892, g: 1.0973123, b: 3, a: 1}
- _EmissionColor: {r: 4, g: 4, b: 4, a: 1}
9 changes: 9 additions & 0 deletions Assets/Materials/NoiseBall White.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

76 changes: 76 additions & 0 deletions Assets/Materials/Shards Blue.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Shards Blue
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0.13235295, g: 0.5316429, b: 2, a: 1}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Material:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Red Particles
m_Name: Shards Red
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
Expand Down Expand Up @@ -73,4 +73,4 @@ Material:
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 3, g: 0.58413357, b: 0.29519892, a: 1}
- _EmissionColor: {r: 2, g: 0.38942227, b: 0.19679916, a: 1}
File renamed without changes.
6 changes: 3 additions & 3 deletions Assets/Materials/Shards.mat
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.854
- _Glossiness: 0.917
- _GlossyReflections: 1
- _Metallic: 1
- _Mode: 0
Expand All @@ -77,5 +77,5 @@ Material:
- _ZWrite: 1
- orbxUid: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 0.7266436, a: 1}
- _EmissionColor: {r: 12, g: 12, b: 12, a: 1}
- _Color: {r: 1, g: 0.99066937, b: 0.66176474, a: 1}
- _EmissionColor: {r: 1.2, g: 0.105882384, b: 1.0792698, a: 1}
10 changes: 5 additions & 5 deletions Assets/Shards.playable
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ MonoBehaviour:
m_ClipIn: 0
m_Asset: {fileID: 114738965567789350}
m_UnderlyingAsset: {fileID: 114738965567789350}
m_Duration: 5
m_Duration: 27.766666666665998
m_ParentID: 0
m_TimeScale: 1
m_BlendCurve:
Expand Down Expand Up @@ -202,7 +202,7 @@ MonoBehaviour:
m_ClipIn: 0
m_Asset: {fileID: 114592493132684118}
m_UnderlyingAsset: {fileID: 114592493132684118}
m_Duration: 5
m_Duration: 27.766666666666666
m_ParentID: 0
m_TimeScale: 1
m_BlendCurve:
Expand Down Expand Up @@ -310,7 +310,7 @@ MonoBehaviour:
m_ClipIn: 0
m_Asset: {fileID: 114065473311688146}
m_UnderlyingAsset: {fileID: 114065473311688146}
m_Duration: 5
m_Duration: 27.766666666665998
m_ParentID: 0
m_TimeScale: 1
m_BlendCurve:
Expand Down Expand Up @@ -396,7 +396,7 @@ MonoBehaviour:
m_ClipIn: 0
m_Asset: {fileID: 114076964515579302}
m_UnderlyingAsset: {fileID: 114076964515579302}
m_Duration: 5
m_Duration: 27.766666666665998
m_ParentID: 0
m_TimeScale: 1
m_BlendCurve:
Expand Down Expand Up @@ -482,7 +482,7 @@ MonoBehaviour:
m_ClipIn: 0
m_Asset: {fileID: 114341462880728092}
m_UnderlyingAsset: {fileID: 114341462880728092}
m_Duration: 5
m_Duration: 27.766666666665998
m_ParentID: 0
m_TimeScale: 1
m_BlendCurve:
Expand Down
Loading

0 comments on commit 25b8d73

Please sign in to comment.