Skip to content
Snippets Groups Projects
Commit 6ac56b7e authored by mhby1g21's avatar mhby1g21
Browse files

Merge branch 'fixing-git-deleted-files' into 'main'

readd/recommit VRtemplateassets from new vr sample project and changed broken...

See merge request !10
parents f460785a 1a6d87ff
No related branches found
No related tags found
1 merge request!10readd/recommit VRtemplateassets from new vr sample project and changed broken...
Showing
with 59 additions and 55 deletions
...@@ -8,18 +8,17 @@ Material: ...@@ -8,18 +8,17 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Anchor Base m_Name: Anchor Base
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords: []
m_InvalidKeywords:
- _OCCLUSIONMAP - _OCCLUSIONMAP
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
......
...@@ -21,14 +21,15 @@ Material: ...@@ -21,14 +21,15 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Anchor Blue Glow m_Name: Anchor Blue Glow
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _ALPHABLEND_ON
- _EMISSION
m_InvalidKeywords:
- _ALPHAMODULATE_ON - _ALPHAMODULATE_ON
- _SURFACE_TYPE_TRANSPARENT - _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords:
- _EMISSION
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 1 m_DoubleSidedGI: 1
...@@ -121,7 +122,7 @@ Material: ...@@ -121,7 +122,7 @@ Material:
- _DistortionEnabled: 0 - _DistortionEnabled: 0
- _DistortionStrength: 1 - _DistortionStrength: 1
- _DistortionStrengthScaled: 0 - _DistortionStrengthScaled: 0
- _DstBlend: 0 - _DstBlend: 10
- _DstBlendAlpha: 1 - _DstBlendAlpha: 1
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _EnvironmentReflections: 1 - _EnvironmentReflections: 1
...@@ -148,7 +149,7 @@ Material: ...@@ -148,7 +149,7 @@ Material:
- _SoftParticlesNearFadeDistance: 0 - _SoftParticlesNearFadeDistance: 0
- _SpecSource: 0 - _SpecSource: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 2 - _SrcBlend: 5
- _SrcBlendAlpha: 0 - _SrcBlendAlpha: 0
- _Surface: 1 - _Surface: 1
- _UVSec: 0 - _UVSec: 0
......
...@@ -8,12 +8,13 @@ Material: ...@@ -8,12 +8,13 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Blue Anchor Arrow m_Name: Blue Anchor Arrow
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _ALPHABLEND_ON
m_InvalidKeywords:
- _SURFACE_TYPE_TRANSPARENT - _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
......
...@@ -8,19 +8,19 @@ Material: ...@@ -8,19 +8,19 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Concrete Blue m_Name: Concrete Blue
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _METALLICSPECGLOSSMAP - _METALLICGLOSSMAP
- _NORMALMAP - _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords:
- _METALLICSPECGLOSSMAP
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
......
...@@ -8,19 +8,19 @@ Material: ...@@ -8,19 +8,19 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Concrete Grey m_Name: Concrete Grey
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _METALLICSPECGLOSSMAP - _METALLICGLOSSMAP
- _NORMALMAP - _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords:
- _METALLICSPECGLOSSMAP
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
......
...@@ -8,19 +8,18 @@ Material: ...@@ -8,19 +8,18 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Glass m_Name: Glass
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _NORMALMAP - _NORMALMAP
m_InvalidKeywords:
- _SURFACE_TYPE_TRANSPARENT - _SURFACE_TYPE_TRANSPARENT
m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- DepthOnly - DepthOnly
- SHADOWCASTER - SHADOWCASTER
...@@ -97,7 +96,7 @@ Material: ...@@ -97,7 +96,7 @@ Material:
- _Cutoff: 0.5 - _Cutoff: 0.5
- _DetailAlbedoMapScale: 1 - _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1 - _DetailNormalMapScale: 1
- _DstBlend: 10 - _DstBlend: 0
- _DstBlendAlpha: 10 - _DstBlendAlpha: 10
- _EnvironmentReflections: 1 - _EnvironmentReflections: 1
- _GlossMapScale: 1 - _GlossMapScale: 1
...@@ -116,12 +115,12 @@ Material: ...@@ -116,12 +115,12 @@ Material:
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecSource: 0 - _SpecSource: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 5 - _SrcBlend: 1
- _SrcBlendAlpha: 1 - _SrcBlendAlpha: 1
- _Surface: 1 - _Surface: 1
- _UVSec: 0 - _UVSec: 0
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 0 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 0.5019608} - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5019608}
- _Color: {r: 1, g: 1, b: 1, a: 0.5019608} - _Color: {r: 1, g: 1, b: 1, a: 0.5019608}
......
...@@ -8,20 +8,21 @@ Material: ...@@ -8,20 +8,21 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Wall Cut m_Name: Wall Cut
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _METALLICSPECGLOSSMAP - _GLOSSYREFLECTIONS_OFF
- _METALLICGLOSSMAP
- _NORMALMAP - _NORMALMAP
- _PARALLAXMAP - _PARALLAXMAP
m_InvalidKeywords: [] m_InvalidKeywords:
- _METALLICSPECGLOSSMAP
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
...@@ -100,6 +101,7 @@ Material: ...@@ -100,6 +101,7 @@ Material:
- _Glossiness: 0 - _Glossiness: 0
- _GlossyReflections: 0 - _GlossyReflections: 0
- _Metallic: 0 - _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 0
...@@ -109,6 +111,7 @@ Material: ...@@ -109,6 +111,7 @@ Material:
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _Surface: 0 - _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
......
...@@ -8,20 +8,21 @@ Material: ...@@ -8,20 +8,21 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Wall Default m_Name: Wall Default
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: m_ValidKeywords:
- _METALLICSPECGLOSSMAP - _GLOSSYREFLECTIONS_OFF
- _METALLICGLOSSMAP
- _NORMALMAP - _NORMALMAP
- _PARALLAXMAP - _PARALLAXMAP
m_InvalidKeywords: [] m_InvalidKeywords:
- _METALLICSPECGLOSSMAP
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
...@@ -100,6 +101,7 @@ Material: ...@@ -100,6 +101,7 @@ Material:
- _Glossiness: 0 - _Glossiness: 0
- _GlossyReflections: 0 - _GlossyReflections: 0
- _Metallic: 0 - _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 0
...@@ -109,6 +111,7 @@ Material: ...@@ -109,6 +111,7 @@ Material:
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _Surface: 0 - _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
......
...@@ -2,18 +2,14 @@ ...@@ -2,18 +2,14 @@
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 8 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: BlinkLine m_Name: BlinkLine
m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_ShaderKeywords: _ALPHABLEND_ON
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHABLEND_ON
m_InvalidKeywords: []
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
...@@ -22,7 +18,7 @@ Material: ...@@ -22,7 +18,7 @@ Material:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- GRABPASS - GRABPASS
m_LockedProperties: - ALWAYS
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
......
...@@ -21,17 +21,17 @@ Material: ...@@ -21,17 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Interactables 4 m_Name: Interactables 4
m_Shader: {fileID: -6465566751694194690, guid: 8ccee1dee7490414ea7e8ad2b953c3e1, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _NORMALMAP
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
......
...@@ -21,17 +21,17 @@ Material: ...@@ -21,17 +21,17 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Handle m_Name: Handle
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0} m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0 m_ModifiedSerializedProperties: 0
m_ValidKeywords: [] m_ValidKeywords:
- _GLOSSYREFLECTIONS_OFF
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: stringTagMap: {}
RenderType: Opaque
disabledShaderPasses: [] disabledShaderPasses: []
m_LockedProperties: m_LockedProperties:
m_SavedProperties: m_SavedProperties:
...@@ -110,6 +110,7 @@ Material: ...@@ -110,6 +110,7 @@ Material:
- _Glossiness: 0 - _Glossiness: 0
- _GlossyReflections: 0 - _GlossyReflections: 0
- _Metallic: 0 - _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.005 - _Parallax: 0.005
- _QueueOffset: 0 - _QueueOffset: 0
...@@ -119,6 +120,7 @@ Material: ...@@ -119,6 +120,7 @@ Material:
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 1
- _Surface: 0 - _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1 - _WorkflowMode: 1
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
......
File added
File added
File added
File added
File added
File added
File added
File added
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment