diff --git a/Assets/GalaxyUI.cs b/Assets/GalaxyUI.cs index 335364b..08b81a6 100644 --- a/Assets/GalaxyUI.cs +++ b/Assets/GalaxyUI.cs @@ -6,37 +6,39 @@ using UnityEngine.UI; public class GalaxyUI : MonoBehaviour { - public GameObject galaxyPrefab; // Prefab des Galaxy-Objekts - int numberOfGalaxies = GameUI.PlayersNumber; // Anzahl der zu erstellenden Galaxien + + int numberOfSolarSystem; // Anzahl der zu erstellenden Solarsystem public float distanceFromCenter; // Abstand der Galaxien vom Hauptobjekt public GameObject canvas; // Referenz auf das Canvas-Objekt - private GameObject[] SolarSystems = new GameObject[12]; - private Vector3[] SolarSystemPositions = new Vector3[12]; + + //private GameObject[] SolarSystems = new GameObject[12]; + private Vector3[] SolarSystemPositions; + - public float Industry; - public float Wealth; - public float Science; - public float Food; - public float MilitaryPower; - public float Population; - public float ActualFood; + public int Industry; + public int Wealth; + public int Science; + public int Food; + public int MilitaryPower; + public int Population; + public int ActualFood; public Text[] texts; // Array der Text-Objekte - private float[] Array = new float[7]; + private int[] Array = new int[7]; void Start() { + numberOfSolarSystem = GameUI.PlayersNumber; // Anzahl der zu erstellenden Solarsystem + SolarSystemPositions = new Vector3[numberOfSolarSystem]; Vector3 centerPosition = canvas.transform.position; // Position des Hauptobjekts - - for (int i = 0; i < numberOfGalaxies; i++) + for (int i = 0; i < numberOfSolarSystem; i++) { - // Erzeuge ein neues GameObject aus dem Prefab - SolarSystems[i] = Instantiate(galaxyPrefab); + // Setze das Canvas als Elternobjekt - SolarSystems[i].transform.SetParent(canvas.transform, false); + GameManager.SolarSystems[i].transform.SetParent(canvas.transform, false); // Berechne den Winkel basierend auf der Anzahl der Galaxien - float angle = i * (360f / numberOfGalaxies); + float angle = i * (360f / numberOfSolarSystem); // Berechne die Position basierend auf dem Winkel und dem Abstand vom Zentrum float xPos = centerPosition.x + (distanceFromCenter * 3) * Mathf.Cos(Mathf.Deg2Rad * angle); @@ -44,23 +46,23 @@ public class GalaxyUI : MonoBehaviour // Setze die Position des Galaxy-Objekts SolarSystemPositions[i] = new Vector3(xPos, yPos, centerPosition.z); - SolarSystems[i].transform.position = new Vector3(xPos, yPos, centerPosition.z); + GameManager.SolarSystems[i].transform.position = new Vector3(xPos, yPos, centerPosition.z); } } - public void HidetSolarSystems() + public void HideSolarSystems() { - for (int i = 0; i < numberOfGalaxies; i++) + for (int i = 0; i < numberOfSolarSystem; i++) { - SolarSystems[i].transform.position = new Vector3(10000, 0, 0); + GameManager.SolarSystems[i].transform.position = new Vector3(10000, 0, 0); } } public void ResetSolarSystemPositions() { - for (int i = 0; i < numberOfGalaxies; i++) + for (int i = 0; i < numberOfSolarSystem; i++) { - SolarSystems[i].transform.position = new Vector3(SolarSystemPositions[i].x, SolarSystemPositions[i].y, SolarSystemPositions[i].z); + GameManager.SolarSystems[i].transform.position = new Vector3(SolarSystemPositions[i].x, SolarSystemPositions[i].y, SolarSystemPositions[i].z); } } @@ -69,6 +71,18 @@ public class GalaxyUI : MonoBehaviour // Update is called once per frame void Update() { + + + + Industry = GameManager.playerManagers[0]._playerAttributes.industrialCapacity; + Wealth = GameManager.playerManagers[0]._playerAttributes.money; + Science = GameManager.playerManagers[0]._playerAttributes.science; + Food = GameManager.playerManagers[0]._playerAttributes.food; + MilitaryPower = GameManager.playerManagers[0]._playerAttributes.power; + Population = GameManager.playerManagers[0]._playerAttributes.population; + ActualFood = GameManager.playerManagers[0]._playerAttributes.actualFood; + + Array[0] = Industry; Array[1] = Wealth; Array[2] = Science; @@ -76,30 +90,19 @@ public class GalaxyUI : MonoBehaviour Array[4] = MilitaryPower; Array[5] = Population; Array[6] = ActualFood; - for (int i = 0; i < numberOfGalaxies; i++) - { - Industry += SolarSystems[i].GetComponent().Industry; - Wealth += SolarSystems[i].GetComponent().Wealth; - Science += SolarSystems[i].GetComponent().Science; - Food += SolarSystems[i].GetComponent().Food; - MilitaryPower += SolarSystems[i].GetComponent().MilitaryPower; - Population += SolarSystems[i].GetComponent().Population; - ActualFood += SolarSystems[i].GetComponent().ActualFood; - - } for (int i = 0; i < 7; i++) { - float temp = Array[i]; + int temp = Array[i]; if (temp / 1000000 >= 1) { temp /= 1000000; - texts[i].text = ((int)temp).ToString() + " M"; + texts[i].text = temp.ToString() + " M"; } else if (temp / 1000 >= 1) { temp /= 1000; - texts[i].text = ((int)temp).ToString() + " K"; + texts[i].text = temp.ToString() + " K"; } else { diff --git a/Assets/Materials/Planet/FocusedSpanishJackrabbit-size_restricted.gif b/Assets/Materials/Planet/FocusedSpanishJackrabbit-size_restricted.gif new file mode 100644 index 0000000..e7afb67 Binary files /dev/null and b/Assets/Materials/Planet/FocusedSpanishJackrabbit-size_restricted.gif differ diff --git a/Assets/Materials/Planet/Lovepik_com-401159942-black-hole.png b/Assets/Materials/Planet/Lovepik_com-401159942-black-hole.png new file mode 100644 index 0000000..796c821 Binary files /dev/null and b/Assets/Materials/Planet/Lovepik_com-401159942-black-hole.png differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-1.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-1.gif new file mode 100644 index 0000000..d8181dc Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-1.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-13.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-13.gif new file mode 100644 index 0000000..ed21220 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-13.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-2.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-2.gif new file mode 100644 index 0000000..85b6b57 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-2.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-24.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-24.gif new file mode 100644 index 0000000..535efa3 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-24.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-35.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-35.gif new file mode 100644 index 0000000..7f89be7 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-35.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-46.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-46.gif new file mode 100644 index 0000000..787acce Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-46.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-57.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-57.gif new file mode 100644 index 0000000..6c52a38 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-57.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-68.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-68.gif new file mode 100644 index 0000000..0fc0238 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-68.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-79.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-79.gif new file mode 100644 index 0000000..a3ba0e0 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-79.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-90.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-90.gif new file mode 100644 index 0000000..6644c2b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-27001-90.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-10.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-10.gif new file mode 100644 index 0000000..cfd557e Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-10.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-11.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-11.gif new file mode 100644 index 0000000..4d30c5e Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-11.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-12.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-12.gif new file mode 100644 index 0000000..e605e0f Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-12.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-14.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-14.gif new file mode 100644 index 0000000..947d5e2 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-14.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-15.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-15.gif new file mode 100644 index 0000000..70685bd Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-15.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-16.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-16.gif new file mode 100644 index 0000000..a0e5a00 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-16.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-17.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-17.gif new file mode 100644 index 0000000..27f639f Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-17.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-18.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-18.gif new file mode 100644 index 0000000..7497ebb Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-18.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-19.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-19.gif new file mode 100644 index 0000000..4f2c72a Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-19.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-20.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-20.gif new file mode 100644 index 0000000..8beb3f1 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-20.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-21.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-21.gif new file mode 100644 index 0000000..042a040 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-21.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-22.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-22.gif new file mode 100644 index 0000000..6b7cbf1 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-22.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-23.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-23.gif new file mode 100644 index 0000000..467fc9a Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-23.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-25.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-25.gif new file mode 100644 index 0000000..6022b2f Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-25.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-26.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-26.gif new file mode 100644 index 0000000..bc8922b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-26.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-27.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-27.gif new file mode 100644 index 0000000..571d65d Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-27.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-28.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-28.gif new file mode 100644 index 0000000..6d2a93f Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-28.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-29.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-29.gif new file mode 100644 index 0000000..91ff679 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-29.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-3.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-3.gif new file mode 100644 index 0000000..f7f13f9 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-3.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-30.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-30.gif new file mode 100644 index 0000000..7fa9b91 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-30.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-31.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-31.gif new file mode 100644 index 0000000..2531ce0 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-31.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-32.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-32.gif new file mode 100644 index 0000000..69569cb Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-32.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-33.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-33.gif new file mode 100644 index 0000000..a624d96 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-33.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-34.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-34.gif new file mode 100644 index 0000000..012e861 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-34.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-36.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-36.gif new file mode 100644 index 0000000..f52a691 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-36.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-37.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-37.gif new file mode 100644 index 0000000..801b720 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-37.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-38.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-38.gif new file mode 100644 index 0000000..02b08e8 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-38.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-39.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-39.gif new file mode 100644 index 0000000..7b0dcf8 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-39.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-4.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-4.gif new file mode 100644 index 0000000..9e34416 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-4.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-40.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-40.gif new file mode 100644 index 0000000..ff8e083 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-40.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-41.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-41.gif new file mode 100644 index 0000000..c683ec1 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-41.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-42.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-42.gif new file mode 100644 index 0000000..c14d03c Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-42.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-43.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-43.gif new file mode 100644 index 0000000..b2ca492 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-43.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-44.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-44.gif new file mode 100644 index 0000000..07aeb99 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-44.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-45.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-45.gif new file mode 100644 index 0000000..0fff6c0 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-45.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-47.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-47.gif new file mode 100644 index 0000000..f6498f0 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-47.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-48.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-48.gif new file mode 100644 index 0000000..a516d9a Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-48.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-49.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-49.gif new file mode 100644 index 0000000..2275a36 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-49.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-5.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-5.gif new file mode 100644 index 0000000..fd9a3d5 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-5.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-50.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-50.gif new file mode 100644 index 0000000..08c14cd Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-50.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-51.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-51.gif new file mode 100644 index 0000000..1f0b338 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-51.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-52.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-52.gif new file mode 100644 index 0000000..f5fd66e Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-52.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-53.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-53.gif new file mode 100644 index 0000000..da894cb Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-53.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-54.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-54.gif new file mode 100644 index 0000000..39011ae Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-54.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-55.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-55.gif new file mode 100644 index 0000000..cd13fe9 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-55.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-56.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-56.gif new file mode 100644 index 0000000..f74553c Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-56.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-58.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-58.gif new file mode 100644 index 0000000..d6152e7 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-58.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-59.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-59.gif new file mode 100644 index 0000000..dc884e7 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-59.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-6.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-6.gif new file mode 100644 index 0000000..0e5b663 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-6.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-60.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-60.gif new file mode 100644 index 0000000..f8e9fc5 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-60.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-61.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-61.gif new file mode 100644 index 0000000..dfcb602 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-61.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-62.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-62.gif new file mode 100644 index 0000000..30ef097 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-62.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-63.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-63.gif new file mode 100644 index 0000000..9c08f00 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-63.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-64.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-64.gif new file mode 100644 index 0000000..de304fe Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-64.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-65.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-65.gif new file mode 100644 index 0000000..4ef1d97 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-65.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-66.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-66.gif new file mode 100644 index 0000000..3a5565b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-66.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-67.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-67.gif new file mode 100644 index 0000000..5ab82e9 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-67.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-69.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-69.gif new file mode 100644 index 0000000..156b909 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-69.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-7.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-7.gif new file mode 100644 index 0000000..b71443a Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-7.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-70.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-70.gif new file mode 100644 index 0000000..1771113 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-70.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-71.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-71.gif new file mode 100644 index 0000000..ee6695b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-71.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-72.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-72.gif new file mode 100644 index 0000000..834e05e Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-72.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-73.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-73.gif new file mode 100644 index 0000000..bffe40e Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-73.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-74.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-74.gif new file mode 100644 index 0000000..362f229 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-74.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-75.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-75.gif new file mode 100644 index 0000000..2f4954c Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-75.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-76.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-76.gif new file mode 100644 index 0000000..2f967f1 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-76.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-77.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-77.gif new file mode 100644 index 0000000..59dc0d6 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-77.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-78.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-78.gif new file mode 100644 index 0000000..e7d9566 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-78.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-8.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-8.gif new file mode 100644 index 0000000..c72d8c6 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-8.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-80.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-80.gif new file mode 100644 index 0000000..c94ce03 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-80.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-81.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-81.gif new file mode 100644 index 0000000..38e040b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-81.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-82.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-82.gif new file mode 100644 index 0000000..c4ac54b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-82.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-83.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-83.gif new file mode 100644 index 0000000..9121618 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-83.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-84.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-84.gif new file mode 100644 index 0000000..392dfff Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-84.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-85.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-85.gif new file mode 100644 index 0000000..987c501 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-85.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-86.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-86.gif new file mode 100644 index 0000000..81e8329 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-86.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-87.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-87.gif new file mode 100644 index 0000000..b2c15e7 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-87.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-88.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-88.gif new file mode 100644 index 0000000..d724d57 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-88.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-89.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-89.gif new file mode 100644 index 0000000..3d6d763 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-89.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-9.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-9.gif new file mode 100644 index 0000000..2050b12 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-9.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-91.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-91.gif new file mode 100644 index 0000000..08e37e0 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-91.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-92.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-92.gif new file mode 100644 index 0000000..2d26418 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-92.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-93.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-93.gif new file mode 100644 index 0000000..43ccc0b Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-93.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-94.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-94.gif new file mode 100644 index 0000000..e195d3a Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-94.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-95.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-95.gif new file mode 100644 index 0000000..3d0ff17 Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-95.gif differ diff --git a/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-96.gif b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-96.gif new file mode 100644 index 0000000..4f97dda Binary files /dev/null and b/Assets/Materials/Planet/blackhole/FocusedSpanishJackrabbit-sizerestricted-imageonline.co-270016-96.gif differ diff --git a/Assets/PlanetMove.cs b/Assets/PlanetMove.cs deleted file mode 100644 index c8124fe..0000000 --- a/Assets/PlanetMove.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class PlanetMove : MonoBehaviour -{ - public int PlayerID; - public float rotationSpeed = 1f; // Geschwindigkeit der Rotation - public float radius = 5f; // Radius des Kreises - private float angle = 0f; // Aktueller Winkel im Kreis - private Vector2 centerPosition; // Position des Zentrums des Kreises - - // Start is called before the first frame update - void Start() - { - centerPosition = transform.parent.position; // Position des Zentrums - transform.position = GetPositionOnCircle(angle); // Setze die Startposition - } - - - // Update is called once per frame - void Update() - { - angle += rotationSpeed * Time.deltaTime; // Aktualisiere den Winkel basierend auf der Geschwindigkeit - transform.position = GetPositionOnCircle(angle); // Berechne die neue Position des Planeten - } - - Vector3 GetPositionOnCircle(float angle) - { - float xPos = centerPosition.x + Mathf.Sin(angle) * radius; // X-Position auf dem Kreis - float yPos = centerPosition.y + Mathf.Cos(angle) * radius; // Y-Position auf dem Kreis - return new Vector3(xPos, yPos, 0f); // Position als Vektor zurückgeben - } - -} diff --git a/Assets/PlanetUI.cs b/Assets/PlanetUI.cs new file mode 100644 index 0000000..049cd0e --- /dev/null +++ b/Assets/PlanetUI.cs @@ -0,0 +1,94 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using System; + + +public class PlanetUI : MonoBehaviour +{ + + public float rotationSpeed = 1f; // Geschwindigkeit der Rotation + public float radius = 5f; // Radius des Kreises + private float angle = 0f; // Aktueller Winkel im Kreis + private Vector2 centerPosition; // Position des Zentrums des Kreises + + public Text textID; + + public int PlayerID = 0; + + // Planet values + public int money; + public int science; + public int power; + public int food; + public int industrialCapacity; + public int population; + public int actualFood; + private int OldFoodLevel = 0; + + // Start is called before the first frame update + void Start() + { + System.Random random = new System.Random(); + centerPosition = transform.parent.position; // Position des Zentrums + transform.position = GetPositionOnCircle(angle); // Setze die Startposition + food = random.Next(2, 5); // Generiert eine zufällige Zahl zwischen 2 (inklusive) und 5 (exklusive) + science = random.Next(2, 5); + money = random.Next(2, 5); + industrialCapacity = random.Next(2, 5); + } + + + // Update is called once per frame + void Update() + { + angle += rotationSpeed * Time.deltaTime; // Aktualisiere den Winkel basierend auf der Geschwindigkeit + transform.position = GetPositionOnCircle(angle); // Berechne die neue Position des Planeten + if (PlayerID == 0) + { + textID.text = ""; + } + else + { + textID.text = PlayerID.ToString(); + } + DistributeFoodToPopulation(); + } + + Vector3 GetPositionOnCircle(float angle) + { + float xPos = centerPosition.x + Mathf.Sin(angle) * radius; // X-Position auf dem Kreis + float yPos = centerPosition.y + Mathf.Cos(angle) * radius; // Y-Position auf dem Kreis + return new Vector3(xPos, yPos, 0f); // Position als Vektor zurückgeben + } + + public void DistributeFoodToPopulation() + { + int remainingFood = food - population; + + if (remainingFood < 0) + { + // Falls das Essen nicht ausreicht, um die Veröffentlichung zu decken, + // setze actualfood auf 0 und aktualisiere die publication entsprechend + actualFood = 0; + population = food; + } + else + { + // Falls das Essen ausreicht, um die Veröffentlichung zu decken, + // setze actualfood auf den überschüssigen Wert + actualFood = remainingFood; + } + } + // update scourse methodes + // nur Food + public void UpdateFood(int foodLevel) + { + if (foodLevel > OldFoodLevel) + { + food *= foodLevel; + OldFoodLevel = foodLevel; + } + } +} diff --git a/Assets/Scenes/Galaxy Generator.unity b/Assets/Scenes/Galaxy Generator.unity index 84742e0..a53c61f 100644 --- a/Assets/Scenes/Galaxy Generator.unity +++ b/Assets/Scenes/Galaxy Generator.unity @@ -311,7 +311,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -456, y: -9} + m_AnchoredPosition: {x: -37, y: -9} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &165535720 stripped @@ -357,27 +357,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchorMax.x - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_SizeDelta.x - value: 97.5763 + value: 197.5763 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_SizeDelta.y - value: 442.6035 + value: 442.60352 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_LocalScale.x @@ -421,11 +421,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchoredPosition.x - value: -505.96185 + value: -823 objectReference: {fileID: 0} - target: {fileID: 22400002, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchoredPosition.y - value: -18.5511 + value: 6 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_SizeDelta.x @@ -437,11 +437,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchoredPosition.x - value: 0.0000076293945 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} propertyPath: m_AnchoredPosition.y - value: 8.999985 + value: 9 objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 11400004, guid: a93c012dd9ef6454fa7d140e976926f7, type: 3} @@ -808,7 +808,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 479.3, y: -2} + m_AnchoredPosition: {x: 59, y: -2} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &279534656 @@ -926,7 +926,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 386.6, y: -5.3} + m_AnchoredPosition: {x: -27, y: -5.3} m_SizeDelta: {x: -54.9282, y: -55.4612} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &282289842 @@ -1058,9 +1058,10 @@ RectTransform: m_GameObject: {fileID: 361694607} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.121319994} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.121319994} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1084660687} m_Father: {fileID: 2058711959} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1081,9 +1082,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7960715d757a77140867a1af9f15d4d0, type: 3} m_Name: m_EditorClassIdentifier: - PlayerID: 0 rotationSpeed: 0.05 - radius: 180 + radius: 300 + textID: {fileID: 1084660688} + PlayerID: 0 + money: 0 + science: 0 + power: 0 + food: 0 + industrialCapacity: 0 + population: 0 + actualFood: 0 --- !u!114 &361694610 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1201,7 +1210,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 474.7, y: -10.3} + m_AnchoredPosition: {x: 60, y: -10.3} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &379004320 @@ -1246,6 +1255,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 379004318} m_CullTransparentMesh: 1 +--- !u!1 &384603133 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 384603134} + - component: {fileID: 384603136} + - component: {fileID: 384603135} + m_Layer: 5 + m_Name: ID Text 1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &384603134 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 384603133} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1454411280} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &384603135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 384603133} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.764151, g: 0.60122824, b: 0.60122824, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &384603136 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 384603133} + m_CullTransparentMesh: 1 --- !u!114 &386857785 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6521698452475932331, guid: 738fe81842f9a114b9a448b5877b5ea1, type: 3} @@ -1400,7 +1489,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -453, y: -158} + m_AnchoredPosition: {x: -37, y: -158} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &474150182 stripped @@ -1441,7 +1530,7 @@ RectTransform: m_GameObject: {fileID: 491783631} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.5, y: 1.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2058711959} @@ -1450,7 +1539,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 130, y: 130} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &491783633 MonoBehaviour: @@ -1522,7 +1611,7 @@ MonoBehaviour: m_CallState: 2 - m_Target: {fileID: 1239600263} m_TargetAssemblyTypeName: GalaxyUI, Assembly-CSharp - m_MethodName: HidetSolarSystems + m_MethodName: HideSolarSystems m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -1582,6 +1671,116 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 491783631} m_CullTransparentMesh: 1 +--- !u!1 &525891672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 525891673} + - component: {fileID: 525891676} + - component: {fileID: 525891675} + - component: {fileID: 525891674} + m_Layer: 5 + m_Name: CenterGalaxy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &525891673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525891672} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1552601731} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &525891674 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525891672} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4e346eaba6b8f5a4ea7bf389dc417026, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!33 &525891675 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525891672} + m_Mesh: {fileID: 0} +--- !u!23 &525891676 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525891672} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &546465769 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6521698452475932331, guid: 738fe81842f9a114b9a448b5877b5ea1, type: 3} @@ -1896,7 +2095,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 388.8, y: -8.4} + m_AnchoredPosition: {x: -26, y: -8.4} m_SizeDelta: {x: -54.5124, y: -55.2159} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &688974707 @@ -1981,8 +2180,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -25} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: -47.086975, y: -25} + m_SizeDelta: {x: 297.0277, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &773470239 MonoBehaviour: @@ -2048,7 +2247,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c35ea2a7dbe529940b51a01fcc1737e2, type: 3} + m_Sprite: {fileID: 21300000, guid: eed30d290e943244fbffbd0957f7482a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2298,7 +2497,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 389.6, y: -4.4} + m_AnchoredPosition: {x: -27, y: -4.4} m_SizeDelta: {x: -55.4495, y: -55.4209} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &805854620 @@ -2431,7 +2630,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -439, y: -64} + m_AnchoredPosition: {x: -37, y: -64} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &872515918 @@ -2512,7 +2711,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4199248806934553299, guid: 0ea0b2a17beb9124dad0673e9b715d6c, type: 3} propertyPath: m_RootOrder - value: 6 + value: 2 objectReference: {fileID: 0} - target: {fileID: 4199248806934553299, guid: 0ea0b2a17beb9124dad0673e9b715d6c, type: 3} propertyPath: m_LocalPosition.x @@ -2566,6 +2765,10 @@ PrefabInstance: propertyPath: clock value: objectReference: {fileID: 1465890861} + - target: {fileID: 7964589156323440753, guid: 0ea0b2a17beb9124dad0673e9b715d6c, type: 3} + propertyPath: SolarSystemPrefab + value: + objectReference: {fileID: 2058711958} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -2960,7 +3163,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -448, y: 141} + m_AnchoredPosition: {x: -37, y: 141} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1054050721 stripped @@ -3003,7 +3206,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 472, y: -7.7} + m_AnchoredPosition: {x: 60, y: -7.7} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1061625614 @@ -3062,7 +3265,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6261394630258406887, guid: 8f5544031ff3a9344bde171df0713cb6, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 6261394630258406887, guid: 8f5544031ff3a9344bde171df0713cb6, type: 3} propertyPath: m_LocalPosition.x @@ -3171,6 +3374,86 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6521698452507906541, guid: 738fe81842f9a114b9a448b5877b5ea1, type: 3} m_PrefabInstance: {fileID: 240715930} m_PrefabAsset: {fileID: 0} +--- !u!1 &1084660686 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1084660687} + - component: {fileID: 1084660689} + - component: {fileID: 1084660688} + m_Layer: 5 + m_Name: ID Text 3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1084660687 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084660686} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 361694608} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1084660688 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084660686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.25268775, g: 0.65502477, b: 0.735849, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1084660689 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1084660686} + m_CullTransparentMesh: 1 --- !u!1001 &1087032727 PrefabInstance: m_ObjectHideFlags: 0 @@ -3498,9 +3781,10 @@ RectTransform: m_GameObject: {fileID: 1149145708} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.121319994} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.121319994} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1422244864} m_Father: {fileID: 2058711959} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3521,9 +3805,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7960715d757a77140867a1af9f15d4d0, type: 3} m_Name: m_EditorClassIdentifier: - PlayerID: 0 rotationSpeed: 0.1 - radius: 120 + radius: 200 + textID: {fileID: 1422244865} + PlayerID: 0 + money: 0 + science: 0 + power: 0 + food: 0 + industrialCapacity: 0 + population: 0 + actualFood: 0 --- !u!114 &1149145711 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4061,7 +4353,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6be583a2845dbb5488baaca61810c0e5, type: 3} m_Name: m_EditorClassIdentifier: - galaxyPrefab: {fileID: 2058711958} distanceFromCenter: 150 canvas: {fileID: 1987858429} Industry: 0 @@ -4142,7 +4433,6 @@ MonoBehaviour: - {fileID: 2068172086} - {fileID: 773470237} - {fileID: 1054050721} - - {fileID: 1701453573} - {fileID: 1974140673} objectsToActivate: - {fileID: 1893697779} @@ -4186,7 +4476,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 475.7, y: -2} + m_AnchoredPosition: {x: 58, y: -2} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1248420914 @@ -4271,7 +4561,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 475, y: -2} + m_AnchoredPosition: {x: 59, y: -2} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1277894120 @@ -4501,7 +4791,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 389.8, y: -3.7077} + m_AnchoredPosition: {x: -27, y: -3.7077} m_SizeDelta: {x: -54.5919, y: -55.4612} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1306699962 @@ -4574,7 +4864,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 391.1, y: -4.3} + m_AnchoredPosition: {x: -27, y: -4.3} m_SizeDelta: {x: -55.2363, y: -55.4849} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1308235638 @@ -4647,7 +4937,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -452, y: 41} + m_AnchoredPosition: {x: -37, y: 41} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1326851746 @@ -4685,7 +4975,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 394.4, y: -4.2} + m_AnchoredPosition: {x: -27, y: -4.2} m_SizeDelta: {x: -55.1138, y: -55.0853} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1326851749 @@ -4911,7 +5201,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -452, y: -110} + m_AnchoredPosition: {x: -37, y: -110} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1404012605 @@ -5068,6 +5358,86 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 6521698452507906541, guid: 738fe81842f9a114b9a448b5877b5ea1, type: 3} m_PrefabInstance: {fileID: 1471426577} m_PrefabAsset: {fileID: 0} +--- !u!1 &1422244863 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1422244864} + - component: {fileID: 1422244866} + - component: {fileID: 1422244865} + m_Layer: 5 + m_Name: ID Text 2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1422244864 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422244863} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1149145709} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 180, y: 180} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1422244865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422244863} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.33716625, g: 0.6226415, b: 0.41924343, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 100 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 100 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1422244866 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1422244863} + m_CullTransparentMesh: 1 --- !u!114 &1424241071 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6521698452475932331, guid: 738fe81842f9a114b9a448b5877b5ea1, type: 3} @@ -5164,9 +5534,10 @@ RectTransform: m_GameObject: {fileID: 1454411279} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.121319994} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.121319994} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 384603134} m_Father: {fileID: 2058711959} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5187,9 +5558,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7960715d757a77140867a1af9f15d4d0, type: 3} m_Name: m_EditorClassIdentifier: - PlayerID: 0 rotationSpeed: 0.2 - radius: 70 + radius: 100 + textID: {fileID: 384603135} + PlayerID: 0 + money: 0 + science: 0 + power: 0 + food: 0 + industrialCapacity: 0 + population: 0 + actualFood: 0 --- !u!114 &1454411282 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5947,7 +6326,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -450, y: 93} + m_AnchoredPosition: {x: -37, y: 93} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1552601727 @@ -6048,13 +6427,14 @@ RectTransform: - {fileID: 2068172087} - {fileID: 1893697780} - {fileID: 1910185749} - - {fileID: 1987858430} - {fileID: 773470238} + - {fileID: 1987858430} - {fileID: 1701453574} - {fileID: 1145504123} - {fileID: 2018850592} + - {fileID: 525891673} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -6171,7 +6551,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_SizeDelta.y - value: 247.27 + value: 247.27002 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_LocalScale.x @@ -6219,11 +6599,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchoredPosition.x - value: -503 + value: -820 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchoredPosition.y - value: -216 + value: -242 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -6473,7 +6853,7 @@ GameObject: - component: {fileID: 1701453576} - component: {fileID: 1701453575} m_Layer: 5 - m_Name: Galaxy Info + m_Name: Player Info m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6725,7 +7105,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 474.2, y: -2} + m_AnchoredPosition: {x: 58, y: -2} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1788519514 @@ -7019,7 +7399,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 377.4, y: -4.2} + m_AnchoredPosition: {x: -28, y: -4.2} m_SizeDelta: {x: -55.4495, y: -55.0853} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1798633129 @@ -8092,12 +8472,12 @@ RectTransform: - {fileID: 361694608} - {fileID: 948356305} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 605.25, y: 261.25} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 613.25, y: 289.75} + m_SizeDelta: {x: 1226.5, y: 579.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2058711960 MonoBehaviour: @@ -8119,13 +8499,18 @@ MonoBehaviour: - {fileID: 948356304} - {fileID: 474150182} objectsToActivate: [] - Industry: 4 + Planets: + - {fileID: 1454411279} + - {fileID: 1149145708} + - {fileID: 361694607} + Industry: 0 Wealth: 0 - Science: 10 - Food: 3 - MilitaryPower: 5 + Science: 0 + Food: 0 + MilitaryPower: 0 Population: 0 ActualFood: 0 + canvas: {fileID: 1552601727} texts: - {fileID: 379004320} - {fileID: 1788519514} @@ -8258,7 +8643,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 462.3, y: -2} + m_AnchoredPosition: {x: 57, y: -2} m_SizeDelta: {x: 24.748016, y: -34.613} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2137260163 diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index dc48c09..df7e216 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -684,10 +684,10 @@ RectTransform: m_Father: {fileID: 1366322665} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1291.751, y: 600} + m_AnchorMin: {x: 0.022564847, y: 0.05426821} + m_AnchorMax: {x: 0.98200005, y: 0.9644601} + m_AnchoredPosition: {x: -3.3253174, y: -5.692566} + m_SizeDelta: {x: 61.542072, y: 54.33816} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &593622909 MonoBehaviour: @@ -1196,7 +1196,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMax.y @@ -1204,7 +1204,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMin.y @@ -1252,7 +1252,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchoredPosition.x - value: -474 + value: 273.45087 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchoredPosition.y @@ -1367,6 +1367,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 400004, guid: 7461a7b0cf97947fd9b9e4502fd2d07b, type: 3} + propertyPath: m_LocalPosition.z + value: -520 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1708,8 +1712,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 3.3838, y: 0} - m_SizeDelta: {x: 1493.9514, y: 600} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1413.0457, y: 600} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1366322666 MonoBehaviour: @@ -2221,7 +2225,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_Position.x - value: 473 + value: -274.45087 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_Position.y @@ -2229,7 +2233,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMax.y @@ -2237,7 +2241,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchorMin.y @@ -2269,7 +2273,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchoredPosition.x - value: 473 + value: -274.45087 objectReference: {fileID: 0} - target: {fileID: 22400004, guid: 05a81c3d5091440058129444d28322f3, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 58650bc..acd990b 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,18 +1,28 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class GameManager : MonoBehaviour { + + // Array will contain objects which contain all information about all players - public PlayerManager[] playerManagers { get; private set; } + static public PlayerManager[] playerManagers { get; private set; } // Clock which counts seconds until new day and updates playerManagers at new day public Clock clock; public ScienceManager sm; - public int numberOfPlayers { get; set; } + int numberOfPlayers = GameUI.PlayersNumber; // number of the created solarsystems + + public GameObject SolarSystemPrefab; // Prefab of SolarSytem-Objekts + + public static GameObject[] SolarSystems; + + + //public int numberOfPlayers;//{ get; set; } void Awake() { @@ -22,8 +32,15 @@ public class GameManager : MonoBehaviour // Start is called before the first frame update void Start() { - initPlayerManagers(1); + SolarSystems = new GameObject[numberOfPlayers]; + initPlayerManagers(numberOfPlayers); clock.gameManager = this; + for (int i = 0; i < numberOfPlayers; i++) + { + // Erzeuge ein neues GameObject aus dem Prefab + SolarSystems[i] = Instantiate(SolarSystemPrefab); + } + SolarSystems[0].GetComponent().SetIDPlanet(1, 0); } // Update is called once per frame @@ -32,10 +49,10 @@ public class GameManager : MonoBehaviour // Initializes numberOfPlayers player managers and puts them into array public void initPlayerManagers(int numberOfPlayers) { - this.playerManagers = new PlayerManager[numberOfPlayers]; + playerManagers = new PlayerManager[numberOfPlayers]; for (int i = 0; i < numberOfPlayers; i++) { - this.playerManagers[i] = new PlayerManager(sm); + playerManagers[i] = new PlayerManager(sm); } } diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index e05cfd0..9f8380d 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -1,5 +1,7 @@ using System.Collections; using System.Collections.Generic; +using UnityEngine.UI; +using UnityEngine; public class PlayerManager { @@ -10,6 +12,7 @@ public class PlayerManager //private List fleets = new List(); private ScienceManager _scienceManager; + public static int PlayerID = 1; public int ScienceAcumulated; // this int has to be moved to player manager later @@ -54,17 +57,43 @@ public class PlayerManager } } - private PlayerValues _playerAttributes; + public PlayerValues _playerAttributes; public PlayerManager(ScienceManager sm) { this._scienceManager = sm; this._playerAttributes = new PlayerValues(); + this._playerAttributes.id = PlayerID; + PlayerID++; } // Called by clock over game manager, once per day public void simulateDay() { + if (GameManager.SolarSystems != null) + { + for (int i = 0; i < GameUI.PlayersNumber; i++) + { + if (GameManager.SolarSystems[i].GetComponent() != null) + { + int playerID = this._playerAttributes.id; + _scienceManager.UpdateScience(this._playerAttributes.science); + this._playerAttributes.science = _scienceManager.PublicScienceAcumulated; + + this._playerAttributes.industrialCapacity += GameManager.SolarSystems[i].GetComponent().GetIndustrialCapacity(playerID) * _scienceManager.techs[0].Level; + this._playerAttributes.money += GameManager.SolarSystems[i].GetComponent().GetMoney(playerID) * _scienceManager.techs[1].Level; + this._playerAttributes.science += GameManager.SolarSystems[i].GetComponent().GetScience(playerID) * _scienceManager.techs[2].Level; + + GameManager.SolarSystems[i].GetComponent().UpdateFood(playerID, _scienceManager.techs[3].Level); + this._playerAttributes.food += GameManager.SolarSystems[i].GetComponent().GetFood(playerID); + this._playerAttributes.population += GameManager.SolarSystems[i].GetComponent().GetPopulation(playerID); + this._playerAttributes.actualFood += GameManager.SolarSystems[i].GetComponent().GetActualFood(playerID); + } + + + } + } + //if (starSystems != null) //{ // Add resources for each part of each starSystem which belongs to this player @@ -78,11 +107,10 @@ public class PlayerManager // this._playerAttributes.power += ((StarSystem)starSystem).getPower(playerID); // this._playerAttributes.food += ((StarSystem)starSystem).getFood(playerID); // this._playerAttributes.industrialCapacity += ((StarSystem)starSystem).getIC(playerID); - this._playerAttributes.science += 5; - _scienceManager.UpdateScience(this._playerAttributes.science); - this._playerAttributes.science = _scienceManager.PublicScienceAcumulated; - //} - //} + //this._playerAttributes.science += 5 * _scienceManager.techs[2].Level; + //_scienceManager.UpdateScience(this._playerAttributes.science); + //this._playerAttributes.science = _scienceManager.PublicScienceAcumulated; + } // Deletes overhanded referrence from fleets list diff --git a/Assets/Scripts/PlayerValues.cs b/Assets/Scripts/PlayerValues.cs index 1b0ea13..f1dea31 100644 --- a/Assets/Scripts/PlayerValues.cs +++ b/Assets/Scripts/PlayerValues.cs @@ -9,6 +9,8 @@ public class PlayerValues public int power { get; set; } public int food { get; set; } public int industrialCapacity { get; set; } + public int population { get; set; } + public int actualFood { get; set; } // Default constructor public PlayerValues() @@ -20,10 +22,13 @@ public class PlayerValues this.power = 0; this.food = 0; this.industrialCapacity = 0; + this.population = 0; + this.actualFood = 0; + } // Constructor to init values - public PlayerValues(int id, int newMoney, int newScience, int newPower, int newFood, int newIC) + public PlayerValues(int id, int newMoney, int newScience, int newPower, int newFood, int newIC, int newPopulation, int newActualFood) { this.id = id; @@ -32,5 +37,7 @@ public class PlayerValues this.power = newPower; this.food = newFood; this.industrialCapacity = newIC; + this.population = newPopulation; + this.actualFood = newActualFood; } } \ No newline at end of file diff --git a/Assets/SolarSystemManager.cs b/Assets/SolarSystemManager.cs index 9b05b6d..f7f1e9d 100644 --- a/Assets/SolarSystemManager.cs +++ b/Assets/SolarSystemManager.cs @@ -7,17 +7,19 @@ public class SolarSystemManager : MonoBehaviour { public GameObject[] objectsToDeactivate; public GameObject[] objectsToActivate; + public GameObject[] Planets; - public float Industry; - public float Wealth; - public float Science; - public float Food; - public float MilitaryPower; - public float Population; - public float ActualFood; + public int Industry; + public int Wealth; + public int Science; + public int Food; + public int MilitaryPower; + public int Population; + public int ActualFood; + public GameObject canvas; // Referenz auf das Canvas-Objekt public Text[] texts; // Array der Text-Objekte - private float[] Array = new float[7]; + private int[] Array = new int[7]; // Start is called before the first frame update void Start() @@ -30,24 +32,23 @@ public class SolarSystemManager : MonoBehaviour { objectsToActivate[i].SetActive(true); // activate the game object } - Array[0]= Industry; - Array[1]= Wealth; - Array[2]= Science; - Array[3]= Food; - Array[4]= MilitaryPower; - Array[5]= Population; - Array[6]= ActualFood; + Array[0] = Industry; + Array[1] = Wealth; + Array[2] = Science; + Array[3] = Food; + Array[4] = MilitaryPower; + Array[5] = Population; + Array[6] = ActualFood; } public void SetPositionCenter() { - transform.position = new Vector3(604.75f, 252.75f, 0f); - + transform.position = canvas.transform.position; // Position des Hauptobjekts } void Update() { - Array[0] += Industry; + Array[0] = Industry; Array[1] = Wealth; Array[2] = Science; Array[3] = Food; @@ -56,17 +57,17 @@ public class SolarSystemManager : MonoBehaviour Array[6] = ActualFood; for (int i = 0; i < 7; i++) { - float temp = Array[i]; + int temp = Array[i]; if (temp / 1000000 >= 1) { temp /= 1000000; - texts[i].text = ((int)temp).ToString() + " M"; + texts[i].text = temp.ToString() + " M"; } else if (temp / 1000 >= 1) { temp /= 1000; - texts[i].text = ((int)temp).ToString() + " K"; + texts[i].text = temp.ToString() + " K"; } else { @@ -74,5 +75,147 @@ public class SolarSystemManager : MonoBehaviour } } } + // Get Methodes, so it will search in all the planets in the solar system to get recours + public int GetFood(int id) + { + int food = 0; + if (Planets != null) { + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + food += Planets[i].GetComponent().food; + } + } + } + + + return food; + } + + public int GetScience(int id) + { + + int science = 0; + if (Planets != null) { + + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + science += Planets[i].GetComponent().science; + } + } + } + + return science; + } + + public int GetPower(int id) + { + + int power = 0; + if (Planets != null) { + + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + power += Planets[i].GetComponent().power; + } + } + } + + return power; + } + + public int GetMoney(int id) + { + int money = 0; + if (Planets != null) { + + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + money += Planets[i].GetComponent().money; + } + } + } + + + return money; + } + + public int GetIndustrialCapacity(int id) + { + + int industrialCapacity = 0; + if (Planets != null) { + + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + industrialCapacity += Planets[i].GetComponent().industrialCapacity; + } + } + } + + return industrialCapacity; + } + + public int GetPopulation(int id) + { + + int population = 0; + if (Planets != null) + { + + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + population += Planets[i].GetComponent().population; + } + + } + } + return population; + } + + public int GetActualFood(int id) + { + int actualFood = 0; + if(Planets != null) { + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + actualFood += Planets[i].GetComponent().actualFood; + } + } + } + + return actualFood; + } + + public void UpdateFood(int id , int FoodLvlScience) + { + if (Planets != null) + { + for (int i = 0; i < Planets.Length; i++) + { + if (Planets[i].GetComponent().PlayerID == id) + { + Planets[i].GetComponent().UpdateFood(FoodLvlScience); + } + } + } + } + public void SetIDPlanet(int PlayerID, int PlanetID) + { + Planets[PlanetID].GetComponent().PlayerID = PlayerID; + } }