Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2018-10-09 2e7aa5faabcbe00757c74379f67b3231b1b3370f

 System/Treasure/TreasureLevelUpWin.cs

@@ -169,6 +169,7 @@
            m_Slider.slider.onValueChanged.AddListener(OnSliderValueUpdate);

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            model.skillLevelUpRedpointUpdate += SkillLevelUpRedpointUpdate;

            m_DragSelect.onDragComplete += onDragComplete;



            CameraManager.uiCamera.enabled = true;

@@ -215,6 +216,7 @@
            model.treasureStateChangeEvent -= TreasureStateChangeEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

            m_DragSelect.onDragComplete -= onDragComplete;

            model.skillLevelUpRedpointUpdate -= SkillLevelUpRedpointUpdate;

            m_Slider.slider.onValueChanged.RemoveAllListeners();

            m_TreasurePotential.Dispose();

            m_AchievementScroll.Dispose();

@@ -1203,14 +1205,15 @@
                    UpdateLevelUpSfx(false);

                }

            }

            if (_id == TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

            {

                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);

            }

        }



        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);

        }



        protected override void LateUpdate()