Browse Source

提交手机版本

jiajun.hu.x 1 year ago
parent
commit
dc81a4d5e7

File diff suppressed because it is too large
+ 8349 - 0
Assets/NavigatorProPhone.unity


+ 7 - 0
Assets/NavigatorProPhone.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b8da3f3ecd5ee4a43bed7807f1295b43
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 5 - 8
Assets/Plugins/Android/AndroidManifest.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mediasoup.droid.demo">
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-  <uses-permission android:name="android.permission.CAMERA" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <application android:usesCleartextTraffic="true" android:requestLegacyExternalStorage="true" android:hardwareAccelerated="true" android:label="@string/app_name" android:icon="@drawable/app_icon">
-    <activity android:name="org.mediasoup.droid.demo.UnityActivity">
+<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">
+    <activity android:name="com.unity3d.player.UnityPlayerActivity">
       <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" />

+ 1 - 1
Assets/Resources/VuforiaConfiguration.asset

@@ -49,4 +49,4 @@ MonoBehaviour:
   webcam:
     renderTextureLayer: 30
   packageInformation:
-    ARFoundationVersion: 
+    ARFoundationVersion: 4.2.8

+ 1 - 1
Assets/SDK/Modules/Module_InputSystem/Module_InputSystem.cs

@@ -122,7 +122,7 @@ namespace SC.XR.Unity.Module_InputSystem
             {
                 activeGGT26Dof = API_Module_SDKConfiguration.GetBool("Module_InputSystem", "ActiveGGT26Dof", 0);
             }
-            activeKS = true;
+            activeKS = false;
             activeHead = true;
 
         }

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/6/7 16:33:26
+Build from HJJ at 2023/6/9 12:40:45

+ 2 - 2
Assets/Studio/MediaSoup/WebSocket/WSRtcHandler.cs

@@ -356,9 +356,9 @@ public class WSRtcHandler  {
                             Debug.Log("changeDisplayName=========>");
                             SCRtcFactory.Instance.mSCRtcHandle.getDevice();
 
-                    #if UNITY_EDITOR || !UNITY_ANDROID
+                   // #if UNITY_EDITOR || !UNITY_ANDROID
                                             joinRoom("{}");
-                    #endif
+                   // #endif
                         break;
                         default:
                             break;

+ 12 - 34
Assets/Studio/Resources/_1LoginSencePrefab/LoginDlg.prefab

@@ -5443,7 +5443,7 @@ GameObject:
   - component: {fileID: 8663634092783487456}
   - component: {fileID: 415691814}
   - component: {fileID: 415691813}
-  - component: {fileID: 1495157068510197381}
+  - component: {fileID: 6727574240926750467}
   m_Layer: 5
   m_Name: UserInputField
   m_TagString: Untagged
@@ -5563,7 +5563,7 @@ MonoBehaviour:
   VisualMove: {fileID: 0}
   VisualScale: {fileID: 1834266650}
   minCompressPercentage: 0.25
---- !u!114 &1495157068510197381
+--- !u!114 &6727574240926750467
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -5572,7 +5572,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8663634092783487453}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a46608ad6e721a8439545e876d6d4a79, type: 3}
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -5617,10 +5617,10 @@ MonoBehaviour:
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnValueChanged:
+  m_OnDidEndEdit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
+  m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
@@ -5630,18 +5630,7 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
-  m_SCKeyboardEnum: 0
-  m_UseCustomTransform: 0
-  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
-  m_SCKeyboardType: 1
-  m_SCKeyboardSpaceEnum: 1
-  m_CustomDistance: 1
-  m_CustomOffset: {x: 0, y: -0.2}
-  m_UseCustomOrderInLayer: 0
-  m_OrderInLayer: 10
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &8663634092788089618
 GameObject:
   m_ObjectHideFlags: 0
@@ -9081,7 +9070,7 @@ GameObject:
   - component: {fileID: 8663634093892348390}
   - component: {fileID: 1006719811}
   - component: {fileID: 1006719810}
-  - component: {fileID: 3249203755615038542}
+  - component: {fileID: 4606466436643212610}
   m_Layer: 5
   m_Name: PasswordInputField
   m_TagString: Untagged
@@ -9202,7 +9191,7 @@ MonoBehaviour:
   VisualMove: {fileID: 0}
   VisualScale: {fileID: 1291039127}
   minCompressPercentage: 0.25
---- !u!114 &3249203755615038542
+--- !u!114 &4606466436643212610
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -9211,7 +9200,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8663634093892348387}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a46608ad6e721a8439545e876d6d4a79, type: 3}
+  m_Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Navigation:
@@ -9256,10 +9245,10 @@ MonoBehaviour:
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnValueChanged:
+  m_OnDidEndEdit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnDidEndEdit:
+  m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
@@ -9269,18 +9258,7 @@ MonoBehaviour:
   m_CaretBlinkRate: 0.85
   m_CaretWidth: 1
   m_ReadOnly: 0
-  m_SCKeyboardEnum: 0
-  m_UseCustomTransform: 0
-  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
-  m_SCKeyboardType: 1
-  m_SCKeyboardSpaceEnum: 1
-  m_CustomDistance: 1
-  m_CustomOffset: {x: 0, y: -0.2}
-  m_UseCustomOrderInLayer: 0
-  m_OrderInLayer: 10
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &8663634093931108080
 GameObject:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 136 - 3
Assets/Studio/Resources/_2HomeSencePrefab/CreateRoomDlg.prefab


File diff suppressed because it is too large
+ 170 - 70
Assets/Studio/Resources/_2HomeSencePrefab/CreateSearchRoomDlg.prefab


File diff suppressed because it is too large
+ 137 - 82
Assets/Studio/Resources/_2HomeSencePrefab/SearchRoomDlg.prefab


File diff suppressed because it is too large
+ 133 - 3
Assets/Studio/Scenes/Home/Home.unity


+ 64 - 0
Assets/Studio/Scenes/Home/HomeSettings.lighting

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: HomeSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0

+ 8 - 0
Assets/Studio/Scenes/Home/HomeSettings.lighting.meta

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

File diff suppressed because it is too large
+ 493 - 283
Assets/Studio/Scenes/Logo/Logo.unity


File diff suppressed because it is too large
+ 132 - 4
Assets/Studio/Scenes/Show/Show.unity


+ 64 - 0
Assets/Studio/Scenes/Show/ShowSettings.lighting

@@ -0,0 +1,64 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ShowSettings
+  serializedVersion: 4
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 1
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 1
+  m_BakeBackend: 1
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 40
+  m_Padding: 2
+  m_LightmapCompression: 3
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 1
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 2
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 2
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 256
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 256
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentMIS: 1
+  m_PVRFilteringMode: 1
+  m_PVRDenoiserTypeDirect: 1
+  m_PVRDenoiserTypeIndirect: 1
+  m_PVRDenoiserTypeAO: 1
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0

+ 8 - 0
Assets/Studio/Scenes/Show/ShowSettings.lighting.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5af6d15faaac62245ae9bbd946e19b3d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Studio/XRLib/Codes/PublicTools/Common/GameSession.cs

@@ -122,6 +122,7 @@ namespace XRTool.Util
             }
 #endif
 
+            //gameHead = OpenXRCamera.Instance.head;
             InitSuccess = false;
             DontDestroyOnLoad(gameObject);
             StartCoroutine(CheckBaseInit());

+ 4 - 4
Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs

@@ -23,8 +23,8 @@ namespace ShadowStudio.UI
     public class LoginDlg : UnitySingleton<LoginDlg>
     {
         private string session;
-        private SCInputField userInputField;
-        private SCInputField passwordInputField;
+        private InputField userInputField;
+        private InputField passwordInputField;
         private Button loginBtn;
         private Button setBtn;
         private Toggle remberToggle;
@@ -45,9 +45,9 @@ namespace ShadowStudio.UI
         {
             CommonMethod.IsReceive = false;
             dlg = GetComponent<WorldDlg>();
-            userInputField = dlg.GetChild<SCInputField>("UIRoot/UserInputField");
+            userInputField = dlg.GetChild<InputField>("UIRoot/UserInputField");
             //dlg.GetBreadthChild<SCInputField>("UserInputField")
-            passwordInputField = dlg.GetChild<SCInputField>("UIRoot/PasswordInputField");
+            passwordInputField = dlg.GetChild<InputField>("UIRoot/PasswordInputField");
             loginBtn = dlg.GetChild<Button>("FullUIRoot/LoginBtn");
             setBtn = dlg.GetChild<Button>("UIRoot/SetBtn");
             remberToggle = dlg.GetChild<Toggle>("UIRoot/RemberToggle_CheckBox");

+ 2 - 2
Assets/Studio/_3HomeScene/HomeSceneScripts_new/CreateSearchRoomDlg.cs

@@ -20,7 +20,7 @@ namespace ShadowStudio.UI
         private Button createRoomBtn;
         private Button deleteBtn;
         private Button aboutmeBtn;
-        private SCInputField searchRoomInputFiled;
+        private InputField searchRoomInputFiled;
         public WorldDlg dlg;
         private XRImage3D image3D;
         private void Start()
@@ -35,7 +35,7 @@ namespace ShadowStudio.UI
             deleteBtn.onClick.AddListener(OnClickDelete);
             aboutmeBtn = dlg.GetBreadthChild<Button>("AboutmeBtn");
             aboutmeBtn.onClick.AddListener(OnClickAboutmeBtn);
-            searchRoomInputFiled = dlg.GetBreadthChild<SCInputField>("SearchRoomInputFiled");
+            searchRoomInputFiled = dlg.GetBreadthChild<InputField>("SearchRoomInputFiled");
             searchRoomInputFiled.onEndEdit.AddListener(InputSearchRoomEnd);
             searchRoomInputFiled.onValueChanged.AddListener(SearchRoomChanged);
             if (UserInfoMgr.Instance.userConfig.Login_type == "3")

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

@@ -175,7 +175,7 @@ namespace ShadowStudio.UI
 
         public void CloseScan()
         {
-            if (vufora_camera.enabled == true)
+            if (vufora_camera!=null&&vufora_camera.enabled == true)
             {
                 CommonMethod.ShowScanEffect(false);
                 vufora_camera.enabled = false;

+ 32 - 1
Assets/XR/XRGeneralSettings.asset

@@ -56,10 +56,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3}
   m_Name: XRGeneralSettings
   m_EditorClassIdentifier: 
-  Keys: 0100000007000000
+  Keys: 01000000070000000d000000
   Values:
   - {fileID: -7061507647067013983}
   - {fileID: -6682207197718421661}
+  - {fileID: 7564021778193297842}
 --- !u!114 &2112244585808358372
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -77,3 +78,33 @@ MonoBehaviour:
   m_AutomaticRunning: 0
   m_Loaders:
   - {fileID: 11400000, guid: 9fccdabffc9d3804f8df794769058ed9, type: 2}
+--- !u!114 &6776991485157659913
+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: f4c3631f5e58749a59194e0cf6baf6d5, type: 3}
+  m_Name: WebGL Providers
+  m_EditorClassIdentifier: 
+  m_RequiresSettingsUpdate: 0
+  m_AutomaticLoading: 0
+  m_AutomaticRunning: 0
+  m_Loaders: []
+--- !u!114 &7564021778193297842
+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: d236b7d11115f2143951f1e14045df39, type: 3}
+  m_Name: WebGL Settings
+  m_EditorClassIdentifier: 
+  m_LoaderManagerInstance: {fileID: 6776991485157659913}
+  m_InitManagerOnStart: 1

Some files were not shown because too many files changed in this diff