Merge branch 'master' of http://git.axibug.com/alienjack/AxibugEmuOnline

# Conflicts:
#	AxibugEmuOnline.Client/Assets/Script/AppMain/AxiPlayerPrefs/AxiPlayerPrefsForFileSystem.cs.meta

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/CRT-Easymode/CRT_easymode.shader

@@ -61,7 +61,6 @@ Shader "Filter/crt-easymode"
             vec4 dilate(vec4 col)
             {
                 vec4 x = mix(vec4(1.0, 1.0, 1.0, 1.0), col, DILATION);
-
                 return col * x;
             }
 
@@ -82,6 +81,7 @@ Shader "Filter/crt-easymode"
 
             mat4x4 get_color_matrix(vec2 co, vec2 dx)
             {
+
                 return mat4x4(TEX2D(co - dx), TEX2D(co), TEX2D(co + dx), TEX2D(co + 2.0 * dx));
             }
 
@@ -161,6 +161,3 @@ Shader "Filter/crt-easymode"
         }
     }
 }
-
-
-

AxibugEmuOnline.Client/Packages/packages-lock.json

@@ -9,8 +9,9 @@
     "com.unity.ext.nunit": {
       "version": "2.0.5",
       "depth": 1,
-      "source": "builtin",
-      "dependencies": {}
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ide.visualstudio": {
       "version": "2.0.22",
@@ -19,7 +20,7 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.inputsystem": {
       "version": "1.11.2",
@@ -28,14 +29,14 @@
       "dependencies": {
         "com.unity.modules.uielements": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.sysroot": {
       "version": "2.0.10",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.sysroot.linux-x86_64": {
       "version": "2.0.9",
@@ -44,17 +45,18 @@
       "dependencies": {
         "com.unity.sysroot": "2.0.10"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.test-framework": {
-      "version": "1.5.1",
+      "version": "1.4.5",
       "depth": 0,
-      "source": "builtin",
+      "source": "registry",
       "dependencies": {
         "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
-      }
+      },
+      "url": "https://packages.unity.cn"
     },
     "com.unity.toolchain.win-x86_64-linux-x86_64": {
       "version": "2.0.10",
@@ -64,7 +66,7 @@
         "com.unity.sysroot": "2.0.10",
         "com.unity.sysroot.linux-x86_64": "2.0.9"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ugui": {
       "version": "2.0.0",