Merge branch '法宝、法宝魂修改'

client_linchunjie

2018-08-18 f4f07847775c12b338d8bccedbbabc067dc1ae2c

 System/Treasure/TreasureSoulPattern2.cs

@@ -47,13 +47,12 @@


        private void Display()

        {

            var specialData = treasure.specialData;

            var configs = ConfigManager.Instance.GetAllValues<ItemPlusSumAttrConfig>();

            var present = -1;

            var next = 0;

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

            {

                if (specialData.presentFinishCount >= configs[i].countNeed)

                if (special.presentFinishCount >= configs[i].countNeed)

                {

                    present = i;

                }

@@ -87,22 +86,22 @@
                    }

                }

            }

            m_Complete.gameObject.SetActive(specialData.state == TreasurePrivilegeState.Complete);

            m_Goto.gameObject.SetActive(specialData.state == TreasurePrivilegeState.Doing);

            m_Get.gameObject.SetActive(specialData.state == TreasurePrivilegeState.Reward);

            m_Progress.text = specialData.ProgressDisplay();

            m_Complete.gameObject.SetActive(special.state == TreasurePrivilegeState.Complete);

            m_Goto.gameObject.SetActive(special.state == TreasurePrivilegeState.Doing);

            m_Get.gameObject.SetActive(special.state == TreasurePrivilegeState.Reward);

            m_Progress.text = special.ProgressDisplay();

            //m_Progress.color = specialData.state == TreasurePrivilegeState.Doing ? UIHelper.GetUIColor(TextColType.Red, true) : UIHelper.GetUIColor(TextColType.Green, true);

        }



        private void OnGoto()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RebornOpenStrength);

            model.gotoSoul = treasure.id;

            model.gotoSoul = (int)special.type;

        }



        private void OnGet()

        {

            treasure.specialData.GetReward();

            special.GetReward();

        }

    }

}