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

client_Hale

2018-09-14 079ecd71b24f5bf9aac653f18f76d4670bcd169e

 System/Dungeon/DungeonInspireBehaviour.cs

@@ -43,7 +43,7 @@
            }

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

            {

                if (_list[i].InspireType == 1)

                if (_list[i].InspireType == 3)

                {

                    m_CoinConfig = _list[i];

                    break;

@@ -54,13 +54,13 @@
        private void UpdateDugeonInspireLv()

        {

            var mapId = model.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            var lv = model.dungeonJadeInspireCount + model.dungeonCoinInspireCount;

            m_Waggle = m_CoinConfig != null && model.dungeonCoinInspireCount < m_CoinConfig.InspireCount

                && lv < model.GetInspireMaxCount(mapId);

            var level = model.GetDungeonInspireLevel();

            m_Waggle = m_CoinConfig != null && model.GetDungeonInspireLevel(3) < m_CoinConfig.InspireCount

                && level < model.GetInspireMaxCount(mapId);

            if (m_InspireProgress != null)

            {

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

                m_InspireProgress.text = StringUtility.Contact(lv * 10, "%");

                m_InspireProgress.text = StringUtility.Contact(level * 10, "%");

            }

            if (!m_Waggle)

            {

@@ -100,7 +100,7 @@


        private void OnInspireBtn()

        {

            if ((model.dungeonCoinInspireCount + model.dungeonJadeInspireCount) >= model.GetInspireMaxCount(PlayerDatas.Instance.baseData.MapID))

            if ((model.GetDungeonInspireLevel()) >= model.GetInspireMaxCount(PlayerDatas.Instance.baseData.MapID))

            {

                SysNotifyMgr.Instance.ShowTip("Xjmj_InspireMaxLevel");

                return;