diff --git a/Assets/DelthorGames/AKM/Materials/AKM_Mat.mat b/Assets/DelthorGames/AKM/Materials/AKM_Mat.mat index 26cd038..55cde23 100644 --- a/Assets/DelthorGames/AKM/Materials/AKM_Mat.mat +++ b/Assets/DelthorGames/AKM/Materials/AKM_Mat.mat @@ -1,15 +1,34 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5982771510888734684 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: AKM_Mat - m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP _NORMALMAP _PARALLAXMAP _SPECGLOSSMAP + m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: + - _EMISSION + - _METALLICGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP + - _SPECGLOSSMAP m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -59,6 +78,19 @@ Material: m_Texture: {fileID: 2800000, guid: f93e7d11111564d47a022d4640605868, type: 3} 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: - _BumpScale: 1.1 - _Cutoff: 0.5 @@ -71,11 +103,22 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 + - _UseAoMap: 1 + - _UseColorMap: 1 + - _UseEmissiveMap: 1 + - _UseMetallicMap: 1 + - _UseNormalMap: 1 + - _UseRoughnessMap: 1 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.26041293, g: 0.41509432, b: 0.3160982, a: 1} + - _UvOffset: {r: 0, g: 0, b: 0, a: 0} + - _UvTiling: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/FreeFlyCamera/Demo/Materials/Material1.mat b/Assets/FreeFlyCamera/Demo/Materials/Material1.mat index 5ee317a..99b65fb 100644 --- a/Assets/FreeFlyCamera/Demo/Materials/Material1.mat +++ b/Assets/FreeFlyCamera/Demo/Materials/Material1.mat @@ -2,23 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Material1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] 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} @@ -55,20 +62,68 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 - _Glossiness: 0.5 + - _GlossyReflections: 0 - _Metallic: 0.274 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.054681636, g: 0.24264705, b: 0.039251722, a: 1} + - _BaseColor: {r: 0.054681636, g: 0.24264705, b: 0.039251722, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] +--- !u!114 &3568404676129724374 +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: 5 diff --git a/Assets/FreeFlyCamera/Demo/Materials/Material2.mat b/Assets/FreeFlyCamera/Demo/Materials/Material2.mat index 0a3b959..f1ec644 100644 --- a/Assets/FreeFlyCamera/Demo/Materials/Material2.mat +++ b/Assets/FreeFlyCamera/Demo/Materials/Material2.mat @@ -1,24 +1,44 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-1931840731265655551 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Material2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] 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} @@ -55,20 +75,55 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 - _Glossiness: 0.5 + - _GlossyReflections: 0 - _Metallic: 0.274 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/GI Blocker.mat b/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/GI Blocker.mat index 84b6c7b..098d038 100644 --- a/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/GI Blocker.mat +++ b/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/GI Blocker.mat @@ -1,23 +1,43 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-4467561736324375955 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: GI Blocker - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] 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} @@ -54,11 +74,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 - _GlossyReflections: 1 @@ -66,11 +110,19 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _Color: {r: 0, g: 0, b: 0, a: 1} + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/Neon Light.mat b/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/Neon Light.mat index 521d17d..243dfe9 100644 --- a/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/Neon Light.mat +++ b/Assets/Gridbox Prototype Materials/Demo/Prototype Materials Demo/Neon Light.mat @@ -2,22 +2,30 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Neon Light - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _EMISSION + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _EMISSION + m_InvalidKeywords: [] m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] 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} @@ -54,11 +62,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -66,11 +98,32 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 1, b: 0.9019608, a: 1} + - _BaseColor: {r: 1, g: 1, b: 0.9019608, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 1, g: 1, b: 0.84705883, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &3524144305717712557 +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: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Red 1.mat b/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Red 1.mat index 49a4aaa..890a01f 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Red 1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Red 1.mat @@ -1,5 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2374923386437618342 +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: 5 --- !u!21 &2100000 Material: serializedVersion: 8 @@ -8,12 +21,13 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Red 1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - - _ALPHABLEND_ON - _NORMALMAP - _SPECULARHIGHLIGHTS_OFF + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: + - _ALPHABLEND_ON - _DISABLE_SSR_TRANSPARENT - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 @@ -29,6 +43,8 @@ Material: - TransparentDepthPostpass - TransparentBackface - RayTracingPrepass + - DepthOnly + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -42,7 +58,7 @@ Material: m_Offset: {x: 0, y: 0} - _BaseMap: m_Texture: {fileID: 2800000, guid: 3d6064e2e1cd7214e9f67f3a68f494fb, type: 3} - m_Scale: {x: 1, y: 1} + m_Scale: {x: 100, y: 100} m_Offset: {x: 0, y: 0} - _BentNormalMap: m_Texture: {fileID: 0} @@ -189,12 +205,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -229,6 +248,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -270,7 +290,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -293,7 +313,7 @@ Material: - _StencilWriteMaskMV: 40 - _SubsurfaceMask: 1 - _SupportDecals: 1 - - _Surface: 0 + - _Surface: 1 - _SurfaceType: 0 - _TexWorldScale: 1 - _TexWorldScaleEmissive: 1 @@ -312,13 +332,14 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - _ZTestTransparent: 4 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0.12941177} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 0.12941177} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Yellow 1.mat b/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Yellow 1.mat index 6270d53..d61de6c 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Yellow 1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Prototype_512x512_Yellow 1.mat @@ -2,15 +2,21 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Yellow 1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: + - _ALPHABLEND_ON + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -24,6 +30,8 @@ Material: - TransparentDepthPostpass - TransparentBackface - RayTracingPrepass + - DepthOnly + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -163,6 +171,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -183,12 +192,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -223,6 +235,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -264,7 +277,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -287,7 +300,7 @@ Material: - _StencilWriteMaskMV: 40 - _SubsurfaceMask: 1 - _SupportDecals: 1 - - _Surface: 0 + - _Surface: 1 - _SurfaceType: 0 - _TexWorldScale: 1 - _TexWorldScaleEmissive: 1 @@ -306,13 +319,14 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 - _ZTestTransparent: 4 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 0} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0.15686275} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 0.15686275} - _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0} @@ -330,3 +344,16 @@ Material: - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0} - _UVMappingMaskEmissive: {r: 1, g: 0, b: 0, a: 0} m_BuildTextureStacks: [] +--- !u!114 &1276922232544375287 +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: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue1.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue1.mat index afa7a8a..47f7e39 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue1.mat @@ -15,20 +15,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Blue1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -278,7 +287,7 @@ Material: - _SSRefractionProjectionModel: 0 - _SampleGI: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -357,4 +366,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue2.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue2.mat index c48e985..61973fd 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue2.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue2.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Blue2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue3.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue3.mat index d45fcbe..c01dff7 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue3.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Blue3.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Blue3 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -162,6 +167,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -182,12 +188,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -222,6 +231,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -263,7 +273,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -305,6 +315,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -354,4 +365,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Brown.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Brown.mat index eeab9df..5d60be9 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Brown.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Brown.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Brown - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Cyan.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Cyan.mat index ce865d5..1f26580 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Cyan.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Cyan.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Cyan - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green1.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green1.mat index 17f05f9..67c943b 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green1.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Green1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green2.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green2.mat index 2ded3e7..a7a031d 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green2.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green2.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Green2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green3.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green3.mat index 66dc195..0b95e35 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green3.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Green3.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Green3 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -48,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: - m_Texture: {fileID: 2800000, guid: 382df89af99b9f2459dd19206e68a63d, type: 3} + m_Texture: {fileID: 2800000, guid: 988b6610bda0aca4286aff060b8d16b8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey1.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey1.mat index 54de235..c9af1f3 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey1.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Grey1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -162,6 +167,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -182,12 +188,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -222,6 +231,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -263,7 +273,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -305,6 +315,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -341,7 +352,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!114 &2849752495664318720 MonoBehaviour: m_ObjectHideFlags: 11 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey2.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey2.mat index 627867f..417d566 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey2.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey2.mat @@ -15,20 +15,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Grey2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -354,4 +365,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey3.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey3.mat index 1c6f395..8233758 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey3.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey3.mat @@ -15,20 +15,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Grey3 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -354,4 +365,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey4.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey4.mat index 4dcb0fd..7ba606e 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey4.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Grey4.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Grey4 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Magenta.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Magenta.mat index 5743c0a..a2f9c12 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Magenta.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Magenta.mat @@ -2,20 +2,25 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Magenta - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -35,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: - m_Texture: {fileID: 2800000, guid: b6fc60785b6a795478135ce6f7712c5a, type: 3} + m_Texture: {fileID: 2800000, guid: 81c078e07a3828a42885510e3d5369a9, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -162,6 +167,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -182,12 +188,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -222,6 +231,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -263,7 +273,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -305,6 +315,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -354,4 +365,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Olive.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Olive.mat index fb0dbe1..cd98272 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Olive.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Olive.mat @@ -12,23 +12,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Olive - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -48,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: - m_Texture: {fileID: 2800000, guid: 382df89af99b9f2459dd19206e68a63d, type: 3} + m_Texture: {fileID: 2800000, guid: 9895b9b639c999f488492b5182e2242c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Orange.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Orange.mat index 24422d7..4eda94a 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Orange.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Orange.mat @@ -25,23 +25,28 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Orange - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -188,6 +193,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -208,12 +214,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -248,6 +257,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -289,7 +299,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -331,6 +341,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Pink.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Pink.mat index 2f6e6ed..1ecf397 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Pink.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Pink.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!114 &-6650882337939974940 MonoBehaviour: m_ObjectHideFlags: 11 @@ -28,20 +28,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Pink - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -61,7 +66,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BaseMap: - m_Texture: {fileID: 2800000, guid: ee12d2bc9f5c8554d97d5beb9dc4b275, type: 3} + m_Texture: {fileID: 2800000, guid: 054e32e11095e1d4896131bb4eed8cc1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BentNormalMap: @@ -188,6 +193,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -208,12 +214,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -248,6 +257,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -289,7 +299,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -331,6 +341,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Purple.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Purple.mat index 38cd76e..c400658 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Purple.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Purple.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!114 &-3574224795644339735 MonoBehaviour: m_ObjectHideFlags: 11 @@ -28,20 +28,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Purple - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -188,6 +193,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -208,12 +214,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -248,6 +257,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -289,7 +299,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -331,6 +341,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Red.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Red.mat index 358850a..c6fa74a 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Red.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Red.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Red - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _NORMALMAP - _SPECULARHIGHLIGHTS_OFF @@ -19,7 +19,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -187,12 +188,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -227,6 +231,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -268,7 +273,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -310,6 +315,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -359,4 +365,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_White.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_White.mat index 03c8042..4c45b9e 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_White.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_White.mat @@ -15,20 +15,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_White - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -175,6 +180,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -195,12 +201,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -235,6 +244,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -276,7 +286,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -318,6 +328,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 @@ -354,4 +365,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Yellow.mat b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Yellow.mat index ecb7ca1..0a7c792 100644 --- a/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Yellow.mat +++ b/Assets/Gridbox Prototype Materials/Materials/Standard/Prototype_512x512_Yellow.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 1 + version: 5 --- !u!114 &-6650882337939974940 MonoBehaviour: m_ObjectHideFlags: 11 @@ -28,20 +28,25 @@ MonoBehaviour: version: 11 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Prototype_512x512_Yellow - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE - _SPECULARHIGHLIGHTS_OFF + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _NORMALMAP + - _SPECULARHIGHLIGHTS_OFF + m_InvalidKeywords: + - _DISABLE_SSR_TRANSPARENT + - _NORMALMAP_TANGENT_SPACE m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: - DistortionVectors - MOTIONVECTORS @@ -188,6 +193,7 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _AORemapMax: 1 - _AORemapMin: 0 @@ -208,12 +214,15 @@ Material: - _Blend: 0 - _BlendMode: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 - _CoatMask: 0 - _Cull: 2 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 - _DepthOffsetEnable: 0 + - _DetailAlbedoMapScale: 1 - _DetailAlbedoScale: 1 - _DetailNormalMapScale: 1 - _DetailNormalScale: 1 @@ -248,6 +257,7 @@ Material: - _EnableFogOnTransparent: 1 - _EnableGeometricSpecularAA: 0 - _EnergyConservingSpecularColor: 1 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossinessSource: 0 @@ -289,7 +299,7 @@ Material: - _RefractionModel: 0 - _SSRefractionProjectionModel: 0 - _Shininess: 0 - - _Smoothness: 0 + - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 - _SmoothnessSource: 1 @@ -331,6 +341,7 @@ Material: - _UVSec: 0 - _UseEmissiveIntensity: 0 - _UseShadowThreshold: 0 + - _WorkflowMode: 1 - _ZTestDepthEqualForOpaque: 3 - _ZTestGBuffer: 4 - _ZTestModeDistortion: 4 diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue1.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue1.mat index 0986ac1..e8f5d68 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue1.mat @@ -2,23 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_blue1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 44cced520ecfd9f4292979a4fe8268c4, type: 3} + m_Scale: {x: 20, y: 20} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +61,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +97,32 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] +--- !u!114 &3622286349949287817 +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: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue2.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue2.mat index 0f17d9a..9f99380 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue2.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue2.mat @@ -2,23 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_blue2 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 17198718c5735204999fb13dc36e290f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -40,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 17198718c5735204999fb13dc36e290f, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,11 +61,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +97,32 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] +--- !u!114 &5044601059427649961 +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: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue3.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue3.mat index a099423..0ff14e8 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue3.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_blue3.mat @@ -1,24 +1,43 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8130454055661593065 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_blue3 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b6fc60785b6a795478135ce6f7712c5a, type: 3} + m_Scale: {x: 100, y: 100} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +74,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +110,19 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown.mat index 486bda1..9ae47d2 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown.mat @@ -8,20 +8,27 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_brown - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: - _ALPHABLEND_ON - m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 3c227d230cca14c42822692b6aff3459, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -58,12 +65,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -71,12 +101,32 @@ Material: - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] +--- !u!114 &3903433445579460744 +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: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown_Preview.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown_Preview.mat index 4c4a5dc..97a972e 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown_Preview.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_brown_Preview.mat @@ -8,19 +8,26 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_brown_Preview - m_Shader: {fileID: 30, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] - m_InvalidKeywords: - - _ALPHABLEND_ON + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ValidKeywords: + - _SPECULAR_COLOR + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - DepthOnly m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 3c227d230cca14c42822692b6aff3459, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -42,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 3c227d230cca14c42822692b6aff3459, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -61,26 +68,63 @@ Material: 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _Cull: 2 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 10 - _GlossMapScale: 1 - _Glossiness: 0.5 + - _GlossinessSource: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Shininess: 0 + - _Smoothness: 0.5 + - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 0 + - _SpecSource: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _Surface: 1 - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 0.5529412} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0.5529412} + - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] +--- !u!114 &9186502566292103486 +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: 5 diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_grey1.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_grey1.mat index bf758d9..400afc9 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_grey1.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_grey1.mat @@ -1,24 +1,43 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6133655792231949091 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_grey1 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: dd29f35641da38647a1eeb1028211f1a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +74,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +110,19 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_white.mat b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_white.mat index 9d5bf18..b0c8697 100644 --- a/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_white.mat +++ b/Assets/Gridbox Prototype Materials/Materials/prototype_512x512_white.mat @@ -1,24 +1,43 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7954744683174345125 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_512x512_white - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9397418d1d7b12543bf27fb61b93bbea, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,11 +74,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +110,19 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Gridbox Prototype Materials/Template/Materials/prototype_texture_512x512.mat b/Assets/Gridbox Prototype Materials/Template/Materials/prototype_texture_512x512.mat index e30ac2a..6376359 100644 --- a/Assets/Gridbox Prototype Materials/Template/Materials/prototype_texture_512x512.mat +++ b/Assets/Gridbox Prototype Materials/Template/Materials/prototype_texture_512x512.mat @@ -2,23 +2,29 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: prototype_texture_512x512 - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: {} + stringTagMap: + RenderType: Opaque disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 3fe239e19d10e284cb9bb5a748ecb82e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -40,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 3fe239e19d10e284cb9bb5a748ecb82e, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -55,11 +61,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -67,12 +97,32 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Surface: 0 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] +--- !u!114 &8237067124677277591 +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: 5 diff --git a/Assets/Img/Materials/FirebaseCircle.mat b/Assets/Img/Materials/FirebaseCircle.mat index ba02d30..f06e1de 100644 --- a/Assets/Img/Materials/FirebaseCircle.mat +++ b/Assets/Img/Materials/FirebaseCircle.mat @@ -1,25 +1,47 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6248295926924526462 +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: 5 --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: FirebaseCircle - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: + - _ALPHABLEND_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent - disabledShaderPasses: [] + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 2e8a4c324d97191458208abd2efd1c01, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _BumpMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -56,11 +78,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - 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: + - _AlphaClip: 0 + - _Blend: 0 - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - _DstBlend: 10 + - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 @@ -68,12 +114,19 @@ Material: - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 5 + - _Surface: 1 - _UVSec: 0 + - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 0.22745098} - _Color: {r: 1, g: 1, b: 1, a: 0.22745098} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/ML-Agents/Timers/Play_timers.json b/Assets/ML-Agents/Timers/Play_timers.json index 0b37c8b..4f2b257 100644 --- a/Assets/ML-Agents/Timers/Play_timers.json +++ b/Assets/ML-Agents/Timers/Play_timers.json @@ -1 +1 @@ -{"count":1,"self":10.4477704,"total":10.526777599999999,"children":{"InitializeActuators":{"count":2,"self":0.0009994,"total":0.0009994,"children":null},"InitializeSensors":{"count":2,"self":0.0010011,"total":0.0010011,"children":null},"AgentSendState":{"count":297,"self":0.0024955,"total":0.012502099999999999,"children":{"CollectObservations":{"count":297,"self":0.0075064999999999993,"total":0.0075064999999999993,"children":null},"WriteActionMask":{"count":297,"self":0.0009999,"total":0.0009999,"children":null},"RequestDecision":{"count":297,"self":0.0015002,"total":0.0015002,"children":null}}},"DecideAction":{"count":297,"self":0.0035018999999999996,"total":0.0035018999999999996,"children":null},"AgentAct":{"count":297,"self":0.0600054,"total":0.0600054,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1692345027","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId c8cecfbf-82e1-47c1-99d7-1c4b89e2861d -accessToken caPolLh-c3wSPf9adNY7VyqTw6hrLcfADpqVzK2KnyA00ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1692345038"}} \ No newline at end of file +{"count":1,"self":48.5149632,"total":49.084985599999996,"children":{"InitializeActuators":{"count":2,"self":0.0010017,"total":0.0010017,"children":null},"InitializeSensors":{"count":2,"self":0.0009998,"total":0.0009998,"children":null},"AgentSendState":{"count":2199,"self":0.013493199999999999,"total":0.0889476,"children":{"CollectObservations":{"count":2199,"self":0.064447999999999991,"total":0.064447999999999991,"children":null},"WriteActionMask":{"count":2199,"self":0.0020020999999999997,"total":0.0020020999999999997,"children":null},"RequestDecision":{"count":2199,"self":0.0090043,"total":0.0090043,"children":null}}},"DecideAction":{"count":2199,"self":0.0139861,"total":0.0139861,"children":null},"AgentAct":{"count":2199,"self":0.46458849999999996,"total":0.46458849999999996,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1694124726","unity_version":"2021.3.14f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2021.3.14f1\\Editor\\Unity.exe -projectpath C:\\Users\\UCUNI\\OneDrive\\Unity\\ML-Agents\\Aimbot-ParallelEnv -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-UCUNI -hubSessionId 0aed42b0-3d5b-4374-942e-adccfa3e50fe -accessToken 846lZd-HJLP4t5aNcNJhMc6uOpoi0s7_Pc1abgAYxk000ef","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Play","end_time_seconds":"1694124775"}} \ No newline at end of file diff --git a/Assets/Prefeb/AttackBlock/Attack-AllLevel-Prefabs.asset b/Assets/Prefeb/AttackBlock/Attack-AllLevel-Prefabs.asset index fe18665..36eadfa 100644 --- a/Assets/Prefeb/AttackBlock/Attack-AllLevel-Prefabs.asset +++ b/Assets/Prefeb/AttackBlock/Attack-AllLevel-Prefabs.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 944a7e8a5086c6646bc0685cbede5ebc, type: 3} m_Name: Attack-AllLevel-Prefabs m_EditorClassIdentifier: - SceneLevelPrefabSet: + singleLevelSet: - {fileID: 11400000, guid: 8fc444f0771edf64f8bfc352977d8597, type: 2} diff --git a/Assets/Prefeb/LevelButton.prefab b/Assets/Prefeb/LevelButton.prefab new file mode 100644 index 0000000..a93abd8 --- /dev/null +++ b/Assets/Prefeb/LevelButton.prefab @@ -0,0 +1,316 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7507962124963951634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7507962124963951635} + - component: {fileID: 7507962124963951637} + - component: {fileID: 7507962124963951636} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7507962124963951635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962124963951634} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7507962125065591918} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7507962124963951637 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962124963951634} + m_CullTransparentMesh: 1 +--- !u!114 &7507962124963951636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962124963951634} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Level + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7507962125065591917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7507962125065591918} + - component: {fileID: 7507962125065591825} + - component: {fileID: 7507962125065591824} + - component: {fileID: 7507962125065591919} + - component: {fileID: 6631082051945816225} + - component: {fileID: 1651166592400170255} + m_Layer: 5 + m_Name: LevelButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7507962125065591918 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962125065591917} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7507962124963951635} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7507962125065591825 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962125065591917} + m_CullTransparentMesh: 1 +--- !u!114 &7507962125065591824 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962125065591917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7507962125065591919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962125065591917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7507962125065591824} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &6631082051945816225 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962125065591917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cbfa6f85d7bca847a18555e6afeba0d, type: 3} + m_Name: + m_EditorClassIdentifier: + level: 0 + levelText: {fileID: 7507962124963951636} +--- !u!114 &1651166592400170255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7507962125065591917} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48f605c5c3d09384fa6b248789466476, type: 3} + m_Name: + m_EditorClassIdentifier: + normalTextColor: + serializedVersion: 2 + rgba: 4293717228 + normalBGColor: + serializedVersion: 2 + rgba: 16777215 + highLightTextColor: + serializedVersion: 2 + rgba: 3861457193 + highLightBGColor: + serializedVersion: 2 + rgba: 1744830463 + pressedTextColor: + serializedVersion: 2 + rgba: 4026531840 + pressedBGColor: + serializedVersion: 2 + rgba: 2701131775 + disableTextColor: + serializedVersion: 2 + rgba: 0 + disableBGColor: + serializedVersion: 2 + rgba: 939524095 + colorChangeSpeed: 0.1 + clickable: 1 + text: {fileID: 0} diff --git a/Assets/Prefeb/LevelButton.prefab.meta b/Assets/Prefeb/LevelButton.prefab.meta new file mode 100644 index 0000000..ae2e6ea --- /dev/null +++ b/Assets/Prefeb/LevelButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 670eb0f20aedb744e81dc597874e6f09 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefeb/Scene Blocks Set.asset b/Assets/Prefeb/Scene Blocks Set.asset index bfaa347..bc3573e 100644 --- a/Assets/Prefeb/Scene Blocks Set.asset +++ b/Assets/Prefeb/Scene Blocks Set.asset @@ -13,6 +13,5 @@ MonoBehaviour: m_Name: Scene Blocks Set m_EditorClassIdentifier: levels: - - {fileID: 11400000, guid: bf3f37e7f498fad4d8640226f4b70374, type: 2} - {fileID: 11400000, guid: e9f031290ad88b1479c80e7adfd6d5fd, type: 2} - - {fileID: 0} + - {fileID: 11400000, guid: bf3f37e7f498fad4d8640226f4b70374, type: 2} diff --git a/Assets/Scenes/Play.unity b/Assets/Scenes/Play.unity index 71af4a6..151d1d0 100644 --- a/Assets/Scenes/Play.unity +++ b/Assets/Scenes/Play.unity @@ -981,140 +981,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 107127976} m_CullTransparentMesh: 1 ---- !u!1 &114578811 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 114578812} - - component: {fileID: 114578815} - - component: {fileID: 114578814} - - component: {fileID: 114578813} - m_Layer: 5 - m_Name: SetAttackTarget - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &114578812 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114578811} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 469147548} - m_Father: {fileID: 405727031} - m_RootOrder: 3 - 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_SizeDelta: {x: 183, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &114578813 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114578811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 114578814} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetAttackPressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &114578814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114578811} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &114578815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 114578811} - m_CullTransparentMesh: 1 --- !u!1 &114821935 GameObject: m_ObjectHideFlags: 0 @@ -1598,141 +1464,6 @@ MonoBehaviour: stateText: {fileID: 580986721} resultTimeout: 1 gaugeImgObj: {fileID: 446172016} ---- !u!1 &166240942 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 166240943} - - component: {fileID: 166240945} - - component: {fileID: 166240944} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &166240943 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 166240942} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2022487657} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &166240944 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 166240942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: StayMode - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &166240945 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 166240942} - m_CullTransparentMesh: 1 --- !u!1 &180706344 GameObject: m_ObjectHideFlags: 0 @@ -2687,6 +2418,7 @@ GameObject: - component: {fileID: 320729029} - component: {fileID: 320729028} - component: {fileID: 320729027} + - component: {fileID: 320729031} m_Layer: 5 m_Name: SetAttackTarget m_TagString: Untagged @@ -2710,11 +2442,11 @@ RectTransform: m_Father: {fileID: 649495072} m_RootOrder: 3 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -90} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &320729027 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2734,7 +2466,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -2758,19 +2490,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 320729028} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetAttackPressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &320729028 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2791,8 +2511,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2809,6 +2529,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320729025} m_CullTransparentMesh: 1 +--- !u!114 &320729031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320729025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] --- !u!1 &321934783 GameObject: m_ObjectHideFlags: 0 @@ -2886,7 +2619,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3160,7 +2893,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: -246.2022} + m_AnchoredPosition: {x: 0.000030517578, y: -246.2018} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &324069808 @@ -3199,7 +2932,7 @@ MonoBehaviour: m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 @@ -3540,7 +3273,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3815,11 +3548,11 @@ RectTransform: m_Father: {fileID: 649495072} m_RootOrder: 2 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &371362500 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3839,7 +3572,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -3863,19 +3596,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 371362501} m_OnClick: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetGotoPressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] --- !u!114 &371362501 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3896,8 +3617,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3926,23 +3647,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} m_Name: m_EditorClassIdentifier: - m_Delegates: - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: - m_MethodName: - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Delegates: [] --- !u!1 &380667083 GameObject: m_ObjectHideFlags: 0 @@ -4162,7 +3867,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4413,8 +4118,10 @@ GameObject: - component: {fileID: 405727034} - component: {fileID: 405727033} - component: {fileID: 405727032} + - component: {fileID: 405727035} + - component: {fileID: 405727036} m_Layer: 5 - m_Name: LevelUIPanel + m_Name: GotoLevelPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4427,24 +4134,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405727030} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1032314817} - - {fileID: 965540410} - - {fileID: 854741224} - - {fileID: 114578812} - - {fileID: 1472703008} - - {fileID: 2022487657} + m_Children: [] m_Father: {fileID: 2082200189} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -183.41, y: -84.36499} - m_SizeDelta: {x: 214.25, y: 186} + m_AnchoredPosition: {x: -180, y: -60.7} + m_SizeDelta: {x: 180, y: 30} m_Pivot: {x: 1, y: 1} --- !u!114 &405727032 MonoBehaviour: @@ -4462,12 +4163,12 @@ MonoBehaviour: m_Left: 0 m_Right: 0 m_Top: 0 - m_Bottom: -31 + m_Bottom: -30 m_ChildAlignment: 1 - m_Spacing: -31 - m_ChildForceExpandWidth: 0 + m_Spacing: -30 + m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 + m_ChildControlWidth: 1 m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 @@ -4484,16 +4185,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0} + m_Material: {fileID: 2100000, guid: f6d46f1e916b3486c90a448a441fac6a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 0} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4510,6 +4211,40 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 405727030} m_CullTransparentMesh: 1 +--- !u!114 &405727035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405727030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02d6bdfbf02e0894e80967002bc8c730, type: 3} + m_Name: + m_EditorClassIdentifier: + primaryButtonType: 0 + levelButtonPrefab: {fileID: 7507962125065591917, guid: 670eb0f20aedb744e81dc597874e6f09, type: 3} + hudObj: {fileID: 2082200184} + defaultPosition: {x: 0, y: 0} + targetPosition: {x: 0, y: 0} + defaultSize: {x: 0, y: 0} + targetSize: {x: 0, y: 0} + isFolding: 0 + isExpanding: 0 +--- !u!114 &405727036 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405727030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] --- !u!1 &413189339 GameObject: m_ObjectHideFlags: 0 @@ -4545,11 +4280,11 @@ RectTransform: m_Father: {fileID: 55747560} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 250, y: -150} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &413189341 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4970,11 +4705,11 @@ RectTransform: m_Father: {fileID: 55747560} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 250, y: -150} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -250, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &440411431 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5255,141 +4990,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 454701933} m_Mesh: {fileID: 7280481152629387332, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} ---- !u!1 &469147547 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 469147548} - - component: {fileID: 469147550} - - component: {fileID: 469147549} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &469147548 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 469147547} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 114578812} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &469147549 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 469147547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: SetAttackTarget - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &469147550 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 469147547} - m_CullTransparentMesh: 1 --- !u!1 &477849377 GameObject: m_ObjectHideFlags: 0 @@ -5466,287 +5066,13 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 477849377} m_CullTransparentMesh: 1 ---- !u!1 &492243813 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 492243814} - - component: {fileID: 492243816} - - component: {fileID: 492243815} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &492243814 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492243813} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 965540410} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &492243815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492243813} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'SetEnemy - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &492243816 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 492243813} - m_CullTransparentMesh: 1 ---- !u!1 &500355573 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 500355574} - - component: {fileID: 500355576} - - component: {fileID: 500355575} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &500355574 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500355573} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1032314817} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &500355575 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500355573} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'ClearGame - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &500355576 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500355573} - m_CullTransparentMesh: 1 --- !u!43 &500455476 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24364 + m_Name: pb_Mesh27842 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6343,7 +5669,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24436 + m_Name: pb_Mesh27914 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6567,170 +5893,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567604020} m_CullTransparentMesh: 1 ---- !u!43 &572193095 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24038 - serializedVersion: 10 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 5, y: 1, z: -0.5} - m_Extent: {x: 5, y: 1, z: 0.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000000000000803f000080bf0000000000000000000080bf000020c10000000000000000000000400000000000000000000000000000803f000080bf0000000000000000000080bf000000000000004000002041000000400000000000000000000000000000803f000080bf0000000000000000000080bf000020c1000000400000204100000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000000000204100000000000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000000000204100000040000000000000803f000000000000000000000000000000000000803f000080bf00000000000000400000204100000040000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000400000204100000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000000000000000000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000204100000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000400000000000000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000400000000000000000000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000040000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000040000000000000004000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000040000000000000004000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000000020410000004000000000000000000000803f000000000000803f0000000000000000000080bf00002041000000000000000000000040000080bf000000000000803f000000000000803f0000000000000000000080bf00000000000080bf0000204100000040000080bf000000000000803f000000000000803f0000000000000000000080bf00002041000080bf0000000000000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000080bf0000204100000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf000020c1000080bf00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000020c100000000 - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 5, y: 1, z: -0.5} - m_Extent: {x: 5, y: 1, z: 0.5} - m_MeshUsageFlags: 0 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - m_MeshMetrics[0]: 1 - m_MeshMetrics[1]: 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: --- !u!1 &579229720 GameObject: m_ObjectHideFlags: 0 @@ -6986,6 +6148,145 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 500, y: 300} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &590670113 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 590670114} + - component: {fileID: 590670118} + - component: {fileID: 590670117} + - component: {fileID: 590670116} + - component: {fileID: 590670115} + - component: {fileID: 590670119} + m_Layer: 5 + m_Name: AttackLevelPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &590670114 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590670113} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2082200189} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -180, y: -30} + m_SizeDelta: {x: 180, y: 15.703726} + m_Pivot: {x: 1, y: 1} +--- !u!114 &590670115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590670113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 02d6bdfbf02e0894e80967002bc8c730, type: 3} + m_Name: + m_EditorClassIdentifier: + primaryButtonType: 1 + levelButtonPrefab: {fileID: 7507962125065591917, guid: 670eb0f20aedb744e81dc597874e6f09, type: 3} + hudObj: {fileID: 2082200184} + defaultPosition: {x: 0, y: 0} + targetPosition: {x: 0, y: 0} + defaultSize: {x: 0, y: 0} + targetSize: {x: 0, y: 0} + isFolding: 0 + isExpanding: 0 +--- !u!114 &590670116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590670113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: -30 + m_ChildAlignment: 1 + m_Spacing: -30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &590670117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590670113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: f6d46f1e916b3486c90a448a441fac6a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &590670118 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590670113} + m_CullTransparentMesh: 1 +--- !u!114 &590670119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590670113} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: [] --- !u!1 &591260565 GameObject: m_ObjectHideFlags: 0 @@ -7740,7 +7041,7 @@ MonoBehaviour: environmentUIControlObj: {fileID: 156390936} targetControllerObj: {fileID: 1692325237} HUDObj: {fileID: 2082200184} - nowCam: {fileID: 0} + fpsCam: {fileID: 1633276149} moveSpeed: 9 vX: 0 vZ: 0 @@ -8023,9 +7324,8 @@ GameObject: - component: {fileID: 649495072} - component: {fileID: 649495075} - component: {fileID: 649495074} - - component: {fileID: 649495073} m_Layer: 5 - m_Name: TargetUIPanel + m_Name: PrimaryTargetButtonPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8050,39 +7350,13 @@ RectTransform: - {fileID: 1411671493} - {fileID: 1413466579} m_Father: {fileID: 2082200189} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 183.4052, y: 185.6298} + m_SizeDelta: {x: 180, y: 180} m_Pivot: {x: 1, y: 1} ---- !u!114 &649495073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 649495071} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 --- !u!114 &649495074 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8095,15 +7369,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0} + m_Material: {fileID: 2100000, guid: f6d46f1e916b3486c90a448a441fac6a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Sprite: {fileID: 0} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -9039,7 +8313,7 @@ GameObject: m_Component: - component: {fileID: 749443373} m_Layer: 0 - m_Name: Enviroment-NonChart + m_Name: Enviroment m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9188,11 +8462,11 @@ RectTransform: m_Father: {fileID: 413189340} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2, y: -0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 2, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &762190081 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9220,7 +8494,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -9825,7 +9099,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22910 + m_Name: pb_Mesh26354 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10066,140 +9340,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 850708202} m_Mesh: {fileID: -8126535997912153522, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} ---- !u!1 &854741223 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 854741224} - - component: {fileID: 854741227} - - component: {fileID: 854741226} - - component: {fileID: 854741225} - m_Layer: 5 - m_Name: SetGotoTarget - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &854741224 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854741223} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1485807292} - m_Father: {fileID: 405727031} - m_RootOrder: 2 - 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_SizeDelta: {x: 183, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &854741225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854741223} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 854741226} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetGotoPressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &854741226 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854741223} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &854741227 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 854741223} - m_CullTransparentMesh: 1 --- !u!1 &861779682 GameObject: m_ObjectHideFlags: 0 @@ -10913,140 +10053,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963643497} m_CullTransparentMesh: 1 ---- !u!1 &965540409 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 965540410} - - component: {fileID: 965540413} - - component: {fileID: 965540412} - - component: {fileID: 965540411} - m_Layer: 5 - m_Name: SetEnemy - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &965540410 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965540409} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 492243814} - m_Father: {fileID: 405727031} - m_RootOrder: 1 - 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_SizeDelta: {x: 183, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &965540411 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965540409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 965540412} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetEnemyPressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &965540412 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965540409} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &965540413 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 965540409} - m_CullTransparentMesh: 1 --- !u!1 &968879642 GameObject: m_ObjectHideFlags: 0 @@ -11452,140 +10458,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1026481343} m_Mesh: {fileID: -1479511118752177815, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} ---- !u!1 &1032314816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1032314817} - - component: {fileID: 1032314820} - - component: {fileID: 1032314819} - - component: {fileID: 1032314818} - m_Layer: 5 - m_Name: ClearGame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1032314817 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1032314816} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 500355574} - m_Father: {fileID: 405727031} - m_RootOrder: 0 - 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_SizeDelta: {x: 183, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1032314818 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1032314816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1032314819} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: ClearGamePressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1032314819 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1032314816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1032314820 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1032314816} - m_CullTransparentMesh: 1 --- !u!1 &1044511425 GameObject: m_ObjectHideFlags: 0 @@ -12482,143 +11354,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156799888} m_CullTransparentMesh: 1 ---- !u!1 &1165192916 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1165192917} - - component: {fileID: 1165192919} - - component: {fileID: 1165192918} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1165192917 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165192916} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1472703008} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1165192918 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165192916} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'FreeMode - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1165192919 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1165192916} - m_CullTransparentMesh: 1 --- !u!1 &1178079198 GameObject: m_ObjectHideFlags: 0 @@ -12970,7 +11705,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 5e88a93148f69984e968ecc92408960f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -13355,6 +12090,7 @@ GameObject: - component: {fileID: 1268283815} - component: {fileID: 1268283817} - component: {fileID: 1268283816} + - component: {fileID: 1268283818} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -13481,6 +12217,21 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1268283814} m_CullTransparentMesh: 1 +--- !u!114 &1268283818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1268283814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 5, y: -5} + m_UseGraphicAlpha: 1 --- !u!1 &1307400466 GameObject: m_ObjectHideFlags: 0 @@ -13567,7 +12318,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24422 + m_Name: pb_Mesh27900 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -14225,11 +12976,11 @@ RectTransform: m_Father: {fileID: 649495072} m_RootOrder: 4 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -120} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &1411671494 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14249,7 +13000,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -14306,8 +13057,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -14359,11 +13110,11 @@ RectTransform: m_Father: {fileID: 649495072} m_RootOrder: 5 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &1413466580 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14383,7 +13134,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -14440,8 +13191,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -14934,140 +13685,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1464437996} m_CullTransparentMesh: 1 ---- !u!1 &1472703007 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1472703008} - - component: {fileID: 1472703011} - - component: {fileID: 1472703010} - - component: {fileID: 1472703009} - m_Layer: 5 - m_Name: FreeMode - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1472703008 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472703007} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1165192917} - m_Father: {fileID: 405727031} - m_RootOrder: 4 - 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_SizeDelta: {x: 183, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1472703009 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472703007} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1472703010} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetFreePressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1472703010 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472703007} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1472703011 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1472703007} - m_CullTransparentMesh: 1 --- !u!1 &1475277968 GameObject: m_ObjectHideFlags: 1 @@ -15192,143 +13809,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1484661764} m_Mesh: {fileID: -3715088358359381335, guid: 99fcce1f10b2ebd4a8cd31a345f6bed8, type: 3} ---- !u!1 &1485807291 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1485807292} - - component: {fileID: 1485807294} - - component: {fileID: 1485807293} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1485807292 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485807291} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 854741224} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1485807293 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485807291} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'SetGotoTarget - -' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1485807294 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485807291} - m_CullTransparentMesh: 1 --- !u!1 &1497113317 GameObject: m_ObjectHideFlags: 0 @@ -15397,11 +13877,11 @@ RectTransform: m_Father: {fileID: 649495072} m_RootOrder: 1 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_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &1502910339 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15421,7 +13901,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -15478,8 +13958,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -15502,7 +13982,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22956 + m_Name: pb_Mesh26400 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -15666,7 +14146,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24416 + m_Name: pb_Mesh27894 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16429,7 +14909,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24336 + m_Name: pb_Mesh27814 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16671,7 +15151,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23640 + m_Name: pb_Mesh27112 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -16922,6 +15402,7 @@ GameObject: m_Component: - component: {fileID: 1633276152} - component: {fileID: 1633276149} + - component: {fileID: 1633276153} m_Layer: 0 m_Name: FPSCamera m_TagString: MainCamera @@ -16988,6 +15469,39 @@ Transform: m_Father: {fileID: 629870343} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1633276153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1633276148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1640192094 GameObject: m_ObjectHideFlags: 0 @@ -17023,11 +15537,11 @@ RectTransform: m_Father: {fileID: 649495072} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_SizeDelta: {x: 180, y: 30} + m_Pivot: {x: 1, y: 1} --- !u!114 &1640192096 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17047,7 +15561,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 m_Colors: m_NormalColor: {r: 1, g: 1, b: 1, a: 1} m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} @@ -17104,8 +15618,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: d29a01ced066fbe4f8366788af0ecb1a, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -17589,6 +16103,170 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695161701} m_CullTransparentMesh: 1 +--- !u!43 &1706016292 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh27516 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 36 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 24 + localAABB: + m_Center: {x: 5, y: 1, z: -0.5} + m_Extent: {x: 5, y: 1, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 24 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1152 + _typelessdata: 00000000000000000000000000000000000000000000803f000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000000000000803f000080bf0000000000000000000080bf000020c10000000000000000000000400000000000000000000000000000803f000080bf0000000000000000000080bf000000000000004000002041000000400000000000000000000000000000803f000080bf0000000000000000000080bf000020c1000000400000204100000000000000000000803f000000000000000000000000000000000000803f000080bf00000000000000000000204100000000000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000000000204100000040000000000000803f000000000000000000000000000000000000803f000080bf00000000000000400000204100000040000080bf0000803f000000000000000000000000000000000000803f000080bf000080bf000000400000204100000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000000000000000000000000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000000000204100000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00002041000000400000000000000040000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000000400000000000000000000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000000000000000000000000000000000080bf00000000000000000000000000000000000080bf000080bf00000000000000000000000000000040000080bf000080bf00000000000000000000000000000000000080bf000080bf0000803f00000040000000000000004000000000000080bf00000000000000000000000000000000000080bf000080bf0000000000000040000000000000004000000000000000000000803f000000000000803f0000000000000000000080bf0000000000000000000020410000004000000000000000000000803f000000000000803f0000000000000000000080bf00002041000000000000000000000040000080bf000000000000803f000000000000803f0000000000000000000080bf00000000000080bf0000204100000040000080bf000000000000803f000000000000803f0000000000000000000080bf00002041000080bf0000000000000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000080bf0000204100000000000080bf00000000000080bf00000000000080bf0000000000000000000080bf000020c1000080bf00000000000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000000000000000000002041000000000000000000000000000080bf00000000000080bf0000000000000000000080bf000020c100000000 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 5, y: 1, z: -0.5} + m_Extent: {x: 5, y: 1, z: 0.5} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1707839903 GameObject: m_ObjectHideFlags: 0 @@ -17705,11 +16383,11 @@ RectTransform: m_Father: {fileID: 440411430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2, y: -0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -2, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &1714055741 MonoBehaviour: m_ObjectHideFlags: 0 @@ -17737,7 +16415,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -18672,7 +17350,7 @@ MeshCollider: serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 572193095} + m_Mesh: {fileID: 1706016292} --- !u!33 &1790388461 MeshFilter: m_ObjectHideFlags: 10 @@ -18680,7 +17358,7 @@ MeshFilter: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1790388458} - m_Mesh: {fileID: 572193095} + m_Mesh: {fileID: 1706016292} --- !u!23 &1790388462 MeshRenderer: m_ObjectHideFlags: 0 @@ -18701,7 +17379,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -18934,8 +17612,8 @@ MonoBehaviour: m_AreaError: 15 m_PreserveMeshAssetOnDestroy: 0 assetGuid: - m_Mesh: {fileID: 572193095} - m_VersionIndex: 9 + m_Mesh: {fileID: 1706016292} + m_VersionIndex: 12 m_IsSelectable: 1 m_SelectedFaces: m_SelectedEdges: [] @@ -19069,8 +17747,8 @@ MonoBehaviour: m_EditorClassIdentifier: sceneSize: 10 environmentObj: {fileID: 749443372} - hudObj: {fileID: 0} - scenePrefabSet: {fileID: 0} + hudObj: {fileID: 2082200184} + scenePrefabSet: {fileID: 11400000, guid: 6ebbd27eb466c4a41bd2584c1b9c2e1f, type: 2} nowBlock: {fileID: 0} --- !u!1 &1817420688 GameObject: @@ -22067,140 +20745,6 @@ Mesh: offset: 0 size: 0 path: ---- !u!1 &2022487656 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2022487657} - - component: {fileID: 2022487660} - - component: {fileID: 2022487659} - - component: {fileID: 2022487658} - m_Layer: 5 - m_Name: StayMode - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2022487657 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022487656} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 166240943} - m_Father: {fileID: 405727031} - m_RootOrder: 5 - 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_SizeDelta: {x: 183, y: 31} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2022487658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022487656} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 2022487659} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 2082200190} - m_TargetAssemblyTypeName: TargetUIController, Assembly-CSharp - m_MethodName: SetStayPressed - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &2022487659 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022487656} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2022487660 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2022487656} - m_CullTransparentMesh: 1 --- !u!1 &2022632339 GameObject: m_ObjectHideFlags: 0 @@ -22872,6 +21416,7 @@ GameObject: - component: {fileID: 2082200185} - component: {fileID: 2082200190} - component: {fileID: 2082200191} + - component: {fileID: 2082200192} m_Layer: 5 m_Name: HUD m_TagString: Untagged @@ -22975,8 +21520,9 @@ RectTransform: - {fileID: 149218410} - {fileID: 427803070} - {fileID: 808242910} - - {fileID: 649495072} - {fileID: 405727031} + - {fileID: 590670114} + - {fileID: 649495072} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -23000,10 +21546,17 @@ MonoBehaviour: targetControllerObj: {fileID: 1692325237} mouseSelectorObj: {fileID: 1962276265} environmentUIObj: {fileID: 156390936} + levelButtonHeight: 30 + clearGameButton: {fileID: 1640192096} + setEnemyButton: {fileID: 1502910339} setAttackButton: {fileID: 320729027} setGotoButton: {fileID: 371362500} setFreeButton: {fileID: 1411671494} setStayButton: {fileID: 1413466580} + primaryButtonNumber: 6 + gotoLevelPanel: {fileID: 405727030} + attackLevelPanel: {fileID: 590670113} + levelPanelAnimeTime: 0.15 --- !u!114 &2082200191 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23023,6 +21576,52 @@ MonoBehaviour: messagePanelObj: {fileID: 324069806} messageTextPrefab: {fileID: 7800828413105135976, guid: bdd79ceda95d4bd44a402c80049df6e8, type: 3} messages: [] +--- !u!114 &2082200192 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2082200184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 48f605c5c3d09384fa6b248789466476, type: 3} + m_Name: + m_EditorClassIdentifier: + clickableButton: + - {fileID: 1640192096} + - {fileID: 1502910339} + - {fileID: 1411671494} + - {fileID: 1413466580} + unclickableButton: + - {fileID: 371362500} + - {fileID: 320729027} + normalTextColor: + serializedVersion: 2 + rgba: 4293717228 + normalBGColor: + serializedVersion: 2 + rgba: 16777215 + highLightTextColor: + serializedVersion: 2 + rgba: 3861457193 + highLightBGColor: + serializedVersion: 2 + rgba: 1744830463 + pressedTextColor: + serializedVersion: 2 + rgba: 4026531840 + pressedBGColor: + serializedVersion: 2 + rgba: 2701131775 + disableTextColor: + serializedVersion: 2 + rgba: 1354020020 + disableBGColor: + serializedVersion: 2 + rgba: 16777215 + colorChangeSpeed: 0.1 + clickable: 1 --- !u!1 &2099230616 GameObject: m_ObjectHideFlags: 0 @@ -23247,7 +21846,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh22994 + m_Name: pb_Mesh26440 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Scenes/Train.unity b/Assets/Scenes/Train.unity index 918a36e..c62120d 100644 --- a/Assets/Scenes/Train.unity +++ b/Assets/Scenes/Train.unity @@ -828,7 +828,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh38862 + m_Name: pb_Mesh37554 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -2647,7 +2647,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3223,7 +3223,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3681,7 +3681,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -4784,7 +4784,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh37952 + m_Name: pb_Mesh36608 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -6790,6 +6790,7 @@ GameObject: m_Component: - component: {fileID: 705507995} - component: {fileID: 705507994} + - component: {fileID: 705507996} m_Layer: 0 m_Name: Directional Light m_TagString: Untagged @@ -6874,6 +6875,26 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &705507996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 705507993} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 1 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} --- !u!1 &707336050 GameObject: m_ObjectHideFlags: 0 @@ -7883,7 +7904,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh37914 + m_Name: pb_Mesh36570 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10322,7 +10343,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 9fe0a856a63e8634ebc7077bc570ea68, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -11104,7 +11125,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: -246.2022} + m_AnchoredPosition: {x: 0.000030517578, y: -246.20218} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1442113294 @@ -13874,7 +13895,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 2100000, guid: 17c44fb3e5be9644586a0728a5f5a386, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -14242,8 +14263,8 @@ MonoBehaviour: m_EditorClassIdentifier: sceneSize: 10 environmentObj: {fileID: 749443372} - hudObj: {fileID: 0} - scenePrefabSet: {fileID: 0} + hudObj: {fileID: 2082200184} + scenePrefabSet: {fileID: 11400000, guid: 6ebbd27eb466c4a41bd2584c1b9c2e1f, type: 2} nowBlock: {fileID: 0} --- !u!1 &1815066823 GameObject: @@ -16246,7 +16267,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1766662801} m_Direction: 2 m_Value: 0 - m_Size: 1 + m_Size: 0.99999416 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -17432,7 +17453,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh37980 + m_Name: pb_Mesh36636 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Script/InGame/AgentController.cs b/Assets/Script/InGame/AgentController.cs index 4d47099..43d94de 100644 --- a/Assets/Script/InGame/AgentController.cs +++ b/Assets/Script/InGame/AgentController.cs @@ -12,7 +12,7 @@ public class AgentController : MonoBehaviour public GameObject environmentUIControlObj; public GameObject targetControllerObj; public GameObject HUDObj; - public Camera nowCam; + public Camera fpsCam; [Header("GetAxis() Simulate")] public float moveSpeed = 9.0f; @@ -182,7 +182,7 @@ public void CameraControl(float Mouse_X, float Mouse_Y) //相机在上下旋转移动时，相机方向不会随着移动，类似于低头和抬头，左右移动时，相机方向会随着向左向右移动，类似于向左向右看 //所以在控制相机向左向右旋转时，要保证和父物体一起转动 - nowCam.transform.localRotation = Quaternion.Euler(yRotation, 0, 0); + fpsCam.transform.localRotation = Quaternion.Euler(yRotation, 0, 0); //this.transform指这个CameraRotation的位置,localRotation指的是旋转轴 //transform.localRotation = Quaternion.Eular(x,y,z)控制旋转的时候，按照X-Y-Z轴的旋转顺规 //即以围绕X轴旋转x度，围绕Y轴旋转y度，围绕Z轴旋转z度 @@ -196,8 +196,8 @@ public void CameraControl(float Mouse_X, float Mouse_Y) // ballistic 射击弹道处理，并返回获得reward private float Ballistic(int shootState) { - Vector3 point = new Vector3(nowCam.pixelWidth / 2, nowCam.pixelHeight / 2, 0);//发射位置 - Ray ray = nowCam.ScreenPointToRay(point); + Vector3 point = new Vector3(fpsCam.pixelWidth / 2, fpsCam.pixelHeight / 2, 0);//发射位置 + Ray ray = fpsCam.ScreenPointToRay(point); RaycastHit hit; // Debug.DrawRay(ray.origin, ray.direction * 100, Color.blue); //按下鼠标左键 @@ -252,7 +252,7 @@ private float FacingReward() float nowReward = 0; bool isFacingtoEnemy = false; float enemyFacingDistance = 0f; - Ray ray = nowCam.ScreenPointToRay(new Vector3(nowCam.pixelWidth / 2, nowCam.pixelHeight / 2, 0)); + Ray ray = fpsCam.ScreenPointToRay(new Vector3(fpsCam.pixelWidth / 2, fpsCam.pixelHeight / 2, 0)); if (targetCon.targetTypeInt == (int)SceneBlockContainer.Targets.Free) { //free mode diff --git a/Assets/Script/InGame/TargetController.cs b/Assets/Script/InGame/TargetController.cs index c2b4443..6d272a9 100644 --- a/Assets/Script/InGame/TargetController.cs +++ b/Assets/Script/InGame/TargetController.cs @@ -43,6 +43,8 @@ public class TargetController : MonoBehaviour [SerializeField, Range(0f, 1f)] public float defenceProb = 0.2f; [System.NonSerialized] public int targetTypeInt; + [System.NonSerialized] public int gotoLevelNum; + [System.NonSerialized] public int attackLevelNum; public float[] targetState = new float[6]; public enum EndType @@ -103,6 +105,8 @@ private void Start() freeProb = 1 - attackProb - gotoProb - defenceProb; targetNum = (int)SceneBlockContainer.Targets.Num; + gotoLevelNum = sceneBlockCon.scenePrefabSet.GetLevelNumber(SceneBlockContainer.Targets.Go); + attackLevelNum = sceneBlockCon.scenePrefabSet.GetLevelNumber(SceneBlockContainer.Targets.Attack); if (freeProb < 0) { Debug.LogError("TargetController.Start: target percentage wrong"); diff --git a/Assets/Script/LevelButton.cs b/Assets/Script/LevelButton.cs index 9295d68..f284a6f 100644 --- a/Assets/Script/LevelButton.cs +++ b/Assets/Script/LevelButton.cs @@ -1,12 +1,15 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; public class LevelButton : MonoBehaviour { public int level; + public TextMeshProUGUI levelText; public void Initialization(int level) { this.level = level; + levelText.text = "Level " + level.ToString(); } } diff --git a/Assets/Script/LevelPanel.cs b/Assets/Script/LevelPanel.cs index fb40160..ae52bfc 100644 --- a/Assets/Script/LevelPanel.cs +++ b/Assets/Script/LevelPanel.cs @@ -1,23 +1,96 @@ -using System.Collections; +using DG.Tweening; using System.Collections.Generic; +using System.Collections.ObjectModel; using UnityEngine; +using UnityEngine.UI; public class LevelPanel : MonoBehaviour { - public int levelNum = 6; - public float buttonHeight = 31; + private int levelNum = 0; + private float buttonHeight = 30; + public TargetUIController.PrimaryButtonType primaryButtonType; + public GameObject levelButtonPrefab; + public GameObject hudObj; + private TargetUIController targetUIController; + public Vector2 defaultPosition = Vector2.zero; + public Vector2 targetPosition = Vector2.zero; + public Vector2 defaultSize = Vector2.zero; + public Vector2 targetSize = Vector2.zero; + public bool isFolding = false; + public bool isExpanding = false; - public void Initialization(int levelNum,float buttonHeight = 31) + private List