Merge branch '2287上古战场'

client_linchunjie

2018-10-18 7389500beb462a96b60ba54734743a85cf35c716

Merge branch '2287上古战场'

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs

@@ -30,8 +30,8 @@
        GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;

        if (_player != null)

        {

            //var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号

            _player.SwitchTitle(vNetData.GradID);

            var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号

            _player.SwitchTitle(titleId);

        }

    }




 Fight/GameActor/GA_Hero.cs

@@ -418,7 +418,8 @@
        var titleModel = ModelCenter.Instance.GetModel<TitleModel>();

        var _title = titleModel.GetTitleEquip();

        uint _titleID = 0;

        if (_title != null && titleModel.IsTitleGain(_title.id))//上古战场不显示称号

        if (_title != null && titleModel.IsTitleGain(_title.id)

            && PlayerDatas.Instance.baseData.MapID != 31160)//上古战场不显示称号

        {

            _titleID = (uint)_title.id;

        }

@@ -438,6 +439,7 @@
        }



        base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        CheckAncientHeadUp();

    }



    public sealed override void SwitchRedName(bool on)


 Fight/GameActor/GA_Player.cs

@@ -352,7 +352,8 @@
            m_HeadUpName = HeadUpName.RequireHeadUpName(HeadUpName.Pattern.Player, MP_Name, 0, CameraController.Instance.CameraObject);

        }



        m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, ActorInfo.titleID, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1);

        var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : ActorInfo.titleID;

        m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, titleId, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1);



        if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.bossBelongBuffID))

        {

@@ -360,6 +361,7 @@
        }



        base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        CheckAncientHeadUp();

    }



    public sealed override void SwitchRedName(bool on)


 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();

    }

@@ -348,20 +352,20 @@
        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);

    //    }

    //}

    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 装备穿戴相关




 Fight/Stage/StageManager.cs

@@ -559,15 +559,15 @@
        _hero.IdleImmediate();



        _hero.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        //_hero.CheckAncientHeadUp();

        //var titleId = 0;

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

        //{

        //    var titelModel = ModelCenter.Instance.GetModel<TitleModel>();

        //    var title = titelModel.GetTitleEquip();

        //    titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0;

        //}

        //_hero.SwitchTitle((uint)titleId);

        _hero.CheckAncientHeadUp();

        var titleId = 0;

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

        {

            var titelModel = ModelCenter.Instance.GetModel<TitleModel>();

            var title = titelModel.GetTitleEquip();

            titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0;

        }

        _hero.SwitchTitle((uint)titleId);



        // 判断buff

        if (StatusMgr.Instance.IsExist(PlayerDatas.Instance.PlayerId, StatusMgr.Instance.redNameBuffID))


 System/Dungeon/DungeonAncientTargetWin.cs

@@ -1,55 +1,57 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI
{
    public class DungeonAncientTargetWin : Window
    {
        [SerializeField] List<Text> m_DungeonTargets;
        [SerializeField] DungeonTargetBehaviour m_DungeonTargetBehaviour;

        DungeonModel m_Model;
        DungeonModel model
        {
            get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); }
        }

        protected override void AddListeners()
        {
        }

        protected override void BindController()
        {
        }

        protected override void OnAfterClose()
        {
        }

        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
            model.updateMissionEvent -= UpdateTargets;
        }

        protected override void OnPreOpen()
        {
            model.updateMissionEvent += UpdateTargets;
            m_DungeonTargetBehaviour.Init(31160);
            UpdateTargets();
        }

        private void UpdateTargets()
        {
            var _help = model.mission;
            m_DungeonTargets[0].text = _help.topName;
            m_DungeonTargets[1].text = UIHelper.ReplaceLargeNum(_help.topScore);
        }
    }
}

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{

    public class DungeonAncientTargetWin : Window

    {

        [SerializeField] Text m_DungeonName;

        [SerializeField] DungeonTargetBehaviour m_DungeonTargetBehaviour;



        DungeonModel m_Model;

        DungeonModel model

        {

            get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); }

        }



        protected override void AddListeners()

        {

        }



        protected override void BindController()

        {

        }



        protected override void OnAfterClose()

        {

        }



        protected override void OnAfterOpen()

        {

        }



        protected override void OnPreClose()

        {

            //model.updateMissionEvent -= UpdateTargets;

        }



        protected override void OnPreOpen()

        {

            //model.updateMissionEvent += UpdateTargets;

            var line = PlayerDatas.Instance.baseData.FBID + 1;

            m_DungeonName.text = StringUtility.Contact(Language.Get("AncientBattle"), "（", Language.Get("FBLine", line), "）");

            m_DungeonTargetBehaviour.Init(31160);

            //UpdateTargets();

        }



        private void UpdateTargets()

        {

            //var _help = model.mission;

            //m_DungeonTargets[0].text = _help.topName;

            //m_DungeonTargets[1].text = UIHelper.ReplaceLargeNum(_help.topScore);

        }

    }

}




 System/Dungeon/DungeonFightWin.cs

@@ -27,6 +27,7 @@
        [SerializeField] RectTransform m_ContainerResPoint;

        [SerializeField] RectTransform m_ContainerAncient;

        [SerializeField] Button m_AncientBtn;

        [SerializeField] Button m_AncientKing;

        [SerializeField] DungeonItemCollect m_ItemCollect;

        [SerializeField] DungeonGuardSkyBehaviour m_GuardSky;

        [SerializeField] DungeonBossBriefInfoContainer m_BossInfosContainer;

@@ -55,6 +56,7 @@
        {

            m_ExitDungeon.AddListener(ExitDungeon);

            m_AncientBtn.onClick.AddListener(OnAncientBtn);

            m_AncientKing.onClick.AddListener(AncientKing);

        }



        protected override void OnPreOpen()

@@ -320,6 +322,18 @@
            }

        }



        private void AncientKing()

        {

            if (WindowCenter.Instance.IsOpen<DungeonAncientKingWin>())

            {

                WindowCenter.Instance.CloseImmediately<DungeonAncientKingWin>();

            }

            else

            {

                WindowCenter.Instance.Open<DungeonAncientKingWin>();

            }

        }



        private void UpdateDungeonExitTime()

        {

            if (existSurplusTime > 0f)


 System/Message/BattleHint.cs

@@ -16,15 +16,15 @@
        public void OnStageLoadFinish()

        {

            Clear();

            //var mapId = PlayerDatas.Instance.baseData.MapID;

            //if (cacheMapId != 0 && cacheMapId != 31160

            //    && mapId == 31160)

            //{

            //    SnxxzGame.Instance.StartCoroutine(Co_LoadFinish());

            //}

            //var help = dungeonModel.mission;

            //ancientKing = mapId != 31160 ? 0 : help.topPlayerID;

            //cacheMapId = PlayerDatas.Instance.baseData.MapID;

            var mapId = PlayerDatas.Instance.baseData.MapID;

            if (cacheMapId != 0 && cacheMapId != 31160

                && mapId == 31160)

            {

                SnxxzGame.Instance.StartCoroutine(Co_LoadFinish());

            }

            var help = dungeonModel.mission;

            ancientKing = mapId != 31160 ? 0 : help.topPlayerID;

            cacheMapId = PlayerDatas.Instance.baseData.MapID;

        }



        public event Action battleHintUpdate;

@@ -56,7 +56,7 @@
                    && ancientKing != help.topPlayerID)

                {

                    ancientKing = help.topPlayerID;

                    //Receive(1);

                    Receive(1);

                }

            }

            ancientKing = help.topPlayerID;

@@ -71,24 +71,24 @@
            }

            if (msg.Equals("AncientBattlefield_8"))

            {

                //Receive(2);

                Receive(2);

            }

        }



        public void Receive(int ancientType)

        {

            //battleHints.Enqueue(ancientType);

            //if (!WindowCenter.Instance.IsOpen<BattleHintWin>())

            //{

            //    WindowCenter.Instance.Open<BattleHintWin>();

            //}

            //else

            //{

            //    if (battleHintUpdate != null)

            //    {

            //        battleHintUpdate();

            //    }

            //}

            battleHints.Enqueue(ancientType);

            if (!WindowCenter.Instance.IsOpen<BattleHintWin>())

            {

                WindowCenter.Instance.Open<BattleHintWin>();

            }

            else

            {

                if (battleHintUpdate != null)

                {

                    battleHintUpdate();

                }

            }

        }



        public void ReceiveEvenKill(string message, ArrayList list)


 System/Message/SysNotifyMgr.cs

@@ -220,7 +220,7 @@
                    }

                    break;

                case SysNotifyType.SysEvenKill:

                    //BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList);

                    BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList);

                    break;

            }

        }


 UI/HUD/HeadUpName.cs

@@ -152,12 +152,11 @@
            {

                return;

            }

            //m_AncientKing.gameObject.SetActive(isAncientKing);

            //if (isAncientKing)

            //{

            //    m_AncientKing.SetSprite("IntegralKing");

            //    m_AncientKing.SetNativeSize();

            //}

            m_AncientKing.gameObject.SetActive(isAncientKing);

            if (isAncientKing)

            {

                m_AncientKing.SetSprite("IntegralKing");

            }

        }



        public void SetAncientEnemy(bool isAncientEnemy)

@@ -166,12 +165,11 @@
            {

                return;

            }

            //m_AncientEnemy.gameObject.SetActive(isAncientEnemy);

            //if (isAncientEnemy)

            //{

            //    m_AncientEnemy.SetSprite("Enemy");

            //    m_AncientEnemy.SetNativeSize();

            //}

            m_AncientEnemy.gameObject.SetActive(isAncientEnemy);

            if (isAncientEnemy)

            {

                m_AncientEnemy.SetSprite("Enemy");

            }

        }



        public void SetAlliance(string _alliance)