diff --git a/Assets/Materials/Skybox.mat b/Assets/Materials/Skybox.mat index 72dd755..b27a5a2 100644 --- a/Assets/Materials/Skybox.mat +++ b/Assets/Materials/Skybox.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Skybox - m_Shader: {fileID: 106, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: 67ce17305c79e8f41abf9c8eb07cc2c4, type: 3} m_ShaderKeywords: _SUNDISK_HIGH_QUALITY m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -19,6 +19,10 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - _BackTex: + 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} @@ -35,10 +39,22 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _DownTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _FrontTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _LeftTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -55,20 +71,35 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _RightTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Tex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _UpTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} m_Floats: - _AtmosphereThickness: 0.91 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 + - _Exponent: 1 - _Exposure: 0.44 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 + - _Intensity: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 + - _Rotation: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -76,9 +107,15 @@ Material: - _SunSize: 0 - _SunSizeConvergence: 5.13 - _UVSec: 0 + - _UpVectorPitch: 0 + - _UpVectorYaw: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color1: {r: 0.20826072, g: 0.11694552, b: 0.33962262, a: 0} + - _Color2: {r: 0.8301887, g: 0.79607844, b: 0.5286579, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _GroundColor: {r: 1, g: 1, b: 1, a: 1} - _SkyTint: {r: 0.5623178, g: 0.77599996, b: 0.23357598, a: 1} + - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + - _UpVector: {r: 0, g: 1, b: 0, a: 0} diff --git a/Assets/Materials/Skybox.shader b/Assets/Materials/Skybox.shader new file mode 100644 index 0000000..7cb8d1b --- /dev/null +++ b/Assets/Materials/Skybox.shader @@ -0,0 +1,71 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Skybox/Gradient Skybox" +{ + Properties + { + _Color1 ("Color 1", Color) = (1, 1, 1, 0) + _Color2 ("Color 2", Color) = (1, 1, 1, 0) + _UpVector ("Up Vector", Vector) = (0, 1, 0, 0) + _Intensity ("Intensity", Float) = 1.0 + _Exponent ("Exponent", Float) = 1.0 + // The properties below are used in the custom inspector. + _UpVectorPitch ("Up Vector Pitch", float) = 0 + _UpVectorYaw ("Up Vector Yaw", float) = 0 + } + + CGINCLUDE + + #include "UnityCG.cginc" + + struct appdata + { + float4 position : POSITION; + float3 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 position : SV_POSITION; + float3 texcoord : TEXCOORD0; + }; + + half4 _Color1; + half4 _Color2; + half4 _UpVector; + half _Intensity; + half _Exponent; + + v2f vert (appdata v) + { + v2f o; + o.position = UnityObjectToClipPos (v.position); + o.texcoord = v.texcoord; + return o; + } + + fixed4 frag (v2f i) : COLOR + { + half d = dot (normalize (i.texcoord), _UpVector) * 0.5f + 0.5f; + return lerp (_Color1, _Color2, pow (d, _Exponent)) * _Intensity; + } + + ENDCG + + SubShader + { + Tags { "RenderType"="Background" "Queue"="Background" } + Pass + { + ZWrite Off + Cull Off + Fog { Mode Off } + CGPROGRAM + #pragma fragmentoption ARB_precision_hint_fastest + #pragma vertex vert + #pragma fragment frag + ENDCG + } + } + CustomEditor "GradientSkyboxInspector" +} \ No newline at end of file diff --git a/Assets/Materials/Skybox.shader.meta b/Assets/Materials/Skybox.shader.meta new file mode 100644 index 0000000..9c39dca --- /dev/null +++ b/Assets/Materials/Skybox.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 67ce17305c79e8f41abf9c8eb07cc2c4 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index f62e609..ae73a1e 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -126,7 +126,7 @@ GameObject: - component: {fileID: 8339392} - component: {fileID: 8339391} - component: {fileID: 8339390} - m_Layer: 0 + m_Layer: 9 m_Name: Text Leaderboard m_TagString: Untagged m_Icon: {fileID: 0} @@ -335,7 +335,7 @@ GameObject: - component: {fileID: 42838984} - component: {fileID: 42838983} - component: {fileID: 42838982} - m_Layer: 0 + m_Layer: 9 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -540,7 +540,7 @@ GameObject: - component: {fileID: 61898116} - component: {fileID: 61898115} - component: {fileID: 61898114} - m_Layer: 0 + m_Layer: 9 m_Name: Text Track (3) m_TagString: Untagged m_Icon: {fileID: 0} @@ -743,7 +743,7 @@ GameObject: - component: {fileID: 79236692} - component: {fileID: 79236694} - component: {fileID: 79236693} - m_Layer: 0 + m_Layer: 9 m_Name: Leaderboard m_TagString: Untagged m_Icon: {fileID: 0} @@ -823,7 +823,7 @@ GameObject: - component: {fileID: 81886397} - component: {fileID: 81886396} - component: {fileID: 81886395} - m_Layer: 0 + m_Layer: 9 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -1028,7 +1028,7 @@ GameObject: - component: {fileID: 202625284} - component: {fileID: 202625283} - component: {fileID: 202625282} - m_Layer: 0 + m_Layer: 9 m_Name: Text Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -1235,7 +1235,7 @@ GameObject: - component: {fileID: 232198208} - component: {fileID: 232198207} - component: {fileID: 232198206} - m_Layer: 0 + m_Layer: 9 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -1438,7 +1438,7 @@ GameObject: - component: {fileID: 315596728} - component: {fileID: 315596730} - component: {fileID: 315596729} - m_Layer: 0 + m_Layer: 9 m_Name: Stepper MSAA m_TagString: Untagged m_Icon: {fileID: 0} @@ -1535,7 +1535,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &343354975 AudioSource: @@ -1722,7 +1722,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 383045425} - m_Layer: 0 + m_Layer: 9 m_Name: Menu Main m_TagString: Untagged m_Icon: {fileID: 0} @@ -1876,7 +1876,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &408032442 MonoBehaviour: @@ -1925,7 +1925,7 @@ Transform: - {fileID: 1554483892} - {fileID: 963194228} m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &416451007 MonoBehaviour: @@ -1965,7 +1965,7 @@ GameObject: - component: {fileID: 434051735} - component: {fileID: 434051734} - component: {fileID: 434051733} - m_Layer: 0 + m_Layer: 9 m_Name: Text Track (2) m_TagString: Untagged m_Icon: {fileID: 0} @@ -2168,7 +2168,7 @@ GameObject: - component: {fileID: 434999705} - component: {fileID: 434999707} - component: {fileID: 434999706} - m_Layer: 0 + m_Layer: 9 m_Name: Button Color m_TagString: Untagged m_Icon: {fileID: 0} @@ -2245,7 +2245,7 @@ GameObject: - component: {fileID: 462344509} - component: {fileID: 462344511} - component: {fileID: 462344510} - m_Layer: 0 + m_Layer: 9 m_Name: Stepper BPM m_TagString: Untagged m_Icon: {fileID: 0} @@ -2326,7 +2326,7 @@ GameObject: - component: {fileID: 485926736} - component: {fileID: 485926735} - component: {fileID: 485926734} - m_Layer: 0 + m_Layer: 9 m_Name: From Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -2531,7 +2531,7 @@ GameObject: - component: {fileID: 542307035} - component: {fileID: 542307037} - component: {fileID: 542307036} - m_Layer: 0 + m_Layer: 9 m_Name: Button Home m_TagString: Untagged m_Icon: {fileID: 0} @@ -2811,7 +2811,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 559954723} - m_Layer: 0 + m_Layer: 9 m_Name: Menu Pause m_TagString: Untagged m_Icon: {fileID: 0} @@ -2845,7 +2845,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 580349063} - m_Layer: 0 + m_Layer: 9 m_Name: Menu GameOver m_TagString: Untagged m_Icon: {fileID: 0} @@ -2884,7 +2884,7 @@ GameObject: - component: {fileID: 611823985} - component: {fileID: 611823984} - component: {fileID: 611823983} - m_Layer: 0 + m_Layer: 9 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -3292,7 +3292,7 @@ GameObject: - component: {fileID: 706504449} - component: {fileID: 706504451} - component: {fileID: 706504450} - m_Layer: 0 + m_Layer: 9 m_Name: Stepper SFX m_TagString: Untagged m_Icon: {fileID: 0} @@ -3371,7 +3371,7 @@ GameObject: - component: {fileID: 766831860} - component: {fileID: 766831862} - component: {fileID: 766831861} - m_Layer: 0 + m_Layer: 9 m_Name: Stepper Music m_TagString: Untagged m_Icon: {fileID: 0} @@ -3450,7 +3450,7 @@ GameObject: - component: {fileID: 813030301} - component: {fileID: 813030303} - component: {fileID: 813030302} - m_Layer: 0 + m_Layer: 9 m_Name: Button Color Disabled m_TagString: Untagged m_Icon: {fileID: 0} @@ -3541,11 +3541,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 850212507} m_LocalRotation: {x: 0.16284245, y: -0.30763045, z: 0.05352413, w: 0.93593854} - m_LocalPosition: {x: 0.538, y: 0.28, z: -0.362} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 32.28, y: 20.34, z: -43.72} + m_LocalScale: {x: 59.999985, y: 60, z: 60} m_Children: - {fileID: 1825209467} - m_Father: {fileID: 963194228} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 19.74, y: -36.39, z: 0} --- !u!20 &850212509 @@ -3557,7 +3557,7 @@ Camera: m_GameObject: {fileID: 850212507} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 + m_ClearFlags: 1 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} @@ -3574,11 +3574,11 @@ Camera: far clip plane: 3000 field of view: 17.3 orthographic: 1 - orthographic size: 11.41 + orthographic size: 6 m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 311 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -3601,7 +3601,7 @@ GameObject: - component: {fileID: 851285687} - component: {fileID: 851285689} - component: {fileID: 851285688} - m_Layer: 0 + m_Layer: 9 m_Name: pivot m_TagString: Untagged m_Icon: {fileID: 0} @@ -3757,7 +3757,7 @@ GameObject: - component: {fileID: 888073837} - component: {fileID: 888073836} - component: {fileID: 888073835} - m_Layer: 0 + m_Layer: 9 m_Name: Username Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -3962,7 +3962,7 @@ GameObject: - component: {fileID: 905512769} - component: {fileID: 905512771} - component: {fileID: 905512770} - m_Layer: 0 + m_Layer: 9 m_Name: Button Quit m_TagString: Untagged m_Icon: {fileID: 0} @@ -4039,7 +4039,7 @@ GameObject: - component: {fileID: 915284778} - component: {fileID: 915284780} - component: {fileID: 915284779} - m_Layer: 0 + m_Layer: 9 m_Name: Tape m_TagString: Untagged m_Icon: {fileID: 0} @@ -4230,7 +4230,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &950738597 GameObject: @@ -4473,7 +4473,7 @@ Camera: m_GameObject: {fileID: 963194225} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 2 + m_ClearFlags: 1 m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} @@ -4516,8 +4516,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 3.54, z: -22} m_LocalScale: {x: 60, y: 60, z: 60} - m_Children: - - {fileID: 850212508} + m_Children: [] m_Father: {fileID: 416451006} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4589,7 +4588,7 @@ GameObject: - component: {fileID: 965477373} - component: {fileID: 965477375} - component: {fileID: 965477374} - m_Layer: 0 + m_Layer: 9 m_Name: Shipping Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -4672,7 +4671,7 @@ GameObject: - component: {fileID: 997515810} - component: {fileID: 997515809} - component: {fileID: 997515808} - m_Layer: 0 + m_Layer: 9 m_Name: Text Track m_TagString: Untagged m_Icon: {fileID: 0} @@ -4877,7 +4876,7 @@ GameObject: - component: {fileID: 1000942073} - component: {fileID: 1000942072} - component: {fileID: 1000942071} - m_Layer: 0 + m_Layer: 9 m_Name: Credits m_TagString: Untagged m_Icon: {fileID: 0} @@ -5082,7 +5081,7 @@ GameObject: - component: {fileID: 1051890148} - component: {fileID: 1051890147} - component: {fileID: 1051890146} - m_Layer: 0 + m_Layer: 9 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -5285,7 +5284,7 @@ GameObject: - component: {fileID: 1088530875} - component: {fileID: 1088530877} - component: {fileID: 1088530876} - m_Layer: 0 + m_Layer: 9 m_Name: Button Home m_TagString: Untagged m_Icon: {fileID: 0} @@ -5364,7 +5363,7 @@ GameObject: - component: {fileID: 1176141353} - component: {fileID: 1176141352} - component: {fileID: 1176141351} - m_Layer: 0 + m_Layer: 9 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -5646,7 +5645,7 @@ GameObject: - component: {fileID: 1283737054} - component: {fileID: 1283737053} - component: {fileID: 1283737052} - m_Layer: 0 + m_Layer: 9 m_Name: Text Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -5851,7 +5850,7 @@ GameObject: - component: {fileID: 1306510288} - component: {fileID: 1306510287} - component: {fileID: 1306510286} - m_Layer: 0 + m_Layer: 9 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -6054,7 +6053,7 @@ GameObject: - component: {fileID: 1317232482} - component: {fileID: 1317232484} - component: {fileID: 1317232483} - m_Layer: 0 + m_Layer: 9 m_Name: Cursor m_TagString: Untagged m_Icon: {fileID: 0} @@ -6131,7 +6130,7 @@ GameObject: - component: {fileID: 1366624817} - component: {fileID: 1366624819} - component: {fileID: 1366624818} - m_Layer: 0 + m_Layer: 9 m_Name: Button Resume m_TagString: Untagged m_Icon: {fileID: 0} @@ -6210,7 +6209,7 @@ GameObject: - component: {fileID: 1393230213} - component: {fileID: 1393230212} - component: {fileID: 1393230211} - m_Layer: 0 + m_Layer: 9 m_Name: Text Track (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -6413,7 +6412,7 @@ GameObject: - component: {fileID: 1409833484} - component: {fileID: 1409833486} - component: {fileID: 1409833485} - m_Layer: 0 + m_Layer: 9 m_Name: Button Play m_TagString: Untagged m_Icon: {fileID: 0} @@ -6492,7 +6491,7 @@ GameObject: - component: {fileID: 1414004969} - component: {fileID: 1414004968} - component: {fileID: 1414004967} - m_Layer: 0 + m_Layer: 9 m_Name: Text Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -6697,7 +6696,7 @@ GameObject: - component: {fileID: 1462420887} - component: {fileID: 1462420886} - component: {fileID: 1462420885} - m_Layer: 0 + m_Layer: 9 m_Name: Text Title m_TagString: Untagged m_Icon: {fileID: 0} @@ -6903,7 +6902,7 @@ GameObject: - component: {fileID: 1510915028} - component: {fileID: 1510915029} - component: {fileID: 1510915031} - m_Layer: 0 + m_Layer: 9 m_Name: UI m_TagString: Untagged m_Icon: {fileID: 0} @@ -6999,7 +6998,7 @@ Transform: - {fileID: 580349063} - {fileID: 2101684220} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1510915031 AudioSource: @@ -7108,7 +7107,7 @@ GameObject: - component: {fileID: 1518462475} - component: {fileID: 1518462477} - component: {fileID: 1518462476} - m_Layer: 0 + m_Layer: 9 m_Name: Button Restart m_TagString: Untagged m_Icon: {fileID: 0} @@ -7185,7 +7184,7 @@ GameObject: - component: {fileID: 1554483892} - component: {fileID: 1554483894} - component: {fileID: 1554483893} - m_Layer: 0 + m_Layer: 9 m_Name: Hanging Rod m_TagString: Untagged m_Icon: {fileID: 0} @@ -7265,7 +7264,7 @@ GameObject: - component: {fileID: 1603319127} - component: {fileID: 1603319129} - component: {fileID: 1603319128} - m_Layer: 0 + m_Layer: 9 m_Name: Button Home m_TagString: Untagged m_Icon: {fileID: 0} @@ -7342,7 +7341,7 @@ GameObject: - component: {fileID: 1616366179} - component: {fileID: 1616366181} - component: {fileID: 1616366180} - m_Layer: 0 + m_Layer: 9 m_Name: Button Restart m_TagString: Untagged m_Icon: {fileID: 0} @@ -7692,7 +7691,7 @@ Transform: - {fileID: 1637713052} - {fileID: 558748034} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1643476466 GameObject: @@ -7705,7 +7704,7 @@ GameObject: - component: {fileID: 1643476467} - component: {fileID: 1643476469} - component: {fileID: 1643476468} - m_Layer: 0 + m_Layer: 9 m_Name: Button Config m_TagString: Untagged m_Icon: {fileID: 0} @@ -7784,7 +7783,7 @@ GameObject: - component: {fileID: 1677932700} - component: {fileID: 1677932699} - component: {fileID: 1677932698} - m_Layer: 0 + m_Layer: 9 m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -8078,7 +8077,7 @@ Transform: m_Children: - {fileID: 351576464} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1825209466 GameObject: @@ -8170,7 +8169,7 @@ GameObject: - component: {fileID: 1946433805} - component: {fileID: 1946433804} - component: {fileID: 1946433803} - m_Layer: 0 + m_Layer: 9 m_Name: Ship Text m_TagString: Untagged m_Icon: {fileID: 0} @@ -8375,7 +8374,7 @@ GameObject: - component: {fileID: 1991466029} - component: {fileID: 1991466028} - component: {fileID: 1991466027} - m_Layer: 0 + m_Layer: 9 m_Name: Score m_TagString: Untagged m_Icon: {fileID: 0} @@ -8580,7 +8579,7 @@ GameObject: - component: {fileID: 2065174155} - component: {fileID: 2065174154} - component: {fileID: 2065174153} - m_Layer: 0 + m_Layer: 9 m_Name: Text Priority m_TagString: Untagged m_Icon: {fileID: 0} @@ -8801,7 +8800,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &2081994160 AudioSource: @@ -8908,7 +8907,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2101684220} - m_Layer: 0 + m_Layer: 9 m_Name: Menu Config m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scripts/GraphX.cs b/Assets/Scripts/GraphX.cs index 0bd7462..519d911 100644 --- a/Assets/Scripts/GraphX.cs +++ b/Assets/Scripts/GraphX.cs @@ -78,7 +78,7 @@ public class GraphX main.design.pivotPos + main.rig.head.rotation * Vector3.up * 2f, main.inputRot, Vector3.one - ); Graphics.DrawMesh(data.arrowMesh, arrowMatrix, data.snakeMat, 0); + ); Graphics.DrawMesh(data.arrowMesh, arrowMatrix, data.snakeMat, 9); } // Face @@ -149,13 +149,13 @@ public class GraphX main.rig.controllerPos, main.rig.controllerRot * Quaternion.Euler(Vector3.up * 90), Vector3.one * main.design.scale - ); Graphics.DrawMesh(data.controllerMesh, controllerMatrix, data.unlitMat, 0); + ); Graphics.DrawMesh(data.controllerMesh, controllerMatrix, data.unlitMat, 9); conArrowMatrix.SetTRS( main.rig.controllerPos, main.rig.inputRot, Vector3.one * main.design.scale - ); Graphics.DrawMesh(data.conArrowMesh, conArrowMatrix, data.unlitMat, 0); + ); Graphics.DrawMesh(data.conArrowMesh, conArrowMatrix, data.unlitMat, 9); Vector3 pointTo = main.rig.inputRot * Vector3.Lerp(Vector3.up, Vector3.forward, main.rig.joystick.magnitude / 3); @@ -164,7 +164,7 @@ public class GraphX main.rig.controllerPos, Quaternion.LookRotation(pointTo), Vector3.one * main.design.scale - ); Graphics.DrawMesh(data.joystickMesh, joystickMatrix, data.unlitMat, 0); + ); Graphics.DrawMesh(data.joystickMesh, joystickMatrix, data.unlitMat, 9); } float rollTime; diff --git a/Assets/entezoa.blend b/Assets/entezoa.blend index 8ccd2e3..f9deb8e 100644 Binary files a/Assets/entezoa.blend and b/Assets/entezoa.blend differ diff --git a/Assets/entezoa.blend1 b/Assets/entezoa.blend1 index 16b4769..60cb596 100644 Binary files a/Assets/entezoa.blend1 and b/Assets/entezoa.blend1 differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 729fae4..4e97ccc 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -15,7 +15,7 @@ TagManager: - - - PostProcessing - - + - HUD - - -