kuhyx/WUT_Computer_Science
1
0
Fork 0
mirror of https://github.com/kuhyx/WUT_Computer_Science.git synced 2026-07-04 17:23:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

merloj: working movement on Development

Browse Source 
- plus fixed text on Base prefab
This commit is contained in:
Maciekxdabu 2022-05-23 14:12:29 +02:00
parent 68a93d8891
commit 3ea366e43f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
theProject/Assets/Prefabs/Base.prefab
View File

@ -81,8 +81,8 @@ MonoBehaviour:
ourType: 0
maxHealthPoints: 10
healthPoints: 1
nameText: {fileID: 0}
healthPointsText: {fileID: 0}
nameText: {fileID: 6838251604148675782}
healthPointsText: {fileID: 8012357605284019061}
--- !u!1 &2026481257847620386
GameObject:
m_ObjectHideFlags: 0
@ -249,12 +249,12 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 1498494949006888735}
m_maskType: 0
_SortingLayer: 0
_SortingLayerID: 0
_SortingOrder: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 1498494949006888735}
m_maskType: 0
--- !u!1 &2062275012809416088
GameObject:
m_ObjectHideFlags: 0
@ -421,12 +421,12 @@ MonoBehaviour:
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 4083783489867894370}
m_maskType: 0
_SortingLayer: 0
_SortingLayerID: 0
_SortingOrder: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 4083783489867894370}
m_maskType: 0
--- !u!1 &8380328954527329432
GameObject:
m_ObjectHideFlags: 0

8
theProject/Assets/Scripts/Managers/TilemapManager.cs
View File

@ -105,17 +105,17 @@ public class TilemapManager : MonoBehaviour
else
tiles[x, y].standingSoldier = Instantiate(soldierPrefab, tilemap.CellToWorld(new Vector3Int(x, y, 0)) + WORLD_SPACE_OFFSET, Quaternion.identity).GetComponent<Soldier>();
if (tiles[x, y].standingSoldier == null)
return false;
if (isAlly)
tiles[x, y].standingSoldier.setOwnTag(Soldier.SoldierType.Ally);
else
tiles[x, y].standingSoldier.setOwnTag(Soldier.SoldierType.Enemy);
if (tiles[x, y].standingSoldier != null)
return true;
tiles[x, y].standingSoldier.SetTileCoords(new Vector2Int(x, y));
return false;
return true;
}
public bool DespawnSoldier(int x, int y)