From 1c52e8157043f6fe67dce27306d1517be0248449 Mon Sep 17 00:00:00 2001
From: ZXW <826696702@qq.com>
Date: 星期五, 10 八月 2018 17:14:08 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/Stage/MapEditor/NewGuideWin.cs | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Fight/Stage/MapEditor/NewGuideWin.cs b/Fight/Stage/MapEditor/NewGuideWin.cs
index dcabc11..43e1bbc 100644
--- a/Fight/Stage/MapEditor/NewGuideWin.cs
+++ b/Fight/Stage/MapEditor/NewGuideWin.cs
@@ -49,8 +49,17 @@
holdImage.cell = _model.size;
rtSelectFrame.sizeDelta = _model.size + new Vector2(15, 15);
+ if (string.IsNullOrEmpty(_model.content))
+ {
+ rtContent.gameObject.SetActive(false);
+ }
+ else
+ {
+ rtContent.gameObject.SetActive(true);
+ }
txtContent.text = _model.content;
m_PressClose = _model.pressedClose;
+ rtArrow.localScale = Vector3.one * _model.arrowScale;
container.gameObject.SetActive(_model.showMask);
if (_model.onClose != null)
@@ -115,25 +124,25 @@
{
_arrowPosition = rtSelectFrame.anchoredPosition + new Vector2(0, rtSelectFrame.sizeDelta.y * .5f + 20f);
_contentPosition = _arrowPosition + new Vector2(0, rtArrow.sizeDelta.y * .5f + rtContent.sizeDelta.y * .5f + 5);
- _rotation = Vector3.zero;
+ _rotation = new Vector3(0, 0, 90);
}
else if (m_Direction == 1)// 涓�
{
_arrowPosition = rtSelectFrame.anchoredPosition + new Vector2(0, -rtSelectFrame.sizeDelta.y * .5f - 20f);
_contentPosition = _arrowPosition + new Vector2(0, -rtArrow.sizeDelta.y * .5f - rtContent.sizeDelta.y * .5f - 5);
- _rotation = new Vector3(0, 0, 180);
+ _rotation = new Vector3(0, 0, 270);
}
else if (m_Direction == 2)// 宸�
{
_arrowPosition = rtSelectFrame.anchoredPosition + new Vector2(-rtSelectFrame.sizeDelta.x * .5f - 20f, 0);
_contentPosition = _arrowPosition + new Vector2(-rtArrow.sizeDelta.x * .5f - rtContent.sizeDelta.x * .5f - 5, 0);
- _rotation = new Vector3(0, 0, 90);
+ _rotation = new Vector3(0, 0, 180);
}
else if (m_Direction == 3)// 鍙�
{
_arrowPosition = rtSelectFrame.anchoredPosition + new Vector2(rtSelectFrame.sizeDelta.x * .5f + 20f, 0);
_contentPosition = _arrowPosition + new Vector2(rtArrow.sizeDelta.x * .5f + rtContent.sizeDelta.x * .5f + 5, 0);
- _rotation = new Vector3(0, 0, 270);
+ _rotation = Vector3.zero;
}
rtArrow.anchoredPosition = _arrowPosition;
--
Gitblit v1.8.0