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

client_Wu Xijin

2019-03-28 1cf3e62a38daceec7e9a7bdd09b25c34b94745b4

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

 System/FairyAu/FairyApplyWin.cs

@@ -218,6 +218,14 @@
                SysNotifyMgr.Instance.ShowTip("FairyGrabBossExitError");

                return;

            }



            var auctionModel = ModelCenter.Instance.GetModel<AuctionInquiryModel>();

            if (!auctionModel.IsFamilyQuit())

            {

                SysNotifyMgr.Instance.ShowTip("ExitFairyError_Auction");

                return;

            }



            PlayerFairyData.FairyData fairy = PlayerDatas.Instance.fairyData.fairy;

            if (fairy != null)

            {


 System/Treasure/TreasureModel.cs

@@ -506,6 +506,21 @@
            return 0;

        }



        public int GetTreasureBySkillId(int skillId)

        {

            var list = GetTreasureCategory(TreasureCategory.Human);

            for (int i = 0; i < list.Count; i++)

            {

                Treasure treasure;

                if (TryGetTreasure(list[i], out treasure)

                    && treasure.skillId == skillId)

                {

                    return list[i];

                }

            }

            return 0;

        }



        public List<int> GetFurnacesAchievements()

        {

            return eightFurnacesAchievements;

@@ -547,7 +562,7 @@
                    continue;

                }

                var config = TreasureConfig.Get(id);

                if (config.PreTreasure == 0 || treasures[config.PreTreasure].state != TreasureState.Collected)

                if (config.PreTreasure != 0 && treasures[config.PreTreasure].state != TreasureState.Collected)

                {

                    continue;

                }

@@ -935,21 +950,6 @@
            {

                demonDungeonChallengeNext();

            }

        }



        public int GetTreasureBySkillId(int skillId)

        {

            var list = GetTreasureCategory(TreasureCategory.Human);

            for (int i = 0; i < list.Count; i++)

            {

                Treasure treasure;

                if (TryGetTreasure(list[i], out treasure)

                    && treasure.skillId == skillId)

                {

                    return list[i];

                }

            }

            return 0;

        }

    }