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

client_Wu Xijin

2018-10-09 00862a9a8898036aa904baae68e3eedf6fcdc4cc

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

 System/KnapSack/Logic/EquipDevourWin.cs

@@ -588,10 +588,10 @@


        public void SendEquipdevourQuest()

        {

            if (!modelInterface.isPackResetOk) return;

            if (!modelInterface.isPackResetOk || SettingEffectMgr.Instance.isStartDecompose) return;



            playerPack.isAutoDecompose = false;



            SettingEffectMgr.Instance.isStartDecompose = true;

            CA32C_tagCMEquipDecompose _petEat = new CA32C_tagCMEquipDecompose();

            byte[] _petIndex = new byte[realDevourlist.Count];

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


 System/KnapSack/Logic/PackModelInterface.cs

@@ -1213,8 +1213,9 @@
        /// <param name="_oneKeySelllist"></param>

        public void SendOneKeySellQuest(List<ItemModel> _oneKeySelllist)

        {

            if (!isPackResetOk) return;

            if (!isPackResetOk || SettingEffectMgr.Instance.isStartOneKeySell) return;



            SettingEffectMgr.Instance.isStartOneKeySell = true;

            byte[] itemIndexs = new byte[_oneKeySelllist.Count];

            int i = 0;

            for (i = 0; i < _oneKeySelllist.Count; i++)


 System/KnapSack/Logic/PlayerPackModels.cs

@@ -1398,8 +1398,9 @@
        public void SendEquipdevourQuest()

        {

            List<ItemModel> itemModels = GetCanDevourModellist();

            if (itemModels == null || itemModels.Count < minDecomposeNum || !modelInterface.isPackResetOk) return;

            if (itemModels == null || itemModels.Count < minDecomposeNum || !modelInterface.isPackResetOk || SettingEffectMgr.Instance.isStartDecompose) return;



            SettingEffectMgr.Instance.isStartDecompose = true;

            isAutoDecompose = true;

            recordAutoDecomNum = itemModels.Count;

            CA32C_tagCMEquipDecompose _petEat = new CA32C_tagCMEquipDecompose();


 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -63,6 +63,7 @@
        CapacityDelayModel capacityDelayModel { get { return m_CapacityDelayModel ?? (m_CapacityDelayModel = ModelCenter.Instance.GetModel<CapacityDelayModel>()); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        private int vipExperienceSurplusTime = 0;

        private int GetLv = 0;//获取人物等级

        public void Init()

        {

            loadingtime = 0f;

@@ -329,7 +330,7 @@


        void Initialize()//关于数据的初始化

        {



            GetLv = PlayerDatas.Instance.baseData.LV;

            _LVText.text = PlayerDatas.Instance.baseData.LV.ToString();//等级的初始化

            _Hp_number.text = PlayerDatas.Instance.baseData.HP.ToString() + "/" + PlayerDatas.Instance.extersion.MaxHP.ToString();//人物血量的初始化

            _hp = (int)PlayerDatas.Instance.baseData.HP;

@@ -368,6 +369,11 @@
                    break;

                case PlayerDataRefresh.LV://等级的刷新8

                    _LVText.text = PlayerDatas.Instance.baseData.LV.ToString();

                    if (PlayerDatas.Instance.baseData.LV > GetLv)

                    {

                        GetLv = PlayerDatas.Instance.baseData.LV;

                        WindowCenter.Instance.Open<UpgradeWin>();

                    }                 
                    break;

                case PlayerDataRefresh.MaxHP://最大血量的刷新28

                    _maxHp = (int)PlayerDatas.Instance.extersion.MaxHP;


 System/MainInterfacePanel/UpgradeWin.cs

@@ -9,15 +9,14 @@
using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI {
namespace Snxxz.UI

{

    public class UpgradeWin : Window
    {
        [SerializeField] UIAlphaTween m_UIAlphaTween;

        [SerializeField] ScaleTween m_ScaleTween;

        [SerializeField] UIAlphaTween m_UIAlphaTween1;
        [SerializeField] GameObject m_Guang;
    {

        [SerializeField] ScaleTween m_ScaleTween;
        [SerializeField] Text m_TextLV;
        [SerializeField] UIEffect m_UIEffect;
        #region Built-in
        protected override void BindController()
        {
@@ -28,31 +27,34 @@
        }

        protected override void OnPreOpen()
        {
          //  m_Guang.SetActive(false);
            m_TextLV.text = PlayerDatas.Instance.baseData.LV.ToString();
            m_UIAlphaTween1.SetEndState();




        {

            m_TextLV.text = PlayerDatas.Instance.baseData.LV.ToString();

        }
        protected override void OnActived()

        {

            m_UIAlphaTween.Play(ShowOverAlpha);

            m_UIEffect.Play();

            m_UIEffect.OnComplete = () => { CloseImmediately(); };

            m_ScaleTween.Play();

        }
        protected override void OnAfterOpen()
        {

           
            WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeClose;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)
        }

        protected override void OnPreClose()
        {

            if (m_UIEffect.IsPlaying)

            {

                m_UIEffect.Stop();

            }

            WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeClose;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)
        }



        protected override void OnAfterClose()
        {
        }

        #endregion

        private void windowBeforeClose(Window _window)

        {

            if (_window is MainInterfaceWin)

@@ -69,15 +71,6 @@
            }

        }



        protected override void OnAfterClose()
        {
        }

        #endregion
        private void ShowOverAlpha()

        {

            m_UIAlphaTween.Play(true);

            m_UIAlphaTween1.Play(true);

        }
    }

}

 System/Store/BuyItemPopModel.cs

@@ -106,23 +106,9 @@
        int count = 0;
        IsReachUpper = false;
        if(canBuyCnt == 0)
        {
            if(isVipBuy)
            {
                IsReachUpper = true;
            }
            else
            {
                if (buyCnt <= 9999)
                {
                    count = buyCnt;
                }
                else
                {
                    count = 9999;
                    IsReachUpper = true;
                }
            }
        {

            IsReachUpper = true;
            count = 0;
        }
        else
        {

 System/Store/Logic/BuyBoxInfoWin.cs

@@ -336,7 +336,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -361,7 +361,6 @@
                if(curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

                }

                else

                {

@@ -373,7 +372,6 @@
            {

                vipInfoText.gameObject.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/Store/Logic/BuyEquipTip.cs

@@ -690,8 +690,8 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            if(itemAttrData.itemConfig.PackCount > 1)

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemAttrData.itemConfig.PackCount > 1)

            {

                _numberGo.gameObject.SetActive(true);

            }

@@ -715,7 +715,6 @@
                if (curVipIndex != -1)

                {

                    btnGroup.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

@@ -727,7 +726,6 @@
            {

                vipInfoText.gameObject.SetActive(false);

                btnGroup.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/Store/Logic/BuyGuardTip.cs

@@ -398,7 +398,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemAttrData.itemConfig.PackCount > 1)

            {

                _numberGo.gameObject.SetActive(true);

@@ -423,7 +423,6 @@
                if (curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

@@ -435,7 +434,6 @@
            {

                vipInfoObj.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/Store/Logic/BuyItemInfoWin.cs

@@ -326,7 +326,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -352,7 +352,7 @@


                if(curVipIndex != -1)

                {

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

                    
                }

                else

                {

@@ -363,7 +363,6 @@
            else

            {

                vipInfoText.gameObject.SetActive(false);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            if(buyItem.storeConfig.LimitValue != 0)

@@ -475,7 +474,7 @@
        private void OnClickNum()

        {

            bool isReachUpper = false;

            buyCnt = buyItem.GetCurBuyCnt(int.Parse(numKeyboard.Value),GetRemainBuyCnt(), isVipBuy,out isReachUpper);

            buyCnt = buyItem.GetCurBuyCnt(int.Parse(numKeyboard.Value), GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            RefreshBuyPrice(buyCnt);

            numKeyboard.Value = buyCnt.ToString();

            if (isReachUpper)

@@ -495,12 +494,12 @@


        private void OnClickPlusBuyNum()

        {

            buyCnt += 1;

            bool isReachUpper = false;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt,GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCnt += 1;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

            if (isReachUpper)

            if (isReachUpper || buyCnt == 0)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("StoreWin109"));

            }

@@ -508,9 +507,9 @@


        private void OnClickReduceBuyNum()

        {

            buyCnt -= 1;

            bool isReachUpper = false;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy,out isReachUpper);

            buyCnt -= 1;

            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

        }


 System/Store/Logic/BuyPetMatInfoWin.cs

@@ -307,7 +307,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig,out canBuyCnt,out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemTipsModel.curAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -333,7 +333,7 @@


                if(curVipIndex != -1)

                {

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt,isVipBuy,out isReachUpper);

                    
                }

                else

                {

@@ -344,7 +344,6 @@
            else

            {

                vipInfoText.gameObject.SetActive(false);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            if(buyItem.storeConfig.LimitValue != 0)


 System/Store/Logic/BuyWingsTip.cs

@@ -361,7 +361,7 @@
            int addBuyCnt = 0;

            bool isLimitCnt = buyItem.CheckIsLimitBuyCnt(buyItem.storeConfig, out canBuyCnt, out addBuyCnt);

            bool isReachUpper = false;

            buyCnt = 0;

            buyCnt = buyItem.GetCurBuyCnt(1, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            if (itemAttrData.itemConfig.PackCount > 1)

            {

                numberGo.gameObject.SetActive(true);

@@ -386,7 +386,6 @@
                if (curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

@@ -398,7 +397,6 @@
            {

                vipInfoText.gameObject.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();


 System/SystemSetting/SettingEffectMgr.cs

@@ -52,6 +52,8 @@


    private float delayTime = 2f;

    private bool isGetNewItem = false;

    public bool isStartDecompose { get; set; }

    public bool isStartOneKeySell { get; set; }



    private void Awake()

    {

@@ -68,15 +70,21 @@
        DeadModel.playerDieEvent += OnPlayerDie;

        m_storeModel.RefreshBuyResultEvent += RefreshBuySuccess;

        DeadModel.CloseRebornWinEvent += PlayerRebornSuccess;

        playerPack.RefreshDecomAttrAct += DecomposeSuccess;

        DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += OneKeySellSuccess;

    }



  
    public void Begin()

    {



        isStartDecompose = false;

        isStartOneKeySell = false;

    }



    float secondTimer = 0;

    float halfSecondTimer = 0;

    float autoSellCoolTimer = 0;

    float autoDecomposeCoolTimer = 0;

    private void LateUpdate()

    {

        if (!(StageManager.Instance.CurrentStage is DungeonStage))

@@ -100,11 +108,32 @@
            }

        }

     

        if(isStartDecompose)

        {

            autoDecomposeCoolTimer += Time.deltaTime;

            if(autoDecomposeCoolTimer >= 5f)

            {

                autoDecomposeCoolTimer = 0;

                isStartDecompose = false;

            }

        }



        if (isStartOneKeySell)

        {

            autoSellCoolTimer += Time.deltaTime;

            if (autoSellCoolTimer >= 5f)

            {

                autoSellCoolTimer = 0;

                isStartOneKeySell = false;

            }

        }



        if (secondTimer >= 1f)

        {

            secondTimer = 0f;

            RefreshBagItem();

        }

    
    }



    private void PlayerRebornSuccess()

@@ -112,6 +141,18 @@
        isPlayerDie = false;

    }



    private void OneKeySellSuccess(H0721_tagMakeItemAnswer obj)

    {

        if (obj.MakeType != (byte)MakeType.Def_mitKeySell)

            return;



        isStartOneKeySell = false;

    }



    private void DecomposeSuccess()

    {

        isStartDecompose = false;

    }



    public bool GetSettingEffect()

    {

@@ -158,7 +199,7 @@
    {

        if (playerPack.GetReaminGridCount(PackType.rptItem) < 5 && modelInterface.isPackResetOk)

        {

            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour))

            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoDevour) && !isStartDecompose)

            {

                if(playerPack.IsReachMinDecomposeNum())

                {

@@ -167,7 +208,9 @@
                }

            }



            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoSell) && modelInterface.GetSellItemList().Count > 0)

            if (HangUpSetModel.Instance.GetBool(HangUpAutoBoolType.isAutoSell) 
                && !isStartOneKeySell

                && modelInterface.GetSellItemList().Count > 0)

            {

                modelInterface.SendOneKeySellQuest(modelInterface.GetSellItemList());

                return;


 System/Treasure/TreasureLevelUpWin.cs

@@ -169,6 +169,7 @@
            m_Slider.slider.onValueChanged.AddListener(OnSliderValueUpdate);

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            model.skillLevelUpRedpointUpdate += SkillLevelUpRedpointUpdate;

            m_DragSelect.onDragComplete += onDragComplete;



            CameraManager.uiCamera.enabled = true;

@@ -215,6 +216,7 @@
            model.treasureStateChangeEvent -= TreasureStateChangeEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

            m_DragSelect.onDragComplete -= onDragComplete;

            model.skillLevelUpRedpointUpdate -= SkillLevelUpRedpointUpdate;

            m_Slider.slider.onValueChanged.RemoveAllListeners();

            m_TreasurePotential.Dispose();

            m_AchievementScroll.Dispose();

@@ -1203,14 +1205,15 @@
                    UpdateLevelUpSfx(false);

                }

            }

            if (_id == TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

            {

                var skillLevelUpRedpointTreasure = model.GetSkillLevelUpRedpointTreasure();

                m_LeftRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                    && model.selectedTreasure > skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

                m_RightRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                    && model.selectedTreasure < skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

            }

        }



        private void SkillLevelUpRedpointUpdate()

        {

            var skillLevelUpRedpointTreasure = model.GetSkillLevelUpRedpointTreasure();

            m_LeftRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                && model.selectedTreasure > skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

            m_RightRedpoint.gameObject.SetActive(skillLevelUpRedpointTreasure != 0

                && model.selectedTreasure < skillLevelUpRedpointTreasure && model.currentCategory == TreasureCategory.Human);

        }



        protected override void LateUpdate()


 System/Treasure/TreasureModel.cs

@@ -45,6 +45,7 @@
        public event Action<int> treasureLevelProgressUpdateEvent;

        public event Action<int> treasureStageUpEvent;

        public event Action<int> humanTreasureStateChangeEvent;

        public event Action skillLevelUpRedpointUpdate;



        bool m_WaitOpenDetailsWin = false;

        public bool waitOpenDetailsWin {

@@ -842,6 +843,10 @@
                            {

                                treasure.skillLevelUpRedpoint.state = RedPointState.Simple;

                                treasure.autoSelectPotential = k;

                                if (skillLevelUpRedpointUpdate != null)

                                {

                                    skillLevelUpRedpointUpdate();

                                }

                                return;

                            }

                        }

@@ -897,6 +902,10 @@
                    treasures[minCostTreasure].autoSelectPotential = minCostPotentialIndex;

                }

            }

            if (skillLevelUpRedpointUpdate != null)

            {

                skillLevelUpRedpointUpdate();

            }

        }



        public int GetSkillLevelUpRedpointTreasure()