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

client_linchunjie

2018-08-15 6a7e18e67423da68c7fc452243a2706e35a19e93

 System/DailyQuest/DailyQuestRealmPracticeBehaviour.cs

@@ -15,9 +15,9 @@
        [SerializeField] RectTransform m_ContainerPractice;

        [SerializeField] Button m_GotoRealm;

        [SerializeField] Slider m_PracticePointSlider;

        [SerializeField] RectTransform m_RealmContainer; 
        [SerializeField] RectTransform m_RealmContainer;

        [SerializeField] Text m_RealmStateDescription;

        [SerializeField] Image m_Realm;

        [SerializeField] Image m_RealmState;

        [SerializeField] Text m_PracticePoint;

        [SerializeField] Text m_PractivePointNeed;

        [SerializeField] Text m_GotoRealmLevelUpHint;

@@ -89,14 +89,36 @@


        private void UpdatePraceticePoint(bool _rightNow)

        {

            var isMaxRealm = realmModel.realmMaxLevel == PlayerDatas.Instance.baseData.realmLevel;

            var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);

            var pointNeed = realmConfig.NeedPoint;

            var pointOwn = PlayerDatas.Instance.extersion.realmPoint;



            m_RealmContainer.gameObject.SetActive(realmConfig != null && realmConfig.Lv > 0);

            if (realmConfig != null && realmConfig.Lv > 0)

            if (isMaxRealm)

            {

                m_Realm.SetSprite(realmConfig.Img);

                m_GotoRealmLevelUpHint.gameObject.SetActive(false);

                realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);

                m_RealmStateDescription.text = Language.Get("DailyquestHighestRealm");

            }

            else

            {

                m_GotoRealmLevelUpHint.gameObject.SetActive(true);

                if (pointOwn >= pointNeed)

                {

                    m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm2");

                }

                else

                {

                    m_GotoRealmLevelUpHint.text = Language.Get("RealmCollecting", pointNeed - pointOwn);

                }

                m_RealmStateDescription.text = Language.Get("DailyquestNextRealm");

            }



            var nextRealmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel + (isMaxRealm ? 0 : 1));

            m_RealmContainer.gameObject.SetActive(nextRealmConfig != null && nextRealmConfig.Lv > 0);

            if (nextRealmConfig != null && nextRealmConfig.Lv > 0)

            {

                m_Realm.SetSprite(nextRealmConfig.Img);

            }



            m_PractivePointNeed.text = StringUtility.Contact("/", pointNeed);

@@ -111,40 +133,6 @@
                StartCoroutine(Co_PointIncreasePerformance(new PointPerformance() { startPoint = piontBuf, endPoint = pointOwn }));

                piontBuf = pointOwn;

            }



            if (pointOwn >= pointNeed)

            {

                m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm2");

                m_RealmState.SetSprite("JJ_TB_1");

            }

            else

            {

                m_GotoRealmLevelUpHint.text = Language.Get("RealmCollecting", pointNeed - pointOwn);

                m_RealmState.SetSprite("JJ_TB_2");

            }



            //switch (PlayerDatas.Instance.realm.prensentRealmState)

            //{

            //    case PlayerRealmData.RealmState.Collecting:

            //        if (pointOwn >= pointNeed)

            //        {

            //            m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm2");

            //        }

            //        else

            //        {

            //            m_GotoRealmLevelUpHint.text = Language.Get("RealmCollecting", pointNeed - pointOwn);

            //        }

            //        m_RealmState.SetSprite("JJ_TB_1");

            //        break;

            //    //case PlayerRealmData.RealmState.Dungeon:

            //    //    m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm3");

            //    //    m_RealmState.SetSprite("JJ_TB_2");

            //    //    break;

            //    //case PlayerRealmData.RealmState.LevelUp:

            //    //    m_GotoRealmLevelUpHint.text = Language.Get("DailyquestRealm4");

            //    //    m_RealmState.SetSprite("JJ_TB_3");

            //    //    break;

            //}



        }