少年修仙传客户端代码仓库
lcy
2024-12-02 64478a3f5745251b6779923bea59fa3b2285f763
10301 仙缘调整界面文字大小,优化排版,福禄可领取物品增加摇动
4个文件已修改
137 ■■■■■ 已修改文件
System/LoopAct/FairyAffinity/FairyAffinityLoginActCell.cs 76 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/LoopAct/FairyAffinity/FairyAffinityLoginActModel.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/LoopAct/FairyAffinity/FairyAffinityLoginActWin.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/LoopAct/FairyAffinity/FairyAffinityWin.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/LoopAct/FairyAffinity/FairyAffinityLoginActCell.cs
@@ -18,6 +18,7 @@
        [SerializeField] List<ImageEx> freeGrays;
        [SerializeField] List<ImageEx> freeLocks;
        [SerializeField] List<ImageEx> freeHaves;
        [SerializeField] List<RotationTween> freeItemCellTweenList = new List<RotationTween>();
        //itemCellExs paidGrays paidLocks paidHaves 个数需要相等
        [SerializeField] List<ItemCell> itemCellExs;
@@ -31,14 +32,54 @@
        [SerializeField] Button reSignBtn;
        [SerializeField] Text waitSignText;
        [SerializeField] Button btnLateSign;
        [SerializeField] List<RotationTween> paidItemCellTweenList = new List<RotationTween>();
        int dayNum = 0;
        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
        FairyAffinityLoginActModel model { get { return ModelCenter.Instance.GetModel<FairyAffinityLoginActModel>(); } }
        private void OnEnable()
        {
            model.PlayAnimationSync += OnPlaySyncAnimation;
            if (dayNum == 0)
                return;
            for (int i = 0; i < freeItemCellTweenList.Count; i++)
            {
                freeItemCellTweenList[i].Stop();
                freeItemCellTweenList[i].SetStartState();
            }
            for (int i = 0; i < paidItemCellTweenList.Count; i++)
            {
                paidItemCellTweenList[i].Stop();
                paidItemCellTweenList[i].SetStartState();
            }
            //0 不可领取(日期未到)  1 可领取  2 已领取 3补签(已过天) 4 继续签到(已购买) 5 继续签到(未购买)
            int state = model.GetLoginAwardState(dayNum);
            for (int i = 0; i < freeItemCellTweenList.Count; i++)
            {
                if (state == 1)
                {
                    freeItemCellTweenList[i].Play();
                }
            }
            for (int i = 0; i < paidItemCellTweenList.Count; i++)
            {
                if (state == 4)
                {
                    paidItemCellTweenList[i].Play();
                }
            }
        }
        private void OnDisable()
        {
            model.PlayAnimationSync -= OnPlaySyncAnimation;
        }
        public void Display(int index)
        {
            OperationLoginAct holiday;
            OperationTimeHepler.Instance.TryGetOperation(FairyAffinityLoginActModel.operaType, out holiday);
            int dayNum = holiday.loginAwards[index].DayNum;
            dayNum = holiday.loginAwards[index].DayNum;
            //0 不可领取(日期未到)  1 可领取  2 已领取 3补签(已过天) 4 继续签到(已购买) 5 继续签到(未购买)
            var state = model.GetLoginAwardState(dayNum);
            m_Day.text = Language.Get("loginact3", dayNum);
@@ -153,6 +194,39 @@
                    paidHaves[i].SetActive(false);
                }
            }
            OnPlaySyncAnimation();
        }
        private void OnPlaySyncAnimation()
        {
            for (int i = 0; i < freeItemCellTweenList.Count; i++)
            {
                freeItemCellTweenList[i].Stop();
                freeItemCellTweenList[i].SetStartState();
            }
            for (int i = 0; i < paidItemCellTweenList.Count; i++)
            {
                paidItemCellTweenList[i].Stop();
                paidItemCellTweenList[i].SetStartState();
            }
            //0 不可领取(日期未到)  1 可领取  2 已领取 3补签(已过天) 4 继续签到(已购买) 5 继续签到(未购买)
            int state = model.GetLoginAwardState(dayNum);
            for (int i = 0; i < freeItemCellTweenList.Count; i++)
            {
                if (freeItemCellTweenList[i].isActiveAndEnabled && state == 1)
                {
                    freeItemCellTweenList[i].Play();
                }
            }
            for (int i = 0; i < paidItemCellTweenList.Count; i++)
            {
                if (paidItemCellTweenList[i].isActiveAndEnabled && state == 4)
                {
                    paidItemCellTweenList[i].Play();
                }
            }
        }
    }
}
System/LoopAct/FairyAffinity/FairyAffinityLoginActModel.cs
@@ -17,6 +17,28 @@
        public int actNum = 11; //对应界面
        public event Action UpdateyLoginEvent;
        //同步播放摆动动画
        public Action PlayAnimationSync;
        private bool isPlayAnimation = false;
        public bool IsPlayAnimation
        {
            get
            {
                return isPlayAnimation;
            }
            set
            {
                isPlayAnimation = value;
                if (isPlayAnimation)
                {
                    PlayAnimationSync?.Invoke();
                }
                isPlayAnimation = false;
            }
        }
        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
        public override void Init()
System/LoopAct/FairyAffinity/FairyAffinityLoginActWin.cs
@@ -3,7 +3,6 @@
//    [  Date ]:           Thursday, April 18, 2019
//--------------------------------------------------------
using System;
using UnityEngine;
namespace vnxbqy.UI
@@ -16,10 +15,9 @@
        [SerializeField] ButtonEx btnBuy;
        [SerializeField] ImageEx imgBuy;
        [SerializeField] ScrollerController m_Controller;
        // 登录天
        //[SerializeField] Text actTime;
        VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } }
        FairyAffinityLoginActModel model { get { return ModelCenter.Instance.GetModel<FairyAffinityLoginActModel>(); } }
        FairyAffinityZhanLingModel fairyAffinityZhanLingModel { get { return ModelCenter.Instance.GetModel<FairyAffinityZhanLingModel>(); } }
        #region Built-in
@@ -46,12 +44,11 @@
        {
            m_Controller.OnRefreshCell += OnRefreshCell;
            model.UpdateyLoginEvent += UpdateHolidayLogin;
            GlobalTimeEvent.Instance.secondEvent += secondEvent;
            fairyAffinityZhanLingModel.UpdateGiftStateEvent += UpdateHolidayLogin;
            OperationTimeHepler.Instance.operationTimeUpdateEvent += OnOperationTimeUpdateEvent;
            vipModel.rechargeCountEvent += VipModel_rechargeCountEvent;
            Display();
            DisplayScroll();
            secondEvent();
        }
        protected override void OnAfterOpen()
@@ -62,7 +59,7 @@
        {
            m_Controller.OnRefreshCell -= OnRefreshCell;
            model.UpdateyLoginEvent -= UpdateHolidayLogin;
            GlobalTimeEvent.Instance.secondEvent -= secondEvent;
            fairyAffinityZhanLingModel.UpdateGiftStateEvent -= UpdateHolidayLogin;
            OperationTimeHepler.Instance.operationTimeUpdateEvent -= OnOperationTimeUpdateEvent;
            vipModel.rechargeCountEvent -= VipModel_rechargeCountEvent;
        }
@@ -102,6 +99,7 @@
            txtBuy.text = Language.Get("PayMoneyNum", orderCfg.PayRMBNum);
            txtProfitRatio.text = Language.Get("BlessedLand039", CTGConfig.Get(holiday.awardExCTGID).Percentage);
            txtBuyValue.text = model.buyValue.ToString();
            model.IsPlayAnimation = true;
        }
        private void DisplayScroll()
@@ -126,12 +124,14 @@
            var _cell = cell as FairyAffinityLoginActCell;
            _cell.Display(_cell.index);
            model.IsPlayAnimation = true;
        }
        private void UpdateHolidayLogin()
        {
            m_Controller.m_Scorller.RefreshActiveCellViews();
            Display();
            model.IsPlayAnimation = true;
        }
        //优先选择可领取的,然后是已领取的下一天
@@ -157,12 +157,5 @@
                return reSign;
            return getYet;
        }
        private void secondEvent()
        {
            //OperationLoginAct holiday;
            //OperationTimeHepler.Instance.TryGetOperation(FairyAffinityLoginActModel.operaType, out holiday);
            //actTime.text = Language.Get("BossFHLanguage2", TimeUtility.SecondsToHMS(holiday.GetResetSurplusTime()));
        }
    }
}
System/LoopAct/FairyAffinity/FairyAffinityWin.cs
@@ -15,7 +15,8 @@
        [SerializeField] ButtonEx btnClose;
        [SerializeField] Transform tranBottomInfo;
        [SerializeField] TextEx txtCheckInCnt;
        [SerializeField] TextEx txtTaskResetTime;
        [SerializeField] TextEx txtTaskResetTime1;
        [SerializeField] TextEx txtTaskResetTime2;
        FairyAffinityModel model { get { return ModelCenter.Instance.GetModel<FairyAffinityModel>(); } }
        FairyAffinityLoginActModel fairyAffinityLoginActModel { get { return ModelCenter.Instance.GetModel<FairyAffinityLoginActModel>(); } }
@@ -150,18 +151,21 @@
        {
            tranBottomInfo.SetActive(functionOrder == 0 || functionOrder == 1);
            txtCheckInCnt.SetActive(functionOrder == 1);
            txtTaskResetTime.SetActive(functionOrder == 0 || functionOrder == 1);
            txtTaskResetTime1.SetActive(functionOrder == 0);
            txtTaskResetTime2.SetActive(functionOrder == 1);
            if (functionOrder == 0 || functionOrder == 1)
            OperationLoginAct holiday;
            OperationTimeHepler.Instance.TryGetOperation(FairyAffinityLoginActModel.operaType, out holiday);
            if (holiday == null)
                return;
            if (functionOrder == 0)
            {
                OperationLoginAct holiday;
                OperationTimeHepler.Instance.TryGetOperation(FairyAffinityLoginActModel.operaType, out holiday);
                txtTaskResetTime.text = Language.Get("FairyAffinity09", TimeUtility.SecondsToDHMSCHS(holiday.GetResetSurplusTime()));
                txtTaskResetTime1.text = Language.Get("FairyAffinity09", TimeUtility.SecondsToDHMSCHS(holiday.GetResetSurplusTime()));
            }
            if (functionOrder == 1)
            else if (functionOrder == 1)
            {
                txtCheckInCnt.text = Language.Get("FairyAffinity15", fairyAffinityLoginActModel.GetHaveAwardDayCnt());
                txtTaskResetTime2.text = Language.Get("FairyAffinity09", TimeUtility.SecondsToDHMSCHS(holiday.GetResetSurplusTime()));
            }
        }
    }