Commit 5277fbcc authored by HaTrungVI's avatar HaTrungVI

Trung: fix main

parent a376addb
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Earth name: Earth
description: description:
health: 0 health: 0
elementId: 0
overlayTexture: {fileID: 2800000, guid: 8a4d3ee4c55603b478c8c57a66a47c56, type: 3} overlayTexture: {fileID: 2800000, guid: 8a4d3ee4c55603b478c8c57a66a47c56, type: 3}
atmosphereColor: {r: 0, g: 30840.47, b: 262144, a: 1} atmosphereColor: {r: 0, g: 30840.47, b: 262144, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Hamburger name: Hamburger
description: description:
health: 0 health: 0
elementId: 1
overlayTexture: {fileID: 2800000, guid: af51c854365c73c4f9e340fc26234e11, type: 3} overlayTexture: {fileID: 2800000, guid: af51c854365c73c4f9e340fc26234e11, type: 3}
atmosphereColor: {r: 257003.92, g: 158314.42, b: 0, a: 1} atmosphereColor: {r: 257003.92, g: 158314.42, b: 0, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Ice Age name: Ice Age
description: description:
health: 0 health: 0
elementId: 10
overlayTexture: {fileID: 2800000, guid: 400fc362c46131d46b49c5921b79acbd, type: 3} overlayTexture: {fileID: 2800000, guid: 400fc362c46131d46b49c5921b79acbd, type: 3}
atmosphereColor: {r: 262144, g: 11308.173, b: 11308.173, a: 1} atmosphereColor: {r: 262144, g: 11308.173, b: 11308.173, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Amethyst name: Amethyst
description: description:
health: 0 health: 0
elementId: 11
overlayTexture: {fileID: 2800000, guid: e4dc0f37c95be314491b74473cfb7d3f, type: 3} overlayTexture: {fileID: 2800000, guid: e4dc0f37c95be314491b74473cfb7d3f, type: 3}
atmosphereColor: {r: 40092.613, g: 230275.52, b: 0, a: 1} atmosphereColor: {r: 40092.613, g: 230275.52, b: 0, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Stonehedge name: Stonehedge
description: description:
health: 0 health: 0
elementId: 12
overlayTexture: {fileID: 2800000, guid: 824d23d8fc9f5bf4c9729c1059ee6c1f, type: 3} overlayTexture: {fileID: 2800000, guid: 824d23d8fc9f5bf4c9729c1059ee6c1f, type: 3}
atmosphereColor: {r: 262144, g: 4112.063, b: 124389.9, a: 1} atmosphereColor: {r: 262144, g: 4112.063, b: 124389.9, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Fantasy 1 name: Fantasy 1
description: description:
health: 0 health: 0
elementId: 13
overlayTexture: {fileID: 2800000, guid: 997d8bc04dc626949b0d1a000da65b6f, type: 3} overlayTexture: {fileID: 2800000, guid: 997d8bc04dc626949b0d1a000da65b6f, type: 3}
atmosphereColor: {r: 51400.785, g: 35980.55, b: 121305.85, a: 1} atmosphereColor: {r: 51400.785, g: 35980.55, b: 121305.85, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Fantasy 2 name: Fantasy 2
description: description:
health: 0 health: 0
elementId: 14
overlayTexture: {fileID: 2800000, guid: 6b824d784a7574547b8807189202c130, type: 3} overlayTexture: {fileID: 2800000, guid: 6b824d784a7574547b8807189202c130, type: 3}
atmosphereColor: {r: 121305.836, g: 36201.22, b: 104490.51, a: 1} atmosphereColor: {r: 121305.836, g: 36201.22, b: 104490.51, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Fantasy 3 name: Fantasy 3
description: description:
health: 0 health: 0
elementId: 15
overlayTexture: {fileID: 2800000, guid: 02699ff6443563e46a4d71f77378e652, type: 3} overlayTexture: {fileID: 2800000, guid: 02699ff6443563e46a4d71f77378e652, type: 3}
atmosphereColor: {r: 51400.785, g: 35980.55, b: 121305.85, a: 1} atmosphereColor: {r: 51400.785, g: 35980.55, b: 121305.85, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: HE-01 name: HE-01
description: description:
health: 0 health: 0
elementId: 16
overlayTexture: {fileID: 2800000, guid: 05a030287f087c94e9f0597557526b27, type: 3} overlayTexture: {fileID: 2800000, guid: 05a030287f087c94e9f0597557526b27, type: 3}
atmosphereColor: {r: 121305.836, g: 65892.16, b: 36201.22, a: 1} atmosphereColor: {r: 121305.836, g: 65892.16, b: 36201.22, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Cheese name: Cheese
description: description:
health: 0 health: 0
elementId: 2
overlayTexture: {fileID: 2800000, guid: 45df769cb78289d41997ded152cb364e, type: 3} overlayTexture: {fileID: 2800000, guid: 45df769cb78289d41997ded152cb364e, type: 3}
atmosphereColor: {r: 178874.73, g: 195322.98, b: 196351, a: 1} atmosphereColor: {r: 178874.73, g: 195322.98, b: 196351, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Ice Cream name: Ice Cream
description: description:
health: 0 health: 0
elementId: 3
overlayTexture: {fileID: 2800000, guid: e331e4f3491a97244823912318cbf272, type: 3} overlayTexture: {fileID: 2800000, guid: e331e4f3491a97244823912318cbf272, type: 3}
atmosphereColor: {r: 219995.36, g: 219995.36, b: 219995.36, a: 1} atmosphereColor: {r: 219995.36, g: 219995.36, b: 219995.36, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Winter name: Winter
description: description:
health: 0 health: 0
elementId: 4
overlayTexture: {fileID: 2800000, guid: c318168a19467f045ba7d11d49669768, type: 3} overlayTexture: {fileID: 2800000, guid: c318168a19467f045ba7d11d49669768, type: 3}
atmosphereColor: {r: 1028.0157, g: 80185.23, b: 262144, a: 1} atmosphereColor: {r: 1028.0157, g: 80185.23, b: 262144, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Milk name: Milk
description: description:
health: 0 health: 0
elementId: 5
overlayTexture: {fileID: 2800000, guid: 2d7f011c8be5ed9469f9c3255c46c632, type: 3} overlayTexture: {fileID: 2800000, guid: 2d7f011c8be5ed9469f9c3255c46c632, type: 3}
atmosphereColor: {r: 181958.78, g: 134670.06, b: 262144, a: 1} atmosphereColor: {r: 181958.78, g: 134670.06, b: 262144, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Space Station name: Space Station
description: description:
health: 0 health: 0
elementId: 6
overlayTexture: {fileID: 2800000, guid: 0a082f1385aa8c64095f182ad7bda144, type: 3} overlayTexture: {fileID: 2800000, guid: 0a082f1385aa8c64095f182ad7bda144, type: 3}
atmosphereColor: {r: 262144, g: 250835.83, b: 55512.848, a: 1} atmosphereColor: {r: 262144, g: 250835.83, b: 55512.848, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Santa Planet name: Santa Planet
description: description:
health: 0 health: 0
elementId: 7
overlayTexture: {fileID: 2800000, guid: fd4890254f87bf54c82c613ae9cb0f85, type: 3} overlayTexture: {fileID: 2800000, guid: fd4890254f87bf54c82c613ae9cb0f85, type: 3}
atmosphereColor: {r: 0, g: 50886.777, b: 131072, a: 1} atmosphereColor: {r: 0, g: 50886.777, b: 131072, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Lava name: Lava
description: description:
health: 0 health: 0
elementId: 8
overlayTexture: {fileID: 2800000, guid: 5e6278087b1b8cd41b7a12bbf90739e3, type: 3} overlayTexture: {fileID: 2800000, guid: 5e6278087b1b8cd41b7a12bbf90739e3, type: 3}
atmosphereColor: {r: 262144, g: 80185.23, b: 16448.252, a: 1} atmosphereColor: {r: 262144, g: 80185.23, b: 16448.252, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
...@@ -15,6 +15,7 @@ MonoBehaviour: ...@@ -15,6 +15,7 @@ MonoBehaviour:
name: Toxic name: Toxic
description: description:
health: 0 health: 0
elementId: 9
overlayTexture: {fileID: 2800000, guid: da373a8fe88900a4fa93f177c212bf09, type: 3} overlayTexture: {fileID: 2800000, guid: da373a8fe88900a4fa93f177c212bf09, type: 3}
atmosphereColor: {r: 262144, g: 33386.266, b: 259748.6, a: 1} atmosphereColor: {r: 262144, g: 33386.266, b: 259748.6, a: 1}
satelliteTexure: {fileID: 0} satelliteTexure: {fileID: 0}
......
fileFormatVersion: 2
guid: 2ebbe89d2487ab14b83779d890267106
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -7,6 +7,7 @@ public class PlanetData : ScriptableObject ...@@ -7,6 +7,7 @@ public class PlanetData : ScriptableObject
public string name; public string name;
public string description; public string description;
public int health; public int health;
public int elementId = -1;
public Texture2D overlayTexture; public Texture2D overlayTexture;
[ColorUsageAttribute(true, true)] [ColorUsageAttribute(true, true)]
public Color atmosphereColor; public Color atmosphereColor;
......
...@@ -38,7 +38,7 @@ RenderSettings: ...@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.070101134, g: 0.091011845, b: 0.079038166, a: 1} m_IndirectSpecularColor: {r: 0.0700972, g: 0.09100845, b: 0.07903535, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
...@@ -38347,6 +38347,7 @@ MonoBehaviour: ...@@ -38347,6 +38347,7 @@ MonoBehaviour:
level: 1 level: 1
meshRenderer: {fileID: 691307058} meshRenderer: {fileID: 691307058}
destroyed: {fileID: 312382587} destroyed: {fileID: 312382587}
elements: []
--- !u!114 &691307057 --- !u!114 &691307057
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -65623,6 +65624,7 @@ MonoBehaviour: ...@@ -65623,6 +65624,7 @@ MonoBehaviour:
level: 4 level: 4
meshRenderer: {fileID: 1117986456} meshRenderer: {fileID: 1117986456}
destroyed: {fileID: 232061971} destroyed: {fileID: 232061971}
elements: []
--- !u!114 &1117986455 --- !u!114 &1117986455
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -72813,8 +72815,6 @@ MonoBehaviour: ...@@ -72813,8 +72815,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
distance: 200 distance: 200
planetPrefab: {fileID: 6928496034449465639, guid: 9b966a854dba3b64ca500de7a725f6b0,
type: 3}
sun: {fileID: 1274851342} sun: {fileID: 1274851342}
--- !u!1 &1280899231 --- !u!1 &1280899231
GameObject: GameObject:
...@@ -80645,6 +80645,7 @@ MonoBehaviour: ...@@ -80645,6 +80645,7 @@ MonoBehaviour:
level: 0 level: 0
meshRenderer: {fileID: 1116133148} meshRenderer: {fileID: 1116133148}
destroyed: {fileID: 1941928521} destroyed: {fileID: 1941928521}
elements: []
--- !u!114 &1473777820 --- !u!114 &1473777820
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -92393,6 +92394,7 @@ MonoBehaviour: ...@@ -92393,6 +92394,7 @@ MonoBehaviour:
level: 2 level: 2
meshRenderer: {fileID: 1773485804} meshRenderer: {fileID: 1773485804}
destroyed: {fileID: 1389867916} destroyed: {fileID: 1389867916}
elements: []
--- !u!114 &1773485803 --- !u!114 &1773485803
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -106126,7 +106128,6 @@ MonoBehaviour: ...@@ -106126,7 +106128,6 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
distance: 20 distance: 20
planetPrefab: {fileID: 0}
sun: {fileID: 1818525654} sun: {fileID: 1818525654}
--- !u!1 &1973860075 --- !u!1 &1973860075
GameObject: GameObject:
...@@ -9,12 +9,18 @@ public class SamplePlanet : MonoBehaviour ...@@ -9,12 +9,18 @@ public class SamplePlanet : MonoBehaviour
public GameObject destroyed; public GameObject destroyed;
private Target target; private Target target;
public string _name { get; set; } public string _name { get; set; }
//public int elementId { get; set; }
public List<GameObject> elements = new List<GameObject>();
public void SetState(bool _destroyed) public void SetState(bool _destroyed)
{ {
meshRenderer.enabled = !_destroyed; meshRenderer.enabled = !_destroyed;
destroyed.SetActive(_destroyed); destroyed.SetActive(_destroyed);
if (_destroyed)
{
elements.ForEach(a => a.SetActive(false));
}
} }
public void SetProperty(int level, string name, Texture text) public void SetProperty(int level, string name, Texture text, int element)
{ {
this.level = level; this.level = level;
gameObject.name = name; gameObject.name = name;
...@@ -25,5 +31,8 @@ public class SamplePlanet : MonoBehaviour ...@@ -25,5 +31,8 @@ public class SamplePlanet : MonoBehaviour
target.showBox = (DataManager.Instance.userData.Level == level); target.showBox = (DataManager.Instance.userData.Level == level);
//target.indicator.ShowStar(level < DataManager.Instance.userData.Level, //target.indicator.ShowStar(level < DataManager.Instance.userData.Level,
// DataManager.Instance.GetStar(DataManager.Instance.userData.Map, DataManager.Instance.userData.Level)); // DataManager.Instance.GetStar(DataManager.Instance.userData.Map, DataManager.Instance.userData.Level));
elements.ForEach(a => a.SetActive(false));
if (element >= 0 && element < elements.Count)
elements[element].SetActive(true);
} }
} }
...@@ -6,7 +6,7 @@ public class SolarSystem : MonoBehaviour ...@@ -6,7 +6,7 @@ public class SolarSystem : MonoBehaviour
{ {
public static SolarSystem Instance; public static SolarSystem Instance;
public float distance = 200f; public float distance = 200f;
public SamplePlanet planetPrefab; //public SamplePlanet planetPrefab;
public Transform sun; public Transform sun;
private List<SamplePlanet> planes = new List<SamplePlanet>(); private List<SamplePlanet> planes = new List<SamplePlanet>();
public int CurrentMap { get; set; } public int CurrentMap { get; set; }
...@@ -85,7 +85,7 @@ public class SolarSystem : MonoBehaviour ...@@ -85,7 +85,7 @@ public class SolarSystem : MonoBehaviour
for(int i=0; i< planets.Length; i++) for(int i=0; i< planets.Length; i++)
{ {
SamplePlanet sample = SpawnPlanet(planets[i]); SamplePlanet sample = SpawnPlanet(planets[i]);
sample.SetProperty(i, planets[i].name, planets[i].overlayTexture); sample.SetProperty(i, planets[i].name, planets[i].overlayTexture, planets[i].elementId);
planes.Add(sample); planes.Add(sample);
//if (DataManager.Instance.userData.Level == i) //if (DataManager.Instance.userData.Level == i)
// current = sample; // current = sample;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment