Prechádzať zdrojové kódy

修复 不可点击的问题

“hujiajun” 1 rok pred
rodič
commit
8cc2b42b3e
35 zmenil súbory, kde vykonal 792 pridanie a 510 odobranie
  1. 515 509
      Assets/NRSDK/Resources/NRUI/NRHomeMenu.prefab
  2. 8 0
      Assets/SDK/Common/Base.meta
  3. 8 0
      Assets/SDK/Common/Base/Editor.meta
  4. 8 0
      Assets/SDK/Common/Plugins.meta
  5. 8 0
      Assets/SDK/Common/StandardAssets/Shaders.meta
  6. 8 0
      Assets/SDK/Common/StandardAssets/Shaders/Editor.meta
  7. 8 0
      Assets/SDK/Modules.meta
  8. 8 0
      Assets/SDK/Modules/Module_CurvedUI.meta
  9. 8 0
      Assets/SDK/Modules/Module_CurvedUI/CurvedUI.meta
  10. 8 0
      Assets/SDK/Modules/Module_CurvedUI/CurvedUI/Scripts.meta
  11. 8 0
      Assets/SDK/Modules/Module_CurvedUI/CurvedUI/Scripts/Editor.meta
  12. 8 0
      Assets/SDK/Modules/Module_DetectorSystem.meta
  13. 8 0
      Assets/SDK/Modules/Module_DetectorSystem/SCNoticeDetector.meta
  14. 8 0
      Assets/SDK/Modules/Module_DetectorSystem/SCNoticeDetector/Editor.meta
  15. 8 0
      Assets/SDK/Modules/Module_DetectorSystem/SCVolumeDetector.meta
  16. 8 0
      Assets/SDK/Modules/Module_DetectorSystem/SCVolumeDetector/Scripts.meta
  17. 8 0
      Assets/SDK/Modules/Module_DetectorSystem/SCVolumeDetector/Scripts/Editor.meta
  18. 8 0
      Assets/SDK/Modules/Module_FPS.meta
  19. 8 0
      Assets/SDK/Modules/Module_FPS/Editor.meta
  20. 8 0
      Assets/SDK/Modules/Module_FinalIK2.0.meta
  21. 8 0
      Assets/SDK/Modules/Module_FinalIK2.0/Plugins.meta
  22. 8 0
      Assets/SDK/Modules/Module_FinalIK2.0/Plugins/RootMotion.meta
  23. 8 0
      Assets/SDK/Modules/Module_FinalIK2.0/Plugins/RootMotion/Editor.meta
  24. 8 0
      Assets/SDK/Modules/Module_Notice.meta
  25. 8 0
      Assets/SDK/Modules/Module_Notice/Scripts.meta
  26. 8 0
      Assets/SDK/Modules/Module_Notice/Scripts/Enums.meta
  27. 8 0
      Runtime/SDK/Common/Base/Editor.meta
  28. 8 0
      Runtime/SDK/Common/Plugins/DOTween/Editor.meta
  29. 8 0
      Runtime/SDK/Common/StandardAssets/Shaders/Editor.meta
  30. 8 0
      Runtime/SDK/Modules/Module_CurvedUI/CurvedUI/Scripts/Editor.meta
  31. 8 0
      Runtime/SDK/Modules/Module_DetectorSystem/SCNoticeDetector/Editor.meta
  32. 8 0
      Runtime/SDK/Modules/Module_DetectorSystem/SCVolumeDetector/Scripts/Editor.meta
  33. 8 0
      Runtime/SDK/Modules/Module_FPS/Editor.meta
  34. 8 0
      Runtime/SDK/Modules/Module_FinalIK2.0/Plugins/RootMotion/Editor.meta
  35. 13 1
      Runtime/SDK/Modules/Module_InputSystem/InputDeviceBase/Common/SCInputModule.cs

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 515 - 509
Assets/NRSDK/Resources/NRUI/NRHomeMenu.prefab


+ 8 - 0
Assets/SDK/Common/Base.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f2600884452a14d3e848ed739fcea289
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Common/Base/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 995cbac221a3643cea9e78ca32f328c0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Common/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b08f0f0e9f31a49f58df38ad58284e71
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Common/StandardAssets/Shaders.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 02cb5a8ece40a4c5d931cfef709f5755
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Common/StandardAssets/Shaders/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 05f15b857b4f0411589ec83c8cdf55f7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ed297e3d7a8ba44c7805527e8e49adaf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_CurvedUI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ad9decaaa381c4378a78eafbf5356b68
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_CurvedUI/CurvedUI.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd63328394e7e45bfae1e94b2a687be5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_CurvedUI/CurvedUI/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0d42a7ca4c0234762bf08cd7f1f14ad8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_CurvedUI/CurvedUI/Scripts/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c6f352594988841a2bf6fb49e51fb433
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_DetectorSystem.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 09259ff6ce8044a3d992740d8457860a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_DetectorSystem/SCNoticeDetector.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a0452c3731e774b62b4de30bdeb5a610
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_DetectorSystem/SCNoticeDetector/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4e77d650c754947f5965263b24b4ab68
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_DetectorSystem/SCVolumeDetector.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dba6bd6ac19c8486697fd2447b70ac43
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_DetectorSystem/SCVolumeDetector/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9476be293363f43919cd6af63fa98dad
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_DetectorSystem/SCVolumeDetector/Scripts/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cd32d2fb6190642cf916e210c3c5f295
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_FPS.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5d6ee8ff454f3468d8d70e0d31cdf7da
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_FPS/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7c79914aa935643baa6d7d7bff6f6551
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_FinalIK2.0.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa73a8bbceb014920bbbcfe49d990fbe
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_FinalIK2.0/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df8f3c346ca52433fa438358586e4cb5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_FinalIK2.0/Plugins/RootMotion.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b3be8ada2e8d94c3b8fc9a6e2420d587
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_FinalIK2.0/Plugins/RootMotion/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b97016d55b554acbb376ade7cb41cac
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_Notice.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d5993968951d9493f9229523e1f9091f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_Notice/Scripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1bd03636a7b4740cd958951e80ff0188
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/SDK/Modules/Module_Notice/Scripts/Enums.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f14217f5635b844debb7f7fff6ad6f4d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Common/Base/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b93f91f8fdeb44a9aa24188bcc9717a9
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Common/Plugins/DOTween/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9c2d74fb01810419b9be7493886f8445
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Common/StandardAssets/Shaders/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fddbffc62936f4472a7d00701bb9d92b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Modules/Module_CurvedUI/CurvedUI/Scripts/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5c5ca5f30355a4bf080e399b46349009
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Modules/Module_DetectorSystem/SCNoticeDetector/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c5c99b76bd214433c8cf38db41c2cd95
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Modules/Module_DetectorSystem/SCVolumeDetector/Scripts/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8d77443e1192848bf99bb93aa0e49690
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Modules/Module_FPS/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df969c148a7c347e2a1674390f6adc29
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Runtime/SDK/Modules/Module_FinalIK2.0/Plugins/RootMotion/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4dc191b939d0045d78fbab76445b9f97
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 13 - 1
Runtime/SDK/Modules/Module_InputSystem/InputDeviceBase/Common/SCInputModule.cs

@@ -3,8 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using NRKernal;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
+
 namespace SC.XR.Unity.Module_InputSystem {
 
     public class SCInputModule : StandaloneInputModule {
@@ -92,8 +95,17 @@ namespace SC.XR.Unity.Module_InputSystem {
             RayCasterCamera.transform.position = posture.position; // posture.position;// Vector3.Lerp(RayCasterCamera.transform.position, targetDetectBase.transform.position,0.3f); //targetDetectBase.transform.position;
             RayCasterCamera.transform.rotation = posture.rotation;
 
+            List<ICanvasRaycastTarget> list = CanvasTargetCollector.GetCanvases();
+            for (int i = 0; i < list.Count; i++)
+            {
+                if (list[i].canvas.gameObject.GetComponent<CanvasCollection>() == null)
+                {
+                    list[i].canvas.gameObject.AddComponent<CanvasCollection>();
+                    list[i].canvas.gameObject.AddComponent<GraphicRaycaster>();
+                }
+            }
             ///Canvas分配wrold Camera
-            foreach(var canvas in CanvasCollection.CanvasList) {
+            foreach (var canvas in CanvasCollection.CanvasList) {
                 canvas.worldCamera = RayCasterCamera;
             }
 

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov