Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/Core/GameEngine/Launch/InitSettingTask.cs

@@ -1,5 +1,6 @@


using Cysharp.Threading.Tasks;
using UnityEngine;

public class InitSettingTask : LaunchTask
@@ -13,16 +14,26 @@
    public override void Begin()
    {
        ShaderUtility.InitGlobalParams();
        SoundPlayer.CreateSoundPlayer();
        //SoundPlayer.Instance.PlayLoginMusic();
        // SoundPlayer.CreateSoundPlayer();
        SoundPlayer.CreateSoundPlayer().ContinueWith(() => {
            SoundPlayer.Instance.Init();
            SoundPlayer.Instance.PlayLoginMusic();

        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());
        SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());
            SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());
            SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());
            SystemSetting.Instance.SetMuteMusic(SystemSetting.Instance.GetMuteMusic());
            SystemSetting.Instance.SetMuteSoundEffect(SystemSetting.Instance.GetMuteSoundEffect());
        }).Forget();
        
        // SoundPlayer.Instance.PlayBackGroundMusic(41);



        SystemSetting.Instance.SetGameFps(SystemSetting.Instance.GetGameFps());
        SystemSetting.Instance.LetFPSUnLimit();

        DebugUtility.Instance.Init();
        DebugUtility.Instance.CreateDebugRoot();
        DebugUtility.Instance.CreateDebugRoot().Forget();

        GameObjectPoolManager.Instance.gameObject.name = "GameObjectPool";
        GameObjectPoolManager.Instance.Initialize();
@@ -40,6 +51,7 @@
    public override void End()
    {
        expectTime = timer;
        OperationLogCollect.Instance.RecordLauchEvent(10);
    }

    public override void Update()