Merge pull request 'fix show ui chat' (#248) from feature/chat into develop
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/248
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2f7579ae86e7eb19b6130eb989cf5237ad9a8ea1fc11edd62f799a1e5d19ea7f
|
||||
size 330010
|
||||
oid sha256:a9a55e98bffb718cd643fe0452bbcde34caaa4927b873b5677a68b51b1daf485
|
||||
size 331323
|
||||
|
||||
@@ -12,11 +12,14 @@ namespace BrewMonster.Scripts.ChatUI
|
||||
|
||||
public void Bind(Sprite iconSprite, string message)
|
||||
{
|
||||
if (iconImage != null)
|
||||
if (iconImage == null)
|
||||
{
|
||||
iconImage.sprite = iconSprite;
|
||||
iconImage.gameObject.SetActive(iconSprite != null);
|
||||
iconImage = GetComponent<Image>();
|
||||
}
|
||||
|
||||
iconImage.sprite = iconSprite;
|
||||
iconImage.gameObject.SetActive(iconSprite != null);
|
||||
|
||||
messageText.text = message;
|
||||
GetComponent<IRefreshLayout>().RefreshLayout();
|
||||
}
|
||||
|
||||
@@ -2738,10 +2738,10 @@ RectTransform:
|
||||
m_Father: {fileID: 1473672866371037475}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4906838759260176767
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -329,7 +329,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 179d32c667fc2f641bdcb7afb18046b9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
iconImage: {fileID: 0}
|
||||
iconImage: {fileID: 2098686458651577804}
|
||||
messageText: {fileID: 5305392080666511277}
|
||||
--- !u!114 &-887576589064363463
|
||||
MonoBehaviour:
|
||||
|
||||
Reference in New Issue
Block a user