Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
65f2f17752
@ -17,13 +17,19 @@ public class SpeechBubble : MonoBehaviour, ISpeechBubble
|
|||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
|
SetImage((Sprite)null);
|
||||||
HidePanel();
|
HidePanel();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShowPanel() => _panel.SetActive(true);
|
private void ShowPanel() => _panel.SetActive(true);
|
||||||
private void HidePanel() => _panel.SetActive(false);
|
private void HidePanel() => _panel.SetActive(false);
|
||||||
public void SetImage(Sprite sprite) => _itemImage.sprite = sprite;
|
public void SetImage(Sprite sprite) => _itemImage.sprite = sprite;
|
||||||
public void SetImage(string key) => DataManager.Instance.GetSprite(key);
|
|
||||||
|
public void SetImage(string key)
|
||||||
|
{
|
||||||
|
var sprite = DataManager.Instance.GetSprite(key);
|
||||||
|
SetImage(sprite);
|
||||||
|
}
|
||||||
|
|
||||||
public void Show(Sprite sprite)
|
public void Show(Sprite sprite)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user