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

client_Zxw

2019-02-25 a60d8245de227716ebcecc3fbdf4e10c343670cb

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

 Core/GameEngine/Login/LoginStage.cs

@@ -77,9 +77,12 @@
    {

        base.OnLateUpdate();



        if (Application.isMobilePlatform)

        {

        CheckClientVersion();

        CheckClientAssets();

    }

    }



    float checkClientTimer = 0f;

    private void CheckClientVersion()


 System/KnapSack/New/BatchWin.cs

@@ -16,80 +16,45 @@
    public class BatchWin : Window

    {

        #region 成员变量

        private Text _itemName;

        private Slider _splitSlider;

        private Text _number;

        private Button _addBtn;

        private Button _reduceBtn;

        private Button _splitBtn;

        private Button _closeBtn;

        private ItemCell _itemCell;

        private Text m_ItemName;

        private Slider m_SplitSlider;

        private Text m_Number;

        private Button m_AddBtn;

        private Button m_ReduceBtn;

        private Button m_SplitBtn;

        private Button m_CloseBtn;

        private ItemCell m_ItemCell;

        #endregion



        ItemTipsModel _itemTipsModel;

        ItemTipsModel itemTipsModel

        {

            get

            {

                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());

            }

        }



        PlayerPackModel _playerPack;

        PlayerPackModel playerPack

        {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

        }



        PlayerBuffDatas _buffModel;

        PlayerBuffDatas Buffmodel

        {

            get

            {

                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

            }

        }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        PlayerBuffDatas Buffmodel { get { return ModelCenter.Instance.GetModel<PlayerBuffDatas>(); } }



        private ItemModel itemModel;

        #region Built-in

        protected override void BindController()

        {

            _itemName = transform.Find("ItemNameText").GetComponent<Text>();

            _number = transform.Find("SplitSlider/Background/Fill/SplitIcon/NumBG/NumText").GetComponent<Text>();

            _splitSlider = transform.Find("SplitSlider").GetComponent<Slider>();

            _addBtn = transform.Find("Addbtn").GetComponent<Button>();

            _splitBtn = transform.Find("Usebtn").GetComponent<Button>();

            _reduceBtn = transform.Find("Reducebtn").GetComponent<Button>();

            _closeBtn = transform.Find("Closebtn").GetComponent<Button>();

            _itemCell = transform.Find("ItemCell").GetComponent<ItemCell>();

            m_ItemName = this.transform.Find("ItemNameText").GetComponent<Text>();

            m_Number = this.transform.Find("SplitSlider/Background/Fill/SplitIcon/NumBG/NumText").GetComponent<Text>();

            m_SplitSlider = this.transform.Find("SplitSlider").GetComponent<Slider>();

            m_AddBtn = this.transform.Find("Addbtn").GetComponent<Button>();

            m_SplitBtn = this.transform.Find("Usebtn").GetComponent<Button>();

            m_ReduceBtn = this.transform.Find("Reducebtn").GetComponent<Button>();

            m_CloseBtn = this.transform.Find("Closebtn").GetComponent<Button>();

            m_ItemCell = this.transform.Find("ItemCell").GetComponent<ItemCell>();

        }



        protected override void AddListeners()

        {

            _splitSlider.onValueChanged.RemoveAllListeners();

            _addBtn.onClick.RemoveAllListeners();

            _reduceBtn.onClick.RemoveAllListeners();

            _splitBtn.onClick.RemoveAllListeners();

            _closeBtn.onClick.RemoveAllListeners();



            _splitSlider.onValueChanged.AddListener(



             delegate

             {

                 OnSplitValueChange();

             }



             );



            _addBtn.onClick.AddListener(OnClickAddBtn);

            _reduceBtn.onClick.AddListener(OnClickReduceBtn);

            _splitBtn.onClick.AddListener(OnClickBatchUseBtn);

            _closeBtn.onClick.AddListener(OnClickCloseBtn);

            m_SplitSlider.SetListener((float value) => { OnSplitValueChange(); });

            m_AddBtn.SetListener(OnClickAddBtn);

            m_ReduceBtn.SetListener(OnClickReduceBtn);

            m_SplitBtn.SetListener(OnClickBatchUseBtn);

            m_CloseBtn.SetListener(OnClickCloseBtn);

        }



        protected override void OnPreOpen()

        {

            //OpenBatchWin(itemInfoModel.CurItemModel);

            OpenBatchWin();

        }



@@ -103,7 +68,7 @@


        protected override void OnAfterClose()

        {



            WindowCenter.Instance.Open<MainInterfaceWin>();

        }

        #endregion



@@ -111,11 +76,14 @@
        {

            itemModel = playerPack.GetItemModelByGUID(BatchUseModel.Instance.guid);

            if (itemModel == null)

            {

                return;

            }



            InitPanel();

        }



        public void InitPanel()

        void InitPanel()

        {

            ulong maxValue = 0;

            if(BatchUseModel.Instance.maxValue <= 0)

@@ -129,41 +97,41 @@
          

            ItemCellModel cellModel = new ItemCellModel(itemModel.itemInfo.ItemID, false, (ulong)maxValue, itemModel.itemInfo.IsBind, 

             itemModel.itemInfo.ItemGUID,itemModel.packType, false);

            _itemCell.Init(cellModel);

            _itemCell.countText.text = maxValue.ToString();

            _itemName.text = itemModel.chinItemModel.ItemName;

            _splitSlider.minValue = 1;

            _splitSlider.maxValue = maxValue;

            m_ItemCell.Init(cellModel);

            m_ItemCell.countText.text = maxValue.ToString();

            m_ItemName.text = itemModel.chinItemModel.ItemName;

            m_SplitSlider.minValue = 1;

            m_SplitSlider.maxValue = maxValue;

            if(itemModel.chinItemModel.BatchUse == 1)

            {

                _splitSlider.value = _splitSlider.minValue;

                m_SplitSlider.value = m_SplitSlider.minValue;

            }

            else if(itemModel.chinItemModel.BatchUse == 2)

            {

                _splitSlider.value = _splitSlider.maxValue;

                m_SplitSlider.value = m_SplitSlider.maxValue;

            }

           

            _number.text = Mathf.Ceil(_splitSlider.value).ToString();

            m_Number.text = Mathf.Ceil(m_SplitSlider.value).ToString();

        }



        public void OnSplitValueChange()

        {

            _number.text = Mathf.Ceil(_splitSlider.value).ToString();

            m_Number.text = Mathf.Ceil(m_SplitSlider.value).ToString();

        }



        public void OnClickAddBtn()

        {

            if (_splitSlider.value < _splitSlider.maxValue)

            if (m_SplitSlider.value < m_SplitSlider.maxValue)

            {

                _splitSlider.value++;

                m_SplitSlider.value++;

            }

        }



        public void OnClickReduceBtn()

        {

            if (_splitSlider.value > _splitSlider.minValue)

            if (m_SplitSlider.value > m_SplitSlider.minValue)

            {

                _splitSlider.value--;

                m_SplitSlider.value--;

            }

        }



@@ -178,7 +146,7 @@
                {

                    if (isOk)

                    {

                        PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                        PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

                    }

                }

                );

@@ -186,17 +154,17 @@
            }

            else if(itemModel.chinItemModel.Type == (int)ItemType.Box)

            {

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.itemInfo.ItemGUID,itemModel.itemId, (ushort)Mathf.Ceil(_splitSlider.value));

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.itemInfo.ItemGUID, itemModel.itemId, (ushort)Mathf.Ceil(m_SplitSlider.value));

            }

            else

            {

                PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(_splitSlider.value), BatchUseModel.Instance.extraPrams);

                PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

            }

         

            OnClickCloseBtn();

        }



        public void OnClickCloseBtn()

        void OnClickCloseBtn()

        {

            Close();

        }