jze9/my-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test mesh

Browse Source
This commit is contained in:
jze9
2026-04-17 02:14:56 +05:00
parent 087db550f1
commit 64293937a7
50 changed files with 2570 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.claude/settings.local.json
View File

@@ -2,7 +2,9 @@
"permissions": { "permissions": {
"allow": [ "allow": [
"WebSearch", "WebSearch",
"WebFetch(domain:docs.unity3d.com)" "WebFetch(domain:docs.unity3d.com)",
"Bash(grep -l \"3009578ee03d9ed46a97978c08168eee\" \"c:/Users/jze9/Documents/unity/my-project/Assets/Blocks/texturs/\"*.meta)",
"Bash(grep -l \"640e614afcdf0cc42ae02e2b478ae512\" \"c:/Users/jze9/Documents/unity/my-project/Assets/Blocks/texturs/\"*.meta)"
] ]
} }
} }

50
Assets/Blocks/Blok.obj Normal file
View File

@@ -0,0 +1,50 @@
# Blender 5.1.1
# www.blender.org
mtllib Blok.mtl
o Cube
v 1.000000 1.000000 -1.000000
v 1.000000 -1.000000 -1.000000
v 1.000000 1.000000 1.000000
v 1.000000 -1.000000 1.000000
v -1.000000 1.000000 -1.000000
v -1.000000 -1.000000 -1.000000
v -1.000000 1.000000 1.000000
v -1.000000 -1.000000 1.000000
vn -0.0000 1.0000 -0.0000
vn -0.0000 -0.0000 1.0000
vn -1.0000 -0.0000 -0.0000
vn -0.0000 -1.0000 -0.0000
vn 1.0000 -0.0000 -0.0000
vn -0.0000 -0.0000 -1.0000
vt 0.498423 0.501818
vt 0.498423 0.998602
vt 0.001023 0.998602
vt 0.001023 0.501818
vt 0.999046 0.500959
vt 0.999046 0.999078
vt 0.500927 0.999078
vt 0.500927 0.500959
vt 0.999042 0.500940
vt 0.999042 0.999059
vt 0.500923 0.999059
vt 0.500923 0.500940
vt 0.498289 0.001223
vt 0.498289 0.499608
vt 0.001369 0.499608
vt 0.001369 0.001223
vt 0.999051 0.500945
vt 0.999051 0.999064
vt 0.500931 0.999064
vt 0.500931 0.500944
vt 0.999044 0.500954
vt 0.999043 0.999074
vt 0.500924 0.999074
vt 0.500924 0.500954
s 0
usemtl Material0
f 1/1/1 5/2/1 7/3/1 3/4/1
f 4/5/2 3/6/2 7/7/2 8/8/2
f 8/9/3 7/10/3 5/11/3 6/12/3
f 6/13/4 2/14/4 4/15/4 8/16/4
f 2/17/5 1/18/5 3/19/5 4/20/5
f 6/21/6 5/22/6 1/23/6 2/24/6

110
Assets/Blocks/Blok.obj.meta Normal file
View File

@@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 9491bc8c1f13b6541bb223ae6d55788a
ModelImporter:
serializedVersion: 24200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
generateMeshLods: 0
meshLodGenerationFlags: 0
maximumMeshLod: -1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Items/ferstitem.prefab.meta → Assets/Blocks/Definitions.meta
View File

@@ -1,6 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 06e51a4df39df524397e91edba2a833d guid: 2caa39746acdf3e449c6ffe7b49194b0
PrefabImporter: folderAsset: yes
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:

24
Assets/Blocks/Definitions/tree.asset Normal file
View File

@@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0c5e75bc3cec52e44bb5bcb6687e6237, type: 3}
m_Name: tree
m_EditorClassIdentifier: Assembly-CSharp::BlockDefinition
blockId: 1
displayName: tree
topTexture: {fileID: 2800000, guid: 31d7c3b267ede19409f90e3eed1c1266, type: 3}
bottomTexture: {fileID: 2800000, guid: 31d7c3b267ede19409f90e3eed1c1266, type: 3}
sideTexture: {fileID: 2800000, guid: 31d7c3b267ede19409f90e3eed1c1266, type: 3}
linkedItem: {fileID: 11400000, guid: 131ca9b5c83edfe4d9c35a6ef4a380a5, type: 2}
isSolid: 1
topIndex: 0
bottomIndex: 1
sideIndex: 2

2
Assets/Inventory/Items/ferstitem123.asset.meta → Assets/Blocks/Definitions/tree.asset.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5db581fdeb06daf4da37cb3d6f32b5ff guid: f827f1cb7a209854598b7f1ee52d32e4
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000

8
Assets/Blocks/Scripts/BlockDefinition.cs
View File

@@ -11,10 +11,10 @@ public class BlockDefinition : ScriptableObject
public string blockId; // уникальный ID, например "grass", "dirt" public string blockId; // уникальный ID, например "grass", "dirt"
public string displayName; public string displayName;
[Header("Textures (128×128)")] [Header("Textures (Sprite или Texture2D)")]
public Texture2D topTexture; // грань Y+ public Sprite topTexture; // грань Y+
public Texture2D bottomTexture; // грань Y- public Sprite bottomTexture; // грань Y-
public Texture2D sideTexture; // все 4 боковых грани public Sprite sideTexture; // все 4 боковых грани
[Header("Inventory Link")] [Header("Inventory Link")]
[Tooltip("ItemData с типом Block, связанная с этим блоком")] [Tooltip("ItemData с типом Block, связанная с этим блоком")]

39
Assets/Blocks/Scripts/BlockPlacer.cs
View File

@@ -17,11 +17,12 @@ public class BlockPlacer : MonoBehaviour
public Texture2D crackTexture; // текстура трещин (grayscale) public Texture2D crackTexture; // текстура трещин (grayscale)
// ── Приватное ───────────────────────────────────────────────────────────── // ── Приватное ─────────────────────────────────────────────────────────────
Camera _cam; Camera _cam;
float _breakProgress; float _breakProgress;
Vector3Int _breakingBlock = Vector3Int.one * int.MinValue; // "никакой" Vector3Int _breakingBlock = Vector3Int.one * int.MinValue;
GameObject _breakOverlay; GameObject _breakOverlay;
MeshRenderer _overlayRenderer; MeshRenderer _overlayRenderer;
MaterialPropertyBlock _mpb;
static readonly int PropProgress = Shader.PropertyToID("_Progress"); static readonly int PropProgress = Shader.PropertyToID("_Progress");
@@ -49,7 +50,7 @@ public class BlockPlacer : MonoBehaviour
void HandleBreak() void HandleBreak()
{ {
if (!Input.GetMouseButton(0)) if (PlayerInput.Instance == null || !PlayerInput.Instance.BreakHeld)
{ {
CancelBreak(); CancelBreak();
return; return;
@@ -61,6 +62,7 @@ public class BlockPlacer : MonoBehaviour
return; return;
} }
// Сменился ли целевой блок? // Сменился ли целевой блок?
if (blockPos != _breakingBlock) if (blockPos != _breakingBlock)
{ {
@@ -106,7 +108,7 @@ public class BlockPlacer : MonoBehaviour
void HandlePlace() void HandlePlace()
{ {
if (!Input.GetMouseButtonDown(1)) return; if (PlayerInput.Instance == null || !PlayerInput.Instance.PlacePressed) return;
if (!Raycast(out RaycastHit hit, out Vector3Int blockPos)) return; if (!Raycast(out RaycastHit hit, out Vector3Int blockPos)) return;
// Ячейка, куда ставим = сосед грани которую мы смотрим // Ячейка, куда ставим = сосед грани которую мы смотрим
@@ -120,11 +122,7 @@ public class BlockPlacer : MonoBehaviour
if (selectedItem == null) return; if (selectedItem == null) return;
var def = BlockRegistry.Instance?.GetByItemId(selectedItem.id); var def = BlockRegistry.Instance?.GetByItemId(selectedItem.id);
if (def == null) if (def == null) return;
{
Debug.Log($"[BlockPlacer] {selectedItem.itemName} не является блоком.");
return;
}
WorldManager.Instance.PlaceBlock(placePos, def.blockId); WorldManager.Instance.PlaceBlock(placePos, def.blockId);
@@ -154,11 +152,10 @@ public class BlockPlacer : MonoBehaviour
void UpdateOverlay(float progress) void UpdateOverlay(float progress)
{ {
if (_overlayRenderer == null) return; if (_overlayRenderer == null) return;
// MaterialPropertyBlock — не создаём новый экземпляр материала _mpb ??= new MaterialPropertyBlock();
var mpb = new MaterialPropertyBlock(); _overlayRenderer.GetPropertyBlock(_mpb);
_overlayRenderer.GetPropertyBlock(mpb); _mpb.SetFloat(PropProgress, progress);
mpb.SetFloat(PropProgress, progress); _overlayRenderer.SetPropertyBlock(_mpb);
_overlayRenderer.SetPropertyBlock(mpb);
} }
// ── Утилиты ─────────────────────────────────────────────────────────────── // ── Утилиты ───────────────────────────────────────────────────────────────
@@ -166,9 +163,13 @@ public class BlockPlacer : MonoBehaviour
bool Raycast(out RaycastHit hit, out Vector3Int blockPos) bool Raycast(out RaycastHit hit, out Vector3Int blockPos)
{ {
blockPos = default; blockPos = default;
Ray ray = new Ray(_cam.transform.position, _cam.transform.forward); Ray ray = new Ray(_cam.transform.position, _cam.transform.forward);
if (Physics.Raycast(ray, out hit, reach, blockLayer)) // blockLayer == 0 означает "Nothing" в Unity LayerMask — рейкаст ни по чему не попадёт.
// Если слой не назначен в Inspector, бьём по всем слоям (-1 = Everything).
int mask = blockLayer.value == 0 ? ~0 : blockLayer.value;
if (Physics.Raycast(ray, out hit, reach, mask))
{ {
// hit.point лежит на грани — смещаемся чуть внутрь блока // hit.point лежит на грани — смещаемся чуть внутрь блока
Vector3 inner = hit.point - hit.normal * 0.01f; Vector3 inner = hit.point - hit.normal * 0.01f;

66
Assets/Blocks/Scripts/BlockRegistry.cs
View File

@@ -45,7 +45,14 @@ public class BlockRegistry : MonoBehaviour
// Собираем уникальные текстуры (top/bottom/side каждого блока) // Собираем уникальные текстуры (top/bottom/side каждого блока)
// Порядок: для блока i → top=i*3, bottom=i*3+1, side=i*3+2 // Порядок: для блока i → top=i*3, bottom=i*3+1, side=i*3+2
int layerCount = definitions.Count * 3; int layerCount = definitions.Count * 3;
int res = 128; // разрешение должно совпадать с текстурами блоков
// Авто-определяем разрешение по первой найденной текстуре (берём из rect спрайта)
int res = 16;
foreach (var d in definitions)
{
Sprite s = d.topTexture ?? d.sideTexture ?? d.bottomTexture;
if (s != null) { res = (int)s.rect.width; break; }
}
TexArray = new Texture2DArray(res, res, layerCount, TexArray = new Texture2DArray(res, res, layerCount,
TextureFormat.RGBA32, true, false); TextureFormat.RGBA32, true, false);
@@ -100,40 +107,43 @@ public class BlockRegistry : MonoBehaviour
// ── Утилиты ─────────────────────────────────────────────────────────────── // ── Утилиты ───────────────────────────────────────────────────────────────
/// <summary> /// <summary>
/// Копирует пиксели из src в Texture2DArray на слой layerIndex. /// Копирует один спрайт (или его часть из атласа) в слой Texture2DArray.
/// Если src null или не того размера — заполняет пурпурным (ошибка-текстура). /// Использует Graphics.Blit с UV offset/scale — Read/Write не нужен.
/// Если src null — заполняет пурпурным (ошибка-текстура).
/// </summary> /// </summary>
static void CopyTexture(Texture2D src, Texture2DArray dst, int layerIndex, int res) static void CopyTexture(Sprite src, Texture2DArray dst, int layerIndex, int res)
{ {
Color[] pixels;
if (src == null) if (src == null)
{ {
// Пурпурный = "текстура не назначена" var pixels = new Color[res * res];
pixels = new Color[res * res];
for (int p = 0; p < pixels.Length; p++) for (int p = 0; p < pixels.Length; p++)
pixels[p] = (p / res + p) % 2 == 0 ? Color.magenta : Color.black; pixels[p] = (p / res + p) % 2 == 0 ? Color.magenta : Color.black;
} dst.SetPixels(pixels, layerIndex);
else if (src.width != res || src.height != res) return;
{
Debug.LogWarning($"[BlockRegistry] {src.name} is {src.width}×{src.height}, expected {res}×{res}. Scaling.");
// Простой fallback — масштабировать через RenderTexture
var rt = RenderTexture.GetTemporary(res, res);
Graphics.Blit(src, rt);
var prev = RenderTexture.active;
RenderTexture.active = rt;
var resized = new Texture2D(res, res, TextureFormat.RGBA32, false);
resized.ReadPixels(new Rect(0, 0, res, res), 0, 0);
resized.Apply();
RenderTexture.active = prev;
RenderTexture.ReleaseTemporary(rt);
pixels = resized.GetPixels();
}
else
{
pixels = src.GetPixels();
} }
dst.SetPixels(pixels, layerIndex); // Вычисляем UV offset/scale этого спрайта внутри атласа.
// sprite.rect — пиксельные координаты (origin = bottom-left атласа).
float atlasW = src.texture.width;
float atlasH = src.texture.height;
var scale = new Vector2(src.rect.width / atlasW, src.rect.height / atlasH);
var offset = new Vector2(src.rect.x / atlasW, src.rect.y / atlasH);
var rt = RenderTexture.GetTemporary(res, res, 0, RenderTextureFormat.ARGB32);
var prevFilter = src.texture.filterMode;
src.texture.filterMode = FilterMode.Point;
Graphics.Blit(src.texture, rt, scale, offset);
src.texture.filterMode = prevFilter;
var prev = RenderTexture.active;
RenderTexture.active = rt;
var tmp = new Texture2D(res, res, TextureFormat.RGBA32, false);
tmp.ReadPixels(new Rect(0, 0, res, res), 0, 0);
tmp.Apply();
RenderTexture.active = prev;
RenderTexture.ReleaseTemporary(rt);
dst.SetPixels(tmp.GetPixels(), layerIndex);
Object.Destroy(tmp);
} }
} }

46
Assets/Blocks/Scripts/Chunk.cs
View File

@@ -30,18 +30,18 @@ public class Chunk : MonoBehaviour
// Порядок по часовой стрелке, смотрим снаружи // Порядок по часовой стрелке, смотрим снаружи
static readonly Vector3[][] FaceVerts = static readonly Vector3[][] FaceVerts =
{ {
// Top (Y+) // Top (Y+) — нормаль (0,+1,0) ✓
new[] { new Vector3(0,1,0), new Vector3(0,1,1), new Vector3(1,1,1), new Vector3(1,1,0) }, new[] { new Vector3(0,1,0), new Vector3(0,1,1), new Vector3(1,1,1), new Vector3(1,1,0) },
// Bottom (Y-) // Bottom (Y-) — нормаль (0,-1,0) ✓
new[] { new Vector3(0,0,0), new Vector3(1,0,0), new Vector3(1,0,1), new Vector3(0,0,1) }, new[] { new Vector3(0,0,0), new Vector3(1,0,0), new Vector3(1,0,1), new Vector3(0,0,1) },
// Front (Z+) // Front (Z+) — нормаль (0,0,+1), исправлен порядок вершин
new[] { new Vector3(1,0,1), new Vector3(0,0,1), new Vector3(0,1,1), new Vector3(1,1,1) }, new[] { new Vector3(0,0,1), new Vector3(1,0,1), new Vector3(1,1,1), new Vector3(0,1,1) },
// Back (Z-) // Back (Z-) — нормаль (0,0,-1), исправлен порядок вершин
new[] { new Vector3(0,0,0), new Vector3(1,0,0), new Vector3(1,1,0), new Vector3(0,1,0) }, new[] { new Vector3(1,0,0), new Vector3(0,0,0), new Vector3(0,1,0), new Vector3(1,1,0) },
// Right (X+) // Right (X+) — нормаль (+1,0,0), исправлен порядок вершин
new[] { new Vector3(1,0,0), new Vector3(1,0,1), new Vector3(1,1,1), new Vector3(1,1,0) }, new[] { new Vector3(1,0,1), new Vector3(1,0,0), new Vector3(1,1,0), new Vector3(1,1,1) },
// Left (X-) // Left (X-) — нормаль (-1,0,0), исправлен порядок вершин
new[] { new Vector3(0,0,1), new Vector3(0,0,0), new Vector3(0,1,0), new Vector3(0,1,1) } new[] { new Vector3(0,0,0), new Vector3(0,0,1), new Vector3(0,1,1), new Vector3(0,1,0) }
}; };
// UV для каждой из 4 вершин грани // UV для каждой из 4 вершин грани
@@ -63,11 +63,11 @@ public class Chunk : MonoBehaviour
_filter.sharedMesh = _mesh; _filter.sharedMesh = _mesh;
} }
public void Initialise(ChunkData data, Material chunkMaterial) public void Initialise(ChunkData data, Material chunkMaterial, bool buildMesh = true)
{ {
Data = data; Data = data;
_renderer.sharedMaterial = chunkMaterial; _renderer.sharedMaterial = chunkMaterial;
RebuildMesh(); if (buildMesh) RebuildMesh();
} }
// ── Публичный API ───────────────────────────────────────────────────────── // ── Публичный API ─────────────────────────────────────────────────────────
@@ -92,10 +92,10 @@ public class Chunk : MonoBehaviour
{ {
if (Data == null) return; if (Data == null) return;
var verts = new List<Vector3>(); var verts = new List<Vector3>();
var tris = new List<int>(); var tris = new List<int>();
var uvs = new List<Vector2>(); // UV0: координаты на грани 0-1 var uvs = new List<Vector2>(); // UV0: координаты на грани 0-1
var texCoord1 = new List<Vector2>(); // UV1: x = индекс в Texture2DArray var texCoord1 = new List<Vector2>(); // UV1: x = texIndex, y = face brightness
for (int x = 0; x < ChunkData.SIZE; x++) for (int x = 0; x < ChunkData.SIZE; x++)
for (int y = 0; y < ChunkData.HEIGHT; y++) for (int y = 0; y < ChunkData.HEIGHT; y++)
@@ -114,19 +114,23 @@ public class Chunk : MonoBehaviour
// Face culling: пропускаем грань если сосед — твёрдый блок // Face culling: пропускаем грань если сосед — твёрдый блок
if (HasSolidNeighbour(neighbour)) continue; if (HasSolidNeighbour(neighbour)) continue;
// Индекс текстуры для этой грани // Индекс текстуры и яркость грани (Minecraft-стиль)
int texIndex = f == 0 ? def.topIndex : int texIndex = f == 0 ? def.topIndex :
f == 1 ? def.bottomIndex : f == 1 ? def.bottomIndex :
def.sideIndex; def.sideIndex;
float bright = f == 0 ? 1.0f : // top
f == 1 ? 0.5f : // bottom
0.8f; // sides
int baseVert = verts.Count; int baseVert = verts.Count;
var origin = new Vector3(x, y, z); var origin = new Vector3(x, y, z);
var faceUV = new Vector2(texIndex, bright); // одна аллокация на грань, не на вершину
for (int v = 0; v < 4; v++) for (int v = 0; v < 4; v++)
{ {
verts.Add(origin + FaceVerts[f][v]); verts.Add(origin + FaceVerts[f][v]);
uvs.Add(FaceUVs[v]); uvs.Add(FaceUVs[v]);
texCoord1.Add(new Vector2(texIndex, 0)); texCoord1.Add(faceUV);
} }
// Два треугольника на грань // Два треугольника на грань

4
Assets/Blocks/Scripts/FlatWorldGenerator.cs
View File

@@ -53,6 +53,10 @@ public class FlatWorldGenerator : MonoBehaviour
WorldManager.Instance.CreateChunk(chunkPos, data); WorldManager.Instance.CreateChunk(chunkPos, data);
} }
// Перестраиваем все меши после создания всех чанков —
// иначе граничные грани между соседними чанками не скрываются
WorldManager.Instance.RebuildAllChunks();
Debug.Log($"[FlatWorldGenerator] Generated {chunksX * chunksZ} chunks."); Debug.Log($"[FlatWorldGenerator] Generated {chunksX * chunksZ} chunks.");
} }

19
Assets/Blocks/Scripts/WorldManager.cs
View File

@@ -16,6 +16,10 @@ public class WorldManager : MonoBehaviour
[Tooltip("Можно оставить пустым — создаётся из кода")] [Tooltip("Можно оставить пустым — создаётся из кода")]
public GameObject chunkPrefab; public GameObject chunkPrefab;
[Header("Chunk Layer")]
[Tooltip("Слой для всех чанков — должен совпадать с blockLayer в BlockPlacer")]
public LayerMask chunkLayer;
// chunkPos (в чанковых координатах) → Chunk // chunkPos (в чанковых координатах) → Chunk
private readonly Dictionary<Vector3Int, Chunk> _chunks = new(); private readonly Dictionary<Vector3Int, Chunk> _chunks = new();
@@ -97,8 +101,11 @@ public class WorldManager : MonoBehaviour
go.transform.position = ChunkData.ChunkToWorld(chunkPos); go.transform.position = ChunkData.ChunkToWorld(chunkPos);
if (chunkLayer.value != 0)
go.layer = Mathf.RoundToInt(Mathf.Log(chunkLayer.value, 2));
var chunk = go.GetComponent<Chunk>() ?? go.AddComponent<Chunk>(); var chunk = go.GetComponent<Chunk>() ?? go.AddComponent<Chunk>();
chunk.Initialise(data, registry.ChunkMaterial); chunk.Initialise(data, registry.ChunkMaterial, buildMesh: false);
_chunks[chunkPos] = chunk; _chunks[chunkPos] = chunk;
return chunk; return chunk;
@@ -129,6 +136,16 @@ public class WorldManager : MonoBehaviour
chunk.RebuildMesh(); chunk.RebuildMesh();
} }
/// <summary>
/// Перестраивает меши всех чанков.
/// Вызывать после того как все чанки созданы — исправляет граничные грани.
/// </summary>
public void RebuildAllChunks()
{
foreach (var chunk in _chunks.Values)
chunk.RebuildMesh();
}
/// <summary>Перевод мировой позиции игрока → мировые координаты блока.</summary> /// <summary>Перевод мировой позиции игрока → мировые координаты блока.</summary>
public static Vector3Int WorldToBlock(Vector3 worldPosition) public static Vector3Int WorldToBlock(Vector3 worldPosition)
{ {

125
Assets/Blocks/Shaders/VoxelLit.shader
View File

@@ -3,53 +3,108 @@ Shader "Blocks/VoxelLit"
Properties Properties
{ {
_MainTexArray ("Texture Array", 2DArray) = "" {} _MainTexArray ("Texture Array", 2DArray) = "" {}
_Glossiness ("Smoothness", Range(0,1)) = 0.0
_Metallic ("Metallic", Range(0,1)) = 0.0
} }
SubShader SubShader
{ {
Tags { "RenderType"="Opaque" } Tags { "RenderType"="Opaque" }
LOD 200 LOD 100
Cull Off // рендерим обе стороны граней — нужно для видимости стен внутри ям
CGPROGRAM Pass
// Standard surface shader с кастомным vertex для передачи texIndex
#pragma surface surf Standard fullforwardshadows vertex:vert
#pragma target 3.5
#pragma require 2darray
UNITY_DECLARE_TEX2DARRAY(_MainTexArray);
struct Input
{ {
float2 uv_MainTexArray; // стандартный UV (0-1 по грани) Tags { "LightMode"="ForwardBase" }
float texIndex; // индекс слоя в Texture2DArray
};
half _Glossiness; CGPROGRAM
half _Metallic; #pragma vertex vert
#pragma fragment frag
#pragma multi_compile_fog
#pragma multi_compile_fwdbase
#pragma target 3.5
#pragma require 2darray
// Vertex-функция: читаем texIndex из канала UV1 (mesh.uv2) #include "UnityCG.cginc"
void vert(inout appdata_full v, out Input o) #include "AutoLight.cginc"
{
UNITY_INITIALIZE_OUTPUT(Input, o); UNITY_DECLARE_TEX2DARRAY(_MainTexArray);
o.uv_MainTexArray = v.texcoord.xy;
o.texIndex = v.texcoord1.x; // UV1.x = индекс текстуры struct appdata
{
float4 vertex : POSITION;
float2 uv : TEXCOORD0; // UV грани 0-1
float2 uv2 : TEXCOORD1; // x = texIndex, y = face brightness
};
struct v2f
{
float4 pos : SV_POSITION;
float3 uvTex : TEXCOORD0; // xy = UV, z = texIndex
float bright : TEXCOORD1; // face brightness (0.5 – 1.0)
UNITY_FOG_COORDS(2)
SHADOW_COORDS(3)
};
v2f vert(appdata v)
{
v2f o;
o.pos = UnityObjectToClipPos(v.vertex);
o.uvTex = float3(v.uv, v.uv2.x);
o.bright = v.uv2.y;
UNITY_TRANSFER_FOG(o, o.pos);
TRANSFER_SHADOW(o);
return o;
}
fixed4 frag(v2f i) : SV_Target
{
fixed4 col = UNITY_SAMPLE_TEX2DARRAY(_MainTexArray, i.uvTex);
// Minecraft-стиль освещения: фиксированная яркость по направлению грани
col.rgb *= i.bright;
// Тени от directional light
fixed shadow = SHADOW_ATTENUATION(i);
col.rgb *= lerp(0.5, 1.0, shadow);
UNITY_APPLY_FOG(i.fogCoord, col);
return col;
}
ENDCG
} }
void surf(Input IN, inout SurfaceOutputStandard o) // Shadow caster pass — нужен чтобы чанки отбрасывали тени
Pass
{ {
fixed4 c = UNITY_SAMPLE_TEX2DARRAY( Tags { "LightMode"="ShadowCaster" }
_MainTexArray, Cull Off
float3(IN.uv_MainTexArray, IN.texIndex)
); CGPROGRAM
o.Albedo = c.rgb; #pragma vertex vert
o.Metallic = _Metallic; #pragma fragment frag
o.Smoothness = _Glossiness; #pragma multi_compile_shadowcaster
o.Alpha = c.a; #pragma target 3.5
#include "UnityCG.cginc"
struct appdata { float4 vertex : POSITION; };
struct v2f
{
V2F_SHADOW_CASTER;
};
v2f vert(appdata v)
{
v2f o;
TRANSFER_SHADOW_CASTER_NORMALOFFSET(o)
return o;
}
fixed4 frag(v2f i) : SV_Target
{
SHADOW_CASTER_FRAGMENT(i)
}
ENDCG
} }
ENDCG
} }
FallBack "Diffuse"
} }

8
Assets/Blocks/material.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 75b00cdc4ce553b4087844bae1e992e2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

95
Assets/Blocks/material/tree.mat Normal file
View File

@@ -0,0 +1,95 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: tree
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _GLOSSYREFLECTIONS_OFF
- _SPECULARHIGHLIGHTS_OFF
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties: _Metallic _MetallicGlossMap
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CrackTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 31d7c3b267ede19409f90e3eed1c1266, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTexArray:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Progress: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 0
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

4
Assets/Inventory/Items/ferstitem.asset.meta → Assets/Blocks/material/tree.mat.meta
View File

@@ -1,8 +1,8 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d870f627519521f4aa24b9a36766465d guid: 2a59d3fb9416740458f1398cf6b2f942
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 2100000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

8
Assets/Blocks/texturs.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ef13a612315aeae43bc2d2c363286de6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Blocks/texturs/tree.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

204
Assets/Blocks/texturs/tree.png.meta Normal file
View File

@@ -0,0 +1,204 @@
fileFormatVersion: 2
guid: 31d7c3b267ede19409f90e3eed1c1266
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 32
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 32
resizeAlgorithm: 1
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: tree_0
rect:
serializedVersion: 2
x: 0
y: 16
width: 16
height: 16
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: dca6d7bc05d6ee343bc521837ba8af3f
internalID: -1348885527
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tree_1
rect:
serializedVersion: 2
x: 16
y: 16
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: be4147745dc24b44d8eb775803676697
internalID: 394011459
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: tree_2
rect:
serializedVersion: 2
x: 0
y: 0
width: 16
height: 16
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
customData:
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 84a8f42573bda534a9ca4a34894e22dc
internalID: -1937943187
vertices: []
indices:
edges: []
weights: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: b332cdd6f7af3b042972045431002e42
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries:
- key: SpriteEditor.SliceSettings
value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":64.0,"y":64.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":0,"keepEmptyRects":false,"isAlternate":false}'
- key: SpriteEditor.SliceOnImport
value: False
nameFileIdTable:
tree_0: -1348885527
tree_1: 394011459
tree_2: -1937943187
tree_3: -413478633
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Blocks/texturs/tree1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

130
Assets/Blocks/texturs/tree1.png.meta Normal file
View File

@@ -0,0 +1,130 @@
fileFormatVersion: 2
guid: 3009578ee03d9ed46a97978c08168eee
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 32
resizeAlgorithm: 1
textureFormat: -1
textureCompression: 3
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 32
resizeAlgorithm: 1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Blocks/texturs/tree2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

130
Assets/Blocks/texturs/tree2.png.meta Normal file
View File

@@ -0,0 +1,130 @@
fileFormatVersion: 2
guid: 640e614afcdf0cc42ae02e2b478ae512
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 32
resizeAlgorithm: 1
textureFormat: -1
textureCompression: 3
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 32
resizeAlgorithm: 1
textureFormat: 10
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Blocks/texturs/tree_icon.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

130
Assets/Blocks/texturs/tree_icon.PNG.meta Normal file
View File

@@ -0,0 +1,130 @@
fileFormatVersion: 2
guid: 63b56781d36f85e49923a6b7b50381e7
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 0
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 0
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 0
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 128
resizeAlgorithm: 1
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 128
resizeAlgorithm: 1
textureFormat: 12
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

124
Assets/Blocks/tree.prefab Normal file
View File

@@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &1834211952878912991
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalPosition.x
value: 0.66041523
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalPosition.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalPosition.z
value: 3.3843179
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7635826562936255635, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7635826562936255635, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_MotionVectors
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7635826562936255635, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_RayTracingMode
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7635826562936255635, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7635826562936255635, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 2a59d3fb9416740458f1398cf6b2f942, type: 2}
- target: {fileID: -7635826562936255635, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: 'm_Materials.Array.data[1]'
value:
objectReference: {fileID: 2100000, guid: 2a59d3fb9416740458f1398cf6b2f942, type: 2}
- target: {fileID: 919132149155446097, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_Name
value: tree
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_Layer
value: 7
objectReference: {fileID: 0}
- target: {fileID: 8164078558771037576, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8164078558771037576, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
insertIndex: -1
addedObject: {fileID: 6307796976124268661}
m_SourcePrefab: {fileID: 100100000, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
--- !u!1 &1564165088969144462 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 9491bc8c1f13b6541bb223ae6d55788a, type: 3}
m_PrefabInstance: {fileID: 1834211952878912991}
m_PrefabAsset: {fileID: 0}
--- !u!65 &6307796976124268661
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1564165088969144462}
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: 2, y: 2, z: 2}
m_Center: {x: 0, y: 0, z: 0}

2
Assets/Items/ferstitem123.prefab.meta → Assets/Blocks/tree.prefab.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 0e4347f1177decb4a8671c25fe736183 guid: 3ae36dcb84d70194993d12a9f047bb1c
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

31
Assets/Inventory/Items/ferstitem.asset
View File

@@ -1,31 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5741b63764436354ebad192c9b71f06c, type: 3}
m_Name: ferstitem
m_EditorClassIdentifier: Assembly-CSharp::ItemData
id: c3b1d462-dc84-4d7a-8463-34ffbde783d9
itemName: ferstitem
description: ferstitem
type: 5
modelPrefab: {fileID: 282714382156279063, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
icon: {fileID: 21300000, guid: 0115b2d990086ae4cbc31baf7c64e680, type: 3}
maxStack: 64
isCraftable: 0
craftingRecipe:
ingredients: []
amounts:
resultId:
resultAmount: 1
weight: 1
value: 1
isDroppable: 1
isStackable: 1

31
Assets/Inventory/Items/ferstitem123.asset
View File

@@ -1,31 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5741b63764436354ebad192c9b71f06c, type: 3}
m_Name: ferstitem123
m_EditorClassIdentifier: Assembly-CSharp::ItemData
id: 4b147ba6-462a-4f90-9d00-29089fed390a
itemName: ferstitem123
description: 123
type: 5
modelPrefab: {fileID: 8569222662204961130, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
icon: {fileID: 21300000, guid: 0115b2d990086ae4cbc31baf7c64e680, type: 3}
maxStack: 64
isCraftable: 0
craftingRecipe:
ingredients: []
amounts:
resultId:
resultAmount: 1
weight: 1
value: 1
isDroppable: 1
isStackable: 1

14
Assets/Inventory/Items/NewItem.asset → Assets/Inventory/Items/tree.asset
View File

@@ -10,14 +10,14 @@ MonoBehaviour:
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5741b63764436354ebad192c9b71f06c, type: 3} m_Script: {fileID: 11500000, guid: 5741b63764436354ebad192c9b71f06c, type: 3}
m_Name: newItem m_Name: tree
m_EditorClassIdentifier: Assembly-CSharp::ItemData m_EditorClassIdentifier: Assembly-CSharp::ItemData
id: c58a6ea4-f064-4392-becd-3b4c2b17cd06 id: f1f81603-393a-4a74-8c41-a9efe9f14e9e
itemName: newItem itemName: tree
description: 123123 description: tree
type: 5 type: 0
modelPrefab: {fileID: 282714382156279063, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3} modelPrefab: {fileID: 2501859741750806132, guid: fe90e1e2b9dde0943b665ca3768153ae, type: 3}
icon: {fileID: 0} icon: {fileID: 21300000, guid: 63b56781d36f85e49923a6b7b50381e7, type: 3}
maxStack: 64 maxStack: 64
isCraftable: 0 isCraftable: 0
craftingRecipe: craftingRecipe:

2
Assets/Inventory/Items/NewItem.asset.meta → Assets/Inventory/Items/tree.asset.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 20cff4d8f616b1140b2264c6f049ba8a guid: 131ca9b5c83edfe4d9c35a6ef4a380a5
NativeFormatImporter: NativeFormatImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 11400000 mainObjectFileID: 11400000

6
Assets/Inventory/Scripts/CraftingManager.cs
View File

@@ -21,9 +21,15 @@ public class CraftingManager : MonoBehaviour
void Awake() void Awake()
{ {
if (Instance == null) if (Instance == null)
{
Instance = this; Instance = this;
DontDestroyOnLoad(gameObject);
}
else else
{
Destroy(gameObject); Destroy(gameObject);
return;
}
_recipeDict = new Dictionary<string, CraftingRecipe>(); _recipeDict = new Dictionary<string, CraftingRecipe>();
foreach (var recipe in recipes) foreach (var recipe in recipes)

209
Assets/Inventory/Scripts/InventoryDragDrop.cs
View File

@@ -3,86 +3,84 @@ using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
/// <summary> /// <summary>
/// Обработка Drag & Drop предметов между слотами и выброс за пределы инвентаря /// Drag & Drop предметов между слотами.
/// Один общий DragIconCanvas на все слоты — создаётся при первом старте.
/// </summary> /// </summary>
public class InventoryDragDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerEnterHandler, IPointerExitHandler public class InventoryDragDrop : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerEnterHandler, IPointerExitHandler
{ {
public Slot slot; public Slot slot;
public int slotIndex; public int slotIndex;
[Header("Drag Visual")] [SerializeField] private float dragIconScale = 1.2f;
[SerializeField] private RectTransform dragIcon; [SerializeField] private bool allowDropOutside = true;
[SerializeField] private Image dragImage; [SerializeField] private float dropThreshold = 100f;
[SerializeField] private float dragIconScale = 1.2f;
[Header("Drop Settings")] // ── Общий на все слоты drag-icon ─────────────────────────────────────────
[SerializeField] private bool allowDropOutside = true; private static GameObject _sharedCanvas;
[SerializeField] private float dropThreshold = 100f; // пикселей за пределами инвентаря private static RectTransform _sharedIcon;
private static Image _sharedImage;
private Canvas _canvas; // ── Per-instance поля ─────────────────────────────────────────────────────
private CanvasGroup _canvasGroup; private CanvasGroup _canvasGroup;
private bool _isDragging; private bool _isDragging;
private Vector2 _dragStartPosition;
private RectTransform _inventoryPanelRect; private RectTransform _inventoryPanelRect;
// ── Unity lifecycle ───────────────────────────────────────────────────────
void Start() void Start()
{ {
_canvas = GetComponentInParent<Canvas>();
_canvasGroup = GetComponent<CanvasGroup>(); _canvasGroup = GetComponent<CanvasGroup>();
if (dragIcon == null) // Создаём общий DragCanvas один раз для всех слотов
{ if (_sharedCanvas == null)
CreateDragIcon(); CreateSharedDragCanvas();
}
// Находим панель инвентаря // Ищем rect инвентарной панели для определения «вне панели»
var inventoryManager = FindObjectOfType<InventoryManager>(); if (InventoryManager.Instance?.inventoryPanel != null)
if (inventoryManager?.inventoryPanel != null) _inventoryPanelRect = InventoryManager.Instance.inventoryPanel
{ .GetComponent<RectTransform>();
_inventoryPanelRect = inventoryManager.inventoryPanel.GetComponent<RectTransform>();
}
if (dragIcon != null)
dragIcon.gameObject.SetActive(false);
} }
private void CreateDragIcon() private static void CreateSharedDragCanvas()
{ {
GameObject canvasGO = new GameObject("DragIconCanvas"); _sharedCanvas = new GameObject("DragIconCanvas");
canvasGO.transform.SetParent(_canvas != null ? _canvas.transform : transform.root); DontDestroyOnLoad(_sharedCanvas);
var dragCanvas = canvasGO.AddComponent<Canvas>(); var c = _sharedCanvas.AddComponent<Canvas>();
dragCanvas.overrideSorting = true; c.renderMode = RenderMode.ScreenSpaceOverlay;
dragCanvas.sortingOrder = 1000; c.sortingOrder = 1000;
dragCanvas.renderMode = RenderMode.ScreenSpaceOverlay; c.overrideSorting = true;
canvasGO.AddComponent<GraphicRaycaster>(); _sharedCanvas.AddComponent<GraphicRaycaster>();
dragIcon = new GameObject("DragIcon").AddComponent<RectTransform>(); var iconGO = new GameObject("DragIcon");
dragIcon.SetParent(canvasGO.transform, false); iconGO.transform.SetParent(_sharedCanvas.transform, false);
dragIcon.sizeDelta = new Vector2(48, 48);
dragImage = dragIcon.gameObject.AddComponent<Image>(); _sharedIcon = iconGO.AddComponent<RectTransform>();
dragImage.raycastTarget = false; _sharedIcon.sizeDelta = new Vector2(48, 48);
dragIcon.gameObject.SetActive(false); _sharedImage = iconGO.AddComponent<Image>();
_sharedImage.raycastTarget = false;
iconGO.SetActive(false);
} }
// ── Drag handlers ─────────────────────────────────────────────────────────
public void OnBeginDrag(PointerEventData eventData) public void OnBeginDrag(PointerEventData eventData)
{ {
if (slot == null || slot.IsEmpty) return; if (slot == null || slot.IsEmpty) return;
_isDragging = true; _isDragging = true;
_dragStartPosition = eventData.position;
if (_canvasGroup != null) if (_canvasGroup != null)
_canvasGroup.blocksRaycasts = false; _canvasGroup.blocksRaycasts = false;
if (dragIcon != null && slot.item?.icon != null) if (_sharedIcon != null && slot.item?.icon != null)
{ {
dragIcon.gameObject.SetActive(true); _sharedImage.sprite = slot.item.icon;
dragImage.sprite = slot.item.icon; _sharedIcon.localScale = Vector3.one * dragIconScale;
dragIcon.localScale = Vector3.one * dragIconScale; _sharedIcon.position = eventData.position;
dragIcon.position = eventData.position; _sharedIcon.gameObject.SetActive(true);
} }
var bg = GetComponent<Image>(); var bg = GetComponent<Image>();
@@ -92,20 +90,19 @@ public class InventoryDragDrop : MonoBehaviour, IBeginDragHandler, IDragHandler,
public void OnDrag(PointerEventData eventData) public void OnDrag(PointerEventData eventData)
{ {
if (!_isDragging || dragIcon == null) return; if (!_isDragging || _sharedIcon == null) return;
dragIcon.position = eventData.position; _sharedIcon.position = eventData.position;
} }
public void OnEndDrag(PointerEventData eventData) public void OnEndDrag(PointerEventData eventData)
{ {
if (!_isDragging) return; if (!_isDragging) return;
_isDragging = false; _isDragging = false;
if (dragIcon != null) if (_sharedIcon != null)
{ {
dragIcon.gameObject.SetActive(false); _sharedIcon.gameObject.SetActive(false);
dragIcon.localScale = Vector3.one; _sharedIcon.localScale = Vector3.one;
} }
if (_canvasGroup != null) if (_canvasGroup != null)
@@ -113,124 +110,66 @@ public class InventoryDragDrop : MonoBehaviour, IBeginDragHandler, IDragHandler,
var bg = GetComponent<Image>(); var bg = GetComponent<Image>();
if (bg != null) if (bg != null)
bg.color = slot.IsEmpty ? new Color(0.25f, 0.25f, 0.25f, 0.8f) : new Color(0.35f, 0.35f, 0.35f, 0.95f); bg.color = slot.IsEmpty
? new Color(0.25f, 0.25f, 0.25f, 0.8f)
: new Color(0.35f, 0.35f, 0.35f, 0.95f);
// Проверяем - выбросили за пределы инвентаря? // Сначала ищем целевой слот (инвентарь ИЛИ хотбар)
if (allowDropOutside && IsOutsideInventory(eventData.position))
{
DropItemOutside();
return;
}
// Иначе - пробуем переместить в другой слот
var raycastResults = new System.Collections.Generic.List<RaycastResult>(); var raycastResults = new System.Collections.Generic.List<RaycastResult>();
EventSystem.current.RaycastAll(eventData, raycastResults); EventSystem.current.RaycastAll(eventData, raycastResults);
Slot targetSlot = null; Slot targetSlot = null;
foreach (var result in raycastResults) foreach (var result in raycastResults)
{ {
var slotComponent = result.gameObject.GetComponent<Slot>(); var s = result.gameObject.GetComponent<Slot>();
if (slotComponent != null && slotComponent != slot) if (s != null && s != slot) { targetSlot = s; break; }
{
targetSlot = slotComponent;
break;
}
} }
if (targetSlot != null && InventoryManager.Instance != null) if (targetSlot != null)
{ {
InventoryManager.Instance.SwapSlots(slotIndex, targetSlot.slotIndex); // Нашли слот — перемещаем (работает и для хотбара)
InventoryManager.Instance?.SwapSlots(slot, targetSlot);
return;
} }
// Слот не найден — выбросить в мир если за пределами инвентаря
if (allowDropOutside && IsOutsideInventory(eventData.position))
DropItemOutside();
} }
private bool IsOutsideInventory(Vector2 screenPosition) // ── Вспомогательные ───────────────────────────────────────────────────────
private bool IsOutsideInventory(Vector2 screenPos)
{ {
if (_inventoryPanelRect == null) return false; if (_inventoryPanelRect == null) return false;
// Получаем границы панели инвентаря в экранных координатах
Vector3[] corners = new Vector3[4]; Vector3[] corners = new Vector3[4];
_inventoryPanelRect.GetWorldCorners(corners); _inventoryPanelRect.GetWorldCorners(corners);
// rect панели в экранных координатах return screenPos.x < corners[0].x - dropThreshold ||
float minX = corners[0].x; screenPos.x > corners[2].x + dropThreshold ||
float maxX = corners[2].x; screenPos.y < corners[0].y - dropThreshold ||
float minY = corners[0].y; screenPos.y > corners[2].y + dropThreshold;
float maxY = corners[2].y;
// Добавляем отступ
float threshold = dropThreshold;
// Проверяем находится ли курсор за пределами панели + threshold
bool outside = screenPosition.x < minX - threshold ||
screenPosition.x > maxX + threshold ||
screenPosition.y < minY - threshold ||
screenPosition.y > maxY + threshold;
return outside;
} }
private void DropItemOutside() private void DropItemOutside()
{ {
if (slot == null || slot.IsEmpty) return; if (slot == null || slot.IsEmpty) return;
var item = slot.item; var item = slot.item;
int amount = slot.amount; int amount = slot.amount;
// Определяем позицию выброса
Vector3 dropPos = Vector3.zero; Vector3 dropPos = Vector3.zero;
if (Camera.main != null) if (Camera.main != null)
{
// Выбрасываем перед игроком
dropPos = Camera.main.transform.position + Camera.main.transform.forward * 2f; dropPos = Camera.main.transform.position + Camera.main.transform.forward * 2f;
}
// Создаём предмет в мире
if (InventoryItemFactory.Instance != null) if (InventoryItemFactory.Instance != null)
{
InventoryItemFactory.Instance.DropItem(item, amount, dropPos); InventoryItemFactory.Instance.DropItem(item, amount, dropPos);
}
else
{
// Fallback - просто создаём объект
var go = new GameObject($"Dropped_{item.itemName}");
go.transform.position = dropPos;
var visual = GameObject.CreatePrimitive(PrimitiveType.Cube);
visual.transform.SetParent(go.transform);
visual.transform.localPosition = Vector3.zero;
visual.transform.localScale = Vector3.one * 0.3f;
DestroyImmediate(visual.GetComponent<Collider>());
var worldItem = go.AddComponent<WorldItem>();
worldItem.Setup(item, amount);
}
// Очищаем слот
slot.Clear(); slot.Clear();
Debug.Log($"[DragDrop] Выброшен: {item.itemName} x{amount}"); Debug.Log($"[DragDrop] Выброшен: {item.itemName} x{amount}");
} }
public void OnPointerEnter(PointerEventData eventData) public void OnPointerEnter(PointerEventData eventData) { }
{ public void OnPointerExit(PointerEventData eventData) { }
if (!_isDragging && slot != null && !slot.IsEmpty)
{
var bg = GetComponent<Image>();
if (bg != null)
bg.color = new Color(0.5f, 0.5f, 0.5f, 1f);
}
}
public void OnPointerExit(PointerEventData eventData)
{
if (!_isDragging && slot != null)
{
var bg = GetComponent<Image>();
if (bg != null)
bg.color = slot.IsEmpty ?
new Color(0.25f, 0.25f, 0.25f, 0.8f) :
new Color(0.35f, 0.35f, 0.35f, 0.95f);
}
}
} }

34
Assets/Inventory/Scripts/InventoryExampleItems.cs
View File

@@ -1,5 +1,6 @@
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
/// <summary> /// <summary>
/// Пример конфигурации предметов /// Пример конфигурации предметов
@@ -11,28 +12,43 @@ public class InventoryExampleItems : MonoBehaviour
void Awake() void Awake()
{ {
// Создаём примеры предметов если база пустая // Создаём примеры предметов если список пустой
if (items == null || items.Count == 0) if (items == null || items.Count == 0)
{ {
items = CreateExampleItems(); items = CreateExampleItems();
} }
// Передаём в InventoryManager
var im = FindObjectOfType<InventoryManager>(); var im = FindObjectOfType<InventoryManager>();
if (im != null) if (im == null) return;
{
im.itemDatabase = items;
im.RebuildItemDictionary();
// Сразу добавляем тестовые предметы // Объединяем с существующей базой — не заменяем!
// Так кастомные предметы (tree.asset и т.д.) из Inspector'а сохраняются.
if (im.itemDatabase == null)
im.itemDatabase = new List<ItemData>();
foreach (var item in items)
{
if (item != null && !im.itemDatabase.Exists(x => x?.id == item.id))
im.itemDatabase.Add(item);
}
im.RebuildItemDictionary();
// Тестовые предметы добавляем ТОЛЬКО если нет сохранения
// Иначе они будут перезаписаны загрузкой в Start() и появляться снова при каждом запуске
string savePath = Path.Combine(Application.persistentDataPath, "inventory_save.json");
if (!File.Exists(savePath))
{
im.AddItem("stone", 32); im.AddItem("stone", 32);
im.AddItem("dirt", 16); im.AddItem("dirt", 16);
im.AddItem("wood", 8); im.AddItem("wood", 8);
im.AddItem("apple", 5); im.AddItem("apple", 5);
im.AddItem("sword", 1); im.AddItem("sword", 1);
im.AddItem("pickaxe", 1); im.AddItem("pickaxe", 1);
Debug.Log("[InventoryExampleItems] No save found — added test items");
Debug.Log("[InventoryExampleItems] Added test items"); }
else
{
Debug.Log("[InventoryExampleItems] Save exists — skipping test items, load will restore inventory");
} }
} }

6
Assets/Inventory/Scripts/InventoryItemFactory.cs
View File

@@ -163,11 +163,7 @@ public class InventoryItemFactory : MonoBehaviour
} }
Vector3 spawnPos = dropPosition + offset; Vector3 spawnPos = dropPosition + offset;
Quaternion rotation = Quaternion.Euler( Quaternion rotation = Quaternion.identity;
Random.Range(0, 360),
Random.Range(0, 360),
Random.Range(0, 360)
);
var worldItem = CreateWorldItem(itemData, amount, spawnPos, rotation); var worldItem = CreateWorldItem(itemData, amount, spawnPos, rotation);

69
Assets/Inventory/Scripts/InventoryManager.cs
View File

@@ -318,10 +318,11 @@ public class InventoryManager : MonoBehaviour
} }
else else
{ {
remaining -= slot.amount; int cleared = slot.amount; // сохранить ДО Clear()
remaining -= cleared;
slot.Clear(); slot.Clear();
OnItemRemoved?.Invoke(itemId, slot.amount); OnItemRemoved?.Invoke(itemId, cleared);
InventoryEvents.Instance?.InvokeItemRemoved(itemId, slot.amount); InventoryEvents.Instance?.InvokeItemRemoved(itemId, cleared);
} }
} }
} }
@@ -342,10 +343,11 @@ public class InventoryManager : MonoBehaviour
} }
else else
{ {
remaining -= slot.amount; int cleared = slot.amount; // сохранить ДО Clear()
remaining -= cleared;
slot.Clear(); slot.Clear();
OnItemRemoved?.Invoke(itemId, slot.amount); OnItemRemoved?.Invoke(itemId, cleared);
InventoryEvents.Instance?.InvokeItemRemoved(itemId, slot.amount); InventoryEvents.Instance?.InvokeItemRemoved(itemId, cleared);
} }
} }
} }
@@ -447,7 +449,7 @@ public class InventoryManager : MonoBehaviour
} }
/// <summary> /// <summary>
/// Поменять предметы между двумя слотами /// Поменять предметы между двумя слотами (по индексам, только основной инвентарь)
/// </summary> /// </summary>
public void SwapSlots(int fromIndex, int toIndex) public void SwapSlots(int fromIndex, int toIndex)
{ {
@@ -455,14 +457,19 @@ public class InventoryManager : MonoBehaviour
toIndex < 0 || toIndex >= slots.Length) toIndex < 0 || toIndex >= slots.Length)
return; return;
var fromSlot = slots[fromIndex]; SwapSlots(slots[fromIndex], slots[toIndex]);
var toSlot = slots[toIndex]; }
// Сохраняем данные /// <summary>
var tempItem = fromSlot.item; /// Поменять предметы между любыми двумя слотами (инвентарь ↔ хотбар и т.д.)
/// </summary>
public void SwapSlots(Slot fromSlot, Slot toSlot)
{
if (fromSlot == null || toSlot == null || fromSlot == toSlot) return;
var tempItem = fromSlot.item;
var tempAmount = fromSlot.amount; var tempAmount = fromSlot.amount;
// Меняем
if (toSlot.IsEmpty) if (toSlot.IsEmpty)
{ {
fromSlot.Clear(); fromSlot.Clear();
@@ -541,6 +548,19 @@ public class InventoryManager : MonoBehaviour
}; };
} }
if (hotbarSlots != null)
{
inventoryData.hotbarSlots = new SlotData[hotbarSlots.Length];
for (int i = 0; i < hotbarSlots.Length; i++)
{
inventoryData.hotbarSlots[i] = new SlotData
{
itemId = hotbarSlots[i].item?.id,
amount = hotbarSlots[i].amount
};
}
}
return JsonUtility.ToJson(inventoryData, true); return JsonUtility.ToJson(inventoryData, true);
} }
@@ -600,12 +620,20 @@ public class InventoryManager : MonoBehaviour
{ {
var slotData = inventoryData.slots[i]; var slotData = inventoryData.slots[i];
if (!string.IsNullOrEmpty(slotData.itemId) && _itemDict.TryGetValue(slotData.itemId, out ItemData item)) if (!string.IsNullOrEmpty(slotData.itemId) && _itemDict.TryGetValue(slotData.itemId, out ItemData item))
{
slots[i].SetItem(item, slotData.amount); slots[i].SetItem(item, slotData.amount);
}
else else
{
slots[i].Clear(); slots[i].Clear();
}
if (inventoryData.hotbarSlots != null && hotbarSlots != null)
{
for (int i = 0; i < Mathf.Min(inventoryData.hotbarSlots.Length, hotbarSlots.Length); i++)
{
var slotData = inventoryData.hotbarSlots[i];
if (!string.IsNullOrEmpty(slotData.itemId) && _itemDict.TryGetValue(slotData.itemId, out ItemData item))
hotbarSlots[i].SetItem(item, slotData.amount);
else
hotbarSlots[i].Clear();
} }
} }
} }
@@ -614,6 +642,7 @@ public class InventoryManager : MonoBehaviour
class InventorySaveData class InventorySaveData
{ {
public SlotData[] slots; public SlotData[] slots;
public SlotData[] hotbarSlots;
} }
[System.Serializable] [System.Serializable]
@@ -623,6 +652,16 @@ public class InventoryManager : MonoBehaviour
public int amount; public int amount;
} }
void OnDestroy()
{
if (PlayerInput.Instance != null)
{
PlayerInput.Instance.OnToggleInventory -= ToggleInventory;
PlayerInput.Instance.OnDropPressed -= DropSelectedItem;
PlayerInput.Instance.OnHotbarSelect -= SelectHotbarSlot;
}
}
void OnApplicationQuit() void OnApplicationQuit()
{ {
SaveToFile(); SaveToFile();

9
Assets/Inventory/Scripts/WorldItem.cs
View File

@@ -35,10 +35,16 @@ public class WorldItem : MonoBehaviour
itemData = data; itemData = data;
amount = count; amount = count;
if (data.modelPrefab != null) // Спавним модель только если визуал ещё не встроен в prefab
if (data.modelPrefab != null && transform.childCount == 0)
{ {
var model = Instantiate(data.modelPrefab, transform); var model = Instantiate(data.modelPrefab, transform);
model.transform.localPosition = Vector3.zero; model.transform.localPosition = Vector3.zero;
// Удаляем WorldItem из визуальной модели — она только для отображения,
// не должна быть самостоятельным подбираемым объектом
foreach (var wi in model.GetComponentsInChildren<WorldItem>())
Destroy(wi);
} }
if (pickupDelay > 0) if (pickupDelay > 0)
@@ -73,6 +79,7 @@ public class WorldItem : MonoBehaviour
int remaining = InventoryManager.Instance.AddItem(itemData, amount); int remaining = InventoryManager.Instance.AddItem(itemData, amount);
if (remaining <= 0) if (remaining <= 0)
{ {
CancelInvoke(); // отменяем отложенный EnablePickup если он ещё не сработал
Destroy(gameObject); Destroy(gameObject);
return true; return true;
} }

135
Assets/Items/ferstitem.prefab
View File

@@ -1,135 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8569222662204961130
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3299916784270131221}
- component: {fileID: 5472821117555071674}
- component: {fileID: 1683734392604781716}
m_Layer: 0
m_Name: ferstitem
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3299916784270131221
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8569222662204961130}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8775671899748787654}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5472821117555071674
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8569222662204961130}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b8ac54fbf9ed99e45a83319443952a91, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::WorldItem
itemData: {fileID: 11400000, guid: d870f627519521f4aa24b9a36766465d, type: 2}
amount: 1
pickupDelay: 0
interactRange: 2.5
--- !u!135 &1683734392604781716
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8569222662204961130}
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: 3
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &746297087722819351
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3299916784270131221}
m_Modifications:
- target: {fileID: 282714382156279063, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_Name
value: Visual
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
--- !u!4 &8775671899748787654 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8327738622413892305, guid: 4fcbba5b8725e254f98c052c4db89e02, type: 3}
m_PrefabInstance: {fileID: 746297087722819351}
m_PrefabAsset: {fileID: 0}

135
Assets/Items/ferstitem123.prefab
View File

@@ -1,135 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3773692352489507899
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3475947316444918413}
- component: {fileID: 4358986541640902538}
- component: {fileID: 8290802686145622635}
m_Layer: 0
m_Name: ferstitem123
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3475947316444918413
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3773692352489507899}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1739540476929525579}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &4358986541640902538
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3773692352489507899}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b8ac54fbf9ed99e45a83319443952a91, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::WorldItem
itemData: {fileID: 11400000, guid: 5db581fdeb06daf4da37cb3d6f32b5ff, type: 2}
amount: 1
pickupDelay: 0
interactRange: 2.5
--- !u!135 &8290802686145622635
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3773692352489507899}
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: 3
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &3886533962277390174
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3475947316444918413}
m_Modifications:
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8569222662204961130, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
propertyPath: m_Name
value: Visual
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
--- !u!4 &1739540476929525579 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3299916784270131221, guid: 06e51a4df39df524397e91edba2a833d, type: 3}
m_PrefabInstance: {fileID: 3886533962277390174}
m_PrefabAsset: {fileID: 0}

373
Assets/Items/item_anim.anim Normal file
View File

@@ -0,0 +1,373 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: item_anim
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 360.424, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_PositionCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: {x: 0, y: 0.33, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.25
value: {x: 0, y: 0, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
time: 0.5
value: {x: 0, y: 0.33, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
weightedMode: 0
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
path:
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1
script: {fileID: 0}
typeID: 4
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
- serializedVersion: 2
path: 0
attribute: 4
script: {fileID: 0}
typeID: 4
customType: 4
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.x
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 360.424
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.y
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: localEulerAnglesRaw.z
path:
classID: 4
script: {fileID: 0}
flags: 16
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0.33
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.25
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalPosition.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_EulerEditorCurves:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.x
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.y
path:
classID: 4
script: {fileID: 0}
flags: 0
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_LocalEulerAngles.z
path:
classID: 4
script: {fileID: 0}
flags: 0
m_HasGenericRootTransform: 1
m_HasMotionFloatCurves: 0
m_Events: []

8
Assets/Items/item_anim.anim.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6ea8e562eb5dcf448a92bb8ce4402a66
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Items/newItem.prefab
View File

73
Assets/Items/tree.controller Normal file
View File

@@ -0,0 +1,73 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: tree
serializedVersion: 6
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 4241218343605681128}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
m_EvaluateTransitionsOnStart: 1
--- !u!1107 &4241218343605681128
AnimatorStateMachine:
serializedVersion: 7
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4489924751263448603}
m_Position: {x: 200, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4489924751263448603}
--- !u!1102 &4489924751263448603
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: item_anim
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6ea8e562eb5dcf448a92bb8ce4402a66, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:

8
Assets/Items/tree.controller.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c4d40bb1024b19944b0ba0f85b0fd89f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

194
Assets/Items/tree.prefab Normal file
View File

@@ -0,0 +1,194 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2501859741750806132
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4239651288264806298}
- component: {fileID: 3599933775027151645}
- component: {fileID: 6068943115296421469}
- component: {fileID: 8918097335992063939}
- component: {fileID: 8272906402636553536}
m_Layer: 6
m_Name: tree
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4239651288264806298
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2501859741750806132}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.3125369, z: -0, w: 0.94990563}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.33, y: 0.33, z: 0.33}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5719490679037582883}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 36.424, z: 0}
--- !u!114 &3599933775027151645
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2501859741750806132}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b8ac54fbf9ed99e45a83319443952a91, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::WorldItem
itemData: {fileID: 11400000, guid: 131ca9b5c83edfe4d9c35a6ef4a380a5, type: 2}
amount: 1
pickupDelay: 0
interactRange: 2.5
--- !u!65 &6068943115296421469
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2501859741750806132}
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: 2, y: 2, z: 2}
m_Center: {x: 0, y: 0, z: 0}
--- !u!95 &8918097335992063939
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2501859741750806132}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: c4d40bb1024b19944b0ba0f85b0fd89f, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!54 &8272906402636553536
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2501859741750806132}
serializedVersion: 5
m_Mass: 1
m_LinearDamping: 0
m_AngularDamping: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1001 &5882089278608227351
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4239651288264806298}
m_Modifications:
- target: {fileID: 1564165088969144462, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_Name
value: Visual
objectReference: {fileID: 0}
- target: {fileID: 1564165088969144462, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7509976937716105303, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
propertyPath: m_Layer
value: 6
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
--- !u!4 &5719490679037582883 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2233459345161642548, guid: 3ae36dcb84d70194993d12a9f047bb1c, type: 3}
m_PrefabInstance: {fileID: 5882089278608227351}
m_PrefabAsset: {fileID: 0}

2
Assets/Items/newItem.prefab.meta → Assets/Items/tree.prefab.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 580244ac82154544e87abf9ff24eaf82 guid: fe90e1e2b9dde0943b665ca3768153ae
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

797
Assets/Scenes/SampleScene.unity
View File

File diff suppressed because it is too large Load Diff

27
Assets/charecter-controller/scripts/PlayerInput.cs
View File

@@ -16,10 +16,14 @@ public class PlayerInput : MonoBehaviour
public InputActionAsset actions; public InputActionAsset actions;
// ── Непрерывные значения ────────────────────────────────────────────────── // ── Непрерывные значения ──────────────────────────────────────────────────
public Vector2 MoveInput { get; private set; } public Vector2 MoveInput { get; private set; }
public Vector2 LookInput { get; private set; } public Vector2 LookInput { get; private set; }
public bool Crouch { get; private set; } public bool Crouch { get; private set; }
public bool Run { get; private set; } public bool Run { get; private set; }
/// <summary>ЛКМ удержана (разрушение блока). False когда инвентарь открыт.</summary>
public bool BreakHeld { get; private set; }
/// <summary>ПКМ нажата в этом кадре (постановка блока). False когда инвентарь открыт.</summary>
public bool PlacePressed { get; private set; }
// ── Дискретные события ──────────────────────────────────────────────────── // ── Дискретные события ────────────────────────────────────────────────────
public event Action OnToggleInventory; public event Action OnToggleInventory;
@@ -107,12 +111,17 @@ public class PlayerInput : MonoBehaviour
void Update() void Update()
{ {
if (_gameplayMap == null || !_gameplayMap.enabled) return; bool gameplayActive = _gameplayMap != null && _gameplayMap.enabled;
MoveInput = _gameplayMap["Move"].ReadValue<Vector2>(); MoveInput = gameplayActive ? _gameplayMap["Move"].ReadValue<Vector2>() : Vector2.zero;
LookInput = _gameplayMap["Look"].ReadValue<Vector2>(); LookInput = gameplayActive ? _gameplayMap["Look"].ReadValue<Vector2>() : Vector2.zero;
Crouch = _gameplayMap["Crouch"].IsPressed(); Crouch = gameplayActive && _gameplayMap["Crouch"].IsPressed();
Run = _gameplayMap["Run"].IsPressed(); Run = gameplayActive && _gameplayMap["Run"].IsPressed();
// Мышь через New Input System — отключаются вместе с gameplay
var mouse = UnityEngine.InputSystem.Mouse.current;
BreakHeld = gameplayActive && (mouse?.leftButton.isPressed ?? false);
PlacePressed = gameplayActive && (mouse?.rightButton.wasPressedThisFrame ?? false);
} }
// ── Сохранение/загрузка биндингов ──────────────────────────────────────── // ── Сохранение/загрузка биндингов ────────────────────────────────────────

26
Assets/charecter-controller/scripts/charecter.cs
View File

@@ -60,9 +60,20 @@ public class charecter : MonoBehaviour
} }
PlayerInput.Instance.OnPickupPressed += TryPickupNearbyItem; PlayerInput.Instance.OnPickupPressed += TryPickupNearbyItem;
PlayerInput.Instance.OnJumpPressed += () => { _jumpRequested = true; }; PlayerInput.Instance.OnJumpPressed += OnJumpPressed;
} }
void OnDestroy()
{
if (PlayerInput.Instance != null)
{
PlayerInput.Instance.OnPickupPressed -= TryPickupNearbyItem;
PlayerInput.Instance.OnJumpPressed -= OnJumpPressed;
}
}
void OnJumpPressed() => _jumpRequested = true;
void Update() void Update()
{ {
HandleLook(); HandleLook();
@@ -85,14 +96,19 @@ public class charecter : MonoBehaviour
foreach (var col in colliders) foreach (var col in colliders)
{ {
var worldItem = col.GetComponent<WorldItem>(); // Ищем WorldItem на коллайдере ИЛИ на любом родителе —
// чтобы дочерние меши (Visual, default и т.д.) тоже находили своего владельца
var worldItem = col.GetComponentInParent<WorldItem>();
if (worldItem == null) continue; if (worldItem == null) continue;
// Дедупликация: пропускаем если этот WorldItem уже учтён через другой коллайдер
if (worldItem == closestItem) continue;
float dist = Vector3.Distance(transform.position, worldItem.transform.position); float dist = Vector3.Distance(transform.position, worldItem.transform.position);
if (dist < closestDist && dist <= worldItem.interactRange) if (dist < closestDist && dist <= worldItem.interactRange)
{ {
closestDist = dist; closestDist = dist;
closestItem = worldItem; closestItem = worldItem;
} }
} }
@@ -143,7 +159,7 @@ public class charecter : MonoBehaviour
if (_jumpRequested && !isCrouching) if (_jumpRequested && !isCrouching)
{ {
_verticalVelocity = Mathf.Sqrt(jumpHeight * -2f * gravity); _verticalVelocity = Mathf.Sqrt(jumpHeight * -2f * gravity);
_anim?.SetTrigger(HashJump); if (_anim != null) _anim.SetTrigger(HashJump);
} }
_jumpRequested = false; _jumpRequested = false;
} }

5
ProjectSettings/TagManager.asset
View File

@@ -11,8 +11,8 @@ TagManager:
- -
- Water - Water
- UI - UI
- - item
- - Blocks
- -
- -
- -
@@ -43,3 +43,4 @@ TagManager:
locked: 0 locked: 0
m_RenderingLayers: m_RenderingLayers:
- Default - Default
m_MigratedRenderPipelines: []