Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/WorldMap/LocalMapWin.cs

@@ -44,7 +44,7 @@
            m_MapLineContainer.gameObject.SetActive(false);

            m_MapLineSwitch.gameObject.SetActive(false);



            var config = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            var config = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

            m_WorldMap.gameObject.SetActive(config.MapFBType == (int)MapType.OpenCountry);

        }



@@ -89,7 +89,7 @@
        {

            ShowMapEventPoints();

            m_LocalMap.Init(mapId);

            var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId);

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

            m_MapName.text = mapConfig.Name;



            m_MapLineSwitch.gameObject.SetActive(mapId == PlayerDatas.Instance.baseData.MapID);

@@ -109,7 +109,7 @@
            var eventPoints = model.GetMapEventPoints(mapId);

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

            {

                var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(eventPoints[i]);

                var config = Config.Instance.Get<MapEventPointConfig>(eventPoints[i]);

                if (config.IsShowInfo == 1)

                {

                    visableEventPoints.Add(eventPoints[i]);

@@ -118,8 +118,8 @@


            visableEventPoints.Sort((int a, int b) =>

            {

                var configA = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(a);

                var configB = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(b);

                var configA = Config.Instance.Get<MapEventPointConfig>(a);

                var configB = Config.Instance.Get<MapEventPointConfig>(b);



                if (configA.LowLV != configB.LowLV)

                {

@@ -170,7 +170,7 @@
        {

            if (model.selectedLocalMapEventPoint != -1)

            {

                var config = ConfigManager.Instance.GetTemplate<MapEventPointConfig>(this.model.selectedLocalMapEventPoint);

                var config = Config.Instance.Get<MapEventPointConfig>(this.model.selectedLocalMapEventPoint);

                WindowCenter.Instance.Close<WorldMapWin>();

                WindowCenter.Instance.Close<LocalMapWin>();

                WindowCenter.Instance.Open<MainInterfaceWin>();

@@ -217,7 +217,7 @@
        {

            if (AchievementGoto.guideAchievementId != 0)

            {

                var config = ConfigManager.Instance.GetTemplate<SuccessConfig>(AchievementGoto.guideAchievementId);

                var config = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId);

                var condition = config.Type == 4;



                if (condition)