5745 【前端】【1.5】仙盟联赛副本中死亡支持玩家使用原地复活（与现有的原地复活逻辑一致）

Client_PangDeRong

2019-01-07 5189b4677e71fab6b654f957bea71f44fe07b9cc

5745 【前端】【1.5】仙盟联赛副本中死亡支持玩家使用原地复活（与现有的原地复活逻辑一致）

 System/Compose/New/ComposeEquipWin.cs

@@ -628,6 +628,7 @@
            List<ItemModel> unSelectItems = unfixedSelectItemDict.Values.ToList();

            unSelectItems.Sort(CompareByOverdueTime);





            for (int i = 0; i < unfixedDisplays.Length; i++)

            {

                var unfixedDisplay = unfixedDisplays[i];

@@ -638,7 +639,7 @@
                    {

                        for(int j = 0; j < unSelectItems.Count; j++)

                        {

                            ItemModel _model = unSelectItems[i];

                            ItemModel _model = unSelectItems[j];

                            if (!unfixeAddDict.ContainsKey(_model.itemInfo.ItemPlace))

                            {

                                selectModel.AddHaveUnfixedSelectItem(_model.itemInfo.ItemPlace);


 System/PlayerDead/PlayerDeadModel.cs

@@ -240,12 +240,6 @@
                            }

                        }

                        break;

                    case 31220:

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

                        {

                            WindowCenter.Instance.Open<RebornWin>();

                        }

                        break;

                    default:

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

                        {


 System/PlayerDead/ReliveWin.cs

@@ -16,6 +16,7 @@


        [SerializeField] Text dieDesText;

        [SerializeField] Text buffText;

        [SerializeField] Button inplaceRebornBtn;



        PlayerDeadModel _deadModel;

        PlayerDeadModel DeadModel

@@ -24,6 +25,7 @@
        }



        public const int ElderBattleMapID = 31160; //上古战场地图Id

        public const int UnionleagueMapID = 31220; //仙盟联赛地图

        int questTimes = 0;

        #region Built-in

        protected override void BindController()

@@ -32,7 +34,7 @@


        protected override void AddListeners()

        {



            inplaceRebornBtn.onClick.AddListener(OnClickInplaceRebornBtn);

        }



        protected override void OnPreOpen()

@@ -45,37 +47,16 @@
            MapConfig mapConfig = Config.Instance.Get<MapConfig>(curMapId);

            dieDesText.gameObject.SetActive(false);

            buffText.gameObject.SetActive(curMapId == ElderBattleMapID);

            if (curMapId == ElderBattleMapID)

            inplaceRebornBtn.gameObject.SetActive(curMapId == UnionleagueMapID);

            switch(curMapId)

            {

                List<int> buffIds = new List<int>();

                StatusMgr.Instance.GetBuffIds(PlayerDatas.Instance.PlayerId, ref buffIds);

                var skillConfigs = SkillConfig.GetSkillActConfigs(0,0,DeadModel.deadBuffId);

                string skillName = string.Empty;

                int buffLv = 0;

                bool isMaxBuff = false;

                if(buffIds.Count > 0)

                {

                    for(int i = 0; i < buffIds.Count; i++)

                    {

                        int buffId = buffIds[i];

                        SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(buffId);

                        if(skillConfig.SkillTypeID == DeadModel.deadBuffId)

                        {

                            buffLv = skillConfig.SkillLV + 1;

                            isMaxBuff = buffLv > DeadModel.maxDeadBuffLV ? true : false;

                            break;

                        }

                    }

                }

    
                if(skillConfigs != null && skillConfigs.Count > 0)

                {

                    SkillConfig skillConfig = skillConfigs[0];

                    skillName = skillConfig.SkillName;

                }

                buffText.text = Language.Get("AncientBattlefield_Text_2",skillName);

                buffText.gameObject.SetActive(!isMaxBuff);

                case ElderBattleMapID:

                    SetBuffDes();

                    break;

                case UnionleagueMapID:

                    break;

            }



            for (int i = 0; i < DeadModel.dungeonKillArray.Length; i++)

            {

                if(DeadModel.dungeonKillArray[i] == curMapId)

@@ -101,6 +82,38 @@
        {

        }

        #endregion



        private void SetBuffDes()

        {

            List<int> buffIds = new List<int>();

            StatusMgr.Instance.GetBuffIds(PlayerDatas.Instance.PlayerId, ref buffIds);

            var skillConfigs = SkillConfig.GetSkillActConfigs(0, 0, DeadModel.deadBuffId);

            string skillName = string.Empty;

            int buffLv = 0;

            bool isMaxBuff = false;

            if (buffIds.Count > 0)

            {

                for (int i = 0; i < buffIds.Count; i++)

                {

                    int buffId = buffIds[i];

                    SkillConfig skillConfig = Config.Instance.Get<SkillConfig>(buffId);

                    if (skillConfig.SkillTypeID == DeadModel.deadBuffId)

                    {

                        buffLv = skillConfig.SkillLV + 1;

                        isMaxBuff = buffLv > DeadModel.maxDeadBuffLV ? true : false;

                        break;

                    }

                }

            }



            if (skillConfigs != null && skillConfigs.Count > 0)

            {

                SkillConfig skillConfig = skillConfigs[0];

                skillName = skillConfig.SkillName;

            }

            buffText.text = Language.Get("AncientBattlefield_Text_2", skillName);

            buffText.gameObject.SetActive(!isMaxBuff);

        }



        public void RefreshTime(int time)

        {

@@ -129,6 +142,12 @@
                }

            }

        }



        private void OnClickInplaceRebornBtn()

        {

            DeadModel.InpacleReborn();

        }



        private void CloseWin()

        {

            Close();