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

client_Hale

2019-01-21 a56b87458cd32bcea06e3fcc8a2d25e295745f10

 System/Dungeon/DungeonInspireBehaviour.cs

@@ -53,7 +53,8 @@
            }

            switch (mapId)

            {

                case 52010:

                case DemonJarModel.DEMONJAR_MAPID:

                case JadeDynastyBossModel.JADEDYNASTY_MAP:

                    m_Icon.SetSprite("W_XYGuwu_a2");

                    break;

                default:

@@ -71,7 +72,7 @@
                && level < model.GetInspireMaxCount(mapId);

            if (m_InspireProgress != null)

            {

                m_InspireProgress.gameObject.SetActive(PlayerDatas.Instance.baseData.MapID == DemonJarModel.DEMONJAR_MAPID);

                m_InspireProgress.gameObject.SetActive(IsRequireDisplayProgress());

                m_InspireProgress.text = StringUtility.Contact(level * model.GetDungeonInspireUpper(mapId), "%");

            }

            if (!m_Waggle)

@@ -103,6 +104,12 @@
            }

        }



        private bool IsRequireDisplayProgress()

        {

            return PlayerDatas.Instance.baseData.MapID == DemonJarModel.DEMONJAR_MAPID

                || PlayerDatas.Instance.baseData.MapID == JadeDynastyBossModel.JADEDYNASTY_MAP;

        }



        private void ResetTween()

        {

            m_Time = 0;