|
@@ -22,7 +22,9 @@ namespace GFGGame
|
|
private GoWrapper _wrapper;
|
|
private GoWrapper _wrapper;
|
|
public override void Dispose()
|
|
public override void Dispose()
|
|
{
|
|
{
|
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject);
|
|
base.Dispose();
|
|
base.Dispose();
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
protected override void OnInit()
|
|
protected override void OnInit()
|
|
@@ -43,6 +45,8 @@ namespace GFGGame
|
|
{
|
|
{
|
|
if (isOptionalGuide) this.Hide();
|
|
if (isOptionalGuide) this.Hide();
|
|
});
|
|
});
|
|
|
|
+ string resPath0 = ResPathUtil.GetViewEffectPath("ui_yd/ui_yd_y", "ui_yd_y");
|
|
|
|
+ SceneController.AddObjectToView(_gameObject, _wrapper, _ui.m_holder, resPath0, out _gameObject, out _wrapper);
|
|
}
|
|
}
|
|
|
|
|
|
protected override void OnShown()
|
|
protected override void OnShown()
|
|
@@ -56,6 +60,9 @@ namespace GFGGame
|
|
isOptionalGuide = (bool)dataList[4];
|
|
isOptionalGuide = (bool)dataList[4];
|
|
devWidth = (float)dataList[5];
|
|
devWidth = (float)dataList[5];
|
|
devHeight = (float)dataList[6];
|
|
devHeight = (float)dataList[6];
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
if (GuideController.useNewGuide)
|
|
if (GuideController.useNewGuide)
|
|
{
|
|
{
|
|
guideId = (int)dataList[7];
|
|
guideId = (int)dataList[7];
|
|
@@ -79,18 +86,18 @@ namespace GFGGame
|
|
_ui.m_compTxt.target.visible = false;
|
|
_ui.m_compTxt.target.visible = false;
|
|
}
|
|
}
|
|
|
|
|
|
- _ui.m_rectFrameTemp.width = _ui.m_mask.target.width;
|
|
|
|
- _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
|
|
|
|
- _ui.m_rectFrameTemp.x = 0;
|
|
|
|
- _ui.m_rectFrameTemp.y = 0;
|
|
|
|
|
|
+ // _ui.m_rectFrameTemp.width = _ui.m_mask.target.width;
|
|
|
|
+ // _ui.m_rectFrameTemp.height = _ui.m_mask.target.height;
|
|
|
|
+ // _ui.m_rectFrameTemp.x = 0;
|
|
|
|
+ // _ui.m_rectFrameTemp.y = 0;
|
|
if (guideTarget != null)
|
|
if (guideTarget != null)
|
|
{
|
|
{
|
|
UpdateGuideRect();
|
|
UpdateGuideRect();
|
|
- _needUpdate = true;
|
|
|
|
- if (_needUpdate)
|
|
|
|
- {
|
|
|
|
- Timers.inst.AddUpdate(UpdateGuideRect);
|
|
|
|
- }
|
|
|
|
|
|
+ // _needUpdate = true;
|
|
|
|
+ // if (_needUpdate)
|
|
|
|
+ // {
|
|
|
|
+ // Timers.inst.AddUpdate(UpdateGuideRect);
|
|
|
|
+ // }
|
|
_ui.m_mask.target.visible = true;
|
|
_ui.m_mask.target.visible = true;
|
|
|
|
|
|
if (GuideController.useNewGuide)
|
|
if (GuideController.useNewGuide)
|
|
@@ -101,6 +108,7 @@ namespace GFGGame
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
|
|
+
|
|
_ui.m_mask.target.visible = false;
|
|
_ui.m_mask.target.visible = false;
|
|
_ui.m_compTxt.target.y = Math.Min(yTxt, GRoot.inst.height - _ui.m_compTxt.target.height - 3);
|
|
_ui.m_compTxt.target.y = Math.Min(yTxt, GRoot.inst.height - _ui.m_compTxt.target.height - 3);
|
|
}
|
|
}
|
|
@@ -111,8 +119,9 @@ namespace GFGGame
|
|
|
|
|
|
protected override void OnHide()
|
|
protected override void OnHide()
|
|
{
|
|
{
|
|
- Timers.inst.Remove(UpdateGuideRect);
|
|
|
|
|
|
+ // Timers.inst.Remove(UpdateGuideRect);
|
|
base.OnHide();
|
|
base.OnHide();
|
|
|
|
+ _ui.m_holder.visible = false;
|
|
OnClickTarget();
|
|
OnClickTarget();
|
|
guideTarget = null;
|
|
guideTarget = null;
|
|
|
|
|
|
@@ -126,6 +135,9 @@ namespace GFGGame
|
|
Rect rect = guideTarget.TransformRect(new Rect(0 + devWidth, devHeight, guideTarget.width, guideTarget.height), _ui.target);
|
|
Rect rect = guideTarget.TransformRect(new Rect(0 + devWidth, devHeight, guideTarget.width, guideTarget.height), _ui.target);
|
|
_ui.m_mask.m_guideArea.size = new Vector2((int)rect.size.x, (int)rect.size.y);
|
|
_ui.m_mask.m_guideArea.size = new Vector2((int)rect.size.x, (int)rect.size.y);
|
|
_ui.m_mask.m_guideArea.position = new Vector2((int)rect.position.x, (int)rect.position.y);
|
|
_ui.m_mask.m_guideArea.position = new Vector2((int)rect.position.x, (int)rect.position.y);
|
|
|
|
+ float x = _ui.m_mask.m_guideArea.position.x + _ui.m_mask.m_guideArea.size.x * 0.5f;
|
|
|
|
+ float y = _ui.m_mask.m_guideArea.position.y + _ui.m_mask.m_guideArea.size.y * 0.5f;
|
|
|
|
+ _ui.m_holder.position = new Vector2(x, y);
|
|
int padding = 30;
|
|
int padding = 30;
|
|
bool atBottom = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding + _ui.m_compTxt.target.height + padding > GRoot.inst.height;
|
|
bool atBottom = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding + _ui.m_compTxt.target.height + padding > GRoot.inst.height;
|
|
if (atBottom)
|
|
if (atBottom)
|
|
@@ -136,19 +148,20 @@ namespace GFGGame
|
|
{
|
|
{
|
|
_ui.m_compTxt.target.y = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding;
|
|
_ui.m_compTxt.target.y = _ui.m_mask.m_guideArea.y + _ui.m_mask.m_guideArea.height + padding;
|
|
}
|
|
}
|
|
- int targetWidth = 20;
|
|
|
|
- if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) > targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) > targetWidth)
|
|
|
|
- {
|
|
|
|
- _ui.m_rectFrameTemp.visible = true;
|
|
|
|
- float duration = 0.5f;
|
|
|
|
- _ui.m_rectFrameTemp.TweenResize(new Vector2(_ui.m_rectFrame.target.width, _ui.m_rectFrame.target.height), duration);
|
|
|
|
- _ui.m_rectFrameTemp.TweenMove(new Vector2(_ui.m_rectFrame.target.x, _ui.m_rectFrame.target.y), duration);
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- _ui.m_rectFrameTemp.visible = false;
|
|
|
|
- _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
|
|
|
|
- }
|
|
|
|
|
|
+ // int targetWidth = 20;
|
|
|
|
+ // if (Mathf.Abs(_ui.m_rectFrameTemp.width - _ui.m_rectFrame.target.width) > targetWidth && Mathf.Abs(_ui.m_rectFrameTemp.height - _ui.m_rectFrame.target.height) > targetWidth)
|
|
|
|
+ // {
|
|
|
|
+ // _ui.m_rectFrameTemp.visible = true;
|
|
|
|
+ // float duration = 0.5f;
|
|
|
|
+ // _ui.m_rectFrameTemp.TweenResize(new Vector2(_ui.m_rectFrame.target.width, _ui.m_rectFrame.target.height), duration);
|
|
|
|
+ // _ui.m_rectFrameTemp.TweenMove(new Vector2(_ui.m_rectFrame.target.x, _ui.m_rectFrame.target.y), duration);
|
|
|
|
+ // }
|
|
|
|
+ // else
|
|
|
|
+ // {
|
|
|
|
+ _ui.m_rectFrameTemp.visible = false;
|
|
|
|
+ // _ui.m_rectFrame.target.visible = _ui.m_mask.target.visible;
|
|
|
|
+ _ui.m_holder.visible = _ui.m_mask.target.visible;
|
|
|
|
+ // }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
private void OnClickTarget()
|
|
private void OnClickTarget()
|