适配Rokid

Assets/GHZScritps/AgoraRTCManager.cs

@@ -4,7 +4,6 @@ using SC.XR.Unity;
 using ShadowStudio.Model;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.Remoting.Contexts;
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Serialization;
@@ -99,7 +98,7 @@ public class AgoraRTCManager : SingletonMono<AgoraRTCManager>
                                     AUDIO_SCENARIO_TYPE.AUDIO_SCENARIO_DEFAULT);
         RtcEngine.Initialize(context);
         RtcEngine.InitEventHandler(handler);
-
+        RtcEngine.SetDefaultAudioRouteToSpeakerphone(true);
 
     }
 

Assets/Plugins/Android/AndroidManifest.xml

@@ -1,29 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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: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">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
+  <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="true"/>
+  <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="true"/>
+  <uses-feature android:name="android.hardware.usb.host"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.CAMERA" />
+  <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+  <application>
+    <activity android:name="com.rokid.uxrunityplugin.UXRActivity"
+           android:theme="@style/UnityThemeSelector">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
+      <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
     </activity>
-    <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.INTERACT_ACROSS_USERS_FULL" />
-  <uses-permission android:name="android.permission.BLUETOOTH" />
-  <uses-permission android:name="android.permission.RECORD_AUDIO" />
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <queries>
-    <package android:name="com.ffalcon.rayneo.systemwindows" />
-  </queries>
-</manifest>
+</manifest>

Assets/Plugins/Android/AndroidManifest.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4370e831f3c77fc418ff2677fde976f1
+guid: 734bd46c551cff14c9014f1b33ce4d48
 TextScriptImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/Android/baseProjectTemplate.gradle

@@ -1,6 +1,7 @@
 allprojects {
     buildscript {
         repositories {**ARTIFACTORYREPOSITORY**
+        maven { url 'https://maven.rokid.com/repository/maven-public/' }
             google()
             jcenter()
         }
@@ -16,6 +17,7 @@ allprojects {
     }
 
     repositories {**ARTIFACTORYREPOSITORY**
+    maven { url 'https://maven.rokid.com/repository/maven-public/' }
         google()
         jcenter()
         flatDir {

Assets/Plugins/Android/baseProjectTemplate.gradle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fc0393c36edf42b4f9d866c5009062d3
+guid: 25310e320c6d428459e3d17c2cc49f11
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Plugins/Android/gradleTemplate.properties

@@ -1,7 +0,0 @@
-org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
-org.gradle.parallel=true
-android.useAndroidX=true
-android.enableJetifier=true
-android.enableR8=**MINIFY_WITH_R_EIGHT**
-unityStreamingAssets=**STREAMING_ASSETS**
-**ADDITIONAL_PROPERTIES**

Assets/Plugins/Android/mainTemplate.gradle

@@ -0,0 +1,43 @@
+apply plugin: 'com.android.library'
+**APPLY_PLUGINS**
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    //ºËÐÄÒÀÀµ
+implementation 'com.rokid.uxrplugin:rkuxrplugin:2.3.7' 
+//ÓïÒôʶ±ðÒÀÀµ
+implementation("com.rokid.axr:glassvoice-phone:1.3.0")
+**DEPS**}
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+        consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+
+    aaptOptions {
+        noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**PACKAGING_OPTIONS**
+}**REPOSITORIES**
+**IL_CPP_BUILD_SETUP**
+**SOURCE_BUILD_SETUP**
+**EXTERNAL_SOURCES**

Assets/Plugins/Android/gradleTemplate.properties.meta → Assets/Plugins/Android/mainTemplate.gradle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 818d25f89d1bef74da95de2fb77f0834
+guid: 52c7b6f690f4f7f439e984d498005e19
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/Resources/VuforiaConfiguration.asset

@@ -24,18 +24,16 @@ MonoBehaviour:
     shareRecordingsInITunes: 0
     logLevel: 0
     version: 10.13.3
-    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"]}'
+    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","10.19"]}'
   database:
     disableModelExtraction: 0
   shaders:
     depthMaskShader: {fileID: 4800000, guid: 1ce7eb78425fb1540838bc9d5d95857a, type: 3}
     outlineShader: {fileID: 4800000, guid: c1ded68d068051d4f92650fcddaae5c7, type: 3}
-    unlitTransparentShader: {fileID: 10750, guid: 0000000000000000f000000000000000,
-      type: 0}
+    unlitTransparentShader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0}
   videoBackground:
     numDivisions: 2
-    videoBackgroundShader: {fileID: 4800000, guid: f40623b353e2f1943b1b3ba42975db7a,
-      type: 3}
+    videoBackgroundShader: {fileID: 4800000, guid: f40623b353e2f1943b1b3ba42975db7a, type: 3}
     unlitShader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
     videoBackgroundEnabled: 1
   deviceTracker:

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from HUJIAJUN at 2023/10/11 12:41:11
+Build from YUNYUNGEGE at 2023/11/24 16:40:51

Assets/Studio/Resources/Container/Component/PlayerViewComponent.prefab

@@ -214,7 +214,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &796545184215631965
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Studio/Resources/_1LoginSencePrefab/LoginDlg.prefab

@@ -5662,12 +5662,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -5680,6 +5683,7 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 0, y: 0, z: 0}
+  m_ShouldActivateOnSelect: 0
 --- !u!65 &415691814
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -6928,12 +6932,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -6946,6 +6953,7 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 0, y: 0, z: 0}
+  m_ShouldActivateOnSelect: 0
 --- !u!1 &8663634093183383850
 GameObject:
   m_ObjectHideFlags: 0
@@ -9288,12 +9296,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 0
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -9306,6 +9317,7 @@ MonoBehaviour:
   m_CustomPosition: {x: 0, y: 0, z: 0}
   m_CustomRotation: {x: 0, y: 0, z: 0}
   m_CustomLocalScale: {x: 0, y: 0, z: 0}
+  m_ShouldActivateOnSelect: 0
 --- !u!65 &1006719811
 BoxCollider:
   m_ObjectHideFlags: 0

Assets/Studio/_3HomeScene/HomeSceneScripts_new/UI/MenuIcon.cs

@@ -32,7 +32,7 @@ public class MenuIcon : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, I
     string _id;//房间ID
     string _passWord;//房间密码
 
-    bool isClick = false;//房间是否被点击
+   static bool isClick = false;//房间是否被点击
     float _clickTime = 0.5f;//点击按下房间的间隔时间
     float _lastTime = 0;//记录开始点击房间时所处的时间
     public bool _isDrag = false;//房间是否被拖拽
@@ -314,6 +314,10 @@ public class MenuIcon : MonoBehaviour, IPointerDownHandler, IPointerUpHandler, I
         HomeMgr.Instance.roomListDlg.SetActive(false);
     }
 
+    private void OnDisable()
+    {
+        isClick = false;
+    }
 
     private void onRtcInit(JsonData data)
     {

Assets/Studio/_3HomeScene/HomeSceneScripts_new/UI/MenuUI.cs

@@ -215,7 +215,10 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
             ob.transform.parent = sed.inputDevicePartBase.transform;
 
         }
-        ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
+       if(XRInputManager.isHand)
+            ob.transform.position = (eventData as SCPointEventData).Position3D;
+        else
+            ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
         ob.transform.localEulerAngles = Vector3.zero;
         bx = ob.transform.localPosition.x;
     }
@@ -229,11 +232,16 @@ public class MenuUI : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHa
             sed.inputDevicePartBase.transform.eulerAngles = OpenXRCamera.Instance.head.eulerAngles;
 
         }
-        ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
+        if (XRInputManager.isHand)
+            ob.transform.position = (eventData as SCPointEventData).Position3D;
+        else
+            ob.transform.position = (eventData as SCPointEventData).PressPosition3D;
         float ox = ob.transform.localPosition.x;
         //  return;
         float _delta = (bx - ox)*100;//eventData.delta.x / _maxDragValue;//记录拖动的增量比值（用作速度比值）
-        bx = ox;
+        if (XRInputManager.isHand)
+            _delta = -_delta;
+            bx = ox;
      //   Debug.Log("_delta===>"+_delta);
         if (_delta < -0.01f)//向左拖动时
         {

Assets/Studio/_4ShowScene/ConsoleFunctionModule/DlgScripts/ConsoleDlg.cs

@@ -127,7 +127,7 @@ namespace ShadowStudio.UI
             }
             yield return null;
 
-            if (DeviceType.type == "LeiNiao"|| DeviceType.type == "YuanNi")
+            if (DeviceType.type == "LeiNiao" || DeviceType.type == "YuanNi" || DeviceType.type == "Rokid")
             {
                 VuforiaManagerSpace.Instance.Vuforia.gameObject.SetActive(false);
                 VuforiaManagerSpace.Instance.NoVuforia.gameObject.SetActive(true);
@@ -216,7 +216,7 @@ namespace ShadowStudio.UI
 
         public void CloseScan()
         {
-            if (DeviceType.type == "Phone" || DeviceType.type == "LeiNiao" || DeviceType.type == "YuanNi")
+            if (DeviceType.type == "Phone" || DeviceType.type == "LeiNiao" || DeviceType.type == "YuanNi" || DeviceType.type == "Rokid")
             { 
                 return;
             }

Assets/Studio/xiong_room_bird/Scenes/SampleScene.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9fc0d4010bbf28b4594072e72b8655ab
+guid: 149b5dc25fb6e854d9f63383ad467c0e
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/XR/Loaders/AR Kit 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: a18c4d6661b404073b154020b9e2d993, type: 3}
+  m_Name: AR Kit Loader
+  m_EditorClassIdentifier: 

Assets/XR/Loaders/AR Kit Loader.asset.meta

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

Assets/XR/Settings/AR Kit Settings.asset

@@ -0,0 +1,16 @@
+%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: 7a3c2811d41034e52a6d6c33ac73a207, type: 3}
+  m_Name: AR Kit Settings
+  m_EditorClassIdentifier: 
+  m_Requirement: 0
+  m_FaceTracking: 0

Assets/XR/Settings/AR Kit Settings.asset.meta

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

Assets/pzManager.cs

@@ -0,0 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class pzManager : MonoBehaviour
+{
+}

Assets/pzManager.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d0dcd6059907652469c7ad1564aaa564
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: