Merge branch 'master' into leonard

client_Wu Xijin

2018-10-23 a974a2621a6dcb90b8fe52b23d075814873c0960

 System/Strengthening/CrystalSelectionWin.cs

@@ -14,14 +14,14 @@

    public class CrystalSelectionWin : Window
    {
        [SerializeField] Text m_TextDisplay;
        [SerializeField] Text m_NumberText;
        [SerializeField] Slider m_Slider;
        [SerializeField] Button m_AddBtn;

        [SerializeField] Button m_ReduceBtn;
        [SerializeField] Button m_DetermineBtn;
        [SerializeField] Button m_CancelBtn;
        [SerializeField] Button m_CloseBtn;

        [SerializeField] Button m_ReduceBtn;

        [SerializeField] Transform m_Tran;

        public Vector3 Pos1 = new Vector3(311,160,0);

        public Vector3 Pos2 = new Vector3(387, 160, 0);

        public Vector3 Pos3 = new Vector3(465, 160, 0);

        #region Built-in
        PlayerPackModel _playerPack;
        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }

@@ -35,17 +35,10 @@
            m_Slider.onValueChanged.AddListener(OnClickSlider);
            m_AddBtn.AddListener(OnClickAddBtn);
            m_ReduceBtn.AddListener(OnClickReduceBtn);
            m_DetermineBtn.AddListener(OnClickDetermineBtn);
            m_CancelBtn.AddListener(OnClickCancelBtn);
            m_CloseBtn.AddListener(OnClickCloseBtn);
        }

        protected override void OnPreOpen()
        {
            string str = godBeastModel.Crystal_ItemModel.chinItemModel.ItemName;
         
            m_TextDisplay.text = string.Format(Language.Get("OwnQuantity_SH"), godBeastModel.Crystal_ItemModel.itemInfo.ItemCount, 
                UIHelper.GetTextColorByItemColor(godBeastModel.Crystal_ItemModel.chinItemModel.ItemColor, str, true));
            m_Slider.minValue = 0;
            m_Slider.maxValue = godBeastModel.Crystal_ItemModel.itemInfo.ItemCount;
            if (godBeastModel.Absorption_Dic.ContainsKey(godBeastModel.ItemInde))

@@ -59,7 +52,23 @@
            }
            m_NumberText.text = m_Slider.value.ToString();
        }

        protected override void OnActived()

        {

            switch (godBeastModel.ItemPos)

            {

                case 1:

                    m_Tran.localPosition = Pos1;

                    break;

                case 2:

                    m_Tran.localPosition = Pos2;

                    break;

                case 3:

                    m_Tran.localPosition = Pos3;

                    break;





            }

        }
        protected override void OnAfterOpen()
        {
        }
@@ -79,6 +88,7 @@
            {

                m_Slider.value += 1;

                m_NumberText.text = m_Slider.value.ToString();

                Determine();//确认

            }

        }

        private void OnClickReduceBtn()

@@ -87,9 +97,10 @@
            {

                m_Slider.value -= 1;

                m_NumberText.text = m_Slider.value.ToString();

                Determine();//确认

            }

        }

        private void OnClickDetermineBtn()

        private void Determine()//确认

        {

            if (godBeastModel.Absorption_Dic.ContainsKey(godBeastModel.ItemInde))

            {

@@ -100,8 +111,7 @@
                else

                {

                    godBeastModel.Absorption_Dic[godBeastModel.ItemInde] = (int)m_Slider.value;

                }

              
                }             
            }

            else

            {

@@ -111,19 +121,11 @@
                }                  

            }

            godBeastModel.AbsorbEventUpdate();

            Close();

        }

        private void OnClickCancelBtn()

        {

            Close();

        }

        private void OnClickCloseBtn()

        {

            Close();

        }

        private void OnClickSlider(float value)

        {

            m_NumberText.text = m_Slider.value.ToString();

            Determine();//确认

        }

    }