Merge remote-tracking branch 'origin/master' into StageLoad

client_Wu Xijin

2019-01-31 e5575c18cd58d9261309b0b4d0f77f5196ea7031

Merge remote-tracking branch 'origin/master' into StageLoad

 System/DailyQuest/DayRemind.cs

@@ -47,6 +47,7 @@
    public const string LEAGUE_NOTICE_REDPOINT = "LeagueNoticeRedpoint";

    public const string FAIRYGRABBOSS_NOTICE_REDPOINT = "FairyGrabBossRedpoint";

    public const string TEAM_TICKET_FAIRYLAND = "TeamTicketFairyLand";

    public const string FESTIVALREDPACKREMIND = "FestivalRedpackRemind";

    public Dictionary<string, int[]> dayRemindDic = new Dictionary<string, int[]>();



    public bool GetDayRemind(string _remindKey)

@@ -102,6 +103,7 @@
        SetDayRemind(LEAGUE_NOTICE_REDPOINT);

        SetDayRemind(FAIRYGRABBOSS_NOTICE_REDPOINT);

        SetDayRemind(TEAM_TICKET_FAIRYLAND);

        SetDayRemind(FESTIVALREDPACKREMIND);

    }



    private void SetDayRemind(string _key)


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -18,7 +18,7 @@
        public string LocalSaveEquipUnlock { get; private set; }

        public string LocalSaveActiveSuit { get; private set; }

        public string LocalSaveActiveStoneSuit { get; private set; }



    
        public int UnlockTowerLayer

        {

            get { return towerModel.highestPassFloor; }

@@ -310,7 +310,7 @@
            string[] activeSuits = LocalSave.GeStringArray(LocalSaveActiveSuit);

            alreadyActiveSuits = activeSuits == null ? new List<string>() : activeSuits.ToList();



            string[] activeStoneSuits = LocalSave.GeStringArray(LocalSaveActiveSuit);

            string[] activeStoneSuits = LocalSave.GeStringArray(LocalSaveActiveStoneSuit);

            alreadyActiveStoneSuits = activeStoneSuits == null ? new List<string>() : activeStoneSuits.ToList();

        }



@@ -377,6 +377,87 @@
            if (unlockEquips == null) return false;



            return unlockEquips.Contains(equipPlace);

        }



        public bool IsPlaySuitPlayerEffect()

        {

            List<int> suitTypes = null;

            List<int> suitLvs = null;

            bool isActiveSuit = TryGetIsActiveSuit(out suitTypes, out suitLvs);

            if (isActiveSuit)

            {

                for (int i = 0; i < suitTypes.Count; i++)

                {

                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = IsLocalSaveActiveSuit(suitType, suitLv);

                    if(!isLocalSaveActiveSuit)

                    {

                        return true;

                    }

                }

            }



            return false;

        }



        public void StopPlaySuitEffect(UIEffect effect,bool isSave = false)

        {

            if (isSave)

            {

                if (effect.IsPlaying)

                {

                    List<int> suitTypes = null;

                    List<int> suitLvs = null;

                    bool isActiveSuit = TryGetIsActiveSuit(out suitTypes, out suitLvs);

                    SetLockLocalSaveActiveSuit(suitTypes, suitLvs);

                }

            }



            if (effect.IsPlaying)

            {

                effect.Stop();

            }

        }



        public bool IsPlayStoneSuitEffect()

        {

            List<int> suitTypes = null;

            List<int> suitLvs = null;

            bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

            if (isActiveSuit)

            {

                for (int i = 0; i < suitTypes.Count; i++)

                {

                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = IsLocalSaveActiveStoneSuit(suitType, suitLv);

                    if (!isLocalSaveActiveSuit)

                    {

                        return true;

                    }

                }

            }

            return false;

        }



        public void StopPlayStoneSuitEffect(UIEffect effect, bool isSave = false)

        {

            if (isSave)

            {

                if (effect.IsPlaying)

                {

                    List<int> suitTypes = null;

                    List<int> suitLvs = null;

                    bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

                    SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);

                }

            }



            if (effect.IsPlaying)

            {

                effect.Stop();

            }

        }

        #endregion



@@ -840,48 +921,5 @@


            return activeSuit != null || nextSuit != null;

        }



        public bool IsPlayStoneSuitEffect()

        {

            List<int> suitTypes = null;

            List<int> suitLvs = null;

            bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

            if (isActiveSuit)

            {

                for (int i = 0; i < suitTypes.Count; i++)

                {

                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = IsLocalSaveActiveStoneSuit(suitType, suitLv);

                    if (!isLocalSaveActiveSuit)

                    {

                        return true;

                    }

                }

            }

            return false;

        }



        public void StopPlayStoneSuitEffect(UIEffect effect,bool isSave = false)

        {

            if(!isSave)

            {

                if (effect.IsPlaying)

                {

                    effect.Stop();

                }

            }

            else

            {

                if (effect.IsPlaying)

                {

                    List<int> suitTypes = null;

                    List<int> suitLvs = null;

                    bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

                    SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);

                }

            }

        }



    }

}


 System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs

@@ -172,45 +172,17 @@


        private void UpdateSuitBtnPlayerEffect(bool isSave = false)

        {

            List<int> suitTypes = null;

            List<int> suitLvs = null;

            bool isActiveSuit = equipModel.TryGetIsActiveSuit(out suitTypes,out suitLvs);

            if(isActiveSuit)

            bool isPlay = equipModel.IsPlaySuitPlayerEffect();

            if(isPlay && !isSave)

            {

                for (int i = 0; i < suitTypes.Count; i++)

                if (!suitBtnEffect.IsPlaying)

                {

                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = equipModel.IsLocalSaveActiveSuit(suitType, suitLv);

                    if (!isLocalSaveActiveSuit)

                    {

                        if (!suitBtnEffect.IsPlaying)

                        {

                            suitBtnEffect.Play();

                        }

                        break;

                    }

                    else

                    {

                        if (suitBtnEffect.IsPlaying)

                        {

                            suitBtnEffect.Stop();

                        }

                    }

                    suitBtnEffect.Play();

                }

            }

            else

            {

                if (suitBtnEffect.IsPlaying)

                {

                    suitBtnEffect.Stop();

                }

            }



            if(isSave && suitBtnEffect.IsPlaying)

            {

                suitBtnEffect.Stop();

                equipModel.SetLockLocalSaveActiveSuit(suitTypes, suitLvs);

                equipModel.StopPlaySuitEffect(suitBtnEffect,isSave);

            }

        }




 System/JadeDynastyKnapSack/JadeDynastyGemWin.cs

@@ -18,10 +18,17 @@
        [SerializeField] ScrollerController m_GemEquipController;

        [SerializeField] ItemCell m_EquipItem;

        [SerializeField] List<GemHoleData> m_GemHoles;

        [SerializeField] Button m_ViewStone;

        [SerializeField] UIEffect m_Effect;



        JadeDynastyGemModel model

        {

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

        }



        JadeDynastyEquipModel jadeDynastyEquipModel

        {

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

        }



        GemModel gemModel

@@ -50,6 +57,7 @@
                    OnHoleClick(_hole);

                });

            }

            m_ViewStone.AddListener(ViewStone);

        }



        protected override void OnPreOpen()

@@ -101,6 +109,7 @@
            m_GemEquipController.JumpIndex(index);



            DisplayEquipItem();

            DisplayStoneEffect();

        }



        void DisplayEquips()

@@ -221,6 +230,19 @@
            }

        }



        void DisplayStoneEffect()

        {

            var requireEffect = jadeDynastyEquipModel.IsPlayStoneSuitEffect();

            if (requireEffect)

            {

                m_Effect.Play();

            }

            else

            {

                m_Effect.StopImediatly();

            }

        }



        private void PlayUIEffect(int index, bool equiped)

        {

            if (equiped)

@@ -263,6 +285,16 @@
            WindowCenter.Instance.Open<JadeDynastySelectGemWin>();

        }



        private void ViewStone()

        {

            var requireEffect = jadeDynastyEquipModel.IsPlayStoneSuitEffect();

            if (requireEffect)

            {

                jadeDynastyEquipModel.StopPlayStoneSuitEffect(m_Effect, true);

            }

            WindowCenter.Instance.Open<JadeDynastyStoneSuitAttrWin>();

        }



        private void SelectEquipPlaceRefresh()

        {

            model.inlayHole = -1;

@@ -275,6 +307,7 @@
        {

            m_GemEquipController.m_Scorller.RefreshActiveCellViews();

            DisplayGems();

            DisplayStoneEffect();

        }



        private void OnRefreshCell(ScrollerDataType type, CellView cell)


 System/OpenServerActivity/FestivalRedpackModel.cs

@@ -103,6 +103,7 @@
        public readonly Redpoint systemRedpoint = new Redpoint(REDPOINTID, 2091901);

        public readonly Redpoint taskRedpoint = new Redpoint(REDPOINTID, 2091902);

        public readonly Redpoint receiveRedpoint = new Redpoint(REDPOINTID, 2091903);

        public readonly Redpoint dailyRemindRedpoint = new Redpoint(REDPOINTID, 2091910);



        public event Action<int> onStateUpate;

        public event Action redpackGrabRefresh;

@@ -548,11 +549,18 @@
            return redpoint.state == RedPointState.GetReward;

        }



        public void SetDayRemind()

        {

            DayRemind.Instance.SetDayRemind(DayRemind.FESTIVALREDPACKREMIND, true);

            UpdateRedpoint();

        }



        private void UpdateRedpoint()

        {

            var existSystemRedpack = false;

            var existFinishTask = false;

            var existUnGetRedpack = false;

            var dailyRemind = false;

            if (IsOpen)

            {

                OperationFestivalRedpack operation;

@@ -624,10 +632,16 @@
                        }

                    }

                }



                if (!DayRemind.Instance.GetDayRemind(DayRemind.FESTIVALREDPACKREMIND))

                {

                    dailyRemind = true;

                }

            }

            systemRedpoint.state = existSystemRedpack ? RedPointState.GetReward : RedPointState.None;

            taskRedpoint.state = existFinishTask ? RedPointState.Simple : RedPointState.None;

            receiveRedpoint.state = existUnGetRedpack ? RedPointState.GetReward : RedPointState.None;

            dailyRemindRedpoint.state = dailyRemind ? RedPointState.Simple : RedPointState.None;

        }

    }




 System/OpenServerActivity/FestivalRedpackSystemBehaviour.cs

@@ -98,7 +98,8 @@
            OperationFestivalRedpack operation;

            if (OperationTimeHepler.Instance.TryGetOperation(Operation.FestivalRedpack, out operation))

            {

                if (operation.resetType == resetType)

                if (operation.resetType == resetType

                    || resetType == 0)

                {

                    if (model.selectDateIndex < model.festivalDay)

                    {


 System/OpenServerActivity/FestivalRedpackWin.cs

@@ -56,6 +56,8 @@
            achieveModel.achievementProgressUpdateEvent += FestivalAchievementRefresh;

            model.taskRedpackRefresh += TaskRedpackRefresh;

            Display();



            model.SetDayRemind();

        }



        protected override void OnAfterOpen()


 System/Welfare/OperationTimeHepler.cs

@@ -854,7 +854,7 @@
        public OperationDate AddDays(int _days)

        {

            DateTime d = new DateTime(year, month, day);

            d = d.AddDays(_days);

            d = d.AddTicks(_days * TimeSpan.TicksPerDay);

            return new OperationDate()

            {

                year = d.Year,