Merge remote-tracking branch 'refs/remotes/origin/taptap'

# Conflicts:
#	Assets/000_assets/material/M_SquareFrame 1.mat
#	Assets/FR2_Cache.asset
#	Assets/Plugins/Easy Save 3/Resources/ES3/ES3Defaults.asset
#	Packages/packages-lock.json
#	ProjectSettings/PackageManagerSettings.asset
#	ProjectSettings/ProjectSettings.asset
#	UserSettings/Layouts/CurrentMaximizeLayout.dwlt
#	UserSettings/Layouts/default-6000.dwlt
#	ichni Official_WwiseProject/.cache/SoundBankInfoCache.dat
#	ichni_Official.slnx

Packages/manifest.json

@@ -1,5 +1,7 @@
 {
   "dependencies": {
+    "com.taptap.sdk.core": "4.5.4",
+    "com.taptap.sdk.login": "4.10.0",
     "com.unity.burst": "1.8.27",
     "com.unity.collab-proxy": "2.11.3",
     "com.unity.collections": "2.6.2",
@@ -9,6 +11,7 @@
     "com.unity.ide.visualstudio": "2.0.26",
     "com.unity.inputsystem": "1.18.0",
     "com.unity.multiplayer.center": "1.0.1",
+    "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.render-pipelines.universal": "17.3.0",
     "com.unity.test-framework": "1.6.0",
     "com.unity.timeline": "1.8.10",
@@ -48,5 +51,21 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  }
+  },
+  "scopedRegistries": [
+    {
+      "name": "package.openupm.com",
+      "url": "https://package.openupm.com",
+      "scopes": [
+        "com.google.external-dependency-manager"
+      ]
+    },
+    {
+      "name": "NPMJS",
+      "url": "https://registry.npmjs.org/",
+      "scopes": [
+        "com.taptap"
+      ]
+    }
+  ]
 }