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

client_Zxw

2018-09-13 cc39df7d7296e2860b62ca563e0c717aad17fd47

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

 System/Chat/ChatOtherVoiceCell.cs

@@ -16,6 +16,7 @@
        [SerializeField] Text playerNameText;

        [SerializeField] Image m_ChatIcon;

        [SerializeField] ImageFitterText m_Fitter;

        [SerializeField] Button m_ViewPlayer;



        ChatCenter m_ChatCenter;

        ChatCenter chatCenter

@@ -27,11 +28,16 @@
        }

        public override void Refresh(CellView cell)

        {

            m_ViewPlayer.RemoveAllListeners();

            ChatUeseData _data = chatCenter.GetChatData(ChatCtrl.Inst.presentChatType, cell.index) as ChatUeseData;

            if (_data == null)

            {

                return;

            }

            m_ViewPlayer.onClick.AddListener(() =>

            {

                ViewPlayer(_data);

            });

            m_ChatTxt.text = _data.content;

            m_Fitter.gameObject.SetActive(!string.IsNullOrEmpty(_data.content));

            m_ChatIcon.SetSprite(GeneralConfig.Instance.GetJobHeadPortrait(_data.job, 0));

@@ -59,6 +65,16 @@
                chatCenter.PlaySpeech(_chat.player, _chat.soundTick, _length);

            }

        }



        void ViewPlayer(ChatUeseData _chat)

        {

            ChatUeseData user = _chat as ChatUeseData;

            if (user.player == PlayerDatas.Instance.baseData.PlayerID)

            {

                return;

            }

            HrefAnalysis.Inst.ExcuteHrefEvent(string.Format("showplayer={0}", user.player));

        }

    }

}




 System/Treasure/TreasureLevelUpWin.cs

@@ -1007,9 +1007,10 @@
            CameraUtility.ScreenShotCut((Texture2D _tex) =>

            {

                TreasureStageUpTriggerWin.screenShotCut = _tex;

                WindowJumpMgr.Instance.ClearJumpData();

                WindowCenter.Instance.Open<MainInterfaceWin>();

                CloseImmediately();

                WindowCenter.Instance.Open<TreasureStageUpTriggerWin>(true);

                WindowCenter.Instance.Open<MainInterfaceWin>();

                if (WindowCenter.Instance.CheckOpen<DialogueDuidanceWin>())

                {

                    WindowCenter.Instance.CloseImmediately<DialogueDuidanceWin>();