diff --git a/Assets/Prefab/ResourcePanel.prefab b/Assets/Prefab/ResourcePanel.prefab
index 946871f37c2d6fcdc8ede4fceed485384243fd9f..f66f8b97853e198d4630041d4de1007133661a3e 100644
--- a/Assets/Prefab/ResourcePanel.prefab
+++ b/Assets/Prefab/ResourcePanel.prefab
@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 3345454733487414898}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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_Father: {fileID: 0}
m_RootOrder: 0
@@ -43,4 +43,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8430aaccc9adbd74c93d8d100f8d421a, type: 3}
m_Name:
m_EditorClassIdentifier:
- respool: {fileID: 7418993124827082457, guid: 72232997f27e3c2448b5ad647af22a35, type: 3}
diff --git a/Assets/Prefab/ResourceRow.prefab b/Assets/Prefab/ResourceRow.prefab
index 6385fd20fdf9bdda2ccab3279310ea02f28f59ef..221eebb714a22bca8a88ec0e3f1042dad1406dff 100644
--- a/Assets/Prefab/ResourceRow.prefab
+++ b/Assets/Prefab/ResourceRow.prefab
@@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 2308576596148104492}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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_Father: {fileID: 5761957582027681033}
m_RootOrder: 0
@@ -106,7 +106,7 @@ Transform:
m_GameObject: {fileID: 5085001290068357248}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
- {fileID: 5007991825820669350}
m_Father: {fileID: 0}
@@ -178,4 +178,10 @@ MonoBehaviour:
- {fileID: 21300004, guid: 82eec913fc22f9043b7dd6a14b77fe77, type: 3}
- {fileID: 21300006, 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}
diff --git a/Assets/Scripts/City/ResourceRow.cs b/Assets/Scripts/City/ResourceRow.cs
index 94f2afd40af327271d4268518a41a93ca2edbf95..a3307b9c9014162779c938e901c806c8b49ab02a 100644
--- a/Assets/Scripts/City/ResourceRow.cs
+++ b/Assets/Scripts/City/ResourceRow.cs
@@ -10,7 +10,10 @@ public class ResourceRow : MonoBehaviour
[SerializeField]
private Sprite[] sprites;
-
+
+ [SerializeField]
+ private Sprite[] upgradesprites;
+
// Start is called before the first frame update
void Start()
@@ -29,7 +32,7 @@ public class ResourceRow : MonoBehaviour
this.r = r;
this.GetComponent<SpriteRenderer>().sprite = r.getResourceImg();
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()
{
@@ -40,29 +43,72 @@ public class ResourceRow : MonoBehaviour
{
if (lista[i].GetResource().GetType().Equals(r.GetType()))
{
-
-
int amount = lista[i].GetAmount();
int max = lista[i].GetMaxCapacity();
float pros = amount*1f / max*1f;
- if (pros<=0.2)
+ if (max<110)
{
- transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[0];
- } else if(pros<=0.4)
- {
- transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[1];
- } else if(pros<=0.6)
- {
- transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[2];
- } else if(pros<=0.8)
- {
- transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[3];
+ SetSpritesForLevel1(pros);
} else
{
- transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[4];
+ SetSpritesForLevel2(pros);
}
+
}
}
}
+ private void SetSpritesForLevel1(float pros)
+ {
+ if (pros <= 0.125)
+ {
+ transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[0];
+ }
+ else if (pros <= 0.375)
+ {
+ transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[1];
+ }
+ else if (pros <= 0.625)
+ {
+ transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[2];
+ }
+ else if (pros <= 0.875)
+ {
+ transform.GetChild(0).GetComponent<SpriteRenderer>().sprite = sprites[3];
+ }
+ else
+ {
+ 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);
+ }
+
}
diff --git a/Assets/Sprites/ResourceAmount.png.meta b/Assets/Sprites/ResourceAmount.png.meta
index 191431d47bd46077441ff951e006c0ae12a2f3d8..04973a4298ffae33e47ec2b6788d47e3c4f8cd49 100644
--- a/Assets/Sprites/ResourceAmount.png.meta
+++ b/Assets/Sprites/ResourceAmount.png.meta
@@ -50,7 +50,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spritePixelsToUnits: 45
+ spritePixelsToUnits: 128
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
@@ -85,6 +85,17 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 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:
serializedVersion: 2
sprites: