# Conflicts: # Assets/_TerrainData/TerrainData_521113671563848736.asset # Assets/_TerrainData/TerrainData_699485723238748736.asset # Assets/_TerrainData/TerrainData_869121471408748736.asset # Assets/_TerrainData/TerrainMaterial_521113671563848736.mat # Assets/_TerrainData/TerrainMaterial_699485723238748736.mat # Assets/_TerrainData/TerrainMaterial_869121471408748736.mat # ProjectSettings/EditorBuildSettings.asset |
||
---|---|---|
.. | ||
Blocker shield.mat | ||
Blocker shield.mat.meta | ||
LINEAHOR1.psd | ||
LINEAHOR1.psd.meta | ||
Recurso 2.png | ||
Recurso 2.png.meta | ||
mask23.psd | ||
mask23.psd.meta | ||
panel.shader | ||
panel.shader.meta | ||
yos shield.fbx | ||
yos shield.fbx.meta | ||
yos shield.mat | ||
yos shield.mat.meta | ||
yos shield.prefab | ||
yos shield.prefab.meta |