From 69e0fea6c92fd4e153d45e5f26ef89baecf0405a Mon Sep 17 00:00:00 2001
From: weixudong <weixudong4700@ktgame.com>
Date: Thu, 19 Nov 2020 08:51:09 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle into master
---
Assets/Scripts/Guide/GuidePanel.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index 191700a..81be6d7 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -67,7 +67,12 @@
backgroundImg = transform.Find("Button").GetComponent<Image>();
towerBuyBtn = GameObject.Find("UICamera/BottomCanvas/Panel/TowerBuyBtn");
- towerBuyBtnPos = new Vector2(-3, -862);
+ RectTransform tmpTs = towerBuyBtn.GetComponent<RectTransform>();
+
+ RectTransform canvasUI = transform.parent.parent.GetComponent<RectTransform>();
+ float tmpOffect = tmpTs.anchoredPosition.y - (canvasUI.sizeDelta.y * 0.5f);
+ towerBuyBtnPos = new Vector2(tmpTs.anchoredPosition.x, tmpOffect);
+
tipsUI = transform.Find("Tips").gameObject;
tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -90,29 +95,44 @@
particle_1 = image_Rim_Rect.transform.Find("Particle System Small").gameObject;
particle_2 = image_Rim_Rect.transform.Find("Particle System Big").gameObject;
+ float a = 0.06666667f;
+ float b = canvasUI.localScale.x;
+ float tmpScale = a / b;
+ //Debug.Log($"记录的比值：{a} 当前Canvas的Scale：{b} 计算得到的比值：{tmpScale}");
+
image_Tip_Rect = transform.Find("Image_Tip").GetComponent<RectTransform>();
text_Tip = image_Tip_Rect.transform.Find("Text").GetComponent<Text>();
image_SkillRim = transform.Find("Image_SkillRim").GetComponent<Image>();
+ image_SkillRim.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
SetRimActive(false);
image_SkillRim.gameObject.SetActive(false);
fire1 = transform.Find("Image_Fire1").GetComponent<ImageFire1>();
+ fire1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
fire2 = transform.Find("Image_Fire2").GetComponent<ImageFire2>();
+ fire2.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
fire1.gameObject.SetActive(false);
fire2.gameObject.SetActive(false);
towerPos = transform.Find("Image_TowerPos").GetComponent<ImageTowerPos>();
+ towerPos.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+
towerPos.enabled = false;
towerPos2 = transform.Find("Image_TowerPos2").GetComponent<ImageTowerPos2>();
+ towerPos2.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+
towerPos2.enabled = false;
water1 = transform.Find("Image_Water").GetComponent<ImageWater>();
+ water1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
water1.gameObject.SetActive(false);
skill = transform.Find("Image_Skill").GetComponent<ImageSkill>();
+ skill.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+
skill.gameObject.SetActive(false);
dragHandImg = transform.Find("ImageHand").GetComponent<RectTransform>();
@@ -159,7 +179,7 @@
SetRimActive(true);
AddButtonListener(towerBuyBtn, ac);
Image btnImg = towerBuyBtn.GetComponent<Image>();
- InitRectGuidance(btnImg, 189, 73.5f);
+ InitRectGuidance(btnImg, 159, 73.5f);
SetRimPos(towerBuyBtn);
//maskObj.ShowImmediately();
@@ -216,7 +236,7 @@
{
tmpMask.enabled = true;
- offectBackground.SetActive(true);
+ offectBackground.SetActive(true);
SetGuideUI(false);
@@ -244,7 +264,7 @@
if (currentIndex == 0)
{
tmpMask.enabled = false;
- offectBackground.SetActive(false);
+ offectBackground.SetActive(false);
SetRimActive(true);
Image btnImg = transform.Find("Image_TowerPos").GetComponent<Image>();
@@ -317,7 +337,7 @@
AddButtonListener(towerBuyBtn, ac);
Image btnImg = towerBuyBtn.GetComponent<Image>();
- InitRectGuidance(btnImg, 189, 73.5f);
+ InitRectGuidance(btnImg, 159, 73.5f);
SetRimPos(towerBuyBtn);
//maskObj.ShowImmediately();
}
--
Gitblit v1.9.1