增加重置Transform动作脚本

Assets/Game/Blue/Action.meta

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

Assets/Game/Blue/Action/ResetTransform.cs

@@ -0,0 +1,46 @@
+using GHZLangChao;
+using UnityEngine;
+
+/// <summary>
+/// 重置位置---Action
+/// </summary>
+public class ResetTransform : MonoBehaviour
+{
+    [SerializeField] private Transform Xunjian => SceneIOCContainer.Instance.Pull("Dof") as Transform;
+
+    public bool FixedHeight;
+
+    private float height;
+    private void Awake()
+    {
+        height = OpenXRCamera.Instance.head.position.y;
+    }
+
+    public void Execute()
+    {
+        if (FixedHeight)
+        {
+            Vector3 v3 = Xunjian.position;
+            v3.y = height;
+            transform.position = v3;
+            Vector3 v3Rot = Xunjian.eulerAngles;
+            v3Rot = new Vector3(0,v3Rot.y,0);
+            transform.eulerAngles = v3Rot;
+
+        }
+        else
+        {
+            transform.position = Xunjian.position;
+            transform.eulerAngles = Xunjian.eulerAngles;
+        }
+
+        /*
+        transform.LookAt(OpenXRCamera.Instance.head);
+        transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
+        Transform Player = OpenXRCamera.Instance.head;
+        Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
+        transform.position = OpenXRCamera.Instance.head.position + Player.forward * 1.6f;
+        transform.position = new Vector3(transform.position.x, transform.position.y + 0f, transform.position.z);
+        */
+    }
+}

Assets/Game/Blue/Action/ResetTransform.cs.meta

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

Assets/Game/Blue/System/GetObjectSystem.cs

@@ -1,13 +1,14 @@
 using Blue;
 using UnityEngine;
+using UnityEngine.UI;
 
 namespace GHZLangChao
 {
     public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
     {
         [SerializeField] private GameObject ShowDevice;
-        [SerializeField] private Transform Xunjian;
-        //[SerializeField] private GameObject ARSpaceForAll;
+        [SerializeField] private Transform Xunjian2;
+
         private void Awake()
         {
             GetObj();
@@ -16,12 +17,16 @@ namespace GHZLangChao
 
         private void GetObj()
         {
+            Xunjian2 = new GameObject("Dof").AddComponent<Image>().transform;
+            Xunjian2.gameObject.SetActive(false);
+            Xunjian2.SetParent(OpenXRCamera.Instance.head.GetChild(0));
+            Xunjian2.GetComponent<RectTransform>().localPosition = new Vector3(50, 0, 180);
         }
 
         private void PushIOC()
         {
-            SceneIOCContainer.Instance.Push("ShowDevice",ShowDevice);
-            SceneIOCContainer.Instance.Push("Xunjian",Xunjian);
+            SceneIOCContainer.Instance.Push("ShowDevice", ShowDevice);
+            SceneIOCContainer.Instance.Push("Dof", Xunjian2);
         }
     }
 }

Assets/Game/ShowChoose/ChooseManager.cs

@@ -10,6 +10,8 @@ public class ChooseManager : MonoBehaviour,IController
     [SerializeField] private GameObject Tip;
     [SerializeField] private GameObject ShowDevice => SceneIOCContainer.Instance.Pull("ShowDevice") as GameObject;
     [SerializeField] private Toggle ShowHide_Toggle;
+
+    public UnityEvent OnReset = new UnityEvent();
     private IQueueSystem mQueueSystem;
     void Awake()
     {
@@ -63,16 +65,14 @@ public class ChooseManager : MonoBehaviour,IController
             ShowHide_Toggle.interactable = true;
         Debug.Log($"打开的数量：{mQueueSystem.Level3QueueCount.Value}");
 
-        Debug.Log(transform.position);
-
+        OnReset?.Invoke();
+        /*
         transform.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
         Vector3 pos = OpenXRCamera.Instance.head.position+ OpenXRCamera.Instance.head.forward * 2.5f;
         transform.position = new Vector3(pos.x, 0.5f, pos.z);
+        */
         Debug.Log("DGJ  =======> " +transform.position);
 
-        GameObject obj = new GameObject();
-        obj.transform.position = transform.position;
-
         BladeServerManager.Instance.isDaoHang = false;
 
     }

Assets/Game/ShowChoose/ShowChoose.prefab

@@ -2342,6 +2342,7 @@ GameObject:
   - component: {fileID: 5466424356445212233}
   - component: {fileID: 6765360492072433445}
   - component: {fileID: -2563318474759143114}
+  - component: {fileID: 6679363164165226943}
   m_Layer: 5
   m_Name: ShowChoose
   m_TagString: Untagged
@@ -2399,6 +2400,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Tip: {fileID: 7897104504025182316}
   ShowHide_Toggle: {fileID: 4042525268217239131}
+  OnReset:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 6679363164165226943}
+        m_TargetAssemblyTypeName: ResetTransform, Assembly-CSharp
+        m_MethodName: Execute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &-2563318474759143114
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2421,6 +2437,21 @@ MonoBehaviour:
   LinearFollowing: 0
   menu_size: {x: 0, y: 0}
   nowV3: {x: 0, y: 0, z: 0}
+--- !u!114 &6679363164165226943
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466424356445212314}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37454ca6d2982b04c83af096610f8a7a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pos: {x: 0, y: 0.15, z: 0}
+  rot: {x: 0, y: 0, z: 0}
+  FixedHeight: 1
 --- !u!1 &5605464660423486481
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/ShowSupport/ShowRtc.prefab

@@ -523,6 +523,7 @@ GameObject:
   - component: {fileID: 3651108695874027832}
   - component: {fileID: 68587665577711952}
   - component: {fileID: 1907783435326225353}
+  - component: {fileID: 8301134418386180382}
   m_Layer: 5
   m_Name: ShowRtc
   m_TagString: Untagged
@@ -581,6 +582,21 @@ MonoBehaviour:
   ShowRtcHistory_Btn: {fileID: 3144313263904251065}
   UserList_Text: {fileID: 3076773033835630584}
   ShowRtcHistory_Text: {fileID: 2911069066738432039}
+  OnReset:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 8301134418386180382}
+        m_TargetAssemblyTypeName: ResetTransform, Assembly-CSharp
+        m_MethodName: Execute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &68587665577711952
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -619,6 +635,21 @@ MonoBehaviour:
   dis: 0
   angle: 0
   pos: {x: 0, y: 0, z: 0}
+--- !u!114 &8301134418386180382
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466424356445212314}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37454ca6d2982b04c83af096610f8a7a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pos: {x: 0, y: 0.15, z: 0}
+  rot: {x: 0, y: 0, z: 0}
+  FixedHeight: 1
 --- !u!1 &5942839336781322053
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/ShowSupport/SupportControl.cs

@@ -2,6 +2,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using Blue;
 using TMPro;
+using UnityEngine.Events;
 
 public class SupportControl : AbstractController
 {
@@ -16,6 +17,8 @@ public class SupportControl : AbstractController
     private FontStyle FontStyleN = FontStyle.Normal;
     [SerializeField] private TextMeshProUGUI UserList_Text;
     [SerializeField] private TextMeshProUGUI ShowRtcHistory_Text;
+    
+    public UnityEvent OnReset = new UnityEvent();
     void Awake()
     {
         Init();
@@ -71,12 +74,7 @@ public class SupportControl : AbstractController
 
     private void OnEnable()
     {
-        transform.LookAt(OpenXRCamera.Instance.head);
-        transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
-        Transform Player = OpenXRCamera.Instance.head;
-        Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
-        transform.position = OpenXRCamera.Instance.head.position + Player.forward * 1.6f;
-        transform.position = new Vector3(transform.position.x, transform.position.y + 0f, transform.position.z);
+        OnReset?.Invoke();
     }
 
 

Assets/Game/ShowXunJian/ShowDaoHang.prefab

@@ -3153,6 +3153,7 @@ GameObject:
   - component: {fileID: 6165832893745008072}
   - component: {fileID: 335074033941586619}
   - component: {fileID: 7533901546252241780}
+  - component: {fileID: 3872284821940436242}
   m_Layer: 5
   m_Name: ShowDaoHang
   m_TagString: Untagged
@@ -3216,6 +3217,21 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
   - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
   UI: {fileID: 9017032404431050513}
+  OnReset:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 3872284821940436242}
+        m_TargetAssemblyTypeName: ResetTransform, Assembly-CSharp
+        m_MethodName: Execute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &335074033941586619
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3254,6 +3270,21 @@ MonoBehaviour:
   dis: 0
   angle: 0
   pos: {x: 0, y: 0, z: 0}
+--- !u!114 &3872284821940436242
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466424356445212314}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37454ca6d2982b04c83af096610f8a7a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pos: {x: 0, y: 0.15, z: 0}
+  rot: {x: 0, y: 0, z: 0}
+  FixedHeight: 1
 --- !u!1 &5573163100672273733
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -5687,6 +5687,7 @@ GameObject:
   - component: {fileID: 5466424356445212233}
   - component: {fileID: 1680626387826341901}
   - component: {fileID: 2159527941179580181}
+  - component: {fileID: 15090157997580263}
   m_Layer: 5
   m_Name: ShowXunJian
   m_TagString: Untagged
@@ -5820,8 +5821,21 @@ MonoBehaviour:
   SaveBtn: {fileID: 3523176626855364471}
   toggleBoolList: 010000000000000000000000
   DefaultUI_go: {fileID: 8040946423383846060}
-  yyyyy: 1.3
-  zzz: {x: -0.2, y: 1, z: 0}
+  OnReset:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 15090157997580263}
+        m_TargetAssemblyTypeName: ResetTransform, Assembly-CSharp
+        m_MethodName: Execute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
   mScreenshotSprite: {fileID: 21300000, guid: 72a6f38aacb371e4e808f9b74800e742, type: 3}
 --- !u!114 &2159527941179580181
 MonoBehaviour:
@@ -5845,6 +5859,21 @@ MonoBehaviour:
   LinearFollowing: 0
   menu_size: {x: 0, y: 0}
   nowV3: {x: 0, y: 0, z: 0}
+--- !u!114 &15090157997580263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466424356445212314}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37454ca6d2982b04c83af096610f8a7a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  pos: {x: 0, y: 0, z: 0}
+  rot: {x: 0, y: 0, z: 0}
+  FixedHeight: 0
 --- !u!1 &5903599608472070034
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/ShowXunJian/StartXunJian.cs

@@ -1,5 +1,6 @@
 using Blue;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.UI;
 
 namespace GHZLangChao
@@ -18,6 +19,8 @@ namespace GHZLangChao
         [SerializeField] private Button SaveBtn;
         [SerializeField] private bool[] toggleBoolList;
         [SerializeField] private GameObject DefaultUI_go;
+
+        public UnityEvent OnReset = new UnityEvent();
         void Start()
         {
             foreach (Button btn in ScreenshotBtnList)
@@ -27,17 +30,10 @@ namespace GHZLangChao
             SaveBtn.onClick.AddListener(ClickSave);
             //CancelBtn.onClick.AddListener(ClickCancel);
         }
-
-        [SerializeField] private Transform Xunjian => SceneIOCContainer.Instance.Pull("Xunjian") as Transform;
-        private void InitTransform()
-        {
-            transform.position = Xunjian.position+new Vector3(0,-0.2f,0);
-            transform.eulerAngles = Xunjian.eulerAngles;
-        }
         private void Update()
         {
             if (Test) return;
-            InitTransform();
+            OnReset?.Invoke();
         }
         public void Next()
         {

Assets/Game/ShowXunJian/XunJianManager.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.UI;
 
 namespace GHZLangChao
@@ -18,6 +19,8 @@ namespace GHZLangChao
         [SerializeField] private List<Sprite> SelectBtnSprite; // 显示隐藏按钮不同样式的Sprite
         public GameObject UI;
 
+        public UnityEvent OnReset = new UnityEvent();
+
         public static XunJianManager Instance;
 
         private void Awake()
@@ -25,30 +28,11 @@ namespace GHZLangChao
             if(Instance==null)
                 Instance = this;
         }
-
-        [SerializeField] private Transform Xunjian => SceneIOCContainer.Instance.Pull("Xunjian") as Transform;
-        private void InitTransform()
-        {
-            Vector3 v3 = Xunjian.position;
-            v3.y = transform.position.y ;
-            transform.position = v3;
-            transform.eulerAngles = Xunjian.eulerAngles;
-        }
         private void OnEnable()
         {
-            /*
-            InitTransform();
-            */
-            transform.LookAt(OpenXRCamera.Instance.head);
-            transform.localEulerAngles = new Vector3(0, transform.localEulerAngles.y + 180f, 0);
-            Transform Player = OpenXRCamera.Instance.head;
-            Player.eulerAngles = new Vector3(0, OpenXRCamera.Instance.head.eulerAngles.y, 0);
-            transform.position = OpenXRCamera.Instance.head.position + Player.forward * 1.6f;
-            transform.position = new Vector3(transform.position.x, transform.position.y + 0f, transform.position.z);
+            OnReset?.Invoke();
         }
 
-        
-
         void Start()
         {
             Serach_Toggle.onValueChanged.AddListener(SerachChange);

Assets/Scripts/Tool/UIFollow.cs

@@ -20,8 +20,8 @@ public class UIFollow : MonoBehaviour
     {
 
         // pos = new Vector3(OpenXRCamera.Instance.transform.position.x, 1.5f,OpenXRCamera.Instance.head.transform.position.z + (OpenXRCamera.Instance.transform.forward * 1.5f).z);
-        pos = HeadBtnManager.Instance.transform.position;
-        Show(pos);
+        //pos = HeadBtnManager.Instance.transform.position;
+        //Show(pos);
     }
 
     private void Awake()