diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index ab3630ee6618f509b2e4185a33b5692009899030..125defdbb7d33a31506201d92934a3372463732d 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -963,7 +963,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -8526,10 +8526,7 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 9c52a7e85c986c2429f4638c6756501c, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects:
- - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 00c9c177e828a57439e290aef2a23b3f, type: 3}
- insertIndex: 2
- addedObject: {fileID: 860631139}
+ m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: -6754674874353905211, guid: 00c9c177e828a57439e290aef2a23b3f, type: 3}
insertIndex: -1
@@ -11061,126 +11058,6 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
m_Variable: {fileID: 0}
---- !u!1 &860631138
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 860631139}
- - component: {fileID: 860631143}
- - component: {fileID: 860631142}
- - component: {fileID: 860631141}
- - component: {fileID: 860631140}
- m_Layer: 0
- m_Name: Floor (1)
- m_TagString: surface
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 2147483647
- m_IsActive: 1
---- !u!4 &860631139
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 860631138}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -0, y: 0, z: 0}
- m_LocalScale: {x: 286.32373, y: 286.32373, z: 286.32373}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 652124636}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &860631140
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 860631138}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 892354a4a51c8204db5eae7a93fdd8bd, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!65 &860631141
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 860631138}
- m_Material: {fileID: 0}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_LayerOverridePriority: 0
- m_IsTrigger: 0
- m_ProvidesContacts: 0
- m_Enabled: 1
- serializedVersion: 3
- m_Size: {x: 0.0349255, y: 0.00010948539, z: 0.034925498}
- m_Center: {x: 0, y: -0.000052995976, z: 9.313226e-10}
---- !u!23 &860631142
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 860631138}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_StaticShadowCaster: 0
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 7d02519ee5c8cb745b09b59fc3d367fe, type: 2}
- - {fileID: 2100000, guid: 895b038bf03adba4c951968630c6032d, type: 2}
- - {fileID: 2100000, guid: 7d02519ee5c8cb745b09b59fc3d367fe, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &860631143
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 860631138}
- m_Mesh: {fileID: -629719859055844128, guid: 00c9c177e828a57439e290aef2a23b3f, type: 3}
--- !u!1 &863846738 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -6218940976453351051, guid: af3a609f3b06600409a356f4e8ba91ba, type: 3}
@@ -13055,7 +12932,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4704240697808797663, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
propertyPath: m_SizeDelta.x
- value: 119.91
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4704240697808797663, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
propertyPath: m_SizeDelta.y
@@ -13075,7 +12952,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4704240698125147210, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
propertyPath: m_SizeDelta.x
- value: 91.91
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4704240698125147210, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -13107,7 +12984,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7785151267686525225, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7785151267686525226, guid: 048249d9a15aa3c459399751e860bde7, type: 3}
propertyPath: m_RootOrder
@@ -21425,6 +21302,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 1976927274, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 1273017728241610668, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
propertyPath: m_Cameras.Array.size
value: 1
@@ -21469,6 +21350,10 @@ PrefabInstance:
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1984668759388320317, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
+ propertyPath: m_text
+ value: Edit
+ objectReference: {fileID: 0}
- target: {fileID: 1984668759388320319, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -21525,6 +21410,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1984668759991436500, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
+ propertyPath: m_text
+ value: Fly
+ objectReference: {fileID: 0}
- target: {fileID: 1984668759991436502, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -21581,6 +21470,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1984668760497519797, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
+ propertyPath: m_text
+ value: Teleport
+ objectReference: {fileID: 0}
- target: {fileID: 1984668760497519799, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
propertyPath: m_AnchorMax.y
value: 0
@@ -21629,6 +21522,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 1984668760711245994, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
+ propertyPath: m_text
+ value: Edit
+ objectReference: {fileID: 0}
- target: {fileID: 2736478854845186207, guid: 65eb6b98091a5734ba9d9ca871cef69a, type: 3}
propertyPath: m_EnableFly
value: 1
diff --git a/Assets/Scrips/Components/UI/FadeText.cs b/Assets/Scrips/Components/UI/FadeText.cs
index 22f7eb77118ec7fe1f38c2b4f5ef1587c40845df..8b441a8116b840b3549d8baac3f7b0e875eabfad 100644
--- a/Assets/Scrips/Components/UI/FadeText.cs
+++ b/Assets/Scrips/Components/UI/FadeText.cs
@@ -6,12 +6,11 @@ using UnityEngine;
// source: https://www.youtube.com/watch?v=WiUUW9RSa5Y
public class FadeText : MonoBehaviour
{
- private float fadeTime = 1f;
+ private readonly float fadeTime = 1f;
private TMP_Text fadeAwayText;
private float alphaValue;
- private float fadeAwayPerSecond;
-
- private bool enableFade = false;
+ private readonly float FPS = 30f;
+ private float da;
private void Awake()
{
@@ -20,24 +19,16 @@ public class FadeText : MonoBehaviour
void Start()
{
- Invoke(nameof(EnableFade), 1.5f);
- fadeAwayPerSecond = 1 / fadeTime;
+ da = fadeTime / FPS;
alphaValue = 1f;
fadeAwayText.color = new Color(fadeAwayText.color.r, fadeAwayText.color.g, fadeAwayText.color.b, alphaValue);
+ InvokeRepeating(nameof(ReduceOpacity), 1.5f, 1f / FPS);
}
- private void EnableFade()
+ private void ReduceOpacity()
{
- enableFade = true;
- }
-
- void Update()
- {
- if (enableFade && fadeTime > 0)
- {
- alphaValue -= fadeAwayPerSecond * Time.deltaTime;
- fadeAwayText.color = new Color(fadeAwayText.color.r, fadeAwayText.color.g, fadeAwayText.color.b, alphaValue);
- fadeTime -= Time.deltaTime;
- }
+ if (alphaValue <= 0f) return;
+ alphaValue -= da;
+ fadeAwayText.color = new Color(fadeAwayText.color.r, fadeAwayText.color.g, fadeAwayText.color.b, alphaValue);
}
}
diff --git a/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat b/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat
index 807519165b119ceb65d73b9409ad3a27d219a29e..9a4404841e3b32b5ecaa2727016019c61d4070b1 100644
--- a/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat
+++ b/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialGrey.mat
@@ -84,7 +84,9 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
+ - _AlphaToMask: 0
- _Blend: 0
+ - _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
@@ -93,6 +95,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
@@ -107,13 +110,14 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- - _BaseColor: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 1}
- - _Color: {r: 0.7529412, g: 0.7529412, b: 0.7529412, a: 1}
+ - _BaseColor: {r: 0.8790899, g: 0.4764151, b: 1, a: 1}
+ - _Color: {r: 0.8790899, g: 0.47641504, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat b/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat
index 60278cfed670f1ba0dd6b209da4b61a0eba3db9a..915b45abff62b8614bf3ac49a28f68d1e4e183e0 100644
--- a/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat
+++ b/Assets/VRTemplateAssets/Materials/Controller/UniversalMaterialWhite.mat
@@ -84,7 +84,9 @@ Material:
m_Ints: []
m_Floats:
- _AlphaClip: 0
+ - _AlphaToMask: 0
- _Blend: 0
+ - _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
@@ -93,6 +95,7 @@ Material:
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
@@ -107,13 +110,14 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _SrcBlendAlpha: 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}
+ - _BaseColor: {r: 0, g: 0, b: 0, a: 1}
+ - _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []