From c49c0e39e4c11a438014a0b0732ecf0968fceb5e Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 27 Nov 2020 20:58:36 +0800
Subject: [PATCH] 出二级宝石的时间不对的bug
---
Assets/Scripts/Guide/GuidePanel.cs | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/Assets/Scripts/Guide/GuidePanel.cs b/Assets/Scripts/Guide/GuidePanel.cs
index 5acb9c0..b9eba13 100644
--- a/Assets/Scripts/Guide/GuidePanel.cs
+++ b/Assets/Scripts/Guide/GuidePanel.cs
@@ -31,9 +31,14 @@
Image tmpMask;//自身的遮罩
GameObject offectBackground;//适配需要的黑色背景
ImageFire1 fire1;
- ImageFire2 fire2;//两个用来合成的火元素
+ ParticleSystem fire1PS1, fire1PS2;//出现的特效
- ImageWater water1;
+ ImageFire2 fire2;//两个用来合成的火元素
+ ParticleSystem fire2PS1, fire2PS2;
+
+ ImageWater wood1;
+
+ ParticleSystem woodPS1, woodPS2;
ImageSkill skill;
@@ -47,7 +52,7 @@
RectTransform dragHandImg;//拖动标识手指
Button skillBtn;//
- Vector2 skillBtnPos = new Vector2(459, 280);
+ Vector2 skillBtnPos = new Vector2(459, 44.6f);
private Image warningImg;//大波敌人来袭提示
/// <summary>
@@ -71,7 +76,7 @@
backgroundImg = transform.Find("Button").GetComponent<Image>();
- skillBtn = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBtn").GetComponent<Button>();
+ skillBtn = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBg/SkillBtn").GetComponent<Button>();
skillBtn.interactable = false;
towerBuyBtn = GameObject.Find("UICamera/BottomCanvas/Panel/TowerBuyBtn");
RectTransform tmpTs = towerBuyBtn.GetComponent<RectTransform>();
@@ -117,8 +122,13 @@
fire1 = transform.Find("Image_Fire1").GetComponent<ImageFire1>();
fire1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+ fire1PS1 = fire1.transform.Find("Huo/Particle System").GetComponent<ParticleSystem>();
+ fire1PS2 = fire1.transform.Find("Huo_02/Particle System").GetComponent<ParticleSystem>();
+
fire2 = transform.Find("Image_Fire2").GetComponent<ImageFire2>();
fire2.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+ fire2PS1 = fire2.transform.Find("Huo/Particle System").GetComponent<ParticleSystem>();
+ fire2PS2 = fire2.transform.Find("Huo_02/Particle System").GetComponent<ParticleSystem>();
fire1.gameObject.SetActive(false);
fire2.gameObject.SetActive(false);
@@ -133,9 +143,12 @@
towerPos2.enabled = false;
- water1 = transform.Find("Image_Water").GetComponent<ImageWater>();
- water1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
- water1.gameObject.SetActive(false);
+ wood1 = transform.Find("Image_Wood").GetComponent<ImageWater>();
+ wood1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
+ woodPS1 = wood1.transform.Find("Mu/Particle System").GetComponent<ParticleSystem>();
+ woodPS2 = wood1.transform.Find("Mu_02/Particle System").GetComponent<ParticleSystem>();
+
+ wood1.gameObject.SetActive(false);
skill = transform.Find("Image_Skill").GetComponent<ImageSkill>();
skill.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
@@ -166,7 +179,7 @@
fire2.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
towerPos.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
towerPos2.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
- water1.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
+ wood1.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
skill.GetComponent<RectTransform>().anchoredPosition -= tmpOffect;
}
@@ -230,18 +243,22 @@
fire1.gameObject.SetActive(true);
fire1.transform.Find("Image_2").gameObject.SetActive(false);
fire1.enabled = false;
+ fire1PS1.Play();
+ fire1PS2.Play();
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire1.transform.position);
+ //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire1.transform.position);
}
}
public void Step1_2()
{
fire2.gameObject.SetActive(true);
+ fire2PS1.Play();
+ fire2PS2.Play();
fire2.enabled = false;
DestoryButtonListener(towerBuyBtn);
SetRimActive(false);
CloseMask();
- EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire2.transform.position);
+ //EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire2.transform.position);
//RemoveButtonListener(towerBuyBtn);
}
@@ -373,15 +390,18 @@
btnImg.raycastTarget = true;
InitRectGuidance(btnImg, 75, 80, tmpOffect);
SetRimPos(go);
- ShowDragPath(water1.GetStartP, btnImg.rectTransform);
+ ShowDragPath(wood1.GetStartP, btnImg.rectTransform);
}
}
public void Step9_1()
{
- water1.gameObject.SetActive(true);
+ wood1.gameObject.SetActive(true);
+ woodPS1.Play();
+ woodPS2.Play();
towerPos2.enabled = true;
DestoryButtonListener(towerBuyBtn);
+ towerBuyBtn.gameObject.SetActive(false);
}
@@ -525,7 +545,7 @@
Image btnImg = skillBtn.GetComponent<Image>();
InitRectGuidance(btnImg, 79, 79f, Vector2.one);
//SetRimPos(skillBtn.gameObject);
- SetRimPos(skillBtn.gameObject, new Vector2(-15, 10));
+ SetRimPos(skillBtn.gameObject, new Vector2(-15, -241));
text_Tip.text = str;//动态改变长度
StartCoroutine(ShowRimTip(str));
@@ -536,6 +556,12 @@
SetGuideUI(true);
backgroundImg.raycastTarget = true;
RemoveButtonListener(skillBtn.gameObject);
+ }
+
+ public void FinishGuide()
+ {
+ towerBuyBtn.gameObject.SetActive(true);
+
}
@@ -562,7 +588,7 @@
{
image_Rim_Rect.anchoredPosition = towerBuyBtnPos - tmpOffect;
}
- else if (target.gameObject.name == "FireSkillBtn")
+ else if (target.gameObject.name == "SkillBtn")
{
image_Rim_Rect.anchoredPosition = skillBtnPos - tmpOffect;
}
@@ -602,7 +628,7 @@
{
image_Rim_Rect.anchoredPosition = towerBuyBtnPos - tmpOffect;
}
- else if (target.gameObject.name == "FireSkillBtn")
+ else if (target.gameObject.name == "SkillBtn")
{
image_Rim_Rect.anchoredPosition = skillBtnPos - tmpOffect;
}
@@ -663,7 +689,7 @@
{
maskObj.InitForCamera(target, towerBuyBtnPos, x, y);
}
- else if (target.gameObject.name == "FireSkillBtn")
+ else if (target.gameObject.name == "SkillBtn")
{
maskObj.InitForCamera(target, skillBtnPos, x, y);
}
--
Gitblit v1.9.1