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

client_Wu Xijin

2019-03-15 19adaa1b5b756bfc0797bab364de984830e1ba29

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

 System/Realm/RealmLevelUpBehaviour.cs

@@ -29,7 +29,7 @@
        public void Display(int realmLevel)

        {

            this.realmLevel = realmLevel;

            var currentRealmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var currentRealmLevel = model.displayRealmLevel;

            var isNext = realmLevel == currentRealmLevel + 1;

            m_ContainerCondition.gameObject.SetActive(isNext);

            m_ContainerCost.gameObject.SetActive(isNext);


 System/Realm/RealmModel.cs

@@ -40,6 +40,20 @@


        int cacheMapId = 0;



        public List<int> displayRealms = new List<int>();



        public int displayRealmLevel

        {

            get

            {

                if (displayRealms.Count > 0)

                {

                    return displayRealms[0];

                }

                return PlayerDatas.Instance.baseData.realmLevel;

            }

        }



        public event Action selectRealmRefresh;



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


 System/Realm/RealmStageBehaviour.cs

@@ -57,7 +57,7 @@
        public void DisplayEffect(bool levelUp)

        {

            m_Effect.StopImediatly();

            if (PlayerDatas.Instance.baseData.realmLevel >= realmLevel)

            if (model.displayRealmLevel >= realmLevel)

            {

                m_Effect.effect = model.GetRealmStageEffect(realmLevel);

                m_Effect.Play();


 System/Realm/RealmWin.cs

@@ -105,7 +105,7 @@
            HideRealmBoss();

            DisplayRealmUp();



            


            m_RealmBriefTween.Play();



            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

@@ -143,6 +143,7 @@
        {

            m_ContainerRealmUp.gameObject.SetActive(true);



            model.displayRealms.Clear();

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            if (realmLevel < model.realmMaxLevel)

            {

@@ -167,6 +168,7 @@
            m_RealmBriefTween.SetEndState();

            m_RealmLevelUpTween.Stop();

            m_RealmLevelUpTween.SetEndState();

            model.displayRealms.Clear();

            foreach (var item in m_RealmStages)

            {

                item.Dispose();

@@ -187,8 +189,7 @@


        void DisplayRealmStages()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var stage = model.GetRealmStage(realmLevel);

            var stage = model.GetRealmStage(model.displayRealmLevel);

            m_RealmAnimation.SetDefault();

            List<int> realms = null;

            if (model.TryGetRealmStages(stage, out realms))

@@ -207,8 +208,8 @@


        void DisplayRealmLevelUp()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var requireLevelUp = realmLevel < model.realmMaxLevel && model.selectRealm > realmLevel;

            var requireLevelUp = model.displayRealmLevel < model.realmMaxLevel

                && model.selectRealm > model.displayRealmLevel;

            m_RealmLevelUp.gameObject.SetActive(requireLevelUp);

            if (requireLevelUp)

            {

@@ -216,7 +217,8 @@
            }



            var config = RealmConfig.Get(model.selectRealm - 1);

            m_GotoBoss.gameObject.SetActive(!model.isBossPass && model.selectRealm == realmLevel + 1

            m_GotoBoss.gameObject.SetActive(!model.isBossPass

                && model.selectRealm == model.displayRealmLevel + 1

                && config != null && config.BossID != 0);

        }



@@ -227,9 +229,8 @@


        void DisplayUnlockEquip()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            m_ContainerUnlockEquip.gameObject.SetActive(false);

            var stage = model.GetRealmStage(realmLevel);

            var stage = model.GetRealmStage(model.displayRealmLevel);

            List<int> realms = null;

            if (model.TryGetRealmStages(stage, out realms))

            {

@@ -237,7 +238,7 @@
                {

                    var level = realms[0] + i;

                    var equipSet = 0;

                    if (realmLevel < level && model.selectRealm != level

                    if (model.displayRealmLevel < level && model.selectRealm != level

                        && model.IsUnlockEquipRealm(level, out equipSet))

                    {

                        var index = realms.IndexOf(level);

@@ -265,33 +266,45 @@
            if (dataType == PlayerDataType.RealmLevel)

            {

                var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

                var stage = model.GetRealmStage(realmLevel);

                var currentStage = model.GetRealmStage(cacheRealmLevel);

                if (cacheRealmLevel > realmLevel || stage > currentStage + 1)

                if (!model.displayRealms.Contains(realmLevel))

                {

                    model.selectRealm = realmLevel + 1;

                    DisplayRealmStages();

                }

                else

                {

                    if (cacheRealmLevel < realmLevel)

                    model.displayRealms.Add(realmLevel);

                    if (model.displayRealms.Count == 1)

                    {

                        List<int> realms = null;

                        if (model.TryGetRealmStages(currentStage, out realms))

                        {

                            var index = realms.IndexOf(cacheRealmLevel);

                            m_RealmAnimation.DisplayLevelUp(realms.IndexOf(cacheRealmLevel));

                        }

                        TryStartAnimation();

                    }

                }

                cacheRealmLevel = realmLevel;

            }

        }



        private void TryStartAnimation()

        {

            var stage = model.GetRealmStage(model.displayRealmLevel);

            var currentStage = model.GetRealmStage(cacheRealmLevel);

            if (cacheRealmLevel > model.displayRealmLevel || stage > currentStage + 1)

            {

                model.displayRealms.Clear();

                model.selectRealm = PlayerDatas.Instance.baseData.realmLevel + 1;

                DisplayRealmStages();

            }

            else

            {

                if (cacheRealmLevel < model.displayRealmLevel)

                {

                    List<int> realms = null;

                    if (model.TryGetRealmStages(currentStage, out realms))

                    {

                        var index = realms.IndexOf(cacheRealmLevel);

                        m_RealmAnimation.DisplayLevelUp(realms.IndexOf(cacheRealmLevel));

                    }

                }

            }

            cacheRealmLevel = model.displayRealmLevel;

        }



        private void OnRotateComplete()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var stage = model.GetRealmStage(realmLevel);

            var stage = model.GetRealmStage(model.displayRealmLevel);

            List<int> realms = null;

            if (model.TryGetRealmStages(stage, out realms))

            {

@@ -305,19 +318,39 @@
                }

            }

            DisplayUnlockEquip();



            if (model.displayRealms.Count > 0)

            {

                model.displayRealms.RemoveAt(0);

            }

            if (model.displayRealms.Count > 0)

            {

                TryStartAnimation();

            }

        }



        private void OnLevelUpComplete()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            if (realmLevel == model.realmMaxLevel)

            if (model.displayRealmLevel == model.realmMaxLevel)

            {

                model.selectRealm = realmLevel;

                model.selectRealm = model.displayRealmLevel;

                DisplayRealmLevelUp();

            }

            else

            {

                model.selectRealm = realmLevel + 1;

                model.selectRealm = model.displayRealmLevel + 1;

            }



            if (!m_RealmAnimation.rotating)

            {

                if (model.displayRealms.Count > 0)

                {

                    model.displayRealms.RemoveAt(0);

                }

                if (model.displayRealms.Count > 0)

                {

                    TryStartAnimation();

                }

            }

        }