Merge remote-tracking branch 'origin/master' into LuaOrgan

client_Lhy

2019-07-04 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5

 Core/GameEngine/Model/Player/Skill/PlayerSkillDatas.cs

@@ -199,7 +199,7 @@


    public void SetQuickSkill(int pos, int id)

    {

        if (model.GetXpSkillID() == id)

        if (model.IsXpSkill(id))

        {

            return;

        }

@@ -349,6 +349,8 @@


    public void ClearSkillData()

    {

        hasInitQuickSkill = false;

        isServerPrepare = false;

        m_QuickSkills.Clear();

        m_PlayerSkills.Clear();

    }