From 040e5a548b96299f1268010854c8da279853bf1a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 02 十一月 2018 17:09:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Chat/ChatContentBehaviour.cs | 39 +++++++++++++++------------------------
1 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/System/Chat/ChatContentBehaviour.cs b/System/Chat/ChatContentBehaviour.cs
index a2759f8..d21d49c 100644
--- a/System/Chat/ChatContentBehaviour.cs
+++ b/System/Chat/ChatContentBehaviour.cs
@@ -4,13 +4,12 @@
using System.Text.RegularExpressions;
using UnityEngine;
using UnityEngine.UI;
-
+using EnhancedUI.EnhancedScroller;
namespace Snxxz.UI
{
public class ChatContentBehaviour : MonoBehaviour
{
[SerializeField] ScrollerController m_ChatContentControl;
- [SerializeField] RichText m_DestText;
[SerializeField] RichText m_DestSysText;
[SerializeField] RichText m_DestTipText;
[SerializeField] RectTransform m_ContaienrNewInfo;
@@ -20,6 +19,12 @@
[SerializeField] Image m_LockAreaCheck;
[SerializeField, Header("鏄剧ず鍖哄煙澶у皬")] float m_ContentDisplaySize = 630;
[SerializeField, Header("閿佸畾褰撳墠鍖哄煙姣斾緥"), Range(0, 1)] float m_Percent = 0.3f;
+
+ [SerializeField] ChatPlayerMineCell m_ChatMineCell;
+ [SerializeField] ChatPlayerOtherCell m_ChatOtherCell;
+ [SerializeField] ChatMineVoiceCell m_ChatMineVoiceCell;
+ [SerializeField] ChatOtherVoiceCell m_ChatOtherVoiceCell;
+
private ChatInfoType m_ChatType = ChatInfoType.System;
public ChatInfoType chatType
{
@@ -62,10 +67,6 @@
m_LockAreaBtn.onClick.AddListener(OnLockAreaBtn);
m_ChatContentControl.mScrollRect.onValueChanged.AddListener(OnScrollValChange);
- if (m_DestText.font == null)
- {
- m_DestText.font = FontUtility.preferred;
- }
if (m_DestSysText.font == null)
{
m_DestSysText.font = FontUtility.preferred;
@@ -370,17 +371,21 @@
switch (_type)
{
case ScrollerDataType.Header:
+ _height = m_ChatMineCell.GetHeight(chat.content, chat.infoList);
+ return true;
case ScrollerDataType.Normal:
- _height = 90;
- break;
+ _height = m_ChatOtherCell.GetHeight(chat.content, chat.infoList);
+ return true;
case ScrollerDataType.Extra1:
case ScrollerDataType.Tail:
_height = 30;
break;
case ScrollerDataType.Extra2:
+ _height = m_ChatMineVoiceCell.GetHeight(chat.content, chat.infoList);
+ return true;
case ScrollerDataType.Extra3:
- _height = chat.content.Equals(string.Empty) ? 80 : 110;
- break;
+ _height = m_ChatOtherVoiceCell.GetHeight(chat.content, chat.infoList);
+ return true;
}
OnGetChatDynamicHeight(chat.content, ref _height, _type, chat.infoList);
return true;
@@ -402,20 +407,6 @@
m_DestTipText.text = _content;
_textHeight = Mathf.Max(m_DestTipText.preferredHeight, m_DestTipText.fontSize);
_height += Mathf.Max(0, _textHeight - 23);
- }
- else if (_type == ScrollerDataType.Extra2 || _type == ScrollerDataType.Extra3)
- {
- m_DestText.SetExtenalData(_infoList);
- m_DestText.text = _content;
- _textHeight = Mathf.Max(m_DestText.preferredHeight, m_DestText.fontSize);
- _height += Mathf.Max(0, _textHeight - 8);
- }
- else
- {
- m_DestText.SetExtenalData(_infoList);
- m_DestText.text = _content;
- _textHeight = Mathf.Max(m_DestText.preferredHeight, m_DestText.fontSize);
- _height += Mathf.Max(0, _textHeight - 30);
}
}
--
Gitblit v1.8.0