2805【前端】超值礼包新增显示仙玉余额

client_linchunjie

2018-08-23 522ca3468a56c88cb15eaa428eb7499d3dba386f

 System/FindPrecious/DemonJarWin.cs

@@ -65,6 +65,7 @@
        {

            model.bossSelectedEvent += OnBossSelected;

            findPreciousModel.bossSubscribeChangeEvent += OnSubscribeBoss;

            dungeonModel.dungeonRecordChangeEvent += OnRemaintimeUpdate;

            dungeonModel.countRemainTimeChangeEvent += OnRemaintimeUpdate;

            dungeonModel.updateDungeonBuyCnt += OnBuyTimesOk;

            model.doubleAwardChangeEvent += OnDoubleAwardChange;

@@ -75,6 +76,7 @@
            guideChallenge = false;

            model.bossSelectedEvent -= OnBossSelected;

            findPreciousModel.bossSubscribeChangeEvent -= OnSubscribeBoss;

            dungeonModel.dungeonRecordChangeEvent -= OnRemaintimeUpdate;

            dungeonModel.countRemainTimeChangeEvent -= OnRemaintimeUpdate;

            dungeonModel.updateDungeonBuyCnt -= OnBuyTimesOk;

            model.doubleAwardChangeEvent -= OnDoubleAwardChange;

@@ -106,14 +108,14 @@
                var targetBoss = model.GetLatestUnLockBoss();

                if (!findPreciousModel.IsBossAlive(targetBoss))

                {

                    var priorConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(targetBoss);

                    var priorConfig = Config.Instance.Get<NPCConfig>(targetBoss);

                    if (priorConfig.NPCLV <= GeneralConfig.Instance.demonJarLevelLimit)

                    {

                        targetBoss = bosses[0];

                        for (int i = bosses.Count - 1; i >= 0; i--)

                        {

                            var bossId = bosses[i];

                            var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(bossId);

                            var npcConfig = Config.Instance.Get<NPCConfig>(bossId);

                            if (npcConfig.NPCLV <= priorConfig.NPCLV && findPreciousModel.IsBossAlive(bossId))

                            {

                                targetBoss = bossId;

@@ -128,11 +130,11 @@


            DemonJarBossData bossData;

            model.TryGetBossData(model.selectedBoss, out bossData);

            var npcDropConfig = ConfigManager.Instance.GetTemplate<NPCDropItemConfig>(bossData.id);

            var npcDropConfig = Config.Instance.Get<NPCDropItemConfig>(bossData.id);

            m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);

            m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(model.selectedBoss);



            var demonJarConfig = ConfigManager.Instance.GetTemplate<DemonJarConfig>(model.selectedBoss);

            var demonJarConfig = Config.Instance.Get<DemonJarConfig>(model.selectedBoss);

            var doubleShowable = demonJarConfig.CanEnterTimes == 0;



            m_ContainerDouble.gameObject.SetActive(doubleShowable);

@@ -215,7 +217,7 @@
            var error = 0;

            if (TestEnterDungeon(out error))

            {

                var config = ConfigManager.Instance.GetTemplate<DemonJarConfig>(model.selectedBoss);

                var config = Config.Instance.Get<DemonJarConfig>(model.selectedBoss);

                if (config.LineID == GeneralConfig.Instance.demonJarHintLineId && PlayerDatas.Instance.baseData.LV < GeneralConfig.Instance.demonJarHintLevelLimit)

                {

                    var grade = dungeonModel.GetDungeonGrade(new Dungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID));

@@ -275,7 +277,7 @@
                            {

                                if (_ok)

                                {

                                    var config = ConfigManager.Instance.GetTemplate<DemonJarConfig>(model.selectedBoss);

                                    var config = Config.Instance.Get<DemonJarConfig>(model.selectedBoss);

                                    dungeonModel.SingleChallengeDungeon(DemonJarModel.DEMONJAR_MAPID, config.LineID);

                                }



@@ -296,6 +298,9 @@
            {

                return;

            }



            totalTimes = dungeonModel.GetDungeonTotalTimes(DemonJarModel.DEMONJAR_MAPID);

            enterTimes = dungeonModel.GetDungeonEnterTimes(DemonJarModel.DEMONJAR_MAPID);



            m_Times.text = StringUtility.Contact(totalTimes - enterTimes, "/", DemonJarModel.TOTALTIME_LIMIT);



@@ -355,7 +360,7 @@
                return false;

            }



            var config = ConfigManager.Instance.GetTemplate<DemonJarConfig>(model.selectedBoss);

            var config = Config.Instance.Get<DemonJarConfig>(model.selectedBoss);

            if (config.CanEnterTimes == 0 && model.isDoubleAward && totalTimes - enterTimes < 2)

            {

                _error = 4;

@@ -378,15 +383,15 @@
            m_BossIntroduce.Display(_bossId, false);

            m_Subscribe.isOn = findPreciousModel.IsBossSubscribed(_bossId);



            var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(_bossId);

            var npcConfig = Config.Instance.Get<NPCConfig>(_bossId);

            m_RewardDescription.text = Language.Get(npcConfig.NPCLV >= GeneralConfig.Instance.demonJarLevelLimit ? "FindPrecious_13" : "FindPrecious_18");



            DemonJarBossData bossData;

            model.TryGetBossData(_bossId, out bossData);

            var npcDropConfig = ConfigManager.Instance.GetTemplate<NPCDropItemConfig>(bossData.id);

            var npcDropConfig = Config.Instance.Get<NPCDropItemConfig>(bossData.id);

            m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV);



            var demonJarConfig = ConfigManager.Instance.GetTemplate<DemonJarConfig>(model.selectedBoss);

            var demonJarConfig = Config.Instance.Get<DemonJarConfig>(model.selectedBoss);

            var doubleShowable = demonJarConfig.CanEnterTimes == 0;

            m_ContainerDouble.gameObject.SetActive(doubleShowable);

            if (doubleShowable)

@@ -399,7 +404,7 @@
        {

            if (AchievementGoto.guideAchievementId != 0)

            {

                var config = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);

                var config = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                var condition = config.Type == 99 && config.Condition[0] == DemonJarModel.DEMONJAR_MAPID;



                if (condition)

@@ -414,7 +419,7 @@
        {

            if (AchievementGoto.guideAchievementId != 0)

            {

                var config = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);

                var config = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                var condition = config.Type == 36 && config.Condition[0] == model.selectedBoss;

                condition = condition || config.Type == 81;