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

client_linchunjie

2018-11-02 9c255d68f551d96a71eb7d964bd0e28c59a1b6dc

 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -102,6 +102,7 @@
        [SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance;



        [SerializeField] FairyCallMemberBehaviour m_FairyCallBehaviour;

        [SerializeField] MapSwitchingBehaviour m_MapSwitchingBehaviour;

        #region

        private int mapId = 0;

        public delegate void OnChatCallback();//聊天回调

@@ -144,6 +145,7 @@
        #region Built-in

        protected override void BindController()

        {

            m_MapSwitchingBehaviour.InitAwake();

            recordPositionBool = true;

            m_TaskAndTeamPanel.localPosition = TaskListTipAnchor1.localPosition;

            m_CastSkillTip.localPosition = m_position1_S.localPosition;

@@ -203,6 +205,7 @@
            m_AnimationFadeOut.Init();

            m_TeamInvitationEntrance.Init();

            m_FairyCallBehaviour.Init();

            m_MapSwitchingBehaviour.Init();

            m_BossBriefInfos.gameObject.SetActive(false);

            UpdateWishAwardImag();

            ArticleExperience();//关于经验条