-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/PA_Tweaks' into dev
# Conflicts: # ProjectSettings/TagManager.asset
- Loading branch information
Showing
24 changed files
with
1,000 additions
and
482 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| %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: Bolt | ||
| m_Shader: {fileID: 202, guid: 0000000000000000f000000000000000, type: 0} | ||
| m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION | ||
| m_LightmapFlags: 1 | ||
| m_CustomRenderQueue: -1 | ||
| stringTagMap: {} | ||
| m_SavedProperties: | ||
| serializedVersion: 2 | ||
| m_TexEnvs: | ||
| - first: | ||
| name: _BumpMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailAlbedoMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailMask | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _DetailNormalMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _EmissionMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _MainTex | ||
| second: | ||
| m_Texture: {fileID: 2800000, guid: 917df88c3872d05428ad7d65fc2e64a2, type: 3} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _MetallicGlossMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _OcclusionMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| - first: | ||
| name: _ParallaxMap | ||
| second: | ||
| m_Texture: {fileID: 0} | ||
| m_Scale: {x: 1, y: 1} | ||
| m_Offset: {x: 0, y: 0} | ||
| m_Floats: | ||
| - first: | ||
| name: _BumpScale | ||
| second: 1 | ||
| - first: | ||
| name: _Cutoff | ||
| second: 0.5 | ||
| - first: | ||
| name: _DetailNormalMapScale | ||
| second: 1 | ||
| - first: | ||
| name: _DstBlend | ||
| second: 10 | ||
| - first: | ||
| name: _GlossMapScale | ||
| second: 1 | ||
| - first: | ||
| name: _Glossiness | ||
| second: 0.5 | ||
| - first: | ||
| name: _GlossyReflections | ||
| second: 1 | ||
| - first: | ||
| name: _InvFade | ||
| second: 1 | ||
| - first: | ||
| name: _Metallic | ||
| second: 0 | ||
| - first: | ||
| name: _Mode | ||
| second: 3 | ||
| - first: | ||
| name: _OcclusionStrength | ||
| second: 1 | ||
| - first: | ||
| name: _Parallax | ||
| second: 0.02 | ||
| - first: | ||
| name: _SmoothnessTextureChannel | ||
| second: 0 | ||
| - first: | ||
| name: _SpecularHighlights | ||
| second: 1 | ||
| - first: | ||
| name: _SrcBlend | ||
| second: 1 | ||
| - first: | ||
| name: _UVSec | ||
| second: 0 | ||
| - first: | ||
| name: _ZWrite | ||
| second: 0 | ||
| m_Colors: | ||
| - first: | ||
| name: _Color | ||
| second: {r: 1, g: 1, b: 1, a: 1} | ||
| - first: | ||
| name: _EmissionColor | ||
| second: {r: 0, g: 0, b: 0, a: 1} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.