Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs

@@ -348,7 +348,7 @@


    void UpdateRequestRedpoint()

    {

        if (HasFairy && IsCanFunc(LimitFunc.CanKick))

        if (HasFairy && IsCanFunc(LimitFunc.CanCall))

        {

            applyRedpoint.state = applyList.Count > 0 ? RedPointState.Simple : RedPointState.None;

        }