Skip to content

Commit

Permalink
Merge pull request #85 from MapleMana/staging
Browse files Browse the repository at this point in the history
v0.1.2
  • Loading branch information
ANDREYDEN committed Jul 6, 2020
2 parents 0b9627b + 2294bcc commit a554973
Show file tree
Hide file tree
Showing 68 changed files with 9,145 additions and 6,100 deletions.
43 changes: 40 additions & 3 deletions Assets/Materials/Wall.mat
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ Material:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
Expand All @@ -35,12 +39,16 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailTex:
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_Texture: {fileID: 10307, guid: 0000000000000000f000000000000000, type: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
Expand All @@ -55,23 +63,52 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _TerrainHolesTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- PixelSnap: 0
- _AO: 2.4
- _BaseLight: 0.35
- _BumpScale: 1
- _Cutoff: 1
- _ColorMask: 16.39
- _Cull: 2
- _Cutoff: 0.119
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _EnableExternalAlpha: 0
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Shininess: 0.078125
- _SmoothnessTextureChannel: 1
- _SpecularHighlights: 0
- _SquashAmount: 1
- _SrcBlend: 1
- _Stencil: 4.09
- _StencilComp: 8.09
- _StencilOp: 77
- _StencilReadMask: 263
- _StencilWriteMask: 285.4
- _UVSec: 0
- _UseUIAlphaClip: 0
- _WindQuality: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.8962264, g: 0.71614003, b: 0.51152545, a: 1}
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 0.8671988, b: 0.7122642, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _Specular: {r: 0, g: 0, b: 0, a: 0}
- _TreeInstanceColor: {r: 1, g: 1, b: 1, a: 1}
- _TreeInstanceScale: {r: 1, g: 1, b: 1, a: 1}
8 changes: 8 additions & 0 deletions Assets/Prefabs/Menus.meta

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

Loading

0 comments on commit a554973

Please sign in to comment.