Merge branch 'Cross_Server' of http://192.168.0.87:10010/r/snxxz_scripts in...

client_Zxw

2018-12-24 336c229f0b32edc4d1dfd3579eb70c5bae142286

 System/CrossServerOneVsOne/CrossSeverOneVsOneDayAwardCell.cs

File was renamed from System/CrossServerOneVsOne/CrossSeverDayAwardCell.cs
@@ -7,7 +7,7 @@


namespace Snxxz.UI

{

    public class CrossSeverDayAwardCell : ScrollItem

    public class CrossSeverOneVsOneDayAwardCell : ScrollItem

    {

        [SerializeField] Text taskNameText;

        [SerializeField] Slider progressSlider;

@@ -15,7 +15,7 @@
        [SerializeField] Button recieveBtn;

        [SerializeField] Image stateImg;

        [SerializeField] List<CommonItemBaisc> itemBaiscs = new List<CommonItemBaisc>();

        [SerializeField] CrossServerCyclicScroll m_CrossServerCyclicScroll;

        [SerializeField] CrossServerOneVsOneCyclicScroll m_CrossServerCyclicScroll;



        [SerializeField] UIAlphaTween m_AlphaTween;

        public UIAlphaTween alphaTween { get { return m_AlphaTween; } }

@@ -23,11 +23,11 @@
        [SerializeField] UILinerMove m_LinerMove;

        public UILinerMove linerMove { get { return m_LinerMove; } }



        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }

        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

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

        CrossServerRewardModel rewardModel { get { return ModelCenter.Instance.GetModel<CrossServerRewardModel>(); } }



        CrossServerModel.AwardType awardType;

        CrossServerOneVsOneModel.AwardType awardType;

        float height = 0;

        bool isLineMove = false;

        public override void Display(object _data)

@@ -36,7 +36,7 @@
            isLineMove = false;

            recieveBtn.AddListener(ClickRecieve);

            crossServerModel.UpdateDayAwardsEvent += UpdateDayAwards;

            awardType = (CrossServerModel.AwardType)_data;

            awardType = (CrossServerOneVsOneModel.AwardType)_data;

            DisplayDayAward();

        }



@@ -50,8 +50,8 @@
        private void DisplayDayAward()

        {

            var awardItems = awardType.awardItems;

            stateImg.gameObject.SetActive(awardType.progress != CrossServerModel.AwardType.CompleteProgress.Completed);

            recieveBtn.gameObject.SetActive(awardType.progress == CrossServerModel.AwardType.CompleteProgress.Completed);

            stateImg.gameObject.SetActive(awardType.progress != CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            recieveBtn.gameObject.SetActive(awardType.progress == CrossServerOneVsOneModel.AwardType.CompleteProgress.Completed);

            progressSlider.minValue = 0;

            progressSlider.maxValue = awardType.num;

            progressSlider.value = awardType.curCompletedNum;