summaryrefslogtreecommitdiff
path: root/AlienSurvival/Assets/Scripts
diff options
context:
space:
mode:
Diffstat (limited to 'AlienSurvival/Assets/Scripts')
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs33
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs.meta2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs.meta2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs6
-rw-r--r--AlienSurvival/Assets/Scripts/Utils/GameLoop.cs38
-rw-r--r--AlienSurvival/Assets/Scripts/Utils/GameLoop.cs.meta11
7 files changed, 77 insertions, 17 deletions
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs
index 6741275..58d00c2 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs
@@ -26,34 +26,45 @@ public class TopDownShadowCaster : MonoBehaviour
m_Coord = GetComponent<TopDownTransform>();
m_SpriteRenderer = GetComponent<SpriteRenderer>();
+ //
+ for(int i = this.transform.childCount - 1; i >= 0 ; --i)
+ {
+ GameObject child = this.transform.GetChild(i).gameObject;
+ if (child.name == "shadow")
+ {
+#if UNITY_EDITOR
+ DestroyImmediate(child);
+#else
+ Destroy(child);
+#endif
+ }
+ }
+
if (m_Shadow == null)
{
m_Shadow = new GameObject("shadow");
- m_Shadow.hideFlags = HideFlags.HideAndDontSave;
- m_Shadow.transform.SetParent(transform);
+// m_Shadow.hideFlags = HideFlags.HideAndDontSave;
+ m_Shadow.transform.SetParent(transform);
m_Shadow.transform.localScale = m_Scale;
-
+
m_ShadowRenderer = m_Shadow.AddComponent<SpriteRenderer>();
m_ShadowRenderer.color = m_Color;
m_ShadowRenderer.sprite = m_SpriteRenderer.sprite;
m_ShadowRenderer.sortingLayerName = "Shadow";
-
}
}
- private void Start()
- {
- }
-
private void Update()
{
- if (m_Shadow == null)
- return;
-
m_ShadowRenderer.color = m_Color;
m_ShadowRenderer.sprite = m_SpriteRenderer.sprite;
+ SetPosition();
+ }
+
+ void SetPosition()
+ {
Vector3 pos = m_Coord.GetGround3DPosition();
m_Shadow.transform.position = pos;
}
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs.meta b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs.meta
index 59d316e..24ecda5 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs.meta
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
- executionOrder: 8
+ executionOrder: 9
icon: {instanceID: 0}
userData:
assetBundleName:
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
index c6841c8..6455f2c 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
@@ -10,7 +10,7 @@ public class TopDownSorting : MonoBehaviour
private SpriteRenderer m_SpriteRenderer;
private TopDownTransform m_Coord;
- private void Start()
+ private void Awake()
{
m_SpriteRenderer = GetComponent<SpriteRenderer>();
m_Coord = GetComponent<TopDownTransform>();
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs.meta b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs.meta
index f454cf2..33f3c75 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs.meta
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs.meta
@@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
- executionOrder: 7
+ executionOrder: 8
icon: {instanceID: 0}
userData:
assetBundleName:
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
index 35e6b79..ce7421a 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
@@ -122,7 +122,7 @@ public class TopDownTransform : MonoBehaviour
transform.localPosition = pos;
}
- private void Start()
+ private void Awake()
{
SpriteRenderer sr = GetComponent<SpriteRenderer>();
if (sr)
@@ -155,8 +155,8 @@ public class TopDownTransform : MonoBehaviour
{
Vector3 pos = new Vector3();
pos.x = m_LocalPosition.x;
- pos.y = m_LocalPosition.y ;
- pos.z = transform.localPosition.z;
+ pos.y = m_LocalPosition.y;
+ pos.z = transform.position.z;
return pos;
}
#endregion
diff --git a/AlienSurvival/Assets/Scripts/Utils/GameLoop.cs b/AlienSurvival/Assets/Scripts/Utils/GameLoop.cs
new file mode 100644
index 0000000..e22ed77
--- /dev/null
+++ b/AlienSurvival/Assets/Scripts/Utils/GameLoop.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class GameLoop : MonoBehaviour
+{
+
+ static GameLoop m_GameLoop;
+
+ static public GameLoop instance
+ {
+ get
+ {
+ return m_GameLoop;
+ }
+ }
+
+ int m_IndexOfUpdate = 0;
+
+ public int indexOfUpdate
+ {
+ get
+ {
+ return m_IndexOfUpdate;
+ }
+ }
+
+ private void Awake()
+ {
+ m_GameLoop = this;
+ }
+
+ private void Update()
+ {
+ ++m_IndexOfUpdate;
+ }
+
+}
diff --git a/AlienSurvival/Assets/Scripts/Utils/GameLoop.cs.meta b/AlienSurvival/Assets/Scripts/Utils/GameLoop.cs.meta
new file mode 100644
index 0000000..fa6fa0e
--- /dev/null
+++ b/AlienSurvival/Assets/Scripts/Utils/GameLoop.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5ce4c552f3823e842853a52a52d3cc3b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: -1100
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant: