Merge branch 'master' of http://git.gfggame.com:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Constant/ConstSortingOrder.cs

@@ -4,8 +4,9 @@ namespace GFGGame
     {
         public const int TOP = 99;
         public const int Guide = 100;
-        public const int Alert = 101;
-        public const int Debug = 102;
-        public const int Float = 103;
+        public const int Modal = 101;
+        public const int Alert = 102;
+        public const int Debug = 103;
+        public const int Float = 104;
     }
 }

GameClient/Assets/Game/HotUpdate/Constant/ConstViewLayer.cs

@@ -18,6 +18,10 @@ namespace GFGGame
         /// </summary>
         public const string GUIDE = "GUIDE";
         /// <summary>
+        /// 等待层
+        /// </summary>
+        public const string MODAL = "MODAL";
+        /// <summary>
         /// 提示层
         /// </summary>
         public const string ALERT = "ALERT";

GameClient/Assets/Game/HotUpdate/Views/BaseView.cs

@@ -28,6 +28,9 @@ namespace GFGGame
                 case ConstViewLayer.GUIDE:
                     ViewManager.AddChildToGuideLayer(viewCom);
                     break;
+                case ConstViewLayer.MODAL:
+                    ViewManager.AddChildToModalLayer(viewCom);
+                    break;
                 case ConstViewLayer.ALERT:
                     ViewManager.AddChildToAlertLayer(viewCom);
                     break;

GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs

@@ -14,7 +14,7 @@ namespace GFGGame
             base.OnInit();
             _ui = UI_ModalStatusUI.Create();
             viewCom = _ui.target;
-            layer = ConstViewLayer.ALERT;
+            layer = ConstViewLayer.MODAL;
             isfullScreen = true;
         }
 

GameClient/Assets/Game/HotUpdate/Views/UIView.cs

@@ -125,6 +125,7 @@ namespace GFGGame
             }
             if (GuideController.IsGuide())
             {
+                // UpdateToCheckGuide(null);
                 Timers.inst.AddUpdate(UpdateToCheckGuide);
             }
         }

GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         private static GComponent _bottomLayer;
         private static GComponent _topLayer;
         private static GComponent _guideLayer;
+        private static GComponent _modalLayer;
         private static GComponent _alertLayer;
         private static GComponent _debugLayer;
         private static GComponent _floatLayer;
@@ -41,6 +42,9 @@ namespace GFGGame
             _guideLayer = CreateLayer("GuideLayer");
             _guideLayer.sortingOrder = ConstSortingOrder.Guide;
 
+            _modalLayer = CreateLayer("ModalLayer");
+            _modalLayer.sortingOrder = ConstSortingOrder.Modal;
+
             _alertLayer = CreateLayer("AlertLayer");
             _alertLayer.sortingOrder = ConstSortingOrder.Alert;
             //debug层
@@ -64,6 +68,10 @@ namespace GFGGame
         {
             _guideLayer.AddChild(gObject);
         }
+        public static void AddChildToModalLayer(GObject gObject)
+        {
+            _modalLayer.AddChild(gObject);
+        }
         public static void AddChildToAlertLayer(GObject gObject)
         {
             _alertLayer.AddChild(gObject);