Подогреваем коллизии

This commit is contained in:
ThomasCharester committed 2025-11-29 00:41:07 +03:00
1 parent 34d7fa3791
commit aa4a9e69dd
11 files changed
+42 -1195

No files matched your search

@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: bb5ad0cc3a72448a93ee2adb560c35ad
timeCreated: 1764345160
@@ -0,0 +1,12 @@
using UnityEngine;
namespace Code.DebugAndTest
{
public class TriggerTest : MonoBehaviour
{
private void OnTriggerEnter(Collider other)
{
Debug.Log(gameObject.name + " found " + other.name);
}
}
}
@@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 6bb3c649d82049079d00b843a76aced8
timeCreated: 1764345168
@@ -10,7 +10,7 @@ namespace Code.Gameplay.Orders.Order
private bool _playerEntered;
private void OnTriggerEnter(Collider other)
{
if (_playerEntered || !other.CompareTag("Player")) return;
if (_playerEntered ) return;
_playerEntered = true;
_orderService.OrderDelivered();
@@ -9,7 +9,7 @@ namespace Code.Gameplay.Orders.Order
private bool _playerEntered;
private void OnTriggerEnter(Collider other)
{
if (_playerEntered || !other.CompareTag("Player")) return;
if (_playerEntered ) return;
_playerEntered = true;
_orderService.OrderGive();
@@ -9,7 +9,7 @@ namespace Code.Gameplay.Orders.Order
private void OnTriggerEnter(Collider other)
{
if (_playerEntered || !other.CompareTag("Player")) return;
if (_playerEntered ) return;
orderDispenser.ThrowOrder();
_playerEntered = true;
}
@@ -159,16 +159,11 @@ namespace Code.Generator
Room pickupRoom = prefab.GetComponent<Room>();
if (_roomIndexesStack.Count == 0)
{
Debug.LogWarning("Стек пуст, нет позиции после первой");
return;
}
if (_roomIndexesStack.Count == 0) return;
int insertPos = Random.Range(1, _roomIndexesStack.Count + 1);
_roomIndexesStack.Insert(insertPos, new(RoomType.PickUp, pickupIndex));
Debug.Log($"PickUp комната '{pickupRoom.name}' позиция {insertPos}");
_roomIndexesStack.Insert(insertPos, new(RoomType.PickUp, pickupIndex));
}
@@ -20,7 +20,7 @@ namespace Code.Generator
// }
private void OnTriggerEnter(Collider other)
{
if (_playerEntered || !other.CompareTag("Player")) return;
if (_playerEntered) return;
_playerEntered = true;