From 077b898443cc5eb9fbc3284ec85f5f4da996ac14 Mon Sep 17 00:00:00 2001
From: Andrey Martinich <aimartinich@edu.hse.ru>
Date: Wed, 17 Jan 2024 20:00:43 +0300
Subject: [PATCH] Fix hint
---
Assets/Playing room/Scripts/BallThrower.cs | 1 -
Assets/Scenes/Terrain2.unity | 89 +++++++++++++---------
Assets/Scripts/HintAppearance.cs | 43 ++++++-----
3 files changed, 79 insertions(+), 54 deletions(-)
diff --git a/Assets/Playing room/Scripts/BallThrower.cs b/Assets/Playing room/Scripts/BallThrower.cs
index ec7dc84..02d0221 100644
--- a/Assets/Playing room/Scripts/BallThrower.cs
+++ b/Assets/Playing room/Scripts/BallThrower.cs
@@ -35,7 +35,6 @@ private void SpawnBall(Transform h)
if (currentBall == null)
{
currentBall = Instantiate(ballPrefab, h.position, Quaternion.identity);
- Rigidbody ballRigidbody = currentBall.GetComponent<Rigidbody>();
goList.Add(currentBall);
currentBall = null;
}
diff --git a/Assets/Scenes/Terrain2.unity b/Assets/Scenes/Terrain2.unity
index 4dde742..f1d5951 100644
--- a/Assets/Scenes/Terrain2.unity
+++ b/Assets/Scenes/Terrain2.unity
@@ -6186,6 +6186,28 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 0.028494263, y: 0.034059513, z: 0.002088928}
m_Center: {x: -0.027874757, y: 0.04986571, z: -0.08069749}
+--- !u!64 &152312007
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 152311999}
+ 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: 5
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: -6632226017173944119, guid: 8c531e383e3a3e54888942988f1b8b9f, type: 3}
--- !u!1001 &152501071
PrefabInstance:
m_ObjectHideFlags: 0
@@ -23079,7 +23101,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!4 &682615456
Transform:
m_ObjectHideFlags: 0
@@ -23123,12 +23145,12 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 682615455}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 97245f7a216b3cc4d904bc13fefe3572, type: 3}
m_Name:
m_EditorClassIdentifier:
- tabletObject: {fileID: 56591354}
+ hintObject: {fileID: 0}
player: {fileID: 2114507866}
activationDistance: 5
--- !u!1001 &685709895
@@ -36313,8 +36335,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 97245f7a216b3cc4d904bc13fefe3572, type: 3}
m_Name:
m_EditorClassIdentifier:
- tabletObject: {fileID: 0}
- player: {fileID: 0}
+ hintObject: {fileID: 150670521}
+ player: {fileID: 2114507866}
activationDistance: 2
--- !u!135 &1097311603
SphereCollider:
@@ -49722,6 +49744,10 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 152312001}
+ - targetCorrespondingSourceObject: {fileID: 2755258472933841554, guid: 8c531e383e3a3e54888942988f1b8b9f,
+ type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 152312007}
m_SourcePrefab: {fileID: 100100000, guid: 8c531e383e3a3e54888942988f1b8b9f, type: 3}
--- !u!1 &1434413667 stripped
GameObject:
@@ -75435,10 +75461,6 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 2114507853}
- - targetCorrespondingSourceObject: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9,
- type: 3}
- insertIndex: -1
- addedObject: {fileID: 2114507854}
- targetCorrespondingSourceObject: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
insertIndex: -1
@@ -75446,7 +75468,7 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
insertIndex: -1
- addedObject: {fileID: 2114507865}
+ addedObject: {fileID: 2114507868}
- targetCorrespondingSourceObject: {fileID: 160596, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
insertIndex: -1
@@ -75493,18 +75515,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
showController: 0
---- !u!114 &2114507854
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2114507852}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7c7801ed64f4c334a8772778fafedecd, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!65 &2114507855
BoxCollider:
m_ObjectHideFlags: 0
@@ -75546,24 +75556,35 @@ MonoBehaviour:
m_EditorClassIdentifier:
player: {fileID: 2114507852}
targetObject: {fileID: 1447488747}
---- !u!114 &2114507865
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2114507852}
- m_Enabled: 0
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: a49463c7f1463474cad142c0e1a6f2fb, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!4 &2114507866 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
m_PrefabInstance: {fileID: 2114507850}
m_PrefabAsset: {fileID: 0}
+--- !u!136 &2114507868
+CapsuleCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2114507852}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 1
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Radius: 0.5
+ m_Height: 1
+ m_Direction: 1
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2115064824
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/HintAppearance.cs b/Assets/Scripts/HintAppearance.cs
index e7295e6..c1db71d 100644
--- a/Assets/Scripts/HintAppearance.cs
+++ b/Assets/Scripts/HintAppearance.cs
@@ -1,4 +1,5 @@
-п»їusing System.Collections;
+п»їusing System;
+using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
@@ -6,32 +7,36 @@
public class HintAppearance : MonoBehaviour
{
- public GameObject tabletObject;
+ public GameObject hintObject;
public Transform player;
public float activationDistance = 3f;
private void Start()
{
- tabletObject = GameObject.Find("tabletHint");
-
- tabletObject.SetActive(false);
- player = GameObject.Find("VRCamera").transform;
-
+ hintObject.SetActive(false);
}
-
- // Update is called once per frame
+
private void Update()
{
- if (player != null) {
- float distanceToPlayer = Vector3.Distance(transform.position, player.position);
-
- if (distanceToPlayer <= activationDistance)
- {
- tabletObject.SetActive(true);
- } else
- {
- tabletObject.SetActive(false);
- }
+ float distanceToPlayer = Vector3.Distance(transform.position, player.position);
+ if (distanceToPlayer <= activationDistance)
+ {
+ hintObject.SetActive(true);
+ } else
+ {
+ hintObject.SetActive(false);
}
}
+
+ private void OnTriggerEnter(Collider other)
+ {
+ hintObject.SetActive(true);
+ Debug.LogError("Enter");
+ }
+
+ private void OnTriggerExit(Collider other)
+ {
+ hintObject.SetActive(false);
+ Debug.LogError("Exit");
+ }
}
--
GitLab