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

client_linchunjie

2019-06-22 ffc290880f69c0c631776efa9fc75c44c03953f8

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

 Fight/MapTransferUtility.cs

@@ -262,6 +262,8 @@
            yield break;

        }



        ClientSceneManager.Instance.ExitTransStatus();



        var sid = data.sid;

        NpcID = data.npcID;

        MapTransferDoType = E_MapTransferDoType.Npc;


 Fight/Stage/MapEditor/Game/ClientSceneManager.cs

@@ -15,6 +15,14 @@
    private Dictionary<int, List<GActor>> m_EventActorDict = new Dictionary<int, List<GActor>>();
    public bool IsClientFightMode { get; private set; }

    public void ExitTransStatus()
    {
        foreach (var _t in m_TransferGroupList)
        {
            _t.StartMoveTo();
        }
    }

    private IEnumerator DelayUnTrigger(int id)
    {
        while (m_MapData == null)

 Fight/Stage/MapEditor/Game/TransferGroup.cs

@@ -10,6 +10,16 @@
    private int startPoint;
    private List<SFXController> m_EffectList = new List<SFXController>();

    public void StartMoveTo()
    {
        if (m_Step == 3)
        {
            m_Step = 0;
            m_InCreaseTime = 0;
            targetPoint = -1;
        }
    }

    public TransferGroup(H2Engine.MapTrasfer data)
    {
        m_Data = data;