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

client_Hale

2019-01-21 a56b87458cd32bcea06e3fcc8a2d25e295745f10

 System/FindPrecious/FindPreciousModel.cs

@@ -56,6 +56,7 @@
        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }

        PersonalBossModel personalBossModel { get { return ModelCenter.Instance.GetModel<PersonalBossModel>(); } }

        DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }

        JadeDynastyBossModel jadeDynastyBossModel { get { return ModelCenter.Instance.GetModel<JadeDynastyBossModel>(); } }



        public override void Init()

        {

@@ -431,11 +432,13 @@
            }



            if (_redpointId == DemonJarModel.DEMONJAR_REDPOINTID ||

                _redpointId == DogzDungeonModel.DOGZDUNGEON_REDPOINT)

                _redpointId == DogzDungeonModel.DOGZDUNGEON_REDPOINT ||

                _redpointId == JadeDynastyBossModel.JADEDYNASTY_REDPOINTID)

            {

                var demonJarRedpointCount = demonJarModel.redpoint.count;

                var dogzDungeonRedpointCount = dogzDungeonModel.redpoint.count;

                var totalCount = demonJarRedpointCount + dogzDungeonRedpointCount;

                var jadeDynastyBossRedpointCount = jadeDynastyBossModel.redpoint.count;

                var totalCount = demonJarRedpointCount + dogzDungeonRedpointCount + jadeDynastyBossRedpointCount;



                lootPreciousRedpoint.count = totalCount;

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

@@ -472,7 +475,10 @@
            {

                return FindPreciousType.CrossServerBoss;

            }



            else if (jadeDynastyBossModel.IsJadeDynastyBoss(_bossId))

            {

                return FindPreciousType.JadeDynastyBoss;

            }

            return FindPreciousType.None;

        }