Merge branch 'master' into leonard

leonard Wu

2018-08-03 7cc84329c52b6e39cd979eb33a126e059b9bf36c

 Fight/Actor/Status/Status_Base.cs

@@ -113,10 +113,10 @@
            m_Effect = null;
        }

        GActorFight _target = GAMgr.Instance.GetBySID(objID) as GActorFight;

        if (buffType == (int)E_BuffType.bfActionBuff)
        {
            GActorFight _target = GAMgr.Instance.GetBySID(objID) as GActorFight;

            // 调用动作
            if (m_SkillConfig.CtrlActionID != 0)
            {
@@ -124,6 +124,7 @@
                _target.IdleImmediate();
            }
        }

        h0605 = null;
    }