Merge branch 'Art01' into feature/newWork

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt

Assets/MyGame/Scripts/Manager/GameManager.cs

@@ -1,6 +1,6 @@
 using Assets.MyGame.Scripts.Net;
 using Assets.MyGame.Scripts.Net.API;
-using CameraShake;
+// using CameraShake;
 using Newtonsoft.Json;
 using System;
 using UnityEngine;
@@ -16,7 +16,7 @@ public class GameManager : MonoSingleton<GameManager>
     public UserData user;
     public GameData gameData = new GameData();
     public Scene scene;
-    public CameraShaker cameraShake;
+    // public CameraShaker cameraShake;
 //    // 指定此方法在加载时立即调用，在显示启动动画前之前执行
 //    [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSplashScreen)]
 //    private static void BeforeSplashScreen()
@@ -49,7 +49,7 @@ public class GameManager : MonoSingleton<GameManager>
         Application.runInBackground = true;
 
         base.Awake();
-        cameraShake = Camera.main.GetComponent<CameraShaker>();
+        // cameraShake = Camera.main.GetComponent<CameraShaker>();
         gameData.currUser = "123";
         //string json = Resources.Load<TextAsset>("Config/GameConfig").text;