lvjincheng преди 3 години
родител
ревизия
b06983bc78
променени са 2 файла, в които са добавени 6 реда и са изтрити 10 реда
  1. 6 2
      Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs
  2. 0 8
      Assets/JC/Untiy/UI/BackgroundAdapter.cs

+ 6 - 2
Assets/BowArrow/Scripts/View/DeviceCalibrateView.cs

@@ -193,8 +193,12 @@ public class DeviceCalibrateView : MonoBehaviour, MenuBackInterface
                         CancelResetMag();
                         //地磁干扰提示页面-start
                         GameObject o = Instantiate(prefab_MagInterferenceTipView);
-                        Canvas cvs = o.GetComponent<Canvas>();
-                        cvs.sortingOrder = JC.Unity.UI.CanvasUtils.FindMaxSortingOrder() + 1;
+                        var nug = FindObjectOfType<NewUserGuider>(); //判断是否处于引导界面
+                        if (nug && nug.gameObject && nug.gameObject.activeSelf) {
+                            JC.Unity.UI.CanvasUtils.PlusSortOrder(nug.gameObject, o, 1);     
+                        } else {
+                            JC.Unity.UI.CanvasUtils.PlusSortOrder(gameObject, o, 1);
+                        }
                         //地磁干扰提示页面-end
                         PopupMgr.ins.ShowTipTop(TextAutoLanguage2.GetTextByKey("tip_mag-calibrate_please-leave-interfere"));
                     } else {

+ 0 - 8
Assets/JC/Untiy/UI/BackgroundAdapter.cs

@@ -38,14 +38,6 @@ namespace JC.Unity.UI {
         public static void PlusSortOrder(GameObject src, GameObject des, int plusValue) {
             des.GetComponent<Canvas>().sortingOrder = src.GetComponent<Canvas>().sortingOrder + plusValue;
         }
-        public static int FindMaxSortingOrder() {
-            Canvas[] cvsList = GameObject.FindObjectsOfType<Canvas>();
-            int maxSortOrder = 0;
-            foreach (Canvas cvs in cvsList) {
-                if (cvs.sortingOrder > maxSortOrder) maxSortOrder = cvs.sortingOrder;
-            }
-            return maxSortOrder;
-        }
     }
     [ExecuteAlways]
     public class BackgroundAdapter : MonoBehaviour