Merge branch '2960仙盟抢Boss活动'

client_linchunjie

2018-08-30 0d371b91a3f7b193f7ea3c1bcde8226ca02275fd

 System/WorldMap/LocalMapWin.cs

@@ -25,6 +25,7 @@


        int mapId = 0;

        MapModel model { get { return ModelCenter.Instance.GetModel<MapModel>(); } }

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }



        protected override void BindController()

        {

@@ -91,13 +92,22 @@
            m_MapName.text = mapConfig.Name;



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

            if (BossFakeLineUtility.Instance.showFakeLine)

            var grabBossLine = 0;

            fairyGrabBossModel.TryGetFairyGrabBossLine(out grabBossLine);

            if (grabBossLine != 0 && PlayerDatas.Instance.baseData.FBID == grabBossLine)

            {

                m_CurrentLine.text = Language.Get("line", 1);

                m_CurrentLine.text = Language.Get("FairyGrabBossLine");

            }

            else

            {

                m_CurrentLine.text = Language.Get("line", PlayerDatas.Instance.baseData.FBID + 1);

                if (BossFakeLineUtility.Instance.showFakeLine)

                {

                    m_CurrentLine.text = Language.Get("line", 1);

                }

                else

                {

                    m_CurrentLine.text = Language.Get("line", PlayerDatas.Instance.baseData.FBID + 1);

                }

            }

        }