5217 【前端】【1.3】【1.3.100】开服全民冲榜赠送魂增加战力显示

Client_PangDeRong

2018-12-06 a3a575e56a1bec6bc224f8dd14562c4caf796e09

5217 【前端】【1.3】【1.3.100】开服全民冲榜赠送魂增加战力显示

 System/BlastFurnace/GetItemPathWin.cs

@@ -305,16 +305,20 @@
        private void SetMidUI()

        {

            _describeText.alignment = TextAnchor.UpperLeft;

            if (itemPathModel.chinItemModel.Effect1 != 215)

            {

                _describeText.text = itemPathModel.GetAllInfoDes();

            }

            else

            string infoDes = itemPathModel.GetAllInfoDes();

            if (infoDes.Contains("{Exp}"))

            {

                ulong expValue = itemTipsModel.GetAddExpValue(itemPathModel.chinItemModel.EffectValueA1, itemPathModel.chinItemModel.EffectValueB1);

                _describeText.text = itemPathModel.GetAllInfoDes().Replace("{0}", UIHelper.ReplaceLargeNum(expValue));

                infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));

            }

          
            if (infoDes.Contains("{FightPower}"))

            {

                int fightPower = 0;

                itemTipsModel.TryGetFightPowerByItemId(itemPathModel.chinItemModel.ID, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }



            _describeText.text = infoDes;

        }



        #region 点击事件


 System/KnapSack/Logic/BoxInfoWin.cs

@@ -163,7 +163,20 @@
                CheckUselimit();

            }



            itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes();

            string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();

            if (infoDes.Contains("{Exp}"))

            {

                ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);

                infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));

            }

            if (infoDes.Contains("{FightPower}"))

            {

                int fightPower = 0;

                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }



            itemDesText.text = infoDes;

            operateBtn.SetActive(false);



            CreateFuncBtn();


 System/KnapSack/Logic/ItemInfoWin.cs

@@ -144,32 +144,21 @@
            itemCell.Init(cellModel);



            CheckUselimit();

            if(itemTipsModel.curAttrData.itemConfig.Effect1 != 215)

            {

                int type = 0;

                bool isContain = itemTipsModel.TryGetContainsParamsType(itemTipsModel.curAttrData.itemId,out type);

                if(isContain)

                {

                    switch(type)

                    {

                        case 1:

                            int fightPower = 0;

                            itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                            itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes().Replace("{0}",fightPower.ToString());

                            break;

                    }

                }

                else

                {

                    itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes();

                }

            }

            else



            string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();

            if(infoDes.Contains("{Exp}"))

            {

                ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);

                itemDesText.text = itemTipsModel.curAttrData.GetAllInfoDes().Replace("{0}", UIHelper.ReplaceLargeNum(expValue));

                infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));

            }

             if(infoDes.Contains("{FightPower}"))

            {

                int fightPower = 0;

                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }



            itemDesText.text = infoDes;

            operateBtn.SetActive(false);



            CreateFuncBtn();


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -95,24 +95,6 @@
            FuncConfigConfig EquipOutWordID = Config.Instance.Get<FuncConfigConfig>("EquipOutWordID");

            PeerlessEquipIds = ConfigParse.GetMultipleStr<int>(EquipOutWordID.Numerical1);



            FuncConfigConfig ItemTipsNum = Config.Instance.Get<FuncConfigConfig>("ItemTipsNum");

            JsonData itemParamsData = JsonMapper.ToObject(ItemTipsNum.Numerical1);

            itemParamsDict = new Dictionary<int, List<int>>();

            foreach (var type in itemParamsData.Keys)

            {

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

                itemParamsDict.Add(int.Parse(type),list);

                if(itemParamsData[type].IsArray)

                {

                    for (int i = 0; i < itemParamsData[type].Count; i++)

                    {

                        int num = 0;

                        int.TryParse(itemParamsData[type][i].ToString(),out num);

                        list.Add(num);

                    }

                }

            }



            FuncConfigConfig legendAttrColor = Config.Instance.Get<FuncConfigConfig>("LegendAttrColor");

            equipLegendAttrTypeDict = new Dictionary<int, List<int>>();

            wingsLegendAttrColorDict = new Dictionary<int, Dictionary<int, string>>();

@@ -688,21 +670,6 @@


        private StringBuilder attrSB = new StringBuilder();

        private PlayerPropertyConfig playerProModel;



        public bool TryGetContainsParamsType(int param,out int _type)

        {

            _type = 0;

            foreach(var type in itemParamsDict.Keys)

            {

                var list = itemParamsDict[type];

                if(list.Contains(param))

                {

                    _type = type;

                    return true;

                }

            }

            return false;

        }



        #region 设置装备基础信息

        /// <summary>

@@ -2595,7 +2562,7 @@


            if (itemTipsModel.randomRuneIds.Contains(itemConfig.ID))

            {

                return string.Format(itemConfig.Description, GetExtraInfos());

                return  itemConfig.Description.Replace("{Rune}", GetExtraInfos());

            }

            else

            {


 System/Store/Logic/BuyItemInfoWin.cs

@@ -156,32 +156,19 @@


            CheckUselimit();



            if (itemTipsModel.curAttrData.itemConfig.Effect1 != 215)

            {

                int type = 0;

                bool isContain = itemTipsModel.TryGetContainsParamsType(itemTipsModel.curAttrData.itemId, out type);

                if (isContain)

                {

                    switch (type)

                    {

                        case 1:

                            int fightPower = 0;

                            itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                            itemDesText.text = itemTipsModel.curAttrData.itemConfig.Description.Replace("{0}",fightPower.ToString());

                            break;

                    }

                }

                else

                {

                    itemDesText.text = itemTipsModel.curAttrData.itemConfig.Description;

                }

              
            }

            else

            string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();

            if (infoDes.Contains("{Exp}"))

            {

                ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);

                itemDesText.text = itemTipsModel.curAttrData.itemConfig.Description.Replace("{0}", UIHelper.ReplaceLargeNum(expValue));

                infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));

            }

            if (infoDes.Contains("{FightPower}"))

            {

                int fightPower = 0;

                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }

            itemDesText.text = infoDes;



            if (itemTipsModel.curAttrData.itemConfig.ExpireTime > 0)

            {


 System/Tip/ChestDetailBehaviour.cs

@@ -97,7 +97,20 @@
                DisplayUseLimit(itemConfig);

            }



            m_Description.text = itemTipsModel.curAttrData.GetAllInfoDes();

            string infoDes = itemTipsModel.curAttrData.GetAllInfoDes();

            if (infoDes.Contains("{Exp}"))

            {

                ulong expValue = itemTipsModel.GetAddExpValue(itemTipsModel.curAttrData.itemConfig.EffectValueA1, itemTipsModel.curAttrData.itemConfig.EffectValueB1);

                infoDes = infoDes.Replace("{Exp}", UIHelper.ReplaceLargeNum(expValue));

            }

            if (infoDes.Contains("{FightPower}"))

            {

                int fightPower = 0;

                itemTipsModel.TryGetFightPowerByItemId(itemTipsModel.curAttrData.itemId, out fightPower);

                infoDes = infoDes.Replace("{FightPower}", fightPower.ToString());

            }



            m_Description.text = infoDes;



            int useCnt = BoxModel.GetUseCntByID(itemTipsModel.curAttrData.itemId);

            m_UseTimes.gameObject.SetActive(itemConfig.MaxSkillCnt > 0);