Parcourir la source

提交A01进阶版适配

胡佳骏 il y a 1 an
Parent
commit
77436b03b7

Fichier diff supprimé car celui-ci est trop grand
+ 729 - 248
Assets/MRNavigatorPro.unity


+ 39 - 0
Assets/OtherCamera.renderTexture

@@ -0,0 +1,39 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!84 &8400000
+RenderTexture:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: OtherCamera
+  m_ImageContentsHash:
+    serializedVersion: 2
+    Hash: 00000000000000000000000000000000
+  m_ForcedFallbackFormat: 4
+  m_DownscaleFallback: 0
+  m_IsAlphaChannelOptional: 0
+  serializedVersion: 5
+  m_Width: 1280
+  m_Height: 720
+  m_AntiAliasing: 1
+  m_MipCount: -1
+  m_DepthStencilFormat: 0
+  m_ColorFormat: 8
+  m_MipMap: 0
+  m_GenerateMips: 1
+  m_SRGB: 0
+  m_UseDynamicScale: 0
+  m_BindMS: 0
+  m_EnableCompatibleFormat: 1
+  m_TextureSettings:
+    serializedVersion: 2
+    m_FilterMode: 1
+    m_Aniso: 0
+    m_MipBias: 0
+    m_WrapU: 1
+    m_WrapV: 1
+    m_WrapW: 1
+  m_Dimension: 2
+  m_VolumeDepth: 1
+  m_ShadowSamplingMode: 2

+ 8 - 0
Assets/OtherCamera.renderTexture.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 92354ac28c543de44b3eac4c20eec4d3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 8400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Fichier diff supprimé car celui-ci est trop grand
+ 19320 - 0
Assets/Prefab/BluePrefabs/SceneChooseItem.prefab


Fichier diff supprimé car celui-ci est trop grand
+ 271 - 236
Assets/Resources/UI/SceneChoose.prefab


+ 2 - 2
Assets/Resources/UI/SceneChoose2.prefab

@@ -178,7 +178,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &4795344182225730044
 RectTransform:
   m_ObjectHideFlags: 0
@@ -417,7 +417,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}

+ 24 - 5
Assets/Scripts/Blue/Temp/MoveChange.cs

@@ -16,8 +16,15 @@ public class MoveChange : MonoBehaviour
 #if UNITY_EDITOR
         ControllerTracker = OpenXRCamera.Instance.head;
 #else
-        ControllerTracker = API_GSXR_Module_InputSystem_KS.GSXR_KSRight.inputDeviceKSPartUI.transform;
+        if(DeviceType.type!="A01"&&DeviceType.type!="Phone")
+        {
+            ControllerTracker = API_GSXR_Module_InputSystem_KS.GSXR_KSRight.inputDeviceKSPartUI.transform;
+        }else
+        {
+            ControllerTracker = OpenXRCamera.Instance.head;
+        }
 #endif
+
         DispatcherBase.KeyDownDelegateRegister(keyDownEventDelegate);
         DispatcherBase.KeyUpDelegateRegister(keyUpEventDelegate);
         RotToggle.onValueChanged.AddListener(RotToggleOnValueChanged);
@@ -47,6 +54,9 @@ public class MoveChange : MonoBehaviour
         if(!IsRot)
         {
             TempVector3 = OpenXRCamera.Instance.head.position-goRefrence.transform.position;
+        }else
+        {
+            TempVector3Rot = OpenXRCamera.Instance.head.eulerAngles - goRefrence.transform.eulerAngles;
         }
         mesh_test.transform.parent = goRefrence.transform;
 
@@ -107,10 +117,18 @@ public class MoveChange : MonoBehaviour
             }
             else
             {
-                Debug.Log("正在旋轉======》");
-                v3.y = ControllerTracker_Y - ControllerTracker.eulerAngles.y;
-                goRefrence.transform.localEulerAngles +=v3;
-                ControllerTracker_Y = ControllerTracker.eulerAngles.y;
+                if(DeviceType.type != "A01" && DeviceType.type != "Phone")
+                {
+                    Debug.Log("正在旋轉======》");
+                    v3.y = ControllerTracker_Y - ControllerTracker.eulerAngles.y;
+                    goRefrence.transform.localEulerAngles += v3;
+                    ControllerTracker_Y = ControllerTracker.eulerAngles.y;
+
+                }else
+                {
+                    goRefrence.transform.localEulerAngles = TempVector3Rot - ControllerTracker.eulerAngles;
+                    goRefrence.transform.localEulerAngles = new Vector3(0, goRefrence.transform.eulerAngles.y, 0);
+                }
                 /*
                 goRefrence.transform.localEulerAngles = ControllerTracker.localEulerAngles - TempVector3;
                 goRefrence.transform.localEulerAngles = new Vector3(0, goRefrence.transform.localEulerAngles.y, 0);
@@ -128,6 +146,7 @@ public class MoveChange : MonoBehaviour
     private float ControllerTracker_Y = 0; // 上次手柄的旋转Y值
     private bool IsRot;
     private Vector3 TempVector3;
+    private Vector3 TempVector3Rot;
     public GameObject goRefrence // 参照物
     {
         get =>SceneIOCContainer.Instance.Pull("goRefrence")as GameObject;

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff