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 | 106 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 93 insertions(+), 13 deletions(-)
diff --git a/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs b/Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
index 859c0b7..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,37 +49,97 @@
public bool beginSkillStep = false;
+ public GameObject darkGroundImg;
+
// Start is called before the first frame update
void Start()
{
+ InitSDK();
+
+ bGameStart = false;
+ bFirstLoaded = false;
+
bVibrate = new bool[4];
bVibrate[0] = bVibrate[1] = bVibrate[2] = bVibrate[3] = false;
- // 设置为顶层渲染:
- countDownTextNew.transform.SetAsLastSibling();
-
- if (timeStatic)
- timeStatic.gameObject.SetActive(false);
EndlessBuffSelect.instance.HideBuffUI();
- EndlessBossHPManager.instance.HideHP();
- EndlessSettlement settlement = SettlementUI.transform.GetChild(0).GetComponent<EndlessSettlement>();
+ EndlessSettlement settlement = SettlementUI.transform.Find("BgMask").GetComponent<EndlessSettlement>();
settlement.Init();
SettlementUI.SetActive(false);
+ EndlessMaskUI.instance.Hide();
+ 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("开始新手引导");
Pause();
- uiStartMssk.gameObject.SetActive(false);
+ HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
- Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), this.transform);
+ GameObject guideObj = Instantiate(Resources.Load<GameObject>("UI/Guide/GuidePanel"), transform.Find("Panel"));
+ guideObj.GetComponent<RectTransform>().offsetMin += tmpOffect;
AddGuideEvent();
}
+
+ GameConfig.EndlessOpenAttackTowerCount = 0;
+ GameConfig.EndlessBuyTowerCount = 0;
+ GameConfig.EndlessPortUseSkillTowerCount = 0;
+
+ AudioSourceManager.Ins.Play(AudioEnum.BGM2);
+
+
+ }
+
+ /// <summary>
+ /// 拖拽时候黑色背景
+ /// </summary>
+ /// <param name="isOn"></param>
+ public void SetDarkGround(bool isOn)
+ {
+ if (darkGroundImg.activeSelf != isOn)
+ darkGroundImg.SetActive(isOn);
+ }
+ private void InitSDK()
+ {
+ if (TDAA_SDKManager.Ins == null)
+ gameObject.AddComponent<TDAA_SDKManager>();
+ TDAA_SDKManager.Ins.ArriveBattle();//埋点
+ TDAA_SDKManager.Ins.Statistics(4);//埋点
+
+ if (AudioSourceManager.Ins == null)
+ gameObject.AddComponent<AudioSourceManager>();
+ }
+
+ public void ShowUIMask()
+ {
+ uiStartMssk.gameObject.SetActive(true);
+ }
+
+ public void HideUIMask()
+ {
+ uiStartMssk.gameObject.SetActive(false);
}
/// <summary>
@@ -95,6 +155,9 @@
EventCenter.Ins.Add((int)KTGMGemClient.EventType.CreateSecondWave, CreateSecondWave);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.SkillRelease, SkillRelease);
EventCenter.Ins.Add((int)KTGMGemClient.EventType.GuideFinish, NewbieGuideEnd);
+
+ EventCenter.Ins.Add<Vector3>((int)KTGMGemClient.EventType.PlayAppearEffect, GuidePlayAppearEffect);
+ EventCenter.Ins.Add<Vector3>((int)KTGMGemClient.EventType.GuidePlayUpgradeEffect, GuidePlayUpgradeEffect);
}
/// <summary>
@@ -145,6 +208,22 @@
}
/// <summary>
+ /// 新手引导生成特效
+ /// </summary>
+ private void GuidePlayAppearEffect(Vector3 worldPos)
+ {
+ EndlessGameUI.instance.PlayAppearEffectGuide(worldPos);
+ }
+
+ /// <summary>
+ /// 新手引导合成特效
+ /// </summary>
+ private void GuidePlayUpgradeEffect(Vector3 worldPos)
+ {
+ EndlessGameUI.instance.GuidePlayUpgradeEffect(worldPos);
+ }
+
+ /// <summary>
/// 在攻击位置上创建一个1级的水塔
/// </summary>
private void CreateWaterLv1()
@@ -174,6 +253,7 @@
// 播放特效，并处理伤害.
EndlessWaveLineManager.instance.PlayWaveLineEffect(waveLineIndex);
AgentInsManager.instance.ExecWavelineAttack(waveLineIndex, attributeId, level, false);
+ ++GameConfig.EndlessPortUseSkillTowerCount;
StartCoroutine(Delay1());
}
@@ -189,7 +269,7 @@
private void NewbieGuideEnd()
{
EndlessLevelManager.instance.RestartWave();
- GameConfig.IsNewbieGuideCompleted = true;
+ GameConfig.IsNewbie = false;
}
/// <summary>
@@ -309,7 +389,7 @@
// 开启游戏，且隐藏中间的数字.
if (secToDo <= 0)
{
- uiStartMssk.gameObject.SetActive(false);
+ HideUIMask();
countDownTextNew.text = "";
countDownTextNew.gameObject.SetActive(false);
bGameStart = true;
--
Gitblit v1.9.1