3638【前端】潜力溶彩石添加修改

client_linchunjie

2018-09-21 5d01238460d6f5f39a3387222d8cb20a62a58ddc

3638【前端】潜力溶彩石添加修改

 System/Treasure/DragSelectComponent.cs

@@ -24,7 +24,8 @@
            if (Input.touchCount > 1 || NewBieCenter.Instance.inGuiding

                || WindowCenter.Instance.CheckOpen<TreasureNewStageWin>()

                || WindowCenter.Instance.CheckOpen<PotentialItemUseWin>()

                || WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>())

                || WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>()

                || WindowCenter.Instance.CheckOpen<GetItemPathWin>())

            {

                m_StartDrag = false;

                return;


 System/Treasure/PotentialItemBehaviour.cs

@@ -51,9 +51,9 @@
            m_ItemBehaviour.SetItem(potentialBook.itemId, 1);

            m_CostCount.text = StringUtility.Contact(own, "/", need);

            m_CostCount.color = own >= need ? UIHelper.GetUIColor(TextColType.White) : UIHelper.GetUIColor(TextColType.Red);

            m_Click.interactable = own >= need;

            //m_Click.interactable = own >= need;

            m_AddBtnText.color = own >= need ? UIHelper.GetUIColor(TextColType.NavyBrown) : UIHelper.GetUIColor(TextColType.White);

            m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            //m_Click.image.material = own >= need ? m_SmoothMask.imageMaterials[0] : m_SmoothMask.imageMaterials[1];

            var config = Config.Instance.Get<TreasureSkillConfig>(potentialBook.levelUpId);

            var upRate = potentialBook.successRate - config.InitialRate;

            m_SuccessRatio.text = Language.Get("HallowsWin_UpSuccess", StringUtility.Contact((upRate * 0.01f).ToString("f0"), "%"));

@@ -61,15 +61,15 @@


        private void SelectPotentialBook()

        {

            if (own >= need)

            {

            //if (own >= need)

            //{

                model.selectedPotentialBook = potentialBook.itemId;

                WindowCenter.Instance.Close<PotentialItemUseWin>();

            }

            else

            {

                SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");

            }

            //}

            //else

            //{

            //    SysNotifyMgr.Instance.ShowTip("SPItemNotEnough");

            //}

        }



        private void Awake()


 System/Treasure/TreasurePotentialBriefInfo.cs

@@ -80,7 +80,7 @@


        private void SelectPotential()

        {

            if (potential == null || !model.IsPotentialUnlock(model.selectedTreasure, potential.id))

            if (potential == null/* || !model.IsPotentialUnlock(model.selectedTreasure, potential.id)*/)

            {

                return;

            }


 System/Treasure/TreasurePotentialPanel.cs

@@ -84,7 +84,8 @@
                    var level = potential.level;

                    var isMax = level >= config.SkillMaxLV;

                    m_PotentialMaxLevelTip.gameObject.SetActive(isMax);

                    m_ContainerUpgrade.gameObject.SetActive(!isMax && FuncOpen.Instance.IsFuncOpen(82));

                    m_ContainerUpgrade.gameObject.SetActive(!isMax &&

                        FuncOpen.Instance.IsFuncOpen(82) && model.IsPotentialUnlock(m_Treasure.id, selectedPotential));

                    m_ContainerRequirement.gameObject.SetActive(!isMax);



                    if (!isMax)

@@ -93,7 +94,6 @@
                        DisplayUpgradeCost();

                        DisplayGetSkill();

                        DisplaySuccessRatio();

                        m_UpgradeImage.gray = !TestPotentialLevelUp();

                    }

                    else

                    {

@@ -526,13 +526,18 @@
            {

                return;

            }

            if (config.InitialRate >= 100)

            {

                model.selectedPotentialBook = 0;

                return;

            }

            var itemId = config.Meterial2ID.Length > 0 ? config.Meterial2ID[0] : 0;

            if (itemId != 0)

            {

                var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);

                var need = config.MeterialNum2[0];

                //var own = playerPack.GetItemCountByID(PackType.rptItem, itemId);

                //var need = config.MeterialNum2[0];

                var rate = config.Rate[0];

                if (rate >= 60 && own >= need)

                if (rate >= 60)

                {

                    model.selectedPotentialBook = itemId;

                }

@@ -550,7 +555,6 @@
            m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);

            m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));

            m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);

            m_UpgradeImage.gray = spOwn < spNeed;

        }



        private void DisplayGetSkill(bool _levelUp = false)

@@ -591,9 +595,10 @@
        {

            var levelUpConfig = GetPotentialLevelUpConfig();

            m_SuccessRatio.text = StringUtility.Contact((levelUpConfig.rate * 0.01f).ToString("f0"), "%");

            m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0);

            m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 ? TextColType.DarkGreen : TextColType.LightYellow);

            m_UpgradeImage.gray = !TestPotentialLevelUp();

            m_RatioUp.gameObject.SetActive(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0);

            m_SuccessRatio.color = UIHelper.GetUIColor(model.selectedPotentialBook != 0 && levelUpConfig.rate > 0

                ? TextColType.DarkGreen : TextColType.LightYellow);

            m_UpgradeImage.gray = levelUpConfig.rate == 0 && model.selectedPotentialBook == 0;

        }



        private void DisplayAddBookRedpoint()

@@ -644,7 +649,9 @@
                m_PotentialBook.SetItem(_potentialBookId, 1);



                var levelUpConfig = GetPotentialLevelUpConfig();

                m_PotentialCount.text = StringUtility.Contact(levelUpConfig.own, "/", levelUpConfig.need);

                bool satisfy = levelUpConfig.own >= levelUpConfig.need;

                m_PotentialCount.text = StringUtility.Contact(UIHelper.GetTextColorByItemColor(satisfy ?

                    TextColType.LightYellow : TextColType.Red, levelUpConfig.own.ToString()), "/", levelUpConfig.need);

            }



            DisplaySuccessRatio();

@@ -657,10 +664,14 @@
            if (packType == PackType.rptItem && config != null && config.Type == 6)

            {

                var levelUpConfig = GetPotentialLevelUpConfig();

                if (levelUpConfig.own < levelUpConfig.need)

                if (_id == model.selectedPotentialBook)

                {

                    model.selectedPotentialBook = 0;

                    DisplayPotentialBook(model.selectedPotentialBook);

                }

                //if (levelUpConfig.own < levelUpConfig.need)

                //{

                //    model.selectedPotentialBook = 0;

                //}

            }

        }



@@ -687,13 +698,21 @@
                        }

                        break;

                    case 3:

                        MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));

                        ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(148);

                        //MessageWin.Inst.ShowFixedTip(Language.Get("Hallows_SpUnEnough"));

                        break;

                    case 4:

                        SysNotifyMgr.Instance.ShowTip("TreasureUnsealed");

                        break;

                    case 6:

                        SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");

                        if (model.selectedPotentialBook != 0)

                        {

                            ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(model.selectedPotentialBook);

                        }

                        else

                        {

                            SysNotifyMgr.Instance.ShowTip("LevelUpZeroRate");

                        }

                        break;

                }



@@ -840,9 +859,10 @@
            }



            var levelUpConfig = GetPotentialLevelUpConfig();

            if (levelUpConfig.own < levelUpConfig.need || !ContainsPotentialBook(model.selectedPotentialBook))

            if (!ContainsPotentialBook(model.selectedPotentialBook))

            {

                model.selectedPotentialBook = 0;

                AutoSelectPotentialBook();

                //model.selectedPotentialBook = 0;

            }



            var curconfig = Config.Instance.Get<SkillConfig>(potential.id);

@@ -924,7 +944,6 @@
                    m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn);

                    m_SPNeed.text = StringUtility.Contact("/", UIHelper.ReplaceLargeNum(spNeed));

                    m_SPOwn.color = spOwn >= spNeed ? UIHelper.GetUIColor(TextColType.DarkGreen) : UIHelper.GetUIColor(TextColType.Red);

                    m_UpgradeImage.gray = !TestPotentialLevelUp();

                    break;

            }

        }