修改列表组件

Assets/Scripts/Blue/0.FrameworkDesign/Core/ArchitectureInitiator.cs → Assets/Scripts/Blue/0.FrameworkDesign/Core/ControllerAr.cs

@@ -5,23 +5,26 @@ using UnityEngine.Scripting;
 
 namespace Blue
 {
+    /// <summary>
+    /// 控制的Archi
+    /// </summary>
     [Preserve]
-    internal sealed class ArchitectureInitiator
+    internal sealed class ControllerAr
     {
-        private ArchitectureInitiator() { }
+        private ControllerAr() { }
 
         private Type architectureType = typeof(IArchitecture);
         private IArchitecture architectureInstance = null;
         private IInjector mInjector;
         private bool architectureInited = false;
         //private bool
-        private static ArchitectureInitiator mInstance;
+        private static ControllerAr mInstance;
         private ModuleInitiator moduleInitiator;
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.AfterAssembliesLoaded)]
         private static void Initiate()
         {
-            mInstance = new ArchitectureInitiator();
+            mInstance = new ControllerAr();
             mInstance.CreateInjector();
             mInstance.CreateModuleInitiator();
             Type[] typeArr = Assembly.GetExecutingAssembly().GetTypes();
@@ -47,7 +50,7 @@ namespace Blue
         //[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
         private static void StartInject() 
         {
-            Debug.Log("StartInject");
+            //Debug.Log("StartInject");
             mInstance.Inject();
             //mInstance.Clear();
         }

Assets/Scripts/Blue/Controller/SetPos/MinMapPos.cs

@@ -5,7 +5,7 @@ public class MinMapPos : MonoBehaviour
     [SerializeField] private GameObject MinMapCanvas;
     void Start()
     {
-        if (MinMapCanvas != null && OpenXRCamera.Instance.head!=null)
+        if (MinMapCanvas != null)
         {
             MinMapCanvas.transform.parent = OpenXRCamera.Instance.head;
         }

Assets/Scripts/Blue/Controller/SetPos/SetBtnPos.cs

@@ -5,7 +5,7 @@ public class SetBtnPos : MonoBehaviour
     [SerializeField] private GameObject SetBtn;
     void Start()
     {
-        if (SetBtn != null && OpenXRCamera.Instance.head != null)
+        if (SetBtn != null)
         {
            SetBtn.transform.parent = OpenXRCamera.Instance.head;
         }

Assets/Scripts/LayoutGroup/DRFanLayout.cs

@@ -1,4 +1,5 @@
 using SC.XR.Unity;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -78,11 +79,11 @@ public class DRFanLayout : MonoBehaviour
                         //Set text position
                         if (mat.textPosition == "top")
                         {
-                            go.transform.localPosition = new Vector3(0, 0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, 1f, 0);
                         }
                         else if (mat.textPosition == "bottom")
                         {
-                            go.transform.localPosition = new Vector3(0, -0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, -1f, 0);
                         }
                     }
                     mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);
@@ -142,7 +143,12 @@ public class DRFanLayout : MonoBehaviour
         data[3].transform.localPosition += new Vector3(0, 0, -0.2f);
         data[3].transform.localRotation = Quaternion.Euler(0, -30, 0);
 
-        data[5].transform.localPosition += new Vector3(0, 0, -0.2f);
-        data[5].transform.localRotation = Quaternion.Euler(0, 30, 0);
+        if (data.Count < 6)
+            Debug.LogWarning("双排扇形不足六个元素图片或视频");
+        else
+        {
+            data[5].transform.localPosition += new Vector3(0, 0, -0.2f);
+            data[5].transform.localRotation = Quaternion.Euler(0, 30, 0);
+        }
     }
 }

Assets/Scripts/LayoutGroup/DRTitleLayout.cs

@@ -90,11 +90,11 @@ public class DRTitleLayout : MonoBehaviour
                         //Set text position
                         if (mat.textPosition == "top")
                         {
-                            go.transform.localPosition = new Vector3(0, 0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, 1f, 0);
                         }
                         else if (mat.textPosition == "bottom")
                         {
-                            go.transform.localPosition = new Vector3(0, -0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, -1f, 0);
                         }
                     }
                     mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);

Assets/Scripts/LayoutGroup/SRSectorLayout.cs

@@ -87,11 +87,11 @@ public class SRSectorLayout : MonoBehaviour
                         //Set text position
                         if (mat.textPosition == "top")
                         {
-                            go.transform.localPosition = new Vector3(0, 0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, 0.6f, 0);
                         }
                         else if (mat.textPosition == "bottom")
                         {
-                            go.transform.localPosition = new Vector3(0, -0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, -0.6f, 0);
                         }
                     }
                     mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);

Assets/Scripts/LayoutGroup/SRTitleLayout.cs

@@ -87,11 +87,11 @@ public class SRTitleLayout : MonoBehaviour
                         //Set text position
                         if (mat.textPosition == "top")
                         {
-                            go.transform.localPosition = new Vector3(0, 0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, 0.6f, 0);
                         }
                         else if (mat.textPosition == "bottom")
                         {
-                            go.transform.localPosition = new Vector3(0, -0.3f, 0);
+                            go.transform.localPosition = new Vector3(0, -0.6f, 0);
                         }
                     }
                     mat.ObjectTransform.SetStartValue(go.transform.localPosition, go.transform.localEulerAngles, go.transform.localScale);