Merge branch 'master' into leonard

client_Wu Xijin

2018-11-09 723604e6defc7414b0423c3d0d6980233531659b

 Assets/Editor/Tool/AudioClipImport.cs

@@ -14,19 +14,19 @@
    static AudioClipImport()

    {

        standalone = new AudioImporterSampleSettings();

        standalone.quality = 0.5f;

        standalone.quality = 0.01f;

        standalone.loadType = AudioClipLoadType.CompressedInMemory;

        standalone.sampleRateSetting = AudioSampleRateSetting.OptimizeSampleRate;

        standalone.compressionFormat = AudioCompressionFormat.Vorbis;



        android = new AudioImporterSampleSettings();

        android.quality = 0.5f;

        android.quality = 0.01f;

        android.loadType = AudioClipLoadType.CompressedInMemory;

        android.sampleRateSetting = AudioSampleRateSetting.OptimizeSampleRate;

        android.compressionFormat = AudioCompressionFormat.Vorbis;



        ios = new AudioImporterSampleSettings();

        ios.quality = 0.5f;

        ios.quality = 0.01f;

        ios.loadType = AudioClipLoadType.CompressedInMemory;

        ios.sampleRateSetting = AudioSampleRateSetting.OptimizeSampleRate;

        ios.compressionFormat = AudioCompressionFormat.Vorbis;