Доделан игрок и тайл менеджер

This commit is contained in:
Dizel 2024-12-21 10:12:17 +03:00
parent 2eb77c8dc2
commit 36d1ee9f33
10 changed files with 2072 additions and 143 deletions

View File

@ -620,8 +620,8 @@ Transform:
m_GameObject: {fileID: 5566479653381875423}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1.2685, z: 0.1401}
m_LocalScale: {x: 2.013762, y: 2.0449, z: 1.4290174}
m_LocalPosition: {x: -0, y: 1.2685, z: -2.8468}
m_LocalScale: {x: 2.013762, y: 2.0449, z: 7.4032335}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4681246928765088494}
@ -711,7 +711,7 @@ GameObject:
- component: {fileID: 8124113394837021501}
m_Layer: 0
m_Name: Cube (2)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1055,7 +1055,7 @@ GameObject:
- component: {fileID: 8822126970857512052}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1160,7 +1160,7 @@ GameObject:
- component: {fileID: 3536463806178529164}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

View File

@ -844,8 +844,8 @@ Transform:
m_GameObject: {fileID: 5057698196999054086}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.0437, y: 0.2483, z: 1.9698}
m_LocalScale: {x: 1.3819929, y: 0.48426896, z: 0.28755203}
m_LocalPosition: {x: 0.0437, y: 0.4926, z: 0.3054}
m_LocalScale: {x: 1.707314, y: 0.97304255, z: 3.616418}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7408114376680220897}

View File

@ -387,7 +387,7 @@ GameObject:
- component: {fileID: 9197025993450719990}
m_Layer: 0
m_Name: Cube (8)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -492,7 +492,7 @@ GameObject:
- component: {fileID: 5810543909057511222}
m_Layer: 0
m_Name: Cube (3)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -695,8 +695,8 @@ Transform:
m_GameObject: {fileID: 3570574020291434284}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: -0.4371, z: 0.5689}
m_LocalScale: {x: 1.522, y: 0.6579945, z: 2.8912246}
m_LocalPosition: {x: 0, y: -0.0787, z: 0.0003}
m_LocalScale: {x: 1.5909466, y: 1.375026, z: 4.02856}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7529156666020220936}
@ -766,7 +766,7 @@ BoxCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
@ -786,7 +786,7 @@ GameObject:
- component: {fileID: 6570911092418126068}
m_Layer: 0
m_Name: Cube (6)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -974,7 +974,7 @@ GameObject:
- component: {fileID: 5336912675773691007}
m_Layer: 0
m_Name: Cube (5)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1079,7 +1079,7 @@ GameObject:
- component: {fileID: 4698032803106112276}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1184,7 +1184,7 @@ GameObject:
- component: {fileID: 8973399925454364754}
m_Layer: 0
m_Name: Cube (2)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1289,7 +1289,7 @@ GameObject:
- component: {fileID: 443994617966762417}
m_Layer: 0
m_Name: Cube (7)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1434,7 +1434,7 @@ GameObject:
- component: {fileID: 3551305743360493704}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -1539,7 +1539,7 @@ GameObject:
- component: {fileID: 2064151246533580999}
m_Layer: 0
m_Name: Cube (4)
m_TagString: Untagged
m_TagString: Car
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0

View File

@ -1375,7 +1375,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &4467392542930695542
Transform:
m_ObjectHideFlags: 0

View File

@ -122,119 +122,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &7786177
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 54541283446148500, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_Target
value:
objectReference: {fileID: 0}
- target: {fileID: 4090221840526957868, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_GazeInteractor
value:
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalPosition.x
value: -2.09
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalPosition.y
value: 4.28
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalPosition.z
value: -12.47
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4134505312059479865, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7313654230448209575, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_Name
value: XR Interaction Setup
objectReference: {fileID: 0}
- target: {fileID: 7696548424635294048, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 9014170783809206330, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_BackGroundColor.a
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9014170783809206330, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_BackGroundColor.b
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9014170783809206330, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_BackGroundColor.g
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9014170783809206330, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_BackGroundColor.r
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9168142743249570444, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
propertyPath: m_MoveSpeed
value: 10
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 4090221840526957868, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
m_RemovedGameObjects:
- {fileID: 3415145736139425353, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
- {fileID: 2819856895474916288, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
- {fileID: 7690080512698956844, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 7696548424635294048, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
insertIndex: -1
addedObject: {fileID: 193195986}
m_SourcePrefab: {fileID: 100100000, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
--- !u!1 &193195979 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 7696548424635294048, guid: 895f6f3c2d334633b5800312285058d2, type: 3}
m_PrefabInstance: {fileID: 7786177}
m_PrefabAsset: {fileID: 0}
--- !u!114 &193195986
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 193195979}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4c85452440a82d49ba8699717838f48, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1140935466
GameObject:
m_ObjectHideFlags: 0
@ -451,11 +338,12 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
scoreManager: {fileID: 0}
_NumTile: 30
_NumTile: 4
_DistanceTiles: 30
_TilePrefs:
- {fileID: 7495788483562650455, guid: 4939760d0f519ec4f8d52cf5575a65c1, type: 3}
_Tiles: []
_PlayerSetup: {fileID: 3310916099714090641}
--- !u!4 &1750947391
Transform:
m_ObjectHideFlags: 0
@ -621,12 +509,12 @@ GameObject:
- component: {fileID: 1991568990}
- component: {fileID: 1991568989}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Name: Player Test
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!65 &1991568989
BoxCollider:
m_ObjectHideFlags: 0
@ -713,6 +601,72 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2234663093327250926
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalPosition.y
value: 1.25
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalPosition.z
value: -10.01
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6415851221908245835, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8703746257660459454, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_Name
value: Player Setup
objectReference: {fileID: 0}
- target: {fileID: 8703746257660459454, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
--- !u!1 &3310916099714090641 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8703746257660459454, guid: 370de91caccb06340a180df8efc5b27a, type: 3}
m_PrefabInstance: {fileID: 2234663093327250926}
m_PrefabAsset: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@ -722,4 +676,4 @@ SceneRoots:
- {fileID: 1750947391}
- {fileID: 1744412849}
- {fileID: 1991568992}
- {fileID: 7786177}
- {fileID: 2234663093327250926}

View File

@ -48,6 +48,9 @@ public class TileManagerScript : MonoBehaviour
/// </summary>
private int _CountTile = 0;
[SerializeField]
private GameObject _PlayerSetup;
/// <summary>
/// при запуске сцены, создание новых тайлов
/// </summary>
@ -63,22 +66,30 @@ public class TileManagerScript : MonoBehaviour
// генерация нового тайла, с собственным z
GameObject tile = GenerateTile(new Vector3(0, 0, z), new Quaternion(0, 0, 0, 0));
if (z <= 0)
if (z < 0)
{
SetCloseZone(tile);
SetTrigZone(tile);
}
if(z == 0)
{
SetTrigZone(tile);
}
// увелечение позиции тайла по transform.position.z
z += _DistanceTiles;
}
//_PlayerSetup.SetActive(true);
}
/// <summary>
/// Активация зон закрытия
///
/// </summary>
/// <param name="tile"></param>
private void SetCloseZone(GameObject tile)
private void SetTrigZone(GameObject tile)
{
// цикл нахождения скрипта тригера по тегу
foreach (Transform child in tile.transform)
@ -93,7 +104,14 @@ public class TileManagerScript : MonoBehaviour
break;
}
}
}
/// <summary>
/// Активация зоны закрытия
/// </summary>
/// <param name="tile"></param>
private void SetCloseZone(GameObject tile)
{
foreach (Transform child in tile.transform)
{
// если найден тег, то передать и закрыть

View File

@ -1,4 +1,5 @@
using UnityEngine;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.Events;
/// <summary>
@ -14,6 +15,7 @@ public class TriggerZoneScript : MonoBehaviour
/// <summary>
/// флаг реакции тригера
/// </summary>
[SerializeField]
private bool _wasTrigged = false;
public bool WasTrigged
{

View File

@ -11,7 +11,7 @@ public class HitDetectorScript : MonoBehaviour
if (other.gameObject.CompareTag("Car"))
{
Debug.Log("Player was hitted car");
SceneManager.LoadScene(SceneManager.GetActiveScene().name);
SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().name);
}
}

1948
Assets/Player Setup.prefab Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 370de91caccb06340a180df8efc5b27a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: