Merge branch 'master' of http://47.95.218.140:8090/r/GemBattle

wangguan

2020-12-25 b35c810d34558ac4bcdbe382fae6db4cb3e3b545

 Assets/Scripts/Guide/GuidePanelNew.cs

@@ -42,8 +42,10 @@
    //ParticleSystem finishPS;
    Button finishBtn;
    Image finishImg;
    Canvas skillCanvasGroup;
    void Awake()
    {

        tmpMask = transform.GetComponent<Image>();
        tipsUI = transform.Find("Tips").gameObject;
        tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -93,12 +95,12 @@
        wood1 = transform.Find("Image_Wood1").GetComponent<ImageWood>();
        wood1.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
        wood1PS1 = wood1.transform.Find("Mu/Particle System").GetComponent<ParticleSystem>();
        wood1PS2 = wood1.transform.Find("Mu_02/Particle System").GetComponent<ParticleSystem>();
        //wood1PS2 = wood1.transform.Find("Mu_02/Particle System").GetComponent<ParticleSystem>();

        wood2 = transform.Find("Image_Wood2").GetComponent<ImageWood2>();
        wood2.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
        wood2PS1 = wood2.transform.Find("Mu/Particle System").GetComponent<ParticleSystem>();
        wood2PS2 = wood2.transform.Find("Mu_02/Particle System").GetComponent<ParticleSystem>();
        //wood2PS2 = wood2.transform.Find("Mu_02/Particle System").GetComponent<ParticleSystem>();

        wood1.gameObject.SetActive(false);
        wood2.gameObject.SetActive(false);
@@ -106,13 +108,13 @@
        fire = transform.Find("Image_Fire").GetComponent<ImageFire1>();
        fire.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
        firePS1 = fire.transform.Find("Huo/Particle System").GetComponent<ParticleSystem>();
        firePS2 = fire.transform.Find("Huo_02/Particle System").GetComponent<ParticleSystem>();
        //firePS2 = fire.transform.Find("Huo_02/Particle System").GetComponent<ParticleSystem>();
        fire.gameObject.SetActive(false);

        water = transform.Find("Image_Water").GetComponent<ImageWater>();
        water.GetComponent<RectTransform>().anchoredPosition *= tmpScale;
        waterPS1 = water.transform.Find("Shui/Particle System").GetComponent<ParticleSystem>();
        waterPS2 = water.transform.Find("Shui_02/Particle System").GetComponent<ParticleSystem>();
        //waterPS2 = water.transform.Find("Shui_02/Particle System").GetComponent<ParticleSystem>();
        water.gameObject.SetActive(false);

        towerPos = transform.Find("Image_TowerPos").GetComponent<ImageTowerPos>();
@@ -210,15 +212,15 @@


    ImageWood wood1;
    ParticleSystem wood1PS1, wood1PS2;//出现的特效
    ParticleSystem wood1PS1;//出现的特效
    ImageWood2 wood2;//两个用来合成的mu元素
    ParticleSystem wood2PS1, wood2PS2;
    ParticleSystem wood2PS1;

    ImageFire1 fire;//火元素
    ParticleSystem firePS1, firePS2;
    ParticleSystem firePS1;

    ImageWater water;//水元素
    ParticleSystem waterPS1, waterPS2;
    ParticleSystem waterPS1;

    /// <summary>
    /// 步骤2：购买---购买---合成---上阵  事件广播结束，不走回调
@@ -251,7 +253,7 @@
            wood1.transform.Find("Image_2").gameObject.SetActive(false);
            wood1.enabled = false;
            wood1PS1.Play();
            wood1PS2.Play();
            //wood1PS2.Play();
            RemoveButtonListener(towerBuyBtn);
            AddButtonListener(towerBuyBtn, Step2_2);
            StartCoroutine(ShowRimTip(strArray[1]));
@@ -276,7 +278,7 @@
        {
            wood2.gameObject.SetActive(true);
            wood2PS1.Play();
            wood2PS2.Play();
            // wood2PS2.Play();
            //fire2.enabled = false;
            DestoryButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);
@@ -345,7 +347,18 @@
        StopShowDragPath(true);
    }


    /// <summary>
    /// 关闭技能X1的显示优先级
    /// </summary>
    public void CloseSkillImage()
    {
        GameObject go1 = GameObject.Find("UICamera/BottomCanvas/Panel/Energy/FireSkillBg/SkillCount1");
        if (go1 != null)
        {
            skillCanvasGroup = go1.GetComponent<Canvas>();
            skillCanvasGroup.overrideSorting = false;
        }
    }

    /// <summary>
    ///  步骤3 ：对话---出兵后杀光---对话---展示火鸡
@@ -558,7 +571,7 @@
            //fire.transform.Find("Image_2").gameObject.SetActive(false);
            water.enabled = true;
            waterPS1.Play();
            waterPS2.Play();
            //waterPS2.Play();
            RemoveButtonListener(towerBuyBtn);
            towerBuyBtn.gameObject.SetActive(false);

@@ -617,6 +630,8 @@
    public void Step7Talk(string[] str, Action ac)
    {
        callBack = ac;
        GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);

        SetGuideUI(true);
        StartShowWord(str, GuideEnergyUp);
    }
@@ -628,7 +643,6 @@
    /// </summary>
    public void GuideEnergyUp()
    {
        GameObject.Find("UICamera/MainUI/BloodUI").SetActive(false);
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuideEnergyUp, 100);

        tmpMask.enabled = false;
@@ -643,21 +657,25 @@
        StartCoroutine(ShowRimTip("释放技能"));
    }

    string[] laterStr;
    public void SkillRelease(string[] str, Action ac)
    {

        GameObject.Find("UICamera/MainUI/BloodUI").SetActive(true);

        RemoveButtonListener(skillBtn.gameObject);
        SetRimActive(false);
        CloseGuidance();

        SetGuideUI(true);
        callBack = ac;
        StartShowWord(str, ShowFinishPanel);
        // charForeach.StartFinalShowWord(str, ac, () =>
        // {
        //     finishPS.Play();
        // });

        laterStr = str;
        Invoke("LaterShow", 2f);
    }

    private void LaterShow()
    {
        SetGuideUI(true);
        StartShowWord(laterStr, ShowFinishPanel);

    }

@@ -677,6 +695,8 @@

    public void FinishGuide()
    {
        if (skillCanvasGroup != null)
            skillCanvasGroup.overrideSorting = true;
        towerBuyBtn.gameObject.SetActive(true);
    }