Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/WorldMap/WorldMapWin.cs

@@ -92,7 +92,7 @@


            WorldMapAreaBehaviour playerAtBehaviour = null;

            var currentMapId = PlayerDatas.Instance.baseData.MapID;



            m_ContainerPlayerHead.gameObject.SetActive(false);

            for (int i = 0; i < m_AreaBehaviours.Length; i++)

            {

                var behaviourTable = m_AreaBehaviours[i];

@@ -104,6 +104,7 @@
                    behaviourTable.areaBehaviour.Init(area);

                    if (behaviourTable.id == currentMapId.ToString())

                    {

                        m_ContainerPlayerHead.gameObject.SetActive(true);

                        playerAtBehaviour = behaviourTable.areaBehaviour;

                        m_ContainerPlayerHead.SetParentEx(behaviourTable.areaBehaviour.playerHead, Vector3.zero, Vector3.zero, Vector3.one);

                    }