Skip to content
Snippets Groups Projects
Commit 404da79e authored by Kimi Heinonen's avatar Kimi Heinonen
Browse files

palkit paivittyy oikein

parent 8f48369e
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ Transform: ...@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 3345454733487414898} m_GameObject: {fileID: 3345454733487414898}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.048, y: -1.51, z: 0.01} m_LocalPosition: {x: -0.048, y: -1.51, z: 0.01}
m_LocalScale: {x: 3.267, y: 1.914, z: 1} m_LocalScale: {x: 3.267, y: 1.74, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
...@@ -43,4 +43,3 @@ MonoBehaviour: ...@@ -43,4 +43,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8430aaccc9adbd74c93d8d100f8d421a, type: 3} m_Script: {fileID: 11500000, guid: 8430aaccc9adbd74c93d8d100f8d421a, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
respool: {fileID: 7418993124827082457, guid: 72232997f27e3c2448b5ad647af22a35, type: 3}
...@@ -26,7 +26,7 @@ Transform: ...@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 2308576596148104492} m_GameObject: {fileID: 2308576596148104492}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.93, y: 0.291, z: 0} m_LocalPosition: {x: 0.93, y: 0.291, z: 0}
m_LocalScale: {x: 0.70104766, y: 0.75656927, z: 1} m_LocalScale: {x: 2.33, y: 1.6, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 5761957582027681033} m_Father: {fileID: 5761957582027681033}
m_RootOrder: 0 m_RootOrder: 0
...@@ -106,7 +106,7 @@ Transform: ...@@ -106,7 +106,7 @@ Transform:
m_GameObject: {fileID: 5085001290068357248} m_GameObject: {fileID: 5085001290068357248}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.387, y: 0.282, z: 0} m_LocalPosition: {x: -0.387, y: 0.282, z: 0}
m_LocalScale: {x: 0.10027549, y: 0.14378266, z: 1} m_LocalScale: {x: 0.4, y: 0.4, z: 1}
m_Children: m_Children:
- {fileID: 5007991825820669350} - {fileID: 5007991825820669350}
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -178,4 +178,10 @@ MonoBehaviour: ...@@ -178,4 +178,10 @@ MonoBehaviour:
- {fileID: 21300004, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3} - {fileID: 21300004, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3}
- {fileID: 21300006, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3} - {fileID: 21300006, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3}
- {fileID: 21300008, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3} - {fileID: 21300008, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3}
spriteR: {fileID: 0} upgradesprites:
- {fileID: 21300000, guid: 45d0e9a104687534f8c83716c90e6532, type: 3}
- {fileID: 21300002, guid: 45d0e9a104687534f8c83716c90e6532, type: 3}
- {fileID: 21300004, guid: 45d0e9a104687534f8c83716c90e6532, type: 3}
- {fileID: 21300006, guid: 45d0e9a104687534f8c83716c90e6532, type: 3}
- {fileID: 21300008, guid: 45d0e9a104687534f8c83716c90e6532, type: 3}
- {fileID: 21300010, guid: 45d0e9a104687534f8c83716c90e6532, type: 3}
...@@ -11,6 +11,9 @@ public class ResourceRow : MonoBehaviour ...@@ -11,6 +11,9 @@ public class ResourceRow : MonoBehaviour
[SerializeField] [SerializeField]
private Sprite[] sprites; private Sprite[] sprites;
[SerializeField]
private Sprite[] upgradesprites;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
...@@ -29,7 +32,7 @@ public class ResourceRow : MonoBehaviour ...@@ -29,7 +32,7 @@ public class ResourceRow : MonoBehaviour
this.r = r; this.r = r;
this.GetComponent<SpriteRenderer>().sprite = r.getResourceImg(); this.GetComponent<SpriteRenderer>().sprite = r.getResourceImg();
this.GetComponent<SpriteRenderer>().transform.position = new Vector3(x, y, z); this.GetComponent<SpriteRenderer>().transform.position = new Vector3(x, y, z);
this.GetComponent<SpriteRenderer>().transform.localScale = new Vector3(0.35f, 0.35f, 1f); //this.GetComponent<SpriteRenderer>().transform.localScale = new Vector3(0.35f, 0.35f, 1f);
} }
public void UpdateBars() public void UpdateBars()
{ {
...@@ -40,29 +43,72 @@ public class ResourceRow : MonoBehaviour ...@@ -40,29 +43,72 @@ public class ResourceRow : MonoBehaviour
{ {
if (lista[i].GetResource().GetType().Equals(r.GetType())) if (lista[i].GetResource().GetType().Equals(r.GetType()))
{ {
int amount = lista[i].GetAmount(); int amount = lista[i].GetAmount();
int max = lista[i].GetMaxCapacity(); int max = lista[i].GetMaxCapacity();
float pros = amount*1f / max*1f; float pros = amount*1f / max*1f;
if (pros<=0.2) if (max<110)
{
SetSpritesForLevel1(pros);
} else
{
SetSpritesForLevel2(pros);
}
}
}
}
private void SetSpritesForLevel1(float pros)
{
if (pros <= 0.125)
{ {
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[0]; transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[0];
} else if(pros<=0.4) }
else if (pros <= 0.375)
{ {
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[1]; transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[1];
} else if(pros<=0.6) }
else if (pros <= 0.625)
{ {
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[2]; transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[2];
} else if(pros<=0.8) }
else if (pros <= 0.875)
{ {
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[3]; transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[3];
} else }
else
{ {
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[4]; transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[4];
} }
}
private void SetSpritesForLevel2(float pros)
{
if (pros <= 0.167)
{
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[0];
}
else if (pros <= 0.333)
{
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[1];
}
else if (pros <= 0.5)
{
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[2];
}
else if (pros <= 0.667)
{
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[3];
}
else if (pros <= 0.833)
{
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[4];
} }
else
{
transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = upgradesprites[5];
} }
//transform.GetChild(0).GetComponent<SpriteRenderer>().transform.localScale = new Vector3(0.35f, 0.35f, 1f);
} }
} }
...@@ -50,7 +50,7 @@ TextureImporter: ...@@ -50,7 +50,7 @@ TextureImporter:
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 45 spritePixelsToUnits: 128
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
...@@ -85,6 +85,17 @@ TextureImporter: ...@@ -85,6 +85,17 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 0 overridden: 0
androidETC2FallbackOverride: 0 androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: sprites:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment