summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2022-04-20 13:07:50 +0800
committerchai <chaifix@163.com>2022-04-20 13:07:50 +0800
commitf935a0fd494583359a300ee4b37ef3f320dc8645 (patch)
treeb5592f54fe977e45997a7a050440dd68eb23b15c
parent0f563fdc6874ee39713303ba457a05693fb08fa1 (diff)
* topdown transform inspector
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs6
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs5
-rw-r--r--AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs5
-rw-r--r--AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity8
-rw-r--r--AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs2
5 files changed, 17 insertions, 9 deletions
diff --git a/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs b/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs
index b1ceaab..238a85a 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/Editor/TopDownTransformInspector.cs
@@ -37,13 +37,13 @@ public class TopDownTransformInspector : Editor
float arrowSize = 2f;
Handles.color = Handles.xAxisColor;
- m_TopDownTransform.x += EditorHandlesHelper.PositionArrow(pos3d, Vector3.right, 1f, arrowSize).x;
+ m_TopDownTransform.x += EditorHandlesHelper.PositionArrow(pos3d + new Vector3(0, -m_TopDownTransform.z, 0), Vector3.right, 1f, arrowSize).x;
Handles.color = Handles.yAxisColor;
- m_TopDownTransform.y -= EditorHandlesHelper.PositionArrow(pos3d, Vector3.up, 1f, arrowSize).y;
+ m_TopDownTransform.y -= EditorHandlesHelper.PositionArrow(pos3d + new Vector3(0, -m_TopDownTransform.z, 0), Vector3.up, 1f, arrowSize).y;
Handles.color = Handles.zAxisColor;
- m_TopDownTransform.z -= EditorHandlesHelper.PositionArrow(pos3d + new Vector3(0, -m_TopDownTransform.z - 0.1f, 0), Vector3.up, m_TopDownTransform.z, arrowSize, true).y;
+ m_TopDownTransform.z -= EditorHandlesHelper.PositionArrow(pos3d /*+ new Vector3(-0.3f, 0, 0)*/, Vector3.up, 1.4f, arrowSize).y;
}
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
index d7ce933..e0101d4 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownSorting.cs
@@ -18,6 +18,11 @@ public class TopDownSorting : MonoBehaviour
private void Update()
{
+ Sorting();
+ }
+
+ public void Sorting()
+ {
// ¸ù¾ÝyÉèÖÃsortOrder
m_SpriteRenderer.sortingOrder = (int)(-m_Coord.y * 100);
}
diff --git a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
index 7e4c261..db52445 100644
--- a/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
+++ b/AlienSurvival/Assets/Scripts/TopDown/TopDownTransform.cs
@@ -37,6 +37,7 @@ public class TopDownTransform : MonoBehaviour
set
{
m_LocalPosition = value;
+ Project();
}
}
@@ -77,6 +78,7 @@ public class TopDownTransform : MonoBehaviour
Project();
}
}
+
public float height
{
get
@@ -85,8 +87,7 @@ public class TopDownTransform : MonoBehaviour
}
set
{
- m_LocalPosition.z = value;
- Project();
+ z = value;
}
}
diff --git a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity
index ae24fb5..d850742 100644
--- a/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity
+++ b/AlienSurvival/Assets/Test/Scenes/6_PixelCanvas 1.unity
@@ -604,7 +604,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 231104471}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 3.841957, y: 9.357882, z: 0}
+ m_LocalPosition: {x: 4.5282884, y: 8.535414, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -648,7 +648,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_LocalPosition: {x: 3.841957, y: 8.087313, z: 1.2705684}
+ m_LocalPosition: {x: 4.5282884, y: 8.05027, z: 0.48514414}
m_LocalRotation: 0
m_LocalScale: {x: 0, y: 0}
--- !u!1 &248224694
@@ -2486,7 +2486,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 844062961}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 1.3318268, y: 6.147071, z: 0}
+ m_LocalPosition: {x: 2.0113106, y: 6.6672025, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@@ -2530,7 +2530,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2b1fbd797bf03674e9d1b81edc11e3f1, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_LocalPosition: {x: 1.3318268, y: 4.408491, z: 1.73858}
+ m_LocalPosition: {x: 2.0113106, y: 4.038198, z: 2.6290045}
m_LocalRotation: 0
m_LocalScale: {x: 0, y: 0}
--- !u!1 &917445573
diff --git a/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs b/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs
index 6b24c3f..021eda7 100644
--- a/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs
+++ b/AlienSurvival/Assets/Test/Scripts/TestPeaceMakerGrenade.cs
@@ -59,6 +59,8 @@ public class TestPeaceMakerGrenade : MonoBehaviour
TopDownTransform coord = exp.GetComponent<TopDownTransform>();
coord.position = m_Coords.position;
+ exp.GetComponent<TopDownSorting>().Sorting();
+
exp.SetActive(true);
}