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

client_Zxw

2018-11-23 cd4e26da0a2347a79aa18f4c77a5df9b103abfa6

 System/Welfare/SignInCell.cs

@@ -54,16 +54,17 @@
        public override void Refresh(CellView cell)

        {

            var _page = cell.index;

            var configs = Config.Instance.GetAllValues<SignInConfig>();

            for (int i = 0; i < 5; i++)

            {

                var _index = _page * 5 + i;

                if (_index >= model.signAwardList.Count)

                if (_index >= configs.Count)

                {

                    m_SignIns[i].gameObject.SetActive(false);

                    continue;

                }

                var _signInCfg = model.signAwardList[_index];

                var _ring = model.isFirst ? 0 : (_signInCfg.ItemID.Length > 1 ? 1 : 0);

                var _signInCfg = configs[_index];

                var _ring = model.IsFirstMonth ? 0 : (_signInCfg.ItemID.Length > 1 ? 1 : 0);

                var _itemCfg = Config.Instance.Get<ItemConfig>(_signInCfg.ItemID[_ring]);

                m_ItemIcons[i].SetSprite(_itemCfg.IconKey);

                m_ItemBgs[i].SetItemBackGround(_itemCfg.ItemColor);

@@ -72,12 +73,12 @@
                m_ItemCntTxts[i].text = _signInCfg.OrdinaryNum[_ring] <= 1 ? string.Empty : _signInCfg.OrdinaryNum[_ring].ToString();

                m_DayTxts[i].text = Language.Get("SignIn_4", _index + 1);

                m_BindImgs[i].gameObject.SetActive(_signInCfg.IsBind == 1);

                m_HasSignImgs[i].gameObject.SetActive(_index < model.signNum);

                m_RetroactiveImgs[i].gameObject.SetActive(_index == model.signNum && model.todaySign

                    && model.surSignNum > 0);

                m_PresentEffects[i].gameObject.SetActive(_index == model.signNum && !model.todaySign);

                if (AchievementGoto.achievementType == AchievementGoto.SignInAchievement && _page == model.signNum / 5

                    && _index == model.signNum && model.surSignNum > 0 && model.todaySign)

                m_HasSignImgs[i].gameObject.SetActive(_index < model.alreadySignInCount);

                m_RetroactiveImgs[i].gameObject.SetActive(_index == model.alreadySignInCount && model.todaySignIn

                    && model.keepSignInCount > 0);

                m_PresentEffects[i].gameObject.SetActive(_index == model.alreadySignInCount && !model.todaySignIn);

                if (AchievementGoto.achievementType == AchievementGoto.SignInAchievement && _page == model.alreadySignInCount / 5

                    && _index == model.alreadySignInCount && model.keepSignInCount > 0 && model.todaySignIn)

                {

                    if (_achieveEffects[i] == null)

                    {

@@ -105,23 +106,23 @@


        private void OnClickSign(int _day)

        {

            if (_day == model.signNum)

            if (_day == model.alreadySignInCount)

            {

                AchievementGoto.achievementType = 0;

                if (!model.todaySign)

                if (!model.todaySignIn)

                {

                    CA509_tagCMDaySign signpack = new CA509_tagCMDaySign();

                    signpack.Day = 0;

                    GameNetSystem.Instance.SendInfo(signpack);

                    return;

                }

                else if (model.surSignNum > 0)

                else if (model.keepSignInCount > 0)

                {

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("SinInReplenish", model.ctnSignJade), (bool isOk) =>

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("SinInReplenish", model.keepSignInCost), (bool isOk) =>

                    {

                        if (isOk)

                        {

                            if (PlayerDatas.Instance.baseData.Gold >= model.ctnSignJade)

                            if (PlayerDatas.Instance.baseData.Gold >= model.keepSignInCost)

                            {

                                CA509_tagCMDaySign signpack = new CA509_tagCMDaySign();

                                signpack.Day = 1;

@@ -141,10 +142,11 @@
                    return;

                }

            }

            var _signInCfg = model.signAwardList[_day];

            var configs = Config.Instance.GetAllValues<SignInConfig>();

            var _signInCfg = configs[_day];

            int itemId = 0;

            int itemCount = 0;

            if (!model.isFirst)

            if (!model.IsFirstMonth)

            {

                itemId = _signInCfg.ItemID.Length > 1 ? _signInCfg.ItemID[1] : _signInCfg.ItemID[0];

                itemCount = _signInCfg.OrdinaryNum.Length > 1 ? _signInCfg.OrdinaryNum[1] : _signInCfg.OrdinaryNum[0];