Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-09-28 c591cb6e215ea5e762560afdae059f1d4fd7f4ec

 Fight/GameActor/GActorPlayerBase.cs

@@ -43,6 +43,8 @@


    public JobSetupConfig JobSetup { get; protected set; }



    DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }



    public override int NextAction

    {

        get

@@ -216,6 +218,7 @@
        MovingState = E_MovingState.Normal;



        SystemSetting.Instance.qualityLevelChangeEvent += OnGameQualityChange;

        dungeonModel.updateMissionEvent += CheckAncientHeadUp;

        base.OnInit(package);

    }



@@ -337,6 +340,7 @@
        JobSetup = null;



        SystemSetting.Instance.qualityLevelChangeEvent -= OnGameQualityChange;

        dungeonModel.updateMissionEvent -= CheckAncientHeadUp;



        base.OnUnit();

    }

@@ -346,6 +350,21 @@
    protected override void OnLateUpdate()

    {

        UpdateRush();

    }



    public void CheckAncientHeadUp()

    {

        if (PlayerDatas.Instance.baseData.MapID == 31160)

        {

            var help = dungeonModel.mission;

            SwitchAncientKing(help.topPlayerID == ServerInstID);

            SwitchAncientEnemy(help.enemyID == ServerInstID && ServerInstID != PlayerDatas.Instance.baseData.PlayerID);

        }

        else

        {

            SwitchAncientKing(false);

            SwitchAncientEnemy(false);

        }

    }



    #region 装备穿戴相关

@@ -435,6 +454,26 @@
        m_HeadUpName.SetFairyLeague(on, ActorInfo.faction);

    }



    public void SwitchAncientKing(bool on)

    {

        if (m_HeadUpName == null)

        {

            return;

        }



        m_HeadUpName.SetAncientKing(on);

    }



    public void SwitchAncientEnemy(bool on)

    {

        if (m_HeadUpName == null)

        {

            return;

        }



        m_HeadUpName.SetAncientEnemy(on);

    }



    public virtual void SwitchYellowName(bool on)

    {

        if (m_HeadUpName == null)