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

client_Hale

2019-04-12 37fe958376a003a36154bf9e4b456397f5c254b1

 System/FindPrecious/FindPreciousModel.cs

@@ -18,8 +18,7 @@
        Redpoint lootPreciousRedpoint = new Redpoint(LOOTPRECIOUs_REDPOINTID);



        int m_ViewKillRecordsBoss = 0;

        public int ViewKillRecordsBoss

        {

        public int ViewKillRecordsBoss {

            get { return this.m_ViewKillRecordsBoss; }

            set { this.m_ViewKillRecordsBoss = value; }

        }

@@ -28,11 +27,9 @@
        public List<BossNotify> bossNotifies = new List<BossNotify>();



        BossNotify m_CurrentBossNotify = default(BossNotify);

        public BossNotify currentBossNotify

        {

        public BossNotify currentBossNotify {

            get { return m_CurrentBossNotify; }

            private set

            {

            private set {

                if (m_CurrentBossNotify != value)

                {

                    m_CurrentBossNotify = value;

@@ -425,23 +422,25 @@
        private void UpdateRedpoint(int _redpointId)

        {

            if (_redpointId == WorldBossModel.WORLDBOSS_REDPOINT ||

                _redpointId == PersonalBossModel.PERSONAL_REDPOINTID)

                _redpointId == PersonalBossModel.PERSONAL_REDPOINTID ||

                _redpointId == DemonJarModel.DEMONJAR_REDPOINTID

                )

            {

                var worldBossRedpointCount = worldBossModel.worldBossRedPoint.count;

                var personalBossRedpointCount = personalBossModel.personalRedpoint.count;

                var totalCount = worldBossRedpointCount + personalBossRedpointCount;

                var demonJarRedpointCount = demonJarModel.redpoint.count;



                var totalCount = worldBossRedpointCount + personalBossRedpointCount + demonJarRedpointCount;

                findPreciousRedpoint.state = totalCount > 0 ? RedPointState.Quantity : RedPointState.None;

                findPreciousRedpoint.count = totalCount;

            }



            if (_redpointId == DemonJarModel.DEMONJAR_REDPOINTID ||

                _redpointId == DogzDungeonModel.DOGZDUNGEON_REDPOINT ||

            if (_redpointId == DogzDungeonModel.DOGZDUNGEON_REDPOINT ||

                _redpointId == JadeDynastyBossModel.JADEDYNASTY_REDPOINTID)

            {

                var demonJarRedpointCount = demonJarModel.redpoint.count;

                var dogzDungeonRedpointCount = dogzDungeonModel.redpoint.count;

                var jadeDynastyBossRedpointCount = jadeDynastyBossModel.redpoint.count;

                var totalCount = demonJarRedpointCount + dogzDungeonRedpointCount + jadeDynastyBossRedpointCount;

                var totalCount = dogzDungeonRedpointCount + jadeDynastyBossRedpointCount;



                lootPreciousRedpoint.count = totalCount;

                lootPreciousRedpoint.state = totalCount > 0 ? RedPointState.Quantity : RedPointState.None;