wangguan
2020-10-30 ab1a24fa8aaed0c9c678ce6771bb7e9031b79476
新手引导宝石上阵特效
15 files modified
81 ■■■■ changed files
Assets/00000/package/Materials/Sequence_025_6X6_b.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Sequence_041_3X3.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Sequence_042_2X2.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Sequence_043_4X6.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Sequence_043_4X6_b.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Sequence_044_3X3.mat 2 ●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Texmap_003.mat 2 ●●● patch | view | raw | blame | history
Assets/Materials/Guide/RectGuidance.mat 6 ●●●● patch | view | raw | blame | history
Assets/Scenes/Levels/Battle/Endless.unity 2 ●●● patch | view | raw | blame | history
Assets/Scripts/Event/EventType.cs 4 ●●●● patch | view | raw | blame | history
Assets/Scripts/Guide/GuidePanel.cs 7 ●●●● patch | view | raw | blame | history
Assets/Scripts/Guide/ImageFire1.cs 2 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs 2 ●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs 20 ●●●●● patch | view | raw | blame | history
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs 24 ●●●●● patch | view | raw | blame | history
Assets/00000/package/Materials/Sequence_025_6X6_b.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Sequence_0140_6X6 1
  m_Name: Sequence_025_6X6_b
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/00000/package/Materials/Sequence_041_3X3.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Sequence_0069_3X3
  m_Name: Sequence_041_3X3
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/00000/package/Materials/Sequence_042_2X2.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Sequence_0010_2X2_b
  m_Name: Sequence_042_2X2
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/00000/package/Materials/Sequence_043_4X6.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Sequence_0102_4X6 1
  m_Name: Sequence_043_4X6
  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/00000/package/Materials/Sequence_043_4X6_b.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Sequence_0102_4X6
  m_Name: Sequence_043_4X6_b
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/00000/package/Materials/Sequence_044_3X3.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Sequence_0016_3X3_e
  m_Name: Sequence_044_3X3
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/00000/package/Materials/Texmap_003.mat
@@ -7,7 +7,7 @@
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Texmap_0084
  m_Name: Texmap_003
  m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
Assets/Materials/Guide/RectGuidance.mat
@@ -69,8 +69,8 @@
    - _OcclusionStrength: 1
    - _Parallax: 0.02
    - _Slider: 81.39478
    - _SliderX: 189
    - _SliderY: 73.5
    - _SliderX: 79
    - _SliderY: 265
    - _SmoothnessTextureChannel: 0
    - _SpecularHighlights: 1
    - _SrcBlend: 1
@@ -83,7 +83,7 @@
    - _UseUIAlphaClip: 0
    - _ZWrite: 1
    m_Colors:
    - _Center: {r: -3, g: -862, b: 0, a: 0}
    - _Center: {r: -145, g: 155, b: 0, a: 0}
    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
Assets/Scenes/Levels/Battle/Endless.unity
@@ -6300,7 +6300,7 @@
  m_SortingBucketNormalizedSize: 0
  m_AdditionalShaderChannelsFlag: 25
  m_SortingLayerID: 0
  m_SortingOrder: 20
  m_SortingOrder: 0
  m_TargetDisplay: 0
--- !u!224 &849284131
RectTransform:
Assets/Scripts/Event/EventType.cs
@@ -43,6 +43,10 @@
        EndlessCompletedPort,
        // 无尽模式关卡结束
        EndlessLevelCompleted,
        //播放生成特效
        PlayAppearEffect,
        //新手引导合成特效
        GuidePlayUpgradeEffect,
    }
}
Assets/Scripts/Guide/GuidePanel.cs
@@ -3,6 +3,7 @@
using UnityEngine;
using UnityEngine.UI;
using System;
using KTGMGemClient;
using DG.Tweening;
/// <summary>
/// 新手引导UI脚本
@@ -62,7 +63,7 @@
        tmpMask.enabled = false;
        backgroundImg = transform.Find("Button").GetComponent<Image>();
        towerBuyBtn = GameObject.Find("MainUI/TowerBuyBtn");
        towerBuyBtn = GameObject.Find("BottomUI/TowerBuyBtn");
        tipsUI = transform.Find("Tips").gameObject;
        tipsUI.transform.SetAsLastSibling();//把tips放在最下面
@@ -176,6 +177,8 @@
            fire1.gameObject.SetActive(true);
            fire1.transform.Find("Image_2").gameObject.SetActive(false);
            fire1.enabled = false;
            EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire1.transform.position);
        }
    }
    public void Step1_2()
@@ -185,6 +188,8 @@
        DestoryButtonListener(towerBuyBtn);
        SetRimActive(false);
        CloseMask();
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.PlayAppearEffect, fire2.transform.position);
        //RemoveButtonListener(towerBuyBtn);
    }
Assets/Scripts/Guide/ImageFire1.cs
@@ -71,6 +71,8 @@
        level2.SetActive(true);
        canDrag = true;
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.AddCard);
        EventCenter.Ins.BroadCast((int)KTGMGemClient.EventType.GuidePlayUpgradeEffect, transform.position);
    }
    public void SetTarget(GameObject target)
Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs
@@ -57,7 +57,7 @@
                IconList[i].Reset();
            }
            EndlessMaskUI.instance.Show();
            EndlessMaskUI.instance?.Show();
        }
        public void OnClick(int index)
Assets/Scripts/TowerDefense/UI/EndlessUIStart.cs
@@ -107,6 +107,10 @@
        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>
@@ -157,6 +161,22 @@
    }
    /// <summary>
    /// 新手引导生成特效
    /// </summary>
    private void GuidePlayAppearEffect(Vector3 worldPos)
    {
        EndlessGameUI.instance.PlayAppearEffect(worldPos);
    }
    /// <summary>
    /// 新手引导合成特效
    /// </summary>
    private void GuidePlayUpgradeEffect(Vector3 worldPos)
    {
        EndlessGameUI.instance.GuidePlayUpgradeEffect(worldPos);
    }
    /// <summary>
    /// 在攻击位置上创建一个1级的水塔
    /// </summary>
    private void CreateWaterLv1()
Assets/Scripts/TowerDefense/UI/HUD/EndlessGameUI.cs
@@ -1359,6 +1359,8 @@
            }
        }
        /// <summary>
        /// 播放宝石出现特效
        /// </summary>
@@ -1379,6 +1381,28 @@
            Destroy(obj, ps.main.duration);
        }
        /// <summary>
        /// 播放升级特效
        /// </summary>
        /// <param name="worldPos"></param>
        public void GuidePlayUpgradeEffect(Vector3 position)
        {
            GameObject effect = TowerUpgradeEffectPrefab;
            // 在sTower的位置播放升级特效
            GameObject obj = Instantiate(effect);
            obj.transform.position = position;
            Vector3 pos = obj.transform.position;
            pos.y += 5f;
            obj.transform.position = pos;
            ParticleSystem ps = obj.GetComponent<ParticleSystem>();
            if (ps == null)
                ps = obj.transform.GetChild(0).GetComponent<ParticleSystem>();
            ps.Play();
            Destroy(obj, ps.main.duration);
        }
        protected void ProcessFeatureTower(Tower ctower)
        {
            if (ctower.towerFeature == EFeatureTower.GrowUp)