feat(app): merge and resolved confilct

Assets/link.xml

+<?xml version="1.0" encoding="utf-8"?>
+<linker>
+  <assembly fullname="HoolaiSDK">
+    <!-- core config -->
+    <type fullname="HoolaiSdkManager" preserve="all"/>
+    <type fullname="PlatformCallback" preserve="all"/>
+    <type fullname="IPlatformCallbackListener" preserve="all"/>
+
+    <!-- data config -->
+    <type fullname="PayParams" preserve="all"/>
+    <type fullname="PlayerInfo" preserve="all"/>
+    <type fullname="InitResult" preserve="all"/>
+    <type fullname="LoginResult" preserve="all"/>
+    <type fullname="GoodsInfo" preserve="all"/>
+
+    <!-- enum config -->
+    <type fullname="EventType" preserve="all"/>
+    <type fullname="AccessActivityType" preserve="all"/>
+
+    <!-- platform interface config -->
+    <type fullname="AndroidSdkInterface" preserve="all"/>
+    <type fullname="IosSdkInterface" preserve="all"/>
+    <type fullname="UnityMainThreadDispatcher" preserve="all"/>
+
+    <!-- util config -->
+    <type fullname="NativeLogger" preserve="all"/>
+
+    <!-- Demo config -->
+    <!-- <type fullname="GameManager" preserve="all"/>
+    <type fullname="HoolaiListener" preserve="all"/>
+    <type fullname="LogViewer" preserve="all"/> -->
+  </assembly>
+
+  <!-- Newtonsoft.Json config-->
+  <assembly fullname="Newtonsoft.Json" preserve="all"/>
+
+  <!-- mscorlib config -->
+  <!-- <assembly fullname="mscorlib">
+      <type fullname="System.Collections.Generic.List`1" preserve="all"/>
+      <type fullname="System.Collections.Generic.Dictionary`2" preserve="all"/>
+  </assembly> -->
+</linker>

Assets/link.xml.meta

+fileFormatVersion: 2
+guid: c7badce9ddf184b7ab437701f3015833
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Packages/packages-lock.json

@@ -38,8 +38,8 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.services.analytics": "1.0.4",
-        "com.unity.ugui": "1.0.0"
+        "com.unity.ugui": "1.0.0",
+        "com.unity.services.analytics": "1.0.4"
       },
       "url": "https://packages.tuanjie.cn"
     },
@@ -207,6 +207,16 @@
       },
       "url": "https://packages.tuanjie.cn"
     },
+    "com.unity.xr.legacyinputhelpers": {
+      "version": "2.1.12",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.modules.vr": "1.0.0",
+        "com.unity.modules.xr": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 0,