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

client_Wu Xijin

2018-12-05 62728f6190e21533b86673afb6763c3c488a4a4f

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

 System/MainInterfacePanel/TaskListTip.cs

@@ -243,7 +243,10 @@
            //    }



            //}

            StartCoroutine(WaitAddTask(MissionID, MissionState));

            if (WindowCenter.Instance.IsOpen("MainInterfaceWin"))

            {

                StartCoroutine(WaitAddTask(MissionID, MissionState));

            }       
        }



        IEnumerator WaitAddTask(int MissionID, int MissionState)


 System/Mount/PlayerMountDatas.cs

@@ -363,20 +363,22 @@
    }



    public int GetMinExpMount()

    {

        int GetMountID = 0;

        int NeedExp = 99999999;

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

    {    
        foreach (var key in ASingleFeedRedPoint.Keys)//当存在驯养红点时选中当有红点的那只

        {

            int horseID = SortMount[i].HorseID;

            if (_DicHorse.ContainsKey(horseID) && _DicHorse[horseID].Lv < Config.Instance.Get<HorseConfig>(horseID).MaxLV)

            if (ASingleFeedRedPoint[key].state == RedPointState.Simple)

            {

                int _NeedExp = HorseUpConfig.GetHorseIDAndLV(horseID, (_DicHorse[horseID].Lv)).NeedExp;

                if (_NeedExp - _DicHorse[horseID].Exp < NeedExp)

                {

                    NeedExp = _NeedExp - _DicHorse[horseID].Exp;

                    GetMountID = horseID;

                }

                return key;

            }

        }

        int GetMountID = 0;

        int MountLV = 999;

        foreach (var key in _DicHorse.Keys)//无红点时跳转选中最低阶数

        {

            if (_DicHorse[key].Lv < MountLV)

            {

                GetMountID = key;

                MountLV = _DicHorse[key].Lv;

            }

        }

        return GetMountID;


 System/Pet/PlayerPetDatas.cs

@@ -391,20 +391,22 @@
    }



    public int GetMinPetExp()

    {

        int GetPetId = 0;

        int NeedExp = 99999999;

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

    {     
        foreach (var key in CultivateRedPoint.Keys)//当存在培养红点时，选中当有红点的那只

        {

            int petID = Sortpet[i].ID;

            if (_DicPetBack.ContainsKey(petID) && _DicPetBack[petID].PetClass < Config.Instance.Get<PetInfoConfig>(petID).MaxRank)

            if (CultivateRedPoint[key].state == RedPointState.Simple)

            {

                int _NeedExp = PetClassCostConfig.GetPetIdAndRank(petID, _DicPetBack[petID].PetClass).UpNeedExp;

                if (_NeedExp - _DicPetBack[petID].petExp < NeedExp)

                {

                    NeedExp = _NeedExp - _DicPetBack[petID].petExp;

                    GetPetId = petID;

                }

                return key;

            }

        }

        int GetPetId = 0;

        int GetPetLv = 999;

        foreach (var key in _DicPetBack.Keys)//无红点时跳转选中等级最低的

        {

            if (_DicPetBack[key].PetClass < GetPetLv)

            {

                GetPetId = key;

                GetPetLv = _DicPetBack[key].PetClass;

            }

        }

        return GetPetId;


 System/Rune/RuneMosaicWin.cs

@@ -44,6 +44,7 @@


        [SerializeField] RectTransform m_ContainerGetRune;

        [SerializeField] Button m_GotoGetRuneBtn;

        [SerializeField] Button m_GotoFindRune;



        [SerializeField] RectTransform m_ContainerSpecial;

        [SerializeField] Button m_UnlockSpecialHole;

@@ -82,6 +83,7 @@
            m_RuneLevelUpBtn.onClick.AddListener(OnRuneUpBtn);

            m_RunePreviewBtn.onClick.AddListener(OnRunePreviewBtn);

            m_GotoGetRuneBtn.onClick.AddListener(OnGotoGetRune);

            m_GotoFindRune.onClick.AddListener(GotoFindRune);

            m_UnlockSpecialHole.onClick.AddListener(UnlockSpecialHole);

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

            {

@@ -169,6 +171,11 @@
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RuneTower);

        }



        private void GotoFindRune()

        {

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RuneXB);

        }



        bool HandleAchievement()

        {

            if (AchievementGoto.achievementType == AchievementGoto.RuneLevelUp)