0312 修改隐私协议的弹出时机为android；增加登录音乐；掉落武将经验改无限

hch

10 天以前 11187d7c6a46a82f10b3d097b8291e59d721b50c

0312 修改隐私协议的弹出时机为android；增加登录音乐；掉落武将经验改无限

 Main/Core/GameEngine/Launch/InitSettingTask.cs

@@ -15,7 +15,8 @@
        ShaderUtility.InitGlobalParams();
        // SoundPlayer.CreateSoundPlayer();
        SoundPlayer.Instance.Init();
        //SoundPlayer.Instance.PlayLoginMusic();
        SoundPlayer.Instance.PlayLoginMusic();
        // SoundPlayer.Instance.PlayBackGroundMusic(41);

        SystemSetting.Instance.SetSoundVolume(SystemSetting.Instance.GetSoundVolume());
        SystemSetting.Instance.SetSoundEffect(SystemSetting.Instance.GetSoundEffect());

 Main/Core/GameEngine/Launch/RequestPermissionStart.cs

@@ -5,24 +5,29 @@

    public override void Begin()
    {
#if UNITY_EDITOR
        done = true;
        LocalSave.SetBool("secretToggleStart5", true);
#endif
// #if UNITY_EDITOR
//         done = true;
//         LocalSave.SetBool("secretToggleStart5", true);
// #endif

        if (LocalSave.GetBool("secretToggleStart5"))
        {
            SDKUtils.Instance.IsAgreeSecret = true;
        // if (LocalSave.GetBool("secretToggleStart5"))
        // {
        //     SDKUtils.Instance.IsAgreeSecret = true;
        //     SDKUtils.Instance.RequestAndroidPermissionStart();
        // }
        // else
        // {
        //     //先弹隐私政策，同意之后才可以申请权限 继续游戏
        //     // UIManager.Instance.OpenWindow<RequestSecretWin>();

        //     //改成向SDK请求隐私权限
        //     SDKUtils.Instance.RequestSecretRule();
        // }

        //到这里一定是同意隐私，纯安卓处理
        LocalSave.SetBool("PrivacyAcceptedKey", true);
            SDKUtils.Instance.RequestAndroidPermissionStart();
        }
        else
        {
            //先弹隐私政策，同意之后才可以申请权限 继续游戏
            // UIManager.Instance.OpenWindow<RequestSecretWin>();

            //改成向SDK请求隐私权限
            SDKUtils.Instance.RequestSecretRule();
        }
        SDKUtils.Instance.IsAgreeSecret = true;
    }

    public override void End()

 Main/Manager/StageManager.cs

@@ -51,7 +51,7 @@


        UIManager.Instance.OpenWindow<LaunchBackGroundWin>();

        UIManager.Instance.OpenWindow<LoginWin>();

        SoundPlayer.Instance.StopBackGroundMusic();

        // SoundPlayer.Instance.StopBackGroundMusic();



        if (VersionUtility.Instance.NeedDownAsset() && !AssetVersionUtility.hasDownLoadFullAsset)

        {

@@ -79,6 +79,7 @@
            UIManager.Instance.OpenWindow<ServerForceExitHintWin>();

        }

        SoundPlayer.Instance.StopBackGroundMusic();

        SoundPlayer.Instance.PlayBackGroundMusic(41);

    }



    protected float GetManagerRequestDataProgress()

@@ -114,7 +115,7 @@
        {

            AssetBundleUtility.Instance.Sync_LoadAll("maps/Game");

        }



        SoundPlayer.Instance.StopBackGroundMusic();

        AsyncOperation asyncOperation = SceneManager.LoadSceneAsync("Game");



        await OnLoading(asyncOperation, () => (DTC0403_tagPlayerLoginLoadOK.finishedLogin ? .5f : 0f) + GetManagerRequestDataProgress() * .5f);


 Main/ResModule/BuiltInLoader.cs

@@ -88,7 +88,7 @@
        if (!AssetSource.isUseAssetBundle)
        {
#if UNITY_EDITOR
            var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Musics/", name, AUDIO_EXTENSION);
            var path = StringUtility.Concat("Assets/ResourcesOut/BuiltIn/Musics/", name, ".mp3");
            audioClip = UnityEditor.AssetDatabase.LoadAssetAtPath<AudioClip>(path);
#endif
        }

 Main/SDK/SDKUtils.cs

@@ -520,6 +520,7 @@
                }
            case CodeA2U.SecretRuleOK:
                {
                    // 纯android处理，这里触发不到了
                    IsAgreeSecret = true;
                    LocalSave.SetBool("secretToggleStart5", true);
                    break;

 Main/System/MainLevel/MainLevelDropCell.cs

@@ -52,8 +52,15 @@
            }
            int curValue = 0;
            MainLevelManager.Instance.m_DailyBootyDict.TryGetValue(itemID, out curValue);
            if (maxValue > 1000000000)
            {
                dropValueText.text = UIHelper.AppendColor(TextColType.Green, UIHelper.ReplaceLargeNum(curValue) + "/" + Language.Get("L1138"));
            }
            else
            {
            dropValueText.text = UIHelper.AppendColor(curValue >= maxValue ? TextColType.Red : TextColType.Green,
            UIHelper.ReplaceLargeNum(curValue) + "/" + UIHelper.ReplaceLargeNum(maxValue));
            }
            
        }
    }

 Main/System/Sound/SoundPlayer.cs

@@ -355,14 +355,14 @@
        }
    }

    //public void PlayLoginMusic()
    //{
    //    var loginMusic = BuiltInLoader.LoadMusic("Music_Login");
    //    if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
    //    {
    //        StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
    //    }
    //}
    public void PlayLoginMusic()
    {
       var loginMusic = BuiltInLoader.LoadMusic("login");
       if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
       {
           StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
       }
    }

    //private void LateUpdate()
    //{