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

client_Hale

2018-09-14 d65372c143a85a4d5d5d4ae31a79ea6c24854f44

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

 System/Dungeon/DungeonInspireBehaviour.cs

@@ -11,6 +11,7 @@
        [SerializeField] Button m_InspireBtn;

        [SerializeField] RotationTween m_RotTween;

        [SerializeField] Text m_InspireProgress;

        [SerializeField] Image m_Icon;

        [SerializeField, Header("晃动次数")]

        int m_WaggleCnt = 6;

        [SerializeField, Header("间隔时间")]

@@ -35,7 +36,8 @@
            ResetTween();

            model.dungeonInspireLvEvent += UpdateDugeonInspireLv;

            UpdateDugeonInspireLv();

            var _list = model.GetDungeonInspire(PlayerDatas.Instance.baseData.MapID);

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var _list = model.GetDungeonInspire(mapId);

            m_CoinConfig = null;

            if (_list == null)

            {

@@ -49,6 +51,16 @@
                    break;

                }

            }

            switch (mapId)

            {

                case 52010:

                    m_Icon.SetSprite("W_XYGuwu_a2");

                    break;

                default:

                    m_Icon.SetSprite("W_Guwu_a");

                    break;

            }

            m_Icon.SetNativeSize();

        }



        private void UpdateDugeonInspireLv()


 System/Dungeon/DungeonInspireWin.cs

@@ -173,7 +173,6 @@
                if (money < model.GetDungeonInspireCost(fairyInspireConfig)

                    && !InGuiding())

                {

                    CloseImmediately();

                    WindowCenter.Instance.Open<RechargeTipWin>();

                }

                else


 System/Dungeon/DungeonModel.cs

@@ -1272,12 +1272,6 @@
                cacheGradeMap = PlayerDatas.Instance.baseData.MapID;

                gradeTween = true;

            }

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            if (mapConfig == null || mapConfig.MapFBType == 0)

            {

                UpdateInspireLevel(0, 0);

            }

        }



        private void ParseConfig()