Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

chenxin

2020-12-09 7fcfe2b029ffad2c35630d411d283c95ada7df5f

Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

 Assets/Materials/PVE/Materials/PVEBg.mat

@@ -8,7 +8,7 @@
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: PVEBg
  m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
  m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0

 Assets/Materials/PVE/PVEBg3.png.meta

@@ -6,7 +6,7 @@
  serializedVersion: 11
  mipmaps:
    mipMapMode: 0
    enableMipMap: 1
    enableMipMap: 0
    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0

 Assets/Resources/Music/BGM2.mp3

Binary files differ

 Assets/Resources/Music/冰淇淋技能.mp3

Binary files differ

 Assets/Resources/Music/火焰喷射.mp3

Binary files differ

 Assets/Resources/Music/选择buff后.mp3

Binary files differ

 Assets/Resources/Music/选择buff后.wav

Binary files differ

 Assets/Resources/Music/选择buff后.wav.meta

File was renamed from Assets/Resources/Music/选择buff后.mp3.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7038f3d098e09e24dae79641a76e7784
guid: 28f2776f5338e0d44af75342f26e20da
AudioImporter:
  externalObjects: {}
  serializedVersion: 6

 Assets/Scripts/Music/AudioSourceManager.cs

@@ -26,6 +26,7 @@
    WaterTowerSkill,//冰淇淋技能
    WoodSkill,//玉米狙击子弹
    Upgrade,//合成
    Gold,//金币

}
public class AudioSourceManager : MonoBehaviour
@@ -154,6 +155,9 @@
            case AudioEnum.Upgrade:
                Play("合成", true);
                break;
            case AudioEnum.Gold:
                Play("金币", true);
                break;
        }
    }

@@ -229,8 +233,10 @@
    /// </summary>
    public void StopBGAudio()
    {
        if (!audioSourceList[0].isPlaying)
        if (audioSourceList[0].isPlaying)
        {
            audioSourceList[0].Stop();
        }
    }

    /// <summary>

 Assets/Scripts/TowerDefense/UI/EndlessBuffSelect.cs

@@ -51,7 +51,6 @@
                IconList[i].Reset();
            }

            AudioSourceManager.Ins?.Play(AudioEnum.BuffAppear);
        }

        private void OnDisable()
@@ -120,6 +119,7 @@
        {
            EndlessMaskUI.instance.Show();
            gameObject.SetActive(true);
            AudioSourceManager.Ins?.Play(AudioEnum.ChooseBuff);
        }

        public void HideBuffUI()
@@ -138,6 +138,7 @@
                IconList[i].SetName(list[i].Config.name);
                IconList[i].SetEffect(list[i].Config.brief);
                IconList[i].SetRare(list[i].Config.rare);
                IconList[i].SetIsGold(list[i].EffectType == EndlessBuffEffectType.GoldAdd);
            }
        }
    }

 Assets/Scripts/TowerDefense/UI/EndlessTowerGridOpen.cs

@@ -70,7 +70,10 @@
        {
            float cashToOpen = TowerPlacementGridEndless.GRID_OPENCASH;
            if (EndlessLevelManager.instance.Currency.currentCurrency < cashToOpen)
            {
                AudioSourceManager.Ins.Play(AudioEnum.UIDisable);
                return;
            }

            // 减少Cash并开启相应塔防管理器的兵线
            bool bsucc = EndlessLevelManager.instance.Currency.TryPurchase((int)cashToOpen);

 Assets/Scripts/TowerDefense/UI/HUD/SelectBuffIcon.cs

@@ -63,7 +63,15 @@

        public void OnClick()
        {
            AudioSourceManager.Ins.Play(AudioEnum.ChooseBuff);
            //判断是否是金钱
            if (isGold)
            {
                AudioSourceManager.Ins.Play(AudioEnum.Gold);
            }
            else
            {
                AudioSourceManager.Ins.Play(AudioEnum.UI);
            }

            if (OnSelectBuffCompleted != null)
                OnSelectBuffCompleted(Index);
@@ -106,6 +114,12 @@
            Name.color = EndlessBuffData.GetColorByRare(rare);
        }

        bool isGold;//是否是金币BUFF
        public void SetIsGold(bool isGold)
        {
            this.isGold = isGold;
        }


        /// <summary>
        /// 设置选中状态，做个缓动播放粒子特效

 Assets/Scripts/UI/FinalPanel/FinalPanel.cs

@@ -80,6 +80,8 @@
    /// <param name="myScore">789220</param>
    public void SetData(string waveInfo, int myScore)
    {
        AudioSourceManager.Ins.StopBGAudio();//进来后停止播放BGM

        _waveInfo = waveInfo;
        _myScore = myScore;
        isFirstStart = true;//首次启动下载到数据执行动效
@@ -233,7 +235,7 @@
        {
            var temp = Math.Floor(value);
            scoreText.text = temp + "";
        }, 0, _myScore, 1.71f));
        }, 0, _myScore, 1.4f));
        agentTweenSeq.AppendCallback(StartLoadLargeData);

        tsLight = transform.Find("ImageLight");