From c7c714566acbbab571bb6cc470cfdc2c33076786 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 19 三月 2019 17:31:35 +0800
Subject: [PATCH] 6362 【前端】【2.0】飞跃的功能 功能实现提交
---
Fight/Stage/MapEditor/Game/TransferGroup.cs | 18 ++++++++++++++++--
Core/MapEditor/Behavior/Bhv_Trasfer.cs | 8 ++++----
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/Core/MapEditor/Behavior/Bhv_Trasfer.cs b/Core/MapEditor/Behavior/Bhv_Trasfer.cs
index b04cb39..3fc8d2b 100644
--- a/Core/MapEditor/Behavior/Bhv_Trasfer.cs
+++ b/Core/MapEditor/Behavior/Bhv_Trasfer.cs
@@ -127,9 +127,9 @@
{
EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
EditorGUILayout.LabelField("鍒颁笂涓�涓妭鐐圭殑鍔ㄤ綔", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(120));
- pointList[i].stateNameFront = EditorGUILayout.TextField(pointList[i].stateNameFront, guiSkin.textField, GUILayout.Height(20));
+ pointList[i].stateNameBack = EditorGUILayout.TextField(pointList[i].stateNameBack, guiSkin.textField, GUILayout.Height(20));
EditorGUILayout.LabelField("鏃堕棿", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
- pointList[i].flyTimeFront = EditorGUILayout.FloatField(pointList[i].flyTimeFront, guiSkin.textField, GUILayout.Height(20));
+ pointList[i].flyTimeBack = EditorGUILayout.FloatField(pointList[i].flyTimeBack, guiSkin.textField, GUILayout.Height(20));
EditorGUILayout.EndHorizontal();
}
@@ -137,9 +137,9 @@
{
EditorGUILayout.BeginHorizontal(GUILayout.Height(22));
EditorGUILayout.LabelField("鍒颁笅涓�涓妭鐐圭殑鍔ㄤ綔", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(120));
- pointList[i].stateNameBack = EditorGUILayout.TextField(pointList[i].stateNameBack, guiSkin.textField, GUILayout.Height(20));
+ pointList[i].stateNameFront = EditorGUILayout.TextField(pointList[i].stateNameFront, guiSkin.textField, GUILayout.Height(20));
EditorGUILayout.LabelField("鏃堕棿", guiSkin.customStyles[0], GUILayout.Height(20), GUILayout.Width(25));
- pointList[i].flyTimeBack = EditorGUILayout.FloatField(pointList[i].flyTimeBack, guiSkin.textField, GUILayout.Height(20));
+ pointList[i].flyTimeFront = EditorGUILayout.FloatField(pointList[i].flyTimeFront, guiSkin.textField, GUILayout.Height(20));
EditorGUILayout.EndHorizontal();
}
diff --git a/Fight/Stage/MapEditor/Game/TransferGroup.cs b/Fight/Stage/MapEditor/Game/TransferGroup.cs
index 2c4a7eb..65b9664 100644
--- a/Fight/Stage/MapEditor/Game/TransferGroup.cs
+++ b/Fight/Stage/MapEditor/Game/TransferGroup.cs
@@ -125,7 +125,14 @@
m_Step = 2;
_hero.OnHorse(0);
DTC0428_tagPlayerRideHorse.Send_tagPlayerRideHorse(false);
- _hero.Play(GAStaticDefine.State_Fly);
+ if (isPositive)
+ {
+ _hero.Play(Animator.StringToHash(m_Data.transferPoints[targetPoint - 1].stateNameFront));
+ }
+ else
+ {
+ _hero.Play(Animator.StringToHash(m_Data.transferPoints[targetPoint + 1].stateNameBack));
+ }
_hero.Idle();
CameraController.Instance.LookAtTarget = _hero.Root.GetChildTransformDeeply("Bip001");
}
@@ -138,7 +145,14 @@
case 2:// 鎵ц鍧愭爣鏀瑰彉
_p = m_Data.transferPoints[targetPoint];
_hero.destForward = _hero.Forward = MathUtility.ForwardXZ(_p.position, _hero.Pos);
- m_InCreaseTime += .5f * Time.deltaTime;
+ if (isPositive)
+ {
+ m_InCreaseTime += (Time.deltaTime / m_Data.transferPoints[targetPoint - 1].flyTimeFront);
+ }
+ else
+ {
+ m_InCreaseTime += (Time.deltaTime / m_Data.transferPoints[targetPoint + 1].flyTimeBack);
+ }
float _y = 0;
if (m_StartPos.y > _p.position.y)
{
--
Gitblit v1.8.0