Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Wu Xijin

2019-03-19 e839cf6c20416092669b5f24aa9d34278edd94ae

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 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();
                        }


 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)
                {