Browse Source

Vufroia报错

胡佳骏 1 year ago
parent
commit
3586aa6d76

+ 3 - 3
Assets/Plugins/Android/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
   <uses-sdk tools:overrideLibrary="com.nreal.glasses_sdk" />
   <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <application android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name" android:requestLegacyExternalStorage="true">
+  <application android:allowNativeHeapPointerTagging="false" android:theme="@style/UnityThemeSelector" android:icon="@mipmap/app_icon" android:label="@string/app_name" android:requestLegacyExternalStorage="true">
     <activity android:name="com.unity3d.player.UnityPlayerActivity">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -12,8 +12,8 @@
     <meta-data android:name="nreal_sdk" android:value="true" />
     <meta-data android:name="com.nreal.supportDevices" android:value="NrealLight|NrealAir" />
   </application>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	<uses-permission android:name="android.permission.CAMERA"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.CAMERA" />
   <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.RECORD_AUDIO" />

+ 7 - 7
Assets/Resources/VuforiaConfiguration.asset

@@ -9,12 +9,12 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -2067402452, guid: bab6fa851cf5a1a4bba3cec5f191cb8e, type: 3}
+  m_Script: {fileID: -2067402452, guid: 8a9a760f95896c34689febc965510927, type: 3}
   m_Name: VuforiaConfiguration
   m_EditorClassIdentifier: 
   vuforia:
-    vuforiaLicenseKey: AVdaifr/////AAABmTxtN/ZN0Eg+uuJIO4iBD7dsw2+y7PFk/RTJIeK591PAPZFHjA0YUX2pybiHDZk+xm0fFr2tLCDPOwMR8S/wxajuVOXUYDkGA8NlzQiNbSfQyFSEFLS92UNrOQO0dnMwsTnZKS0VUhk+Xh9bYy4Iv7lfQ8fPvG6/DSQ/qfSrn8IbZsQ3Dl2MomN1VAO5YPXSQwjCyY8Lncu6XwJXfrxZoDvBJkDDnp5NiWhlqdiYi/ZewaJyrhAE1tImEkTKR4B4bu2VE1n8qaXCEFmRGtX2SLYiCchylxYXzYnF9DwTlLOVvY/3vXnuJ8VPhaUtAM8xIrk072ZL5lvBnVJ508LHC5vzzWJcLBI8pDmS9p6BcU1D
-    ufoLicenseKey: QWZDWHZFYi8vLy8vQUFBQUtCSG4rNmRtR1U3SWhyaGdVWk5pWWF0S20rN2d1SHRDUVJqTEJReDk3ek00VnR5cjEzRzFmSWhsM2dTdDV4cWZuUEQzZHNnRzJrQU1IRHRWL051eS9VOVVHZU9sclVaMzd0YTlTRVFpUEdia3dqYnJVdHNQeFFXSjViZlNQVEErdjVZV2IwSlY2NkxZbmppUGlORTZhU0d0V2JWdi8vNFhHd2FSYzlqdkh3TnF2Nml0cHMzOXNnSFdPTjdPRlBNRWdvMmxhMlIvRDFQK0hpZ0xSUnhKMlRGd2tQa2hVa2x4OHN3Qll4dXRNQ0lpMUUrWU05WU1lVHoydVhxYjJpNVlaNXlJVnVnSkNDVnkvcFB1d09WbzMvbFh2MnUyMWZhTFFROVJielB6dk9NZm0zam42b3cvSnhxbHZJNWtPeCtTekdFSEYwRURYV3RJRzhvNFUxU0ZFUGtub0RBa29jUTlOZTgzS2pXblJtRDk=
+    vuforiaLicenseKey: 
+    ufoLicenseKey: QVJDeU5mai8vLy8vQUFBQUtIUVJqWCtvekV1eXRxa0tHYytHbEcyU0s0aGEva2I0WkhIQnNnaGREVDgzUkVELzY5Y1RseWNLclRJT3d4SlUvRW96U1ZnTW15M2dCeXcvUzRwcCtsS0h6WXpyZlBrd0NyWlhJRW9FQzdDRlBSRFhQZmJSV3NabHdjTmZTT0dEVTdRRTVDaVlzbXNNVERUeFIzUnpmcU9xcDkyRmJGTjByWDZFU2FDdkhFODV6UDhURjRyYjlHWnFBdU45QWhxZzNtZUdlekhSMml4VFBBb1lBekJPci95Sk9udWFoWW1DSlVXL2pnZFFHU1VEcUxidDNzZTFNRmxmckplT0RFVFlPOW13OHR5MDR3b2xVR1MrNFZNQzB2ZGEzcG1vU0Z3NmZ5NE1BNndPcjhSYTdZZEVsMFFUWExkaEdody9KZWQ1NkZWYmN1SEk5TVlwOG9NWVJweEV0emtmajRleWNzdlJkMUNCdGU0Y0x5cFg=
     delayedInitialization: 0
     cameraFocusModeSetting: 2
     cameraDeviceModeSetting: -1
@@ -24,7 +24,7 @@ MonoBehaviour:
     shareRecordingsInITunes: 0
     logLevel: 0
     version: 10.13.3
-    eulaAcceptedVersions: '{"Values":["8.5","7.5","8.3","7.2","7.1","8.0","7.7","8.1","0.0","9.2","9.4","9.8","10.3","10.2","9.1","10.11","10.12","10.13","10.10","10.15","9.7"]}'
+    eulaAcceptedVersions: '{"Values":["7.5","7.1","7.2","8.0","7.7","8.1","0.0","8.3","8.5","9.2","9.4","9.8","10.3","10.2","9.1","10.11","10.12","10.13","10.10","10.15","9.7"]}'
   database:
     disableModelExtraction: 0
   shaders:
@@ -37,12 +37,12 @@ MonoBehaviour:
     videoBackgroundShader: {fileID: 4800000, guid: f40623b353e2f1943b1b3ba42975db7a,
       type: 3}
     unlitShader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
-    videoBackgroundEnabled: 0
+    videoBackgroundEnabled: 1
   deviceTracker:
-    autoStartTracker: 0
+    autoStartTracker: 1
     arcoreRequirement: 1
     autoImportArcore: 1
-    thirdPartyARCoreClientDetected: 1
+    thirdPartyARCoreClientDetected: 0
   playmode:
     mSequencePath: 
     playModeType: 0

+ 1 - 10
Assets/Resources/VufroiaManager.prefab

@@ -42,7 +42,6 @@ GameObject:
   m_Component:
   - component: {fileID: 7256260229356061537}
   - component: {fileID: 6262994141980935983}
-  - component: {fileID: 4052429610188441647}
   m_Layer: 0
   m_Name: Camera
   m_TagString: Untagged
@@ -93,7 +92,7 @@ Camera:
   field of view: 60
   orthographic: 0
   orthographic size: 5
-  m_Depth: 0
+  m_Depth: -2
   m_CullingMask:
     serializedVersion: 2
     m_Bits: 4294967295
@@ -108,14 +107,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &4052429610188441647
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3037844599970412806}
-  m_Enabled: 1
 --- !u!1 &3935256225360497020
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from YUNYUNGEGE at 2023/10/10 11:07:19
+Build from HUJIAJUN at 2023/10/11 12:41:11

+ 1 - 1
Assets/Studio/Scenes/Logo/Logo.unity

@@ -2038,7 +2038,7 @@ PrefabInstance:
     - target: {fileID: 7842368593265403976, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 9056915208821754902, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}

+ 4 - 1
Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs

@@ -120,8 +120,11 @@ namespace ShadowStudio.UI
         IEnumerator initVuforia()
         {
             if (!vgo)
+            {
+
                 vgo = Resources.Load<GameObject>("VufroiaManager");
-            GameObject.Instantiate(vgo);
+                vgo = GameObject.Instantiate(vgo);
+            }
             yield return null;
 
             if (DeviceType.type == "LeiNiao")

+ 14 - 0
Assets/XR/Loaders/XR Loader.asset

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0c1ad74a4588d8043a50d5694fd40e23, type: 3}
+  m_Name: XR Loader
+  m_EditorClassIdentifier: 

+ 8 - 0
Assets/XR/Loaders/XR Loader.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bc07119c0f872c74e812efa2e28066ab
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 14 - 0
Assets/XR/Settings/XR Settings.asset

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c84c1319d98aca43a8d29142e24a20a, type: 3}
+  m_Name: XR Settings
+  m_EditorClassIdentifier: 

+ 8 - 0
Assets/XR/Settings/XR Settings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1bfa53d7da5d73440a54028c896f7b69
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/XR/XRGeneralSettings.asset

@@ -44,7 +44,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: 53584fd2c6a42324e9d7690d0e4e1d12, type: 2}
+  - {fileID: 11400000, guid: e1339d3b24f7bd145a9ec425510ff76d, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0