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

client_Wu Xijin

2018-08-14 c67ec126d849674f5f63527ba6f86b65be0f540a

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

 System/KnapSack/New/BagWin.cs

@@ -161,6 +161,8 @@
        {

            if (type != PackType.rptItem)

                return;



            _gridlineCtrl.JumpIndex(0);

            OnRefrenshUIModel();

        }




 System/KnapSack/New/DepotWin.cs

@@ -136,6 +136,7 @@
        {

            if (type != PackType.rptWarehouse)

                return;

            _gridlineCtrl.JumpIndex(0);

            OnCreateGridLineCell(_gridlineCtrl);

        }




 System/OpenServerActivity/OpenServerActivityCell.cs

@@ -1,44 +1,47 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI
{
    public class OpenServerActivityCell : CellView
    {
        [SerializeField] RedpointBehaviour m_Redpoint;
        public RedpointBehaviour redpoint
        {
            get
            {
                return m_Redpoint;
            }
        }
        [SerializeField] Button m_FuncBtn;
        public Button funcBtn
        {
            get
            {
                return m_FuncBtn;
            }
        }
        [SerializeField] FunctionButtonConfig m_AlternativeConfig;
        public FunctionButtonConfig alternativeConfig { get { return m_AlternativeConfig; } set { m_AlternativeConfig = value; } }
        [SerializeField] Image m_Icon;
        [SerializeField] Text m_Title;
        public Text title { get { return m_Title; } }
        [SerializeField] Image m_Arrow;
        public Image arrow { get { return m_Arrow; } }
        private int m_Order = 0;
        public int order { get { return m_Order; } set { m_Order = value; } }

        public void ChangeState(TitleBtnState _state)
        {
            m_Icon.SetSprite(alternativeConfig.GetIconKey(_state));
            m_Title.color = alternativeConfig.GetFontColor(_state);
            m_Title.fontSize = alternativeConfig.GetFontSize(_state);
        }
    }
}

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;



namespace Snxxz.UI

{

    public class OpenServerActivityCell : CellView

    {

        [SerializeField] RedpointBehaviour m_Redpoint;

        public RedpointBehaviour redpoint

        {

            get

            {

                return m_Redpoint;

            }

        }

        [SerializeField] Button m_FuncBtn;

        public Button funcBtn

        {

            get

            {

                return m_FuncBtn;

            }

        }

        [SerializeField] FunctionButtonConfig m_AlternativeConfig;

        public FunctionButtonConfig alternativeConfig { get { return m_AlternativeConfig; } set { m_AlternativeConfig = value; } }

        [SerializeField] Image m_Icon;

        [SerializeField] Text m_Title;

        public Text title { get { return m_Title; } }

        [SerializeField] Image m_DownArrow;

        public Image downArrow { get { return m_DownArrow; } }

        [SerializeField] Image m_UpArrow;

        public Image upArrow { get { return m_UpArrow; } }



        private int m_Order = 0;

        public int order { get { return m_Order; } set { m_Order = value; } }



        public void ChangeState(TitleBtnState _state)

        {

            m_Icon.SetSprite(alternativeConfig.GetIconKey(_state));

            m_Title.color = alternativeConfig.GetFontColor(_state);

            m_Title.fontSize = alternativeConfig.GetFontSize(_state);

        }

    }

}




 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -290,8 +290,13 @@
            _cell.order = _cell.index;

            _cell.redpoint.redpointId = MainRedDot.REDPOINT_OPENSERVER * 100 + _cell.index;

            _cell.ChangeState(_cell.order == functionOrder ? TitleBtnState.Click : TitleBtnState.Normal);

            _cell.arrow.rectTransform.localEulerAngles = m_ActivitySpreadDict[_cell.order] ? new Vector3(0, 0, -90) : Vector3.zero;

            _cell.arrow.gameObject.SetActive(_cell.order == 0 || _cell.order == 2);

            _cell.downArrow.gameObject.SetActive(false);

            _cell.upArrow.gameObject.SetActive(false);

            if(_cell.order == 0 || _cell.order == 2)

            {

                _cell.downArrow.gameObject.SetActive(m_ActivitySpreadDict[_cell.order]);

                _cell.upArrow.gameObject.SetActive(!m_ActivitySpreadDict[_cell.order]);

            }

            _cell.funcBtn.onClick.RemoveAllListeners();

            _cell.funcBtn.onClick.AddListener(() =>

            {


 System/Store/StoreWin.cs

@@ -106,6 +106,29 @@
        protected override void OnActived()

        {

            base.OnActived();

            if(!WindowJumpMgr.Instance.IsJumpState && functionOrder == 0)

            {

                if(m_storeModel.storeFunc1Point.state == RedPointState.Simple)

                {

                    functionOrder = _weekStoreTitle.order;

                }

                else if(m_storeModel.storeFunc2Point.state == RedPointState.Simple)

                {

                    functionOrder = _commonStoreTitle.order;

                }

                else if (m_storeModel.storeFunc3Point.state == RedPointState.Simple)

                {

                    functionOrder = _growStrongerStoreTitle.order;

                }

                else if (m_storeModel.storeFunc4Point.state == RedPointState.Simple)

                {

                    functionOrder = _bindStoreTitle.order;

                }

                else if (m_storeModel.storeFunc5Point.state == RedPointState.Simple)

                {

                    functionOrder = _integralStoreTitle.order;

                }

            }

            _funcBtnGroup.TriggerByOrder(functionOrder);

            GlobalTimeEvent.Instance.secondEvent += RefreshResetTime;

        }