summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2022-04-21 21:13:24 +0800
committerchai <chaifix@163.com>2022-04-21 21:13:24 +0800
commitea0717eba0b624d47bd60edba7fb7862633f2f5f (patch)
tree5778924bea8cc8e4d04c5b207b7f9193a40ecdf1
parentffcb3964166d7729af217dfb24ac14b365bc6d09 (diff)
*topdown
-rw-r--r--AlienSurvival/Assets/Scripts/Physics/AABBShape.cs2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs2
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs7
-rw-r--r--AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs4
6 files changed, 10 insertions, 9 deletions
diff --git a/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs b/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs
index 5105c72..abff597 100644
--- a/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs
+++ b/AlienSurvival/Assets/Scripts/Physics/AABBShape.cs
@@ -35,7 +35,7 @@ public class AABBShape : ShapeBase
private void OnDrawGizmos()
{
- Vector3 pos = topdownTransform.Get3DPosition();
+ Vector3 pos = topdownTransform.GetProjectedPosition();
Handles.color = Color.green;
Handles.DrawWireCube(pos + new Vector3(m_Centre.x, m_Centre.y, 0), new Vector3(size.x, size.y, 0));
}
diff --git a/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs b/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs
index 238a85a..1e4f6e0 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs
@@ -32,7 +32,7 @@ public class TopDownTransformInspector : Editor
//https://answers.unity.com/questions/463207/how-do-you-make-a-custom-handle-respond-to-the-mou.html
private void OnSceneGUI()
{
- Vector3 pos3d = m_TopDownTransform.Get3DPosition();
+ Vector3 pos3d = m_TopDownTransform.GetProjectedPosition();
float arrowSize = 2f;
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs
index 1c541b9..ed17323 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownShadowCaster.cs
@@ -63,7 +63,7 @@ public class TopDownShadowCaster : MonoBehaviour
public void SetPosition()
{
- Vector3 pos = m_Coord.GetGround3DPosition();
+ Vector3 pos = m_Coord.GetProjectedGroundPosition();
m_Shadow.transform.position = pos;
}
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
index 6455f2c..3ee2f0a 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
@@ -34,7 +34,7 @@ public class TopDownSorting : MonoBehaviour
}
// 根据y设置sortOrder
- m_SpriteRenderer.sortingOrder = (int)(-m_Coord.y * 100);
+ m_SpriteRenderer.sortingOrder = (int)(-m_Coord.position.y * 100);
}
}
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
index 216f2cf..d624267 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
@@ -129,6 +129,7 @@ public class TopDownTransform : MonoBehaviour
self = self.parent;
}
m_LocalPosition = pos;
+ Project();
}
}
@@ -180,8 +181,8 @@ public class TopDownTransform : MonoBehaviour
Project();
}
- #region 转换到3D笛卡尔空间
- public Vector3 Get3DPosition()
+ #region 转换到Transform坐标
+ public Vector3 GetProjectedPosition()
{
Vector3 posTD = position;
@@ -196,7 +197,7 @@ public class TopDownTransform : MonoBehaviour
/// 注意是在3D空间下
/// </summary>
/// <returns></returns>
- public Vector3 GetGround3DPosition()
+ public Vector3 GetProjectedGroundPosition()
{
Vector3 posTD = position;
diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
index f685e15..9bbde78 100644
--- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
+++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMaker.cs
@@ -80,7 +80,7 @@ public class TestPeaceMaker : MonoBehaviour
CallB2();
- //SpaceBeam();
+ SpaceBeam();
CameraFollow();
@@ -292,7 +292,7 @@ public class TestPeaceMaker : MonoBehaviour
{
TestB2 b2 = Instantiate<TestB2>(m_B2);
- Vector3 pos3D = m_Coord.Get3DPosition();
+ Vector3 pos3D = m_Coord.GetProjectedPosition();
b2.Set(pos3D + new Vector3(-15, 0,0 ), pos3D + new Vector3(15, 0,0 ), 20f, 3f);
}
}