diff --git a/Assets/_Materials/Humans/Female Elegantsuit01.mat b/Assets/_Materials/Humans/Female Elegantsuit01.mat index 7e85e15..5b293bc 100644 --- a/Assets/_Materials/Humans/Female Elegantsuit01.mat +++ b/Assets/_Materials/Humans/Female Elegantsuit01.mat @@ -21,18 +21,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Female Elegantsuit01 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -67,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 68021cbcf3dd5c44893f828f89876ab4, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 68021cbcf3dd5c44893f828f89876ab4, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: c858a30f30b3c7840b6e09451b2b953a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -118,6 +125,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.02 @@ -130,7 +138,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Male Casualsuit01.mat b/Assets/_Materials/Humans/Male Casualsuit01.mat index b8ea182..059f4b0 100644 --- a/Assets/_Materials/Humans/Male Casualsuit01.mat +++ b/Assets/_Materials/Humans/Male Casualsuit01.mat @@ -21,18 +21,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Male Casualsuit01 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -67,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 1dcbd0114546dd440b3a457b2375dcd2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 1dcbd0114546dd440b3a457b2375dcd2, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: a5f75aecdddc9664392672adb762a841, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -118,6 +125,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.07 @@ -130,7 +138,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Male Casualsuit06.mat b/Assets/_Materials/Humans/Male Casualsuit06.mat index 77cfac9..d4fe46c 100644 --- a/Assets/_Materials/Humans/Male Casualsuit06.mat +++ b/Assets/_Materials/Humans/Male Casualsuit06.mat @@ -8,18 +8,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Male Casualsuit06 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -54,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: 0e4212b0626bd8044ad0e449de8b27fd, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 0e4212b0626bd8044ad0e449de8b27fd, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: 1ea132d45694f064daf1ee72e10b2c67, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -105,6 +112,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.04 @@ -117,7 +125,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Shoes03.mat b/Assets/_Materials/Humans/Shoes03.mat index dc3458b..2e4a536 100644 --- a/Assets/_Materials/Humans/Shoes03.mat +++ b/Assets/_Materials/Humans/Shoes03.mat @@ -8,18 +8,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Shoes03 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SPECULAR_SETUP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -54,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: 193b8bfaad2c04649bb82fe3b6ec3892, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 193b8bfaad2c04649bb82fe3b6ec3892, type: 3} + 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} + - _NormalMap: + 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} @@ -105,6 +112,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.1 @@ -117,7 +125,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Skin asian boy.mat b/Assets/_Materials/Humans/Skin asian boy.mat index 11bd0d3..6cb5c70 100644 --- a/Assets/_Materials/Humans/Skin asian boy.mat +++ b/Assets/_Materials/Humans/Skin asian boy.mat @@ -21,7 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skin asian boy - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,8 +31,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -66,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: aa24f4a5bbd37954da6022e7df696b91, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: aa24f4a5bbd37954da6022e7df696b91, type: 3} + 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} + - _NormalMap: + 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} @@ -118,6 +126,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.04 @@ -131,7 +140,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Skin middleaged caucasian man.mat b/Assets/_Materials/Humans/Skin middleaged caucasian man.mat index f319ac5..ef937d4 100644 --- a/Assets/_Materials/Humans/Skin middleaged caucasian man.mat +++ b/Assets/_Materials/Humans/Skin middleaged caucasian man.mat @@ -21,18 +21,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skin middleaged caucasian man - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _SPECULAR_SETUP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -67,6 +66,10 @@ Material: m_Texture: {fileID: 2800000, guid: da5abe1db972ada4598f91ac7cbf8c21, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: da5abe1db972ada4598f91ac7cbf8c21, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -118,6 +121,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.1 @@ -130,7 +134,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Skin old caucasian woman.mat b/Assets/_Materials/Humans/Skin old caucasian woman.mat index a727e72..3875900 100644 --- a/Assets/_Materials/Humans/Skin old caucasian woman.mat +++ b/Assets/_Materials/Humans/Skin old caucasian woman.mat @@ -21,7 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skin old caucasian woman - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,8 +31,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -66,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 9b229c610f5d0b6478e51cf647b9af39, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 9b229c610f5d0b6478e51cf647b9af39, type: 3} + 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} + - _NormalMap: + 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} @@ -117,6 +125,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.1 @@ -129,7 +138,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/Skin young african woman.mat b/Assets/_Materials/Humans/Skin young african woman.mat index 161f898..996b5ac 100644 --- a/Assets/_Materials/Humans/Skin young african woman.mat +++ b/Assets/_Materials/Humans/Skin young african woman.mat @@ -21,7 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skin young african woman - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,8 +31,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -66,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 51723981d12cc9f499bf96b2c4913c9a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 51723981d12cc9f499bf96b2c4913c9a, type: 3} + 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} + - _NormalMap: + 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} @@ -118,6 +126,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.04 @@ -131,7 +140,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/african_girl.mat b/Assets/_Materials/Humans/african_girl.mat index e83f250..0591f8e 100644 --- a/Assets/_Materials/Humans/african_girl.mat +++ b/Assets/_Materials/Humans/african_girl.mat @@ -8,7 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: african_girl - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,8 +18,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -53,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: 8efeb77d87542a64d8d845720a7bfb9d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 8efeb77d87542a64d8d845720a7bfb9d, type: 3} + 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} + - _NormalMap: + 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} @@ -105,6 +113,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.1 @@ -118,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/f_trousers_01.mat b/Assets/_Materials/Humans/f_trousers_01.mat index 9993923..01d8f1c 100644 --- a/Assets/_Materials/Humans/f_trousers_01.mat +++ b/Assets/_Materials/Humans/f_trousers_01.mat @@ -21,18 +21,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: f_trousers_01 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -67,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 521648c9ab2d32a4380fd0692bf6ffed, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 521648c9ab2d32a4380fd0692bf6ffed, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: f3c13c84ebf18df41a1629298ec001ee, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -119,6 +126,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.02 @@ -132,7 +140,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/flats_ballet.mat b/Assets/_Materials/Humans/flats_ballet.mat index 969f8c6..49bf2dc 100644 --- a/Assets/_Materials/Humans/flats_ballet.mat +++ b/Assets/_Materials/Humans/flats_ballet.mat @@ -8,7 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: flats_ballet - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,8 +18,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -53,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: e1022c7e9c3bdf2438260f15167258fc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: e1022c7e9c3bdf2438260f15167258fc, type: 3} + 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} + - _NormalMap: + 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} @@ -105,6 +113,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.022 @@ -118,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/male_casualsuit04.mat b/Assets/_Materials/Humans/male_casualsuit04.mat index 9ff321e..d606c42 100644 --- a/Assets/_Materials/Humans/male_casualsuit04.mat +++ b/Assets/_Materials/Humans/male_casualsuit04.mat @@ -21,18 +21,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: male_casualsuit04 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -67,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 7eb0b1ca12673274ebb71a635ed93dae, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 7eb0b1ca12673274ebb71a635ed93dae, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: e07f91368deaa9d4fa4f41ed0b7abc7a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -119,6 +126,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.02 @@ -132,7 +140,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/mens_shirt_untuck_elvbhp1f.mat b/Assets/_Materials/Humans/mens_shirt_untuck_elvbhp1f.mat index 364936e..8eba8b0 100644 --- a/Assets/_Materials/Humans/mens_shirt_untuck_elvbhp1f.mat +++ b/Assets/_Materials/Humans/mens_shirt_untuck_elvbhp1f.mat @@ -8,7 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: mens_shirt_untuck_elvbhp1f - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,8 +18,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -53,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: 4691b5222ecb4c943a9bc5f90a92e888, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 4691b5222ecb4c943a9bc5f90a92e888, type: 3} + 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} + - _NormalMap: + 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} @@ -105,6 +113,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0 @@ -118,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/riding_breeches.mat b/Assets/_Materials/Humans/riding_breeches.mat index c7285eb..94b97f2 100644 --- a/Assets/_Materials/Humans/riding_breeches.mat +++ b/Assets/_Materials/Humans/riding_breeches.mat @@ -8,18 +8,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: riding_breeches - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -54,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: 0cbfa4ba8fb0d174ab76084d5f4543fc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 0cbfa4ba8fb0d174ab76084d5f4543fc, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: 74e5c534c52568a46b1979d84b87b842, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -106,6 +113,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.04 @@ -119,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/shoes05.mat b/Assets/_Materials/Humans/shoes05.mat index bb7983b..fdebb59 100644 --- a/Assets/_Materials/Humans/shoes05.mat +++ b/Assets/_Materials/Humans/shoes05.mat @@ -8,7 +8,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: shoes05 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,8 +18,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -53,10 +53,18 @@ Material: m_Texture: {fileID: 2800000, guid: 9df931c36119d2e4399236325a820de9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 9df931c36119d2e4399236325a820de9, type: 3} + 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} + - _NormalMap: + 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} @@ -105,6 +113,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.08944272 @@ -118,7 +127,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Humans/t_shirt_basic_tucked.mat b/Assets/_Materials/Humans/t_shirt_basic_tucked.mat index ce240a5..7f60b7a 100644 --- a/Assets/_Materials/Humans/t_shirt_basic_tucked.mat +++ b/Assets/_Materials/Humans/t_shirt_basic_tucked.mat @@ -21,7 +21,8 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: t_shirt_basic_tucked - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -30,8 +31,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -66,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 02a9a139f34100548922435f07832e9e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 02a9a139f34100548922435f07832e9e, type: 3} + 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} + - _NormalMap: + 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} @@ -118,6 +126,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.04 @@ -131,7 +140,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Overlays/Foveal FOV.mat b/Assets/_Materials/Overlays/Foveal FOV.mat index e6174d9..92c793d 100644 --- a/Assets/_Materials/Overlays/Foveal FOV.mat +++ b/Assets/_Materials/Overlays/Foveal FOV.mat @@ -133,8 +133,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0, g: 0.98978424, b: 1, a: 0.5176471} - - _Color: {r: 0, g: 0.9897842, b: 1, a: 0.5176471} + - _BaseColor: {r: 0.20803666, g: 0.515211, b: 0.5188679, a: 0.3137255} + - _Color: {r: 0.20803663, g: 0.515211, b: 0.51886785, a: 0.3137255} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Overlays/Highlight.shadergraph b/Assets/_Materials/Overlays/Highlight.shadergraph new file mode 100644 index 0000000..77190a4 --- /dev/null +++ b/Assets/_Materials/Overlays/Highlight.shadergraph @@ -0,0 +1,1368 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "e70b89c90b234c0a81e057337d65167a", + "m_Properties": [ + { + "m_Id": "0ee53b4266f84f85bf731fe03ef39cdc" + }, + { + "m_Id": "451401517c4246f2ad151aee15c92e84" + }, + { + "m_Id": "ebd3555da82d4f8492ec8bae8099f15a" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "5b20eaedb46a4792b0fee0613183645f" + } + ], + "m_Nodes": [ + { + "m_Id": "cc047ae916304821bcf670a2a3695099" + }, + { + "m_Id": "39ee612d39494200a0a8387ba411a94d" + }, + { + "m_Id": "d553e96ffe87499db4f995420620bc9f" + }, + { + "m_Id": "206dd90905c0455b93802f29688aad46" + }, + { + "m_Id": "443c2ed00fc0454b9e0b1e78faf0c4ad" + }, + { + "m_Id": "be643477e1534d44a43582d7485278fe" + }, + { + "m_Id": "1a00b9dfa16e4385947e743609c6151c" + }, + { + "m_Id": "bfb03ee7ac38476fb094c00856b36b2c" + }, + { + "m_Id": "30152d01182d4814846919cee22a11e6" + }, + { + "m_Id": "2d53747b88474076ad344fca4b32433c" + }, + { + "m_Id": "e412e6499be34375aef047a15d0231d0" + }, + { + "m_Id": "03bc6a09b34249fa965fa21de31075e4" + }, + { + "m_Id": "e2362665522948cab1708dea7f95c1f7" + }, + { + "m_Id": "5ae702a623ef4f6fa4e641fa2673919e" + } + ], + "m_GroupDatas": [], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "03bc6a09b34249fa965fa21de31075e4" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "206dd90905c0455b93802f29688aad46" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2d53747b88474076ad344fca4b32433c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "03bc6a09b34249fa965fa21de31075e4" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5ae702a623ef4f6fa4e641fa2673919e" + }, + "m_SlotId": 5 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "be643477e1534d44a43582d7485278fe" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e2362665522948cab1708dea7f95c1f7" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5ae702a623ef4f6fa4e641fa2673919e" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "e412e6499be34375aef047a15d0231d0" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1a00b9dfa16e4385947e743609c6151c" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "cc047ae916304821bcf670a2a3695099" + }, + { + "m_Id": "39ee612d39494200a0a8387ba411a94d" + }, + { + "m_Id": "d553e96ffe87499db4f995420620bc9f" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "206dd90905c0455b93802f29688aad46" + }, + { + "m_Id": "443c2ed00fc0454b9e0b1e78faf0c4ad" + }, + { + "m_Id": "be643477e1534d44a43582d7485278fe" + }, + { + "m_Id": "1a00b9dfa16e4385947e743609c6151c" + }, + { + "m_Id": "bfb03ee7ac38476fb094c00856b36b2c" + }, + { + "m_Id": "30152d01182d4814846919cee22a11e6" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "c6cc750a5255475b95c52d38dec0bb77" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "03bc6a09b34249fa965fa21de31075e4", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -525.0, + "y": -108.00000762939453, + "width": 208.00003051757813, + "height": 433.00006103515627 + } + }, + "m_Slots": [ + { + "m_Id": "86feb73b17754e63abea0eaec0ef16b7" + }, + { + "m_Id": "05f11d71c9d04354b6c798aecc061b16" + }, + { + "m_Id": "52c3ac7835cc46c5a80607210807338b" + }, + { + "m_Id": "0f92dd9585864f97b4cb0b0473b6dced" + }, + { + "m_Id": "ff28ff9796864d21afbd5b525e12a991" + }, + { + "m_Id": "4a67ddb5a1b84e33b41a4a50f304814f" + }, + { + "m_Id": "ef15357561e246e3856b4afabef3ae4d" + }, + { + "m_Id": "fc27209aff0b410994d14c258c8bfbb2" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "05f11d71c9d04354b6c798aecc061b16", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0bfbaad0a66f4db38f015df69e3cfc3e", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.05000000074505806, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "0ee53b4266f84f85bf731fe03ef39cdc", + "m_Guid": { + "m_GuidSerialized": "65c557ef-afca-47a0-a352-4a8616df2686" + }, + "m_Name": "Color", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Color", + "m_DefaultReferenceName": "_Color", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": true, + "hlslDeclarationOverride": 3, + "m_Hidden": false, + "m_Value": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 0.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0f92dd9585864f97b4cb0b0473b6dced", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "1a00b9dfa16e4385947e743609c6151c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "7a992d0788f4421e9a1e11a1dc7bfe13" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "1a496ac55609424daf36d708b9ad702c", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "206dd90905c0455b93802f29688aad46", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "7b41a3a63bf34a60b0a1ec2b2f34b9cb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "27e70fe44ab348c6b4e45ebe46bbb2c2", + "m_Id": 0, + "m_DisplayName": "Metallic", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Metallic", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "2bdd265bca2f49038b06eb80339d4bc2", + "m_Id": 0, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2d53747b88474076ad344fca4b32433c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -765.0000610351563, + "y": -75.0, + "width": 148.00006103515626, + "height": 34.0000114440918 + } + }, + "m_Slots": [ + { + "m_Id": "92b9cbe8cc604d16aa9fadecc9767eac" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "451401517c4246f2ad151aee15c92e84" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "30152d01182d4814846919cee22a11e6", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Metallic", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "27e70fe44ab348c6b4e45ebe46bbb2c2" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Metallic" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "39ee612d39494200a0a8387ba411a94d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "64e2ce124b854e10b5253303a61c17fa" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "3ef972ddd1974295962a8cb038b81e2d", + "m_Id": 0, + "m_DisplayName": "NormalMap", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "4130f11897214d0c97400d9ff446a556", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "443c2ed00fc0454b9e0b1e78faf0c4ad", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "0bfbaad0a66f4db38f015df69e3cfc3e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "451401517c4246f2ad151aee15c92e84", + "m_Guid": { + "m_GuidSerialized": "023d849b-e544-4aa0-b37c-1eaa11fc5a69" + }, + "m_Name": "MainTexture", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MainTexture", + "m_DefaultReferenceName": "_MainTexture", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "4a67ddb5a1b84e33b41a4a50f304814f", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "52c3ac7835cc46c5a80607210807338b", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalFromTextureNode", + "m_ObjectId": "5ae702a623ef4f6fa4e641fa2673919e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Normal From Texture", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -380.0, + "y": 441.0, + "width": 208.00003051757813, + "height": 373.99993896484377 + } + }, + "m_Slots": [ + { + "m_Id": "2bdd265bca2f49038b06eb80339d4bc2" + }, + { + "m_Id": "b83ed0acd132412cad8c8bd3a73add1b" + }, + { + "m_Id": "cf77a50675104cdbb3c91517a32d06c0" + }, + { + "m_Id": "cf34f3d1ceac447dbadd3a39014dabe4" + }, + { + "m_Id": "f6d5eecba5ea4d4a823d2057a39968eb" + }, + { + "m_Id": "bbbfb8c3911f4963949684af23c25315" + } + ], + "synonyms": [ + "convert to normal", + "bump map" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "5b20eaedb46a4792b0fee0613183645f", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "0ee53b4266f84f85bf731fe03ef39cdc" + }, + { + "m_Id": "451401517c4246f2ad151aee15c92e84" + }, + { + "m_Id": "ebd3555da82d4f8492ec8bae8099f15a" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "64e2ce124b854e10b5253303a61c17fa", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "73c6e80023b445f497c7b37808591724", + "m_WorkflowMode": 1, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "7a992d0788f4421e9a1e11a1dc7bfe13", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "7b41a3a63bf34a60b0a1ec2b2f34b9cb", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "86feb73b17754e63abea0eaec0ef16b7", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "92b9cbe8cc604d16aa9fadecc9767eac", + "m_Id": 0, + "m_DisplayName": "MainTexture", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "96c6e2ebc10249588050aa36ed5b97ad", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "9bb622bf7e034e459e46dc20381526ed", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "b83ed0acd132412cad8c8bd3a73add1b", + "m_Id": 1, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", + "m_ObjectId": "bbbfb8c3911f4963949684af23c25315", + "m_Id": 5, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "be643477e1534d44a43582d7485278fe", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "1a496ac55609424daf36d708b9ad702c" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "bfb03ee7ac38476fb094c00856b36b2c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "96c6e2ebc10249588050aa36ed5b97ad" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "c6cc750a5255475b95c52d38dec0bb77", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "73c6e80023b445f497c7b37808591724" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 0, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 2, + "m_AlphaClip": false, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "cc047ae916304821bcf670a2a3695099", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "9bb622bf7e034e459e46dc20381526ed" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "cf34f3d1ceac447dbadd3a39014dabe4", + "m_Id": 3, + "m_DisplayName": "Offset", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Offset", + "m_StageCapability": 3, + "m_Value": 0.5, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "cf77a50675104cdbb3c91517a32d06c0", + "m_Id": 2, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "d553e96ffe87499db4f995420620bc9f", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "4130f11897214d0c97400d9ff446a556" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "d697c64d7f3e4636b1d6a2092af2b3fc", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "e2362665522948cab1708dea7f95c1f7", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -691.0, + "y": 477.0, + "width": 144.00006103515626, + "height": 33.999969482421878 + } + }, + "m_Slots": [ + { + "m_Id": "3ef972ddd1974295962a8cb038b81e2d" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ebd3555da82d4f8492ec8bae8099f15a" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "e412e6499be34375aef047a15d0231d0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -316.9999694824219, + "y": 362.0, + "width": 104.99995422363281, + "height": 34.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "d697c64d7f3e4636b1d6a2092af2b3fc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "0ee53b4266f84f85bf731fe03ef39cdc" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "ebd3555da82d4f8492ec8bae8099f15a", + "m_Guid": { + "m_GuidSerialized": "1de2914d-6fa0-43dc-b082-749a87a52ef6" + }, + "m_Name": "NormalMap", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "NormalMap", + "m_DefaultReferenceName": "_NormalMap", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "ef15357561e246e3856b4afabef3ae4d", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f6d5eecba5ea4d4a823d2057a39968eb", + "m_Id": 4, + "m_DisplayName": "Strength", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Strength", + "m_StageCapability": 3, + "m_Value": 8.0, + "m_DefaultValue": 8.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "fc27209aff0b410994d14c258c8bfbb2", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ff28ff9796864d21afbd5b525e12a991", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + diff --git a/Assets/_Materials/Overlays/Highlight.shadergraph.meta b/Assets/_Materials/Overlays/Highlight.shadergraph.meta new file mode 100644 index 0000000..21b6132 --- /dev/null +++ b/Assets/_Materials/Overlays/Highlight.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 22b7b80c1921626418d97f6e56a13ca1 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/_Materials/Overlays/Peripheric FOV.mat b/Assets/_Materials/Overlays/Peripheric FOV.mat index 15ee5a7..0a85059 100644 --- a/Assets/_Materials/Overlays/Peripheric FOV.mat +++ b/Assets/_Materials/Overlays/Peripheric FOV.mat @@ -133,8 +133,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.25725347, g: 0.32291484, b: 0.4433962, a: 0.54509807} - - _Color: {r: 0.25725344, g: 0.3229148, b: 0.44339618, a: 0.54509807} + - _BaseColor: {r: 0.25725344, g: 0.3229148, b: 0.44339618, a: 0.54509807} + - _Color: {r: 0.2572534, g: 0.32291478, b: 0.44339615, a: 0.54509807} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/Rubber Duck.mat b/Assets/_Materials/Rubber Duck.mat index fde11ba..a1627e7 100644 --- a/Assets/_Materials/Rubber Duck.mat +++ b/Assets/_Materials/Rubber Duck.mat @@ -21,18 +21,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Rubber Duck - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -67,10 +66,18 @@ Material: m_Texture: {fileID: 2800000, guid: 8b62e98631a1fe046b0c50ada414a880, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 8b62e98631a1fe046b0c50ada414a880, type: 3} + 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} + - _NormalMap: + m_Texture: {fileID: 2800000, guid: d66435a34c783b749a0e24990cc726f1, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _OcclusionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -118,6 +125,7 @@ Material: - _Metallic: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveShadows: 1 - _Smoothness: 0.05 @@ -130,7 +138,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/_Materials/RubberDuckHighlight.mat b/Assets/_Materials/RubberDuckHighlight.mat new file mode 100644 index 0000000..ad8ce0d --- /dev/null +++ b/Assets/_Materials/RubberDuckHighlight.mat @@ -0,0 +1,141 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RubberDuckHighlight + m_Shader: {fileID: -6465566751694194690, guid: 22b7b80c1921626418d97f6e56a13ca1, + type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + 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} + 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} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: 8b62e98631a1fe046b0c50ada414a880, type: 3} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &1191530852238294633 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/_Materials/RubberDuckHighlight.mat.meta b/Assets/_Materials/RubberDuckHighlight.mat.meta new file mode 100644 index 0000000..429f0c2 --- /dev/null +++ b/Assets/_Materials/RubberDuckHighlight.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f12f85133e01bf1468ff51cc93c27dba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Prefabs/Humans/African girl.prefab b/Assets/_Prefabs/Humans/African girl.prefab index 2d5e823..2c8fc87 100644 --- a/Assets/_Prefabs/Humans/African girl.prefab +++ b/Assets/_Prefabs/Humans/African girl.prefab @@ -391,18 +391,34 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2796040150381930432} + - targetCorrespondingSourceObject: {fileID: -7643410594688094780, guid: 614e5e0c8633f0e419bf0f8a6c55c062, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7300745700656007178} - targetCorrespondingSourceObject: {fileID: -6165381028818857327, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} insertIndex: -1 addedObject: {fileID: 4020103059896277885} + - targetCorrespondingSourceObject: {fileID: -6165381028818857327, guid: 614e5e0c8633f0e419bf0f8a6c55c062, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3257665145696618894} - targetCorrespondingSourceObject: {fileID: -648769202560210829, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} insertIndex: -1 addedObject: {fileID: 5336252678390571373} + - targetCorrespondingSourceObject: {fileID: -648769202560210829, guid: 614e5e0c8633f0e419bf0f8a6c55c062, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7765499334579656167} - targetCorrespondingSourceObject: {fileID: -6718868552114684940, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} insertIndex: -1 addedObject: {fileID: 6234984857311808219} + - targetCorrespondingSourceObject: {fileID: -6718868552114684940, guid: 614e5e0c8633f0e419bf0f8a6c55c062, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8803086583349120940} m_SourcePrefab: {fileID: 100100000, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} --- !u!1 &546500881291758022 stripped GameObject: @@ -432,6 +448,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} +--- !u!114 &8803086583349120940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 546500881291758022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1091117539937591459 stripped GameObject: m_CorrespondingSourceObject: {fileID: -6165381028818857327, guid: 614e5e0c8633f0e419bf0f8a6c55c062, @@ -460,6 +488,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4169401807805013511, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} +--- !u!114 &3257665145696618894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1091117539937591459} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3510944647416700918 stripped GameObject: m_CorrespondingSourceObject: {fileID: -7643410594688094780, guid: 614e5e0c8633f0e419bf0f8a6c55c062, @@ -488,6 +528,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 3234532436284403329, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} +--- !u!114 &7300745700656007178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3510944647416700918} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6029014615060585025 stripped GameObject: m_CorrespondingSourceObject: {fileID: -648769202560210829, guid: 614e5e0c8633f0e419bf0f8a6c55c062, @@ -516,3 +568,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5057857686587457962, guid: 614e5e0c8633f0e419bf0f8a6c55c062, type: 3} +--- !u!114 &7765499334579656167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6029014615060585025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Prefabs/Humans/Asian boy Standing.prefab b/Assets/_Prefabs/Humans/Asian boy Standing.prefab index f32dcb4..801a136 100644 --- a/Assets/_Prefabs/Humans/Asian boy Standing.prefab +++ b/Assets/_Prefabs/Humans/Asian boy Standing.prefab @@ -386,14 +386,26 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 4309320041445970129} + - targetCorrespondingSourceObject: {fileID: 1478555931850884302, guid: f5b6bdf082ca58d4a999319e567c4e64, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1288757202153908989} - targetCorrespondingSourceObject: {fileID: -4254632774612326348, guid: f5b6bdf082ca58d4a999319e567c4e64, type: 3} insertIndex: -1 addedObject: {fileID: 6373854432464058526} + - targetCorrespondingSourceObject: {fileID: -4254632774612326348, guid: f5b6bdf082ca58d4a999319e567c4e64, + type: 3} + insertIndex: -1 + addedObject: {fileID: 624564972956498700} - targetCorrespondingSourceObject: {fileID: -648769202560210829, guid: f5b6bdf082ca58d4a999319e567c4e64, type: 3} insertIndex: -1 addedObject: {fileID: 8042889705146004579} + - targetCorrespondingSourceObject: {fileID: -648769202560210829, guid: f5b6bdf082ca58d4a999319e567c4e64, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7387765932717554547} m_SourcePrefab: {fileID: 100100000, guid: f5b6bdf082ca58d4a999319e567c4e64, type: 3} --- !u!1 &147244669067699808 stripped GameObject: @@ -423,6 +435,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 3374624964878114114, guid: f5b6bdf082ca58d4a999319e567c4e64, type: 3} +--- !u!114 &624564972956498700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 147244669067699808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3458913976493647399 stripped GameObject: m_CorrespondingSourceObject: {fileID: -648769202560210829, guid: f5b6bdf082ca58d4a999319e567c4e64, @@ -451,6 +475,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 5057857686587457962, guid: f5b6bdf082ca58d4a999319e567c4e64, type: 3} +--- !u!114 &7387765932717554547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3458913976493647399} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &5943483766040300186 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1478555931850884302, guid: f5b6bdf082ca58d4a999319e567c4e64, @@ -479,3 +515,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 925442984535896597, guid: f5b6bdf082ca58d4a999319e567c4e64, type: 3} +--- !u!114 &1288757202153908989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5943483766040300186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Prefabs/Humans/Basic caucasian man standing 1.prefab b/Assets/_Prefabs/Humans/Basic caucasian man standing 1.prefab index e715d90..df2ec63 100644 --- a/Assets/_Prefabs/Humans/Basic caucasian man standing 1.prefab +++ b/Assets/_Prefabs/Humans/Basic caucasian man standing 1.prefab @@ -681,14 +681,26 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 4602058788268917912} + - targetCorrespondingSourceObject: {fileID: 3661280438786393635, guid: 22338e4c11903c642a4591cad1b33818, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1182056709398708310} - targetCorrespondingSourceObject: {fileID: 1729854651497536393, guid: 22338e4c11903c642a4591cad1b33818, type: 3} insertIndex: -1 addedObject: {fileID: 5546176201557827612} + - targetCorrespondingSourceObject: {fileID: 1729854651497536393, guid: 22338e4c11903c642a4591cad1b33818, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2603227009603414563} - targetCorrespondingSourceObject: {fileID: 8639897403354266163, guid: 22338e4c11903c642a4591cad1b33818, type: 3} insertIndex: -1 addedObject: {fileID: 1404420347947902386} + - targetCorrespondingSourceObject: {fileID: 8639897403354266163, guid: 22338e4c11903c642a4591cad1b33818, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2015981925650582005} m_SourcePrefab: {fileID: 100100000, guid: 22338e4c11903c642a4591cad1b33818, type: 3} --- !u!1 &3727932818138911973 stripped GameObject: @@ -718,6 +730,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8610701838714165572, guid: 22338e4c11903c642a4591cad1b33818, type: 3} +--- !u!114 &2015981925650582005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3727932818138911973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6654911155894596959 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1729854651497536393, guid: 22338e4c11903c642a4591cad1b33818, @@ -746,6 +770,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -8825938288182521773, guid: 22338e4c11903c642a4591cad1b33818, type: 3} +--- !u!114 &2603227009603414563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6654911155894596959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8544499357670697205 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3661280438786393635, guid: 22338e4c11903c642a4591cad1b33818, @@ -774,3 +810,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 6057981514881211704, guid: 22338e4c11903c642a4591cad1b33818, type: 3} +--- !u!114 &1182056709398708310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8544499357670697205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Prefabs/Humans/Male Sitting Pose (1).prefab b/Assets/_Prefabs/Humans/Male Sitting Pose (1).prefab index 0be2a70..60d717c 100644 --- a/Assets/_Prefabs/Humans/Male Sitting Pose (1).prefab +++ b/Assets/_Prefabs/Humans/Male Sitting Pose (1).prefab @@ -376,14 +376,26 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 4384206701500601903} + - targetCorrespondingSourceObject: {fileID: 6022945068485402411, guid: 92fff7977ca90bd44bfaa80bd67c1993, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7566121492600159753} - targetCorrespondingSourceObject: {fileID: 1105652786289008234, guid: 92fff7977ca90bd44bfaa80bd67c1993, type: 3} insertIndex: -1 addedObject: {fileID: 9145512552651061101} + - targetCorrespondingSourceObject: {fileID: 1105652786289008234, guid: 92fff7977ca90bd44bfaa80bd67c1993, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8058081348537911367} - targetCorrespondingSourceObject: {fileID: 8639897403354266163, guid: 92fff7977ca90bd44bfaa80bd67c1993, type: 3} insertIndex: -1 addedObject: {fileID: 3349326735785690500} + - targetCorrespondingSourceObject: {fileID: 8639897403354266163, guid: 92fff7977ca90bd44bfaa80bd67c1993, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5646625956535778847} m_SourcePrefab: {fileID: 100100000, guid: 92fff7977ca90bd44bfaa80bd67c1993, type: 3} --- !u!1 &3332173820457941315 stripped GameObject: @@ -413,6 +425,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4954358730978589925, guid: 92fff7977ca90bd44bfaa80bd67c1993, type: 3} +--- !u!114 &8058081348537911367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3332173820457941315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6233342382481153306 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8639897403354266163, guid: 92fff7977ca90bd44bfaa80bd67c1993, @@ -441,6 +465,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 8610701838714165572, guid: 92fff7977ca90bd44bfaa80bd67c1993, type: 3} +--- !u!114 &5646625956535778847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233342382481153306} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8283139608358582274 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6022945068485402411, guid: 92fff7977ca90bd44bfaa80bd67c1993, @@ -469,3 +505,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -8334529202348542581, guid: 92fff7977ca90bd44bfaa80bd67c1993, type: 3} +--- !u!114 &7566121492600159753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8283139608358582274} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Prefabs/Humans/Stroke Shaking Head.prefab b/Assets/_Prefabs/Humans/Stroke Shaking Head.prefab index 59a2b24..a7239b2 100644 --- a/Assets/_Prefabs/Humans/Stroke Shaking Head.prefab +++ b/Assets/_Prefabs/Humans/Stroke Shaking Head.prefab @@ -371,10 +371,18 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7983020121993130990} + - targetCorrespondingSourceObject: {fileID: 7576641255734393159, guid: a4c72855fe819e7499005aa65968d795, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2378315950717624143} - targetCorrespondingSourceObject: {fileID: -4713287419499454762, guid: a4c72855fe819e7499005aa65968d795, type: 3} insertIndex: -1 addedObject: {fileID: 5703582348217175265} + - targetCorrespondingSourceObject: {fileID: -4713287419499454762, guid: a4c72855fe819e7499005aa65968d795, + type: 3} + insertIndex: -1 + addedObject: {fileID: 755433396897098589} m_SourcePrefab: {fileID: 100100000, guid: a4c72855fe819e7499005aa65968d795, type: 3} --- !u!1 &3995135782921593153 stripped GameObject: @@ -404,6 +412,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 1745040298615867404, guid: a4c72855fe819e7499005aa65968d795, type: 3} +--- !u!114 &755433396897098589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3995135782921593153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6972482446873495248 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7576641255734393159, guid: a4c72855fe819e7499005aa65968d795, @@ -432,3 +452,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 384717373608012344, guid: a4c72855fe819e7499005aa65968d795, type: 3} +--- !u!114 &2378315950717624143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6972482446873495248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Prefabs/Humans/Young african woman Standing.prefab b/Assets/_Prefabs/Humans/Young african woman Standing.prefab index 8b8d064..913ff37 100644 --- a/Assets/_Prefabs/Humans/Young african woman Standing.prefab +++ b/Assets/_Prefabs/Humans/Young african woman Standing.prefab @@ -396,18 +396,34 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 35328396335927030} + - targetCorrespondingSourceObject: {fileID: -4558003389933642901, guid: f104c610d9c63524e979f6e70d496a3a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 422157580340128354} - targetCorrespondingSourceObject: {fileID: 4787928282668718269, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} insertIndex: -1 addedObject: {fileID: 1002531046313702040} + - targetCorrespondingSourceObject: {fileID: 4787928282668718269, guid: f104c610d9c63524e979f6e70d496a3a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 5753587790559950361} - targetCorrespondingSourceObject: {fileID: 402320812894914255, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} insertIndex: -1 addedObject: {fileID: 3181413977514390348} + - targetCorrespondingSourceObject: {fileID: 402320812894914255, guid: f104c610d9c63524e979f6e70d496a3a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 945240144959466094} - targetCorrespondingSourceObject: {fileID: -8457569262833790222, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} insertIndex: -1 addedObject: {fileID: 2371432918777797113} + - targetCorrespondingSourceObject: {fileID: -8457569262833790222, guid: f104c610d9c63524e979f6e70d496a3a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3539143599838036806} m_SourcePrefab: {fileID: 100100000, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} --- !u!1 &2511363514818657988 stripped GameObject: @@ -437,6 +453,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -56347663649282705, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} +--- !u!114 &945240144959466094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2511363514818657988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3310109418636110585 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8457569262833790222, guid: f104c610d9c63524e979f6e70d496a3a, @@ -465,6 +493,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -5349217344665611162, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} +--- !u!114 &3539143599838036806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3310109418636110585} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7295074990766858422 stripped GameObject: m_CorrespondingSourceObject: {fileID: 4787928282668718269, guid: f104c610d9c63524e979f6e70d496a3a, @@ -493,6 +533,18 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 2641222219712204329, guid: f104c610d9c63524e979f6e70d496a3a, type: 3} +--- !u!114 &5753587790559950361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7295074990766858422} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7489991383244596064 stripped GameObject: m_CorrespondingSourceObject: {fileID: -4558003389933642901, guid: f104c610d9c63524e979f6e70d496a3a, @@ -521,3 +573,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 0} +--- !u!114 &422157580340128354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7489991383244596064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Prefabs/rubber_duck_toy_2k.prefab b/Assets/_Prefabs/rubber_duck_toy_2k.prefab index ea1336c..7f0fa9f 100644 --- a/Assets/_Prefabs/rubber_duck_toy_2k.prefab +++ b/Assets/_Prefabs/rubber_duck_toy_2k.prefab @@ -76,6 +76,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 8720928692931675929} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8b7b5cf6dc40bd84aa47d4323f29b0a3, + type: 3} + insertIndex: -1 + addedObject: {fileID: -8380230304484969828} m_SourcePrefab: {fileID: 100100000, guid: 8b7b5cf6dc40bd84aa47d4323f29b0a3, type: 3} --- !u!1 &5165458861040981103 stripped GameObject: @@ -105,3 +109,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: -6899698615531720065, guid: 8b7b5cf6dc40bd84aa47d4323f29b0a3, type: 3} +--- !u!114 &-8380230304484969828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5165458861040981103} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_Scenes/CQB/Room 1.unity b/Assets/_Scenes/CQB/Room 1.unity index 279542b..7a65b7d 100644 --- a/Assets/_Scenes/CQB/Room 1.unity +++ b/Assets/_Scenes/CQB/Room 1.unity @@ -2473,6 +2473,24 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 7.5, y: 2.5, z: 0.19999999} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &826182568 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8544499357670697205, guid: 586dd0740b414824e89974847c93c16e, + type: 3} + m_PrefabInstance: {fileID: 528763075073887548} + m_PrefabAsset: {fileID: 0} +--- !u!114 &826182570 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826182568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &864589221 GameObject: m_ObjectHideFlags: 0 @@ -5014,6 +5032,24 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 0.19999999, y: 2.5, z: 7.5} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &1079336153 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6654911155894596959, guid: 586dd0740b414824e89974847c93c16e, + type: 3} + m_PrefabInstance: {fileID: 528763075073887548} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1079336157 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1079336153} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1084217702 PrefabInstance: m_ObjectHideFlags: 0 @@ -8627,7 +8663,15 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8544499357670697205, guid: 586dd0740b414824e89974847c93c16e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 826182570} + - targetCorrespondingSourceObject: {fileID: 6654911155894596959, guid: 586dd0740b414824e89974847c93c16e, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1079336157} m_SourcePrefab: {fileID: 100100000, guid: 586dd0740b414824e89974847c93c16e, type: 3} --- !u!1001 &2006314532501040960 PrefabInstance: @@ -8692,11 +8736,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6678725029176440250, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: f12f85133e01bf1468ff51cc93c27dba, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2006314532501040962} m_SourcePrefab: {fileID: 100100000, guid: 21a133bccb7244245a1c90c15ac4066a, type: 3} +--- !u!1 &2006314532501040961 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + m_PrefabInstance: {fileID: 2006314532501040960} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2006314532501040962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2006314532501040961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2006314532501040963 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + m_PrefabInstance: {fileID: 2006314532501040960} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2006314532501040961} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &2158675441087684419 PrefabInstance: m_ObjectHideFlags: 0 @@ -8801,6 +8884,10 @@ MonoBehaviour: furnitures: [] portals: [] enemies: [] + targets: + - {fileID: 2006314532501040963} + - {fileID: 826182570} + - {fileID: 1079336157} --- !u!1001 &3099629970909374319 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/_Scenes/CQB/Room 2.unity b/Assets/_Scenes/CQB/Room 2.unity index a4a2ee7..92fae8d 100644 --- a/Assets/_Scenes/CQB/Room 2.unity +++ b/Assets/_Scenes/CQB/Room 2.unity @@ -3229,6 +3229,10 @@ MonoBehaviour: furnitures: [] portals: [] enemies: [] + targets: + - {fileID: 1644507331} + - {fileID: 4743394599326061292} + - {fileID: 4743394599326061291} --- !u!1001 &1644507330 PrefabInstance: m_ObjectHideFlags: 0 @@ -3237,6 +3241,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + propertyPath: m_Name + value: rubber_duck_toy_2k + objectReference: {fileID: 0} - target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a, type: 3} propertyPath: m_LocalPosition.x @@ -3287,16 +3296,23 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, - type: 3} - propertyPath: m_Name - value: rubber_duck_toy_2k - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 21a133bccb7244245a1c90c15ac4066a, type: 3} +--- !u!114 &1644507331 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + m_PrefabInstance: {fileID: 1644507330} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1663205462 GameObject: m_ObjectHideFlags: 0 @@ -4335,6 +4351,30 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f8664cb3766e172489bbf61fe9b6e97f, type: 3} +--- !u!114 &4743394599326061291 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 755433396897098589, guid: f8664cb3766e172489bbf61fe9b6e97f, + type: 3} + m_PrefabInstance: {fileID: 4743394599326061290} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4743394599326061292 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2378315950717624143, guid: f8664cb3766e172489bbf61fe9b6e97f, + type: 3} + m_PrefabInstance: {fileID: 4743394599326061290} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/_Scenes/CQB/Room 3.unity b/Assets/_Scenes/CQB/Room 3.unity index 1940d96..30f6591 100644 --- a/Assets/_Scenes/CQB/Room 3.unity +++ b/Assets/_Scenes/CQB/Room 3.unity @@ -529,6 +529,20 @@ MonoBehaviour: furnitures: [] portals: [] enemies: [] + targets: + - {fileID: 4516616980196606189} + - {fileID: 4516616980196606188} + - {fileID: 4516616980196606187} + - {fileID: 6675076392627903243} + - {fileID: 6675076392627903242} + - {fileID: 6675076392627903241} + - {fileID: 6675076392627903240} + - {fileID: 2328872132692517378} + - {fileID: 2328872132692517377} + - {fileID: 2328872132692517376} + - {fileID: 634777273} + - {fileID: 175008791} + - {fileID: 649094030} --- !u!1001 &175008789 PrefabInstance: m_ObjectHideFlags: 0 @@ -537,6 +551,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1931555095} m_Modifications: + - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + propertyPath: m_Name + value: rubber_duck_toy_2k (1) + objectReference: {fileID: 0} - target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a, type: 3} propertyPath: m_LocalPosition.x @@ -587,11 +606,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, - type: 3} - propertyPath: m_Name - value: rubber_duck_toy_2k (1) - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -603,6 +617,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 175008789} m_PrefabAsset: {fileID: 0} +--- !u!114 &175008791 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + m_PrefabInstance: {fileID: 175008789} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &192788614 PrefabInstance: m_ObjectHideFlags: 0 @@ -3287,6 +3313,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1931555095} m_Modifications: + - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + propertyPath: m_Name + value: rubber_duck_toy_2k + objectReference: {fileID: 0} - target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a, type: 3} propertyPath: m_LocalPosition.x @@ -3337,11 +3368,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, - type: 3} - propertyPath: m_Name - value: rubber_duck_toy_2k - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3353,6 +3379,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 634777271} m_PrefabAsset: {fileID: 0} +--- !u!114 &634777273 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + m_PrefabInstance: {fileID: 634777271} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &649094028 PrefabInstance: m_ObjectHideFlags: 0 @@ -3361,6 +3399,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1931555095} m_Modifications: + - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + propertyPath: m_Name + value: rubber_duck_toy_2k (2) + objectReference: {fileID: 0} - target: {fileID: 5540753397945044693, guid: 21a133bccb7244245a1c90c15ac4066a, type: 3} propertyPath: m_LocalPosition.x @@ -3411,11 +3454,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5165458861040981103, guid: 21a133bccb7244245a1c90c15ac4066a, - type: 3} - propertyPath: m_Name - value: rubber_duck_toy_2k (2) - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -3427,6 +3465,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 649094028} m_PrefabAsset: {fileID: 0} +--- !u!114 &649094030 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: -8380230304484969828, guid: 21a133bccb7244245a1c90c15ac4066a, + type: 3} + m_PrefabInstance: {fileID: 649094028} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &651875748 PrefabInstance: m_ObjectHideFlags: 0 @@ -11942,6 +11992,42 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 73ab30b86cb6034429b0584820a0808f, type: 3} +--- !u!114 &2328872132692517376 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7387765932717554547, guid: 73ab30b86cb6034429b0584820a0808f, + type: 3} + m_PrefabInstance: {fileID: 2328872132692517375} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2328872132692517377 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 624564972956498700, guid: 73ab30b86cb6034429b0584820a0808f, + type: 3} + m_PrefabInstance: {fileID: 2328872132692517375} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2328872132692517378 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 1288757202153908989, guid: 73ab30b86cb6034429b0584820a0808f, + type: 3} + m_PrefabInstance: {fileID: 2328872132692517375} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &4516616980196606186 PrefabInstance: m_ObjectHideFlags: 0 @@ -12005,11 +12091,52 @@ PrefabInstance: propertyPath: m_Name value: Male Sitting Pose (1) objectReference: {fileID: 0} + - target: {fileID: 3754201454259012101, guid: abfa52ac452faf541887ac5ebee2d3e3, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: abfa52ac452faf541887ac5ebee2d3e3, type: 3} +--- !u!114 &4516616980196606187 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5646625956535778847, guid: abfa52ac452faf541887ac5ebee2d3e3, + type: 3} + m_PrefabInstance: {fileID: 4516616980196606186} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4516616980196606188 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8058081348537911367, guid: abfa52ac452faf541887ac5ebee2d3e3, + type: 3} + m_PrefabInstance: {fileID: 4516616980196606186} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &4516616980196606189 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7566121492600159753, guid: abfa52ac452faf541887ac5ebee2d3e3, + type: 3} + m_PrefabInstance: {fileID: 4516616980196606186} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &6675076392627903239 PrefabInstance: m_ObjectHideFlags: 0 @@ -12078,6 +12205,54 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 830b64464ddc2ae4a922ab347028baf3, type: 3} +--- !u!114 &6675076392627903240 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3539143599838036806, guid: 830b64464ddc2ae4a922ab347028baf3, + type: 3} + m_PrefabInstance: {fileID: 6675076392627903239} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6675076392627903241 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 945240144959466094, guid: 830b64464ddc2ae4a922ab347028baf3, + type: 3} + m_PrefabInstance: {fileID: 6675076392627903239} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6675076392627903242 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5753587790559950361, guid: 830b64464ddc2ae4a922ab347028baf3, + type: 3} + m_PrefabInstance: {fileID: 6675076392627903239} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &6675076392627903243 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 422157580340128354, guid: 830b64464ddc2ae4a922ab347028baf3, + type: 3} + m_PrefabInstance: {fileID: 6675076392627903239} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60276d638c326f64e8ef8d871e7bb6fa, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/_Scenes/TrainingObserverMeta.unity b/Assets/_Scenes/TrainingObserverMeta.unity index 44a2b39..39f7637 100644 --- a/Assets/_Scenes/TrainingObserverMeta.unity +++ b/Assets/_Scenes/TrainingObserverMeta.unity @@ -1036,9 +1036,9 @@ RectTransform: - {fileID: 742612851} m_Father: {fileID: 753441170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 120, y: 0} m_SizeDelta: {x: 100, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &42380809 @@ -1205,9 +1205,9 @@ RectTransform: - {fileID: 2110043844} m_Father: {fileID: 1622022040} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -136.66667} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &55378119 @@ -1729,9 +1729,9 @@ RectTransform: - {fileID: 286914586} m_Father: {fileID: 1619745764} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 10.666687, y: -10} m_SizeDelta: {x: 400, y: 220} m_Pivot: {x: 0, y: 1} --- !u!114 &121153627 @@ -6150,9 +6150,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 744656470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -30} m_SizeDelta: {x: 230, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &487167219 @@ -6751,9 +6751,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2039085482} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -10} m_SizeDelta: {x: 380, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &576238808 @@ -7023,9 +7023,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1681810798} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -10} m_SizeDelta: {x: 380, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &582478604 @@ -7247,9 +7247,9 @@ RectTransform: - {fileID: 1401977604} m_Father: {fileID: 1541381071} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -30} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &598425501 @@ -7713,9 +7713,9 @@ RectTransform: - {fileID: 718897439} m_Father: {fileID: 1491115971} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -30} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &647139621 @@ -7774,7 +7774,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &659299841 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9216,9 +9216,9 @@ RectTransform: - {fileID: 487167218} m_Father: {fileID: 121153626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -52.5} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &744656471 @@ -9416,9 +9416,9 @@ RectTransform: - {fileID: 973112869} m_Father: {fileID: 1622022040} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 200, y: -93.33333} m_SizeDelta: {x: 360, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &753441171 @@ -10008,7 +10008,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &795105299 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10198,9 +10198,9 @@ RectTransform: - {fileID: 321151740} m_Father: {fileID: 121153626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195, y: -192.5} m_SizeDelta: {x: 350, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &808650660 @@ -10892,9 +10892,9 @@ RectTransform: - {fileID: 557721207} m_Father: {fileID: 744656470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -30} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &839361875 @@ -11115,7 +11115,7 @@ RectTransform: m_Father: {fileID: 351652692} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -12861,9 +12861,9 @@ RectTransform: - {fileID: 1662617722} m_Father: {fileID: 753441170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 240, y: 0} m_SizeDelta: {x: 100, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &973112870 @@ -13652,8 +13652,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 1602904148} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.05, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 30, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -13804,9 +13804,9 @@ RectTransform: - {fileID: 1458947473} m_Father: {fileID: 1736322358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -63.333332} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &1014826332 @@ -16300,9 +16300,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1736322358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -10} m_SizeDelta: {x: 380, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &1193117761 @@ -16665,9 +16665,9 @@ RectTransform: - {fileID: 1622022040} m_Father: {fileID: 389166861} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 450, y: -130} m_SizeDelta: {x: 840, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1205835604 @@ -17252,9 +17252,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1622022040} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -10} m_SizeDelta: {x: 380, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &1255846874 @@ -18526,9 +18526,9 @@ RectTransform: - {fileID: 479533743} m_Father: {fileID: 1014826331} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -30} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1372447994 @@ -19466,9 +19466,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1014826331} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -30} m_SizeDelta: {x: 280, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1458947474 @@ -19602,9 +19602,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 2039085482} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -145} m_SizeDelta: {x: 230, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1476771259 @@ -19941,9 +19941,9 @@ RectTransform: - {fileID: 1788961771} m_Father: {fileID: 2039085482} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -52.5} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &1491115972 @@ -20377,8 +20377,8 @@ RectTransform: - {fileID: 1021849024} m_Father: {fileID: 753441170} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 60} m_Pivot: {x: 0, y: 1} @@ -20621,9 +20621,9 @@ RectTransform: - {fileID: 1682367433} m_Father: {fileID: 1736322358} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -136.66667} m_SizeDelta: {x: 320, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &1541381072 @@ -20746,9 +20746,9 @@ RectTransform: - {fileID: 1602904148} m_Father: {fileID: 2039085482} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195, y: -192.5} m_SizeDelta: {x: 350, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1557660644 @@ -21292,9 +21292,9 @@ RectTransform: - {fileID: 1598634297} m_Father: {fileID: 2041551378} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -140} m_SizeDelta: {x: 400, y: 80} m_Pivot: {x: 0, y: 1} --- !u!114 &1587802139 @@ -21841,9 +21841,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 121153626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -10} m_SizeDelta: {x: 380, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &1607048910 @@ -21982,9 +21982,9 @@ RectTransform: - {fileID: 2039085482} m_Father: {fileID: 389166861} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 2324, y: -130} m_SizeDelta: {x: 1224, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1619745765 @@ -22132,9 +22132,9 @@ RectTransform: - {fileID: 55378118} m_Father: {fileID: 1205835603} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 430, y: -10} m_SizeDelta: {x: 400, y: 220} m_Pivot: {x: 0, y: 1} --- !u!114 &1622022041 @@ -22271,7 +22271,7 @@ RectTransform: m_Father: {fileID: 434632081} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.05, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -22684,8 +22684,8 @@ RectTransform: - {fileID: 2124794174} m_Father: {fileID: 2041551378} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 400, y: 140} m_Pivot: {x: 0, y: 1} @@ -22785,9 +22785,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1541381071} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -30} m_SizeDelta: {x: 280, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1682367434 @@ -22967,7 +22967,7 @@ RectTransform: m_Father: {fileID: 63268246} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0.05, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -23523,9 +23523,9 @@ RectTransform: - {fileID: 574200426} m_Father: {fileID: 1619745764} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 412, y: -10} m_SizeDelta: {x: 400, y: 220} m_Pivot: {x: 0, y: 1} --- !u!114 &1736322359 @@ -24166,9 +24166,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1491115971} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -30} m_SizeDelta: {x: 230, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1788961772 @@ -26533,8 +26533,8 @@ RectTransform: m_Children: [] m_Father: {fileID: 321151740} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 0.05, y: 0} + m_AnchorMax: {x: 0.05, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 30, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -26609,9 +26609,9 @@ RectTransform: - {fileID: 1498998533} m_Father: {fileID: 55378118} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 30, y: -30} m_SizeDelta: {x: 60, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1953766675 @@ -26684,9 +26684,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 121153626} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -145} m_SizeDelta: {x: 230, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1963460741 @@ -26821,7 +26821,7 @@ RectTransform: m_Father: {fileID: 844279240} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 30, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -27468,9 +27468,9 @@ RectTransform: - {fileID: 248044082} m_Father: {fileID: 1619745764} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 813.3334, y: -10} m_SizeDelta: {x: 400, y: 220} m_Pivot: {x: 0, y: 1} --- !u!114 &2039085483 @@ -27570,9 +27570,9 @@ RectTransform: - {fileID: 1587802138} m_Father: {fileID: 1205835603} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210, y: -120} m_SizeDelta: {x: 400, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2041551379 @@ -28484,7 +28484,7 @@ GameObject: - component: {fileID: 2090760414} - component: {fileID: 2090760413} m_Layer: 5 - m_Name: Start + m_Name: StartButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -28934,9 +28934,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 55378118} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 75, y: -30} m_SizeDelta: {x: 230, y: 60} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2110043846 @@ -29211,9 +29211,9 @@ RectTransform: - {fileID: 960053746} m_Father: {fileID: 1681810798} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -65} m_SizeDelta: {x: 360, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &2124794175 @@ -36749,7 +36749,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6913818243333983922} - - component: {fileID: 6913818243333983923} m_Layer: 6 m_Name: XRI_Network_Player_Avatar m_TagString: Untagged @@ -37337,23 +37336,6 @@ Transform: - {fileID: 5382535} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6913818243333983923 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5358844087720009267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 318f8ae78f0375c4db5613429c9ef197, type: 3} - m_Name: - m_EditorClassIdentifier: - headcam: {fileID: 1163434184} - eyeLeft: {fileID: 1936952809} - eyeRight: {fileID: 5382535} - overlayRendererFeature: {fileID: -7063961766839908257, guid: f843ca40f22d4cd458efe215f9736bad, - type: 2} --- !u!1 &6919819199353144338 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Scripts/Eye-Tracking/EyeTrackingCollisionPoints.cs b/Assets/_Scripts/Eye-Tracking/EyeTrackingCollisionPoints.cs index 90bc787..6a8c21f 100644 --- a/Assets/_Scripts/Eye-Tracking/EyeTrackingCollisionPoints.cs +++ b/Assets/_Scripts/Eye-Tracking/EyeTrackingCollisionPoints.cs @@ -24,12 +24,11 @@ public class EyeTrackingCollisionPoints : MonoBehaviour if ( hitPoint != null && Physics.Raycast(transform.position, rayCastDirection, out hit, rayDistance, layersToInclude)) { hitPoint.transform.position = new Vector3(hit.point.x, hit.point.y, hit.point.z); - + GameObject hitObject = hit.collider.gameObject; - - if (hit.collider.GetType() == typeof(MeshCollider)) + if ( hitObject.GetComponent() != null) { - hitObject.GetComponent().addHitPoint(hit.textureCoord.x, hit.textureCoord.y); + hitObject.GetComponent().AddHeat(0.02f); } } } diff --git a/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs b/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs index b13cacd..7f9b156 100644 --- a/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs +++ b/Assets/_Scripts/GhostSystem/GhostRecorderBatch.cs @@ -61,7 +61,7 @@ namespace GhostSystem supabaseReady = true; } - private void HandleSceneIdReady(string id, List doors) + private void HandleSceneIdReady(string id, List doors, List targets) { SceneId = id; sceneIdReady = true; diff --git a/Assets/_Scripts/GhostSystem/GhostReplayManager.cs b/Assets/_Scripts/GhostSystem/GhostReplayManager.cs index fd9c632..45365fe 100644 --- a/Assets/_Scripts/GhostSystem/GhostReplayManager.cs +++ b/Assets/_Scripts/GhostSystem/GhostReplayManager.cs @@ -50,6 +50,7 @@ namespace GhostSystem private bool sceneIdReady = false; private string loadedSceneId; private int doorCount; + private List heatTargets; private DateTime latestLoadedTimestamp; @@ -78,7 +79,7 @@ namespace GhostSystem TryInitializeReplay(); } - private void HandleSceneIdReady(string id, List doors) + private void HandleSceneIdReady(string id, List doors, List targets) { sceneIdReady = true; loadedSceneId = id; @@ -90,6 +91,7 @@ namespace GhostSystem TrackedObjects.Add(trackedObjectBinding); doorCount++; } + heatTargets = targets; TryInitializeReplay(); } @@ -243,7 +245,13 @@ namespace GhostSystem if (playbackTime > totalDuration) { if (Loop) + { playbackTime = 0f; + foreach (RecieveHeat target in heatTargets) + { + target.SetHeat(0); + } + } else isPlaying = false; } diff --git a/Assets/_Scripts/Utility/FillDopdownWithScenes.cs b/Assets/_Scripts/Utility/FillDopdownWithScenes.cs index 486cd05..5eadba7 100644 --- a/Assets/_Scripts/Utility/FillDopdownWithScenes.cs +++ b/Assets/_Scripts/Utility/FillDopdownWithScenes.cs @@ -18,8 +18,9 @@ public class FillDopdownWithScenes : MonoBehaviour dropdown.ClearOptions(); List sceneNames = new List(); + //sceneNames.Add("none"); - for (int i = 0; i < SceneManager.sceneCountInBuildSettings; i++) + for (int i = 1; i < SceneManager.sceneCountInBuildSettings; i++) { string path = SceneUtility.GetScenePathByBuildIndex(i); string name = System.IO.Path.GetFileNameWithoutExtension(path); diff --git a/Assets/_Scripts/Utility/FlushAndLoad.cs b/Assets/_Scripts/Utility/FlushAndLoad.cs index 2e1692b..5cdb937 100644 --- a/Assets/_Scripts/Utility/FlushAndLoad.cs +++ b/Assets/_Scripts/Utility/FlushAndLoad.cs @@ -66,7 +66,7 @@ public class FlushAndLoad : MonoBehaviour } } - private void HandleSceneIdReady(string id, List doors) + private void HandleSceneIdReady(string id, List doors, List targets) { sceneId = id; if (id == "Room1") diff --git a/Assets/_Scripts/Utility/RecieveHeat.cs b/Assets/_Scripts/Utility/RecieveHeat.cs new file mode 100644 index 0000000..b4398d3 --- /dev/null +++ b/Assets/_Scripts/Utility/RecieveHeat.cs @@ -0,0 +1,24 @@ +using UnityEngine; + +public class RecieveHeat : MonoBehaviour +{ + private float heatLevel; + private Material myMat; + private void Start() + { + myMat = GetComponent().material; + } + + public void SetHeat(float heat) + { + if (heat > 255) return; + heatLevel = heat; + myMat.color = new Color(heatLevel,0,0); + } + + public void AddHeat(float heat) + { + heatLevel += heat; + myMat.color = new Color(heatLevel, 0, 0); + } +} diff --git a/Assets/_Scripts/Utility/RecieveHeat.cs.meta b/Assets/_Scripts/Utility/RecieveHeat.cs.meta new file mode 100644 index 0000000..8ac480e --- /dev/null +++ b/Assets/_Scripts/Utility/RecieveHeat.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 60276d638c326f64e8ef8d871e7bb6fa \ No newline at end of file diff --git a/Assets/_Scripts/Utility/ReplaySceneLoader.cs b/Assets/_Scripts/Utility/ReplaySceneLoader.cs index 5bfe644..0cc987b 100644 --- a/Assets/_Scripts/Utility/ReplaySceneLoader.cs +++ b/Assets/_Scripts/Utility/ReplaySceneLoader.cs @@ -10,10 +10,12 @@ public class ReplaySceneLoader : MonoBehaviour private int currentScene; public void LoadSceneAdditive(int sceneIndex) { + sceneIndex += 1; if(SceneManager.loadedSceneCount > 1) { SceneManager.UnloadSceneAsync(currentScene); } + //if (sceneIndex == 0) return; SceneManager.LoadSceneAsync(sceneIndex, LoadSceneMode.Additive); currentScene = sceneIndex; diff --git a/Assets/_Scripts/Utility/RoomManager.cs b/Assets/_Scripts/Utility/RoomManager.cs index 3cdc4ba..160d337 100644 --- a/Assets/_Scripts/Utility/RoomManager.cs +++ b/Assets/_Scripts/Utility/RoomManager.cs @@ -14,8 +14,9 @@ public class RoomManager : MonoBehaviour public List furnitures; public List portals; public List enemies; + public List targets; - public static event Action> OnSceneIdReady; // um das Replay erst auszulösen, wenn die SceneId da ist, die nun über die RoomPrefs festgelegt wird. + public static event Action, List> OnSceneIdReady; // um das Replay erst auszulösen, wenn die SceneId da ist, die nun über die RoomPrefs festgelegt wird. GhostRecorderBatch ghostRecorder; public void Awake() @@ -48,7 +49,7 @@ public class RoomManager : MonoBehaviour foreach (GameObject enemy in enemies) enemy.SetActive(true); } sceneId = myRoom.sceneId; - OnSceneIdReady?.Invoke(sceneId, doors); + OnSceneIdReady?.Invoke(sceneId, doors, targets); } } \ No newline at end of file