Browse Source

优化gm弹窗指令

zhaoyang 2 years ago
parent
commit
07ac20275f

+ 11 - 11
FGUIProject/assets/Arena/ArenaDressInfoUI.xml

@@ -34,29 +34,29 @@
       <item/>
     </list>
     <component id="n80_psph" name="comCard" src="psph1d" fileName="components/ComCard.xml" xy="34,1292">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
+      <relation target="n84_u10a" sidePair="bottom-top"/>
     </component>
-    <image id="n81_jcej" name="n81" src="jcej2q" fileName="images/jjsy_xzdik.png" xy="128,1611" size="670,75" group="n79_psph"/>
-    <component id="n74_psph" name="btn0" src="psph1e" fileName="components/BtnTab3.xml" xy="129,1612" group="n79_psph">
+    <image id="n81_jcej" name="n81" src="jcej2q" fileName="images/jjsy_xzdik.png" xy="128,1610" size="670,75" group="n79_psph"/>
+    <component id="n74_psph" name="btn0" src="psph1e" fileName="components/BtnTab3.xml" xy="129,1611" group="n79_psph">
       <Button icon="ui://4lc5fhlbjcej2r" selectedIcon="ui://4lc5fhlbjcej2n" controller="c2" page="0"/>
     </component>
-    <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="353,1612" size="224,77" group="n79_psph">
+    <component id="n77_psph" name="btn1" src="psph1e" fileName="components/BtnTab3.xml" xy="353,1611" size="224,77" group="n79_psph">
       <Button checked="true" icon="ui://4lc5fhlbjcej2s" selectedIcon="ui://4lc5fhlbjcej2o" controller="c2" page="1"/>
     </component>
-    <component id="n78_psph" name="btn2" src="psph1e" fileName="components/BtnTab3.xml" xy="577,1612" size="224,77" group="n79_psph">
+    <component id="n78_psph" name="btn2" src="psph1e" fileName="components/BtnTab3.xml" xy="577,1611" size="224,77" group="n79_psph">
       <Button icon="ui://4lc5fhlbjcej2t" selectedIcon="ui://4lc5fhlbjcej2p" controller="c2" page="2"/>
     </component>
-    <group id="n79_psph" name="n79" xy="128,1611" size="673,78" advanced="true">
-      <relation target="" sidePair="bottom-bottom"/>
-    </group>
-    <component id="n73_psph" name="btnDress" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="107,1725" group="n31_psph">
+    <group id="n79_psph" name="n79" xy="128,1610" size="673,78" group="n84_u10a" advanced="true"/>
+    <component id="n73_psph" name="btnDress" src="r9ritjg" fileName="components/Button17.xml" pkg="mk0fwx0x" xy="107,1719" group="n31_psph">
       <Button title="更换搭配"/>
     </component>
-    <component id="n30_psph" name="btnRecommend" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="475,1724" group="n31_psph">
+    <component id="n30_psph" name="btnRecommend" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="475,1718" group="n31_psph">
       <Button title="推荐搭配"/>
     </component>
-    <group id="n31_psph" name="n31" xy="107,1724" size="712,97" advanced="true" layout="hz" colGap="26" excludeInvisibles="true">
+    <group id="n31_psph" name="n31" xy="107,1718" size="712,97" group="n84_u10a" advanced="true" layout="hz" colGap="26" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="0"/>
+    </group>
+    <group id="n84_u10a" name="n84" xy="107,1610" size="712,205" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
   </displayList>

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ViewGlobal.cs

@@ -65,6 +65,7 @@ namespace GFGGame
 
         public static void ShowGmView()
         {
+            if (ViewManager.isViewOpen(typeof(PhotographView).FullName)) return;
             ViewManager.Show(ViewName.GM_PANEL_VIEW);
         }
     }

+ 9 - 9
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -97,9 +97,9 @@ namespace GFGGame
         /// <param name="viewData">Ҫ���ݸ���ͼ�IJ���</param>
         /// <param name="goBackParams">�Ӹ���ͼ���ص���ͼ��Ϣ</param>
         /// <param name="hideOthers">�Ƿ�ر�������ͼ</param>
-        public static bool Show(string viewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
+        public static bool Show(string fullViewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
         {
-            string name = GetName(viewName);
+            string name = GetName(fullViewName);
             if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
             {
                 return false;
@@ -116,7 +116,7 @@ namespace GFGGame
             }
             else
             {
-                obj = CreateViewInstance(viewName) as UIView;
+                obj = CreateViewInstance(fullViewName) as UIView;
                 obj.viewName = name;
                 _viewDic.Add(name, obj);
             }
@@ -153,9 +153,9 @@ namespace GFGGame
 
         }
 
-        public static bool isViewOpen(string viewName)
+        public static bool isViewOpen(string fullViewName)
         {
-            string name = GetName(viewName);
+            string name = GetName(fullViewName);
 
             UIView obj = null;
             if (_viewDic.ContainsKey(name))
@@ -226,9 +226,9 @@ namespace GFGGame
             return true;
         }
 
-        public static void Hide(string viewName)
+        public static void Hide(string fullViewName)
         {
-            string name = GetName(viewName);
+            string name = GetName(fullViewName);
             if (!_viewDic.ContainsKey(name))
             {
                 return;
@@ -280,9 +280,9 @@ namespace GFGGame
             }
         }
 
-        public static object[] GetGoBackDatas(string viewName)
+        public static object[] GetGoBackDatas(string fullViewName)
         {
-            string name = GetName(viewName);
+            string name = GetName(fullViewName);
             object[] value = null;
             if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
             {

BIN
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes