Compare commits

..

3 Commits

Author SHA1 Message Date
5f253e05a7 Removed false comment 2025-04-06 18:30:30 -04:00
9ffc98db9a Merge branch 'main' into bugfix/placeUnitOnSameTile 2025-04-06 18:23:36 -04:00
05a9fa2112 Add castle sprite and change its dmg 2->3 (#3)
Reviewed-on: #3
Reviewed-by: Ader_Alisma <ader.alisma.1@ens.etsmtl.ca>
Co-authored-by: craftwill <william-gin1@hotmail.com>
Co-committed-by: craftwill <william-gin1@hotmail.com>
2025-03-02 18:06:54 +00:00
5 changed files with 8 additions and 21 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: bc54d5d5ac69f334daf7b36882bd5199 guid: bf13763ff43b8114b8bdca864dfdf62f
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
@ -33,7 +33,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 0 filterMode: 1
aniso: 1 aniso: 1
mipBias: 0 mipBias: 0
wrapU: 1 wrapU: 1
@ -70,7 +70,7 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
resizeAlgorithm: 0 resizeAlgorithm: 0
textureFormat: -1 textureFormat: -1
textureCompression: 0 textureCompression: 1
compressionQuality: 50 compressionQuality: 50
crunchedCompression: 0 crunchedCompression: 0
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
@ -113,18 +113,6 @@ TextureImporter:
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0 forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: WebGL
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

View File

@ -243,7 +243,7 @@ MonoBehaviour:
_lifeBar: {fileID: 981581452810264329} _lifeBar: {fileID: 981581452810264329}
_hp: 20 _hp: 20
_speed: 1 _speed: 1
_attack_damage: 2 _attack_damage: 3
_attack_interval: 2 _attack_interval: 2
_enemy: {fileID: 0} _enemy: {fileID: 0}
_root: {fileID: 3828680565076245792} _root: {fileID: 3828680565076245792}
@ -403,7 +403,7 @@ GameObject:
- component: {fileID: 6894793432076062629} - component: {fileID: 6894793432076062629}
- component: {fileID: 3061324007943427060} - component: {fileID: 3061324007943427060}
m_Layer: 0 m_Layer: 0
m_Name: exemple_castle m_Name: castle
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
@ -417,8 +417,8 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7803635882566565305} m_GameObject: {fileID: 7803635882566565305}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0.067, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.99116, y: 0.99116, z: 0.99116}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 8393796362083852573} m_Father: {fileID: 8393796362083852573}
@ -465,7 +465,7 @@ SpriteRenderer:
m_SortingLayerID: 364159097 m_SortingLayerID: 364159097
m_SortingLayer: 1 m_SortingLayer: 1
m_SortingOrder: 4 m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: bc54d5d5ac69f334daf7b36882bd5199, type: 3} m_Sprite: {fileID: 21300000, guid: bf13763ff43b8114b8bdca864dfdf62f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
m_FlipY: 0 m_FlipY: 0

View File

@ -11,7 +11,6 @@ public abstract class UnitPlaceholder : DraggablePlaceholder
WasPlaced?.Invoke(this); WasPlaced?.Invoke(this);
} }
// Not actually used because overriden.
public override bool CanBePlacedHere() public override bool CanBePlacedHere()
{ {
return base.CanBePlacedHere() && ResourceManager.Instance.EnoughFor(Rock, Wood, Food) return base.CanBePlacedHere() && ResourceManager.Instance.EnoughFor(Rock, Wood, Food)