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

client_Zxw

2019-03-14 a294900af79418ea0870bbfc4e2bb0e589899408

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

 System/Realm/RealmLevelUpBehaviour.cs

@@ -111,10 +111,13 @@
            switch (error)

            {

                case 1:

                    SysNotifyMgr.Instance.ShowTip("RealmLevelUpError_1");

                    break;

                case 2:

                    SysNotifyMgr.Instance.ShowTip("RealmLevelUpError_2");

                    break;

                case 3:

                    SysNotifyMgr.Instance.ShowTip("RealmLevelUpError_3");

                    break;

            }

        }


 System/Realm/RealmModel.cs

@@ -83,21 +83,12 @@
                    m_RealmProperties.Add(config.Lv, dict);

                }



                if (stages.Contains(config.Lv))

                {

                    stages = new List<int>();

                    m_RealmStages.Add(stages);

                }



                stages.Add(config.Lv);



                if (config.BossID != 0)

                {

                    var nextConfig = RealmConfig.Get(config.Lv + 1);

                    if (nextConfig != null)

                    {

                        stages.Add(config.Lv + 1);

                    }

                    stages = new List<int>();

                    m_RealmStages.Add(stages);

                }



                if (!string.IsNullOrEmpty(config.equips))

@@ -167,8 +158,13 @@
            for (int i = 0; i < m_RealmStages.Count; i++)

            {

                var stages = m_RealmStages[i];

                if (stages.Contains(realmLevel))

                var index = stages.IndexOf(realmLevel);

                if (index != -1)

                {

                    if (stages.Count == 1)

                    {

                        return i - 1;

                    }

                    return i;

                }

            }


 System/Realm/RealmWin.cs

@@ -19,6 +19,8 @@
        [SerializeField] RealmLevelUpBehaviour m_RealmLevelUp;

        [SerializeField] RealmAnimationBehaviour m_RealmAnimation;

        [SerializeField] RealmStageBehaviour[] m_RealmStages;

        [SerializeField] Transform m_ContainerUnlockEquip;

        [SerializeField] Image m_EquipName;

        [SerializeField] Transform m_ContainerBoss;

        [SerializeField] RealmHeartMagicBehaviour m_RealmHeartMagic;

        [SerializeField] Button m_RealmRestraint;

@@ -27,6 +29,10 @@


        [SerializeField] PositionTween m_RealmBriefTween;

        [SerializeField] PositionTween m_RealmLevelUpTween;



        int cacheRealmLevel = 0;



        const int REALM_STAGE_COUNT = 5;



        RealmState m_RealmState = RealmState.LevelUp;

        RealmState realmState

@@ -86,6 +92,8 @@
            PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;

            model.selectRealmRefresh += SelectRealmRefresh;

            m_RealmAnimation.onRotateComplete += OnRotateComplete;



            cacheRealmLevel = PlayerDatas.Instance.baseData.realmLevel;

        }



        protected override void OnActived()

@@ -96,8 +104,15 @@
            HideRealmBoss();

            DisplayRealmUp();



            
            m_RealmBriefTween.Play();

            m_RealmLevelUpTween.Play();



            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

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

            if (requireLevelUp)

            {

                m_RealmLevelUpTween.Play();

            }

        }



        protected override void OnAfterOpen()

@@ -137,6 +152,7 @@
            DisplayRealmLevelUp();

            DisplayRealmStages();

            DisplayRealmBrief();

            DisplayUnlockEquip();

        }



        void HideRealmUp()

@@ -167,7 +183,8 @@


        void DisplayRealmStages()

        {

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

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var stage = model.GetRealmStage(realmLevel);

            m_RealmAnimation.SetDefault();

            List<int> realms = null;

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

@@ -175,18 +192,10 @@
                for (int i = 0; i < m_RealmStages.Length; i++)

                {

                    var index = m_RealmStages[i].animIndex;

                    if (index < realms.Count)

                    m_RealmStages[i].gameObject.SetActive(index < REALM_STAGE_COUNT);

                    if (realms[0] + index <= model.realmMaxLevel)

                    {

                        m_RealmStages[i].gameObject.SetActive(true);

                        m_RealmStages[i].Display(realms[index]);

                    }

                    else

                    {

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

                        if (realms[realms.Count - 1] < model.realmMaxLevel)

                        {

                            m_RealmStages[i].Display(realms[0] + index);

                        }

                        m_RealmStages[i].Display(realms[0] + index);

                    }

                }

            }

@@ -211,6 +220,41 @@
            m_RealmBrief.Display(model.selectRealm);

        }



        void DisplayUnlockEquip()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            m_ContainerUnlockEquip.gameObject.SetActive(false);

            var stage = model.GetRealmStage(realmLevel);

            List<int> realms = null;

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

            {

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

                {

                    var level = realms[0] + i;

                    var equipSet = 0;

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

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

                    {

                        var index = realms.IndexOf(level);

                        m_ContainerUnlockEquip.gameObject.SetActive(true);

                        foreach (var realmStage in m_RealmStages)

                        {

                            if (realmStage.animIndex == index)

                            {

                                var worldpos = realmStage.transform.TransformPoint(Vector2.zero + Vector2.down * 60);

                                var localpos = m_ContainerRealmUp.InverseTransformPoint(worldpos);

                                m_ContainerUnlockEquip.localPosition = localpos;

                                break;

                            }

                        }

                        var config = RealmConfig.Get(level);

                        m_EquipName.SetSprite(config.equipNameIcon);

                        break;

                    }

                }

            }

        }



        private void PlayerDataRefreshEvent(PlayerDataType dataType)

        {

            if (dataType == PlayerDataType.RealmLevel)

@@ -222,13 +266,23 @@
                }

                else

                {

                    var stage = model.GetRealmStage(realmLevel + 1);

                    var currentStage = model.GetRealmStage(model.selectRealm);

                    if (stage != currentStage)

                    {

                        m_RealmAnimation.StartRotate();

                    }

                    var stage = model.GetRealmStage(realmLevel);

                    var currentStage = model.GetRealmStage(cacheRealmLevel);

                    model.selectRealm = realmLevel + 1;

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

                    {

                        model.selectRealm = realmLevel + 1;

                        DisplayRealmStages();

                    }

                    else

                    {

                        if (stage != currentStage)

                        {

                            m_RealmAnimation.StartRotate();

                            m_ContainerUnlockEquip.gameObject.SetActive(false);

                        }

                    }

                    cacheRealmLevel = realmLevel;

                }

            }

        }

@@ -236,25 +290,27 @@
        private void OnRotateComplete()

        {

            var realmLevel = PlayerDatas.Instance.baseData.realmLevel;

            var stage = model.GetRealmStage(realmLevel + 1);

            var stage = model.GetRealmStage(realmLevel);

            List<int> realms = null;

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

            {

                for (int i = 0; i < m_RealmStages.Length; i++)

                {

                    var index = m_RealmStages[i].animIndex;

                    if (index > 4)

                    if (index >= REALM_STAGE_COUNT && realms[0] + index <= model.realmMaxLevel)

                    {

                        m_RealmStages[i].Display(realms[0] + index);

                    }

                }

            }

            DisplayUnlockEquip();

        }



        private void SelectRealmRefresh()

        {

            DisplayRealmBrief();

            DisplayRealmLevelUp();

            DisplayUnlockEquip();

        }



        private void OnBack()