Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Treasure/TreasureLevelUpWin.cs

@@ -347,10 +347,8 @@
            _leftRifht = Config.Instance.Get<TreasureConfig>(model.selectedTreasure - 1);

            m_LeftBtn.gameObject.SetActive(_leftRifht != null);

            var skillLevelUpRedpointTreasure = model.GetSkillLevelUpRedpointTreasure();

            m_LeftRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                && model.selectedTreasure > skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

            m_RightRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                && model.selectedTreasure < skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

            m_LeftRedpoint.gameObject.SetActive(false);

            m_RightRedpoint.gameObject.SetActive(false);

        }



        private void HideHuman()

@@ -1210,10 +1208,8 @@
        private void SkillLevelUpRedpointUpdate()

        {

            var skillLevelUpRedpointTreasure = model.GetSkillLevelUpRedpointTreasure();

            m_LeftRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                && model.selectedTreasure > skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

            m_RightRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                && model.selectedTreasure < skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

            m_LeftRedpoint.gameObject.SetActive(false);

            m_RightRedpoint.gameObject.SetActive(false);

        }



        protected override void LateUpdate()