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

client_Wu Xijin

2019-06-27 e86b563f0ff78795593c21d62733730644834d52

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

 Fight/Actor/AI/HeroAI_Auto.cs

@@ -1,4 +1,5 @@


using System;

using Snxxz.UI;



using UnityEngine;

@@ -70,22 +71,14 @@
            xpSkillID = ConfigParse.GetDic<int, int>(_funcConfig.Numerical1)[PlayerDatas.Instance.baseData.Job];//获取各个职业的XP技能

        }



        GA_Hero _hero = PlayerDatas.Instance.hero;

        if (_hero != null)

        var _skillModel = ModelCenter.Instance.GetModel<SkillModel>();

        var _skillList = _skillModel.GetSkillMatchs();

        if (_skillList != null)

        {

            if (!string.IsNullOrEmpty(_hero.JobSetup.DungeonSkillList))

            m_HandUpSkill = new int[_skillList.Count];

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

            {

                var _json = LitJson.JsonMapper.ToObject(_hero.JobSetup.DungeonSkillList);

                var _key = PlayerDatas.Instance.baseData.MapID.ToString();

                if (((System.Collections.IDictionary)_json).Contains(_key))

                {

                    _json = _json[_key];

                    m_HandUpSkill = new int[_json.Count];

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

                    {

                        m_HandUpSkill[i] = (int)_json[i];

                    }

                }

                m_HandUpSkill[i] = _skillList[i];

            }

        }



@@ -110,8 +103,23 @@
        UserInputHandler.OnClickedFloor += OnClickFloor;

        GA_Hero.OnLockTargetChanged += OnLockTargetChanged;

        HeroBehaviour.OnUserClickSkill += OnUserClickSkill;

        _skillModel.onSkillMatchPageUpdate += OnSkillMatchPageUpdate;



        OnEnter();

    }



    private void OnSkillMatchPageUpdate()

    {

        var _skillModel = ModelCenter.Instance.GetModel<SkillModel>();

        var _skillList = _skillModel.GetSkillMatchs();

        if (_skillList != null)

        {

            m_HandUpSkill = new int[_skillList.Count];

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

            {

                m_HandUpSkill[i] = _skillList[i];

            }

        }

    }



    public sealed override void Update()

@@ -433,7 +441,9 @@
        UserInputHandler.OnCirclePanelTouched -= OnActiveInterrupt;

        UserInputHandler.OnClickedFloor -= OnClickFloor;

        HeroBehaviour.OnUserClickSkill -= OnUserClickSkill;



        GA_Hero.OnLockTargetChanged -= OnLockTargetChanged;

        var _skillModel = ModelCenter.Instance.GetModel<SkillModel>();

        _skillModel.onSkillMatchPageUpdate -= OnSkillMatchPageUpdate;

        OnExit();

    }




 System/Equip/EquipSuitEffect.cs

@@ -71,6 +71,12 @@
        static IEnumerator Co_SetOrder(EquipSuitEffect behaviour, RectTransform transform)

        {

            yield return null;



            if (transform == null || behaviour == null)

            {

                yield break;

            }



            Canvas canva = transform.GetComponentInParent<Canvas>();

            if (canva != null)

            {


 System/FairyAu/FairyModel.cs

@@ -88,7 +88,7 @@
            {

                if (PlayerDatas.Instance.fairyData.HasFairy)

                {

                    functionOrder = 2;

                    functionOrder = 1;

                    if (RedpointCenter.Instance.GetRedpointState(10701) == RedPointState.Simple)

                    {

                        functionOrder = 1;


 System/FindPrecious/WorldBossCountWin.cs

@@ -21,8 +21,8 @@


    protected override void BindController()

    {

        m_WorldBossCellAry[0].Init(1128, false);

        m_WorldBossCellAry[1].Init(1129, false);

        m_WorldBossCellAry[0].Init(1129, false);

        m_WorldBossCellAry[1].Init(1128, false);

        m_WorldBossCellAry[2].Init(4680, true);

    }




 System/FindPrecious/WorldBossWin.cs

@@ -24,11 +24,13 @@
        [SerializeField] RectTransform m_NoDamageTip;

        [SerializeField] ToggleButton m_Subscribe;

        [SerializeField] Button m_BuyTimesBtn;

        [SerializeField] GameObject m_BuyTip;



        WorldBossModel model { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } }

        FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }

        PackModel m_PackModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }



        #region Built-in

        protected override void BindController()

@@ -47,6 +49,7 @@
        {

            OnBossWearyValue();

            model.UpdateAddTimesRedPoint();

            m_BuyTip.gameObject.SetActive(IsShowBuyTip());

        }



        protected override void OnAfterOpen()

@@ -74,10 +77,38 @@
        }

        #endregion



        private bool IsShowBuyTip()

        {

            int bossRemainCount = model.GetWorldBossRemainCount();

            if(bossRemainCount == model.WorldBossMaxCount)

            {

                return false;

            }

            ulong activePoint = UIHelper.GetMoneyCnt(15);

            StoreConfig storeConfig = StoreConfig.Get(351);

            var price = storeConfig.MoneyNumber;

            if( (ulong)price > activePoint )

            {

                return false;

            }

            int remainBuyCount = BuyItemController.Instance.GetBuyCountLimit(351, PlayerDatas.Instance.baseData.LV);

            if(remainBuyCount == 0)

            {

                return false;

            }

            int remainUseCount = ItemConfig.Get(1129).MaxSkillCnt - m_PackModel.GetItemUsedTimesToday(1129);

            if(remainUseCount == 0)

            {

                return false;

            }

            return true;

        }



        private void OnBuyTimesBtnDown()

        {

            WindowCenter.Instance.Open<WorldBossCountWin>();

            model.worldBossAddTimeRedPoint.state = RedPointState.None;

            m_BuyTip.gameObject.SetActive(false);

        }



        private void ShowBosses()