From 09053388ef6d58a7de59fab450c11ee0affbceb2 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 20 Nov 2020 11:50:55 +0800
Subject: [PATCH] Merge commit 'fafc11ad74601a1c4e4b2e28165af25bd19bb5a9' into master
---
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 7b65c0c..d171304 100644
--- a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
+++ b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -19,7 +19,7 @@
public TextMeshProUGUI timeTextNew = null;
- public TextMeshProUGUI timeStatic = null;
+ //public TextMeshProUGUI timeStatic = null;
/// <summary>
/// 结算界面
@@ -49,7 +49,7 @@
public bool beginSkillStep = false;
- private GameObject darkGroundImg;
+ public GameObject darkGroundImg;
// Start is called before the first frame update
void Start()
@@ -58,13 +58,10 @@
bGameStart = false;
bFirstLoaded = false;
- darkGroundImg = transform.Find("Image_DarkGround").gameObject;
- darkGroundImg.SetActive(false);
+
bVibrate = new bool[4];
bVibrate[0] = bVibrate[1] = bVibrate[2] = bVibrate[3] = false;
- if (timeStatic)
- timeStatic.gameObject.SetActive(false);
EndlessBuffSelect.instance.HideBuffUI();
EndlessSettlement settlement = SettlementUI.transform.Find("BgMask").GetComponent<EndlessSettlement>();
settlement.Init();
@@ -73,10 +70,26 @@
EndlessBossHPManager.instance.HideHP();
EndlessScoreManager.instance.HideScore();
+
+ float ratio = 0.06666667f;
+ RectTransform ts = GetComponent<RectTransform>();
+ float tmpScale = ratio / ts.localScale.x - 1.0f;
+ float offect = tmpScale * (ts.sizeDelta.y * 0.5f);
+ //Debug.Log($"tmpScale:{tmpScale} offect:{offect}");
+ Vector2 tmpOffect = new Vector2(0, offect);
+ transform.Find("Panel/Bottom").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
+ transform.Find("Panel/TowerBuyBtn").GetComponent<RectTransform>().anchoredPosition += tmpOffect;
+
+ //darkGroundImg = transform.Find("Image_DarkGround").gameObject;
+ darkGroundImg.GetComponent<RectTransform>().offsetMin += tmpOffect;
+ darkGroundImg.GetComponent<RectTransform>().offsetMax -= tmpOffect*0.5f;
+
+ darkGroundImg.SetActive(false);
//查询是否已经做过了新手引导
int guide = PlayerPrefs.GetInt("GemBattleGuide");
GameConfig.IsNewbie = guide == 0;
-
+ // cx test
+ GameConfig.IsNewbie = false;
if (GameConfig.IsNewbie)
{
Debug.Log("开始新手引导");
@@ -85,7 +98,8 @@
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
- Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), GameObject.Find("BottomUI").transform);
+ GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
+ guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
AddGuideEvent();
}
@@ -94,6 +108,8 @@
GameConfig.EndlessPortUseSkillTowerCount = 0;
AudioSourceManager.Ins.Play(AudioEnum.BGM2);
+
+
}
/// <summary>
@@ -196,7 +212,7 @@
/// </summary>
private void GuidePlayAppearEffect(Vector3 worldPos)
{
- EndlessGameUI.instance.PlayAppearEffect(worldPos);
+ EndlessGameUI.instance.PlayAppearEffectGuide(worldPos);
}
/// <summary>
--
Gitblit v1.9.1