竞技场点击空白处关闭战力详情

FGUIProject/assets/Arena/ArenaDressInfoUI.xml

@@ -4,17 +4,20 @@
     <remark page="0" value="自己的搭配"/>
     <remark page="1" value="查看他人搭配"/>
   </controller>
-  <controller name="c2" pages="0,,1,,2," selected="1">
+  <controller name="c2" pages="0,,1,,2," selected="0">
     <remark page="0" value="主题一"/>
     <remark page="1" value="主题二"/>
     <remark page="2" value="主题三"/>
   </controller>
   <controller name="c3" alias="标签数量" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <displayList>
-    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <loader id="n1_psph" name="loaBg" xy="0,0" size="1080,1920" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
+    <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <graph id="n85_u2u3" name="grhCloseComFightScore" xy="0,0" size="1080,1920" alpha="0" type="rect">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <component id="n83_jcej" name="comValueInfo" src="jcej3t" fileName="components/ComValueInfo.xml" xy="18,236"/>
     <component id="n14_psph" name="comListBg" src="psph16" fileName="components/ComListType.xml" xy="850,40" size="230,1880">
       <relation target="" sidePair="height-height"/>
@@ -38,10 +41,10 @@
     </component>
     <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"/>
+      <Button checked="true" 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,1611" size="224,77" group="n79_psph">
-      <Button checked="true" icon="ui://4lc5fhlbjcej2s" selectedIcon="ui://4lc5fhlbjcej2o" controller="c2" page="1"/>
+      <Button 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,1611" size="224,77" group="n79_psph">
       <Button icon="ui://4lc5fhlbjcej2t" selectedIcon="ui://4lc5fhlbjcej2p" controller="c2" page="2"/>

FGUIProject/assets/Arena/ArenaUI.xml

@@ -4,7 +4,7 @@
     <remark page="0" value="选对手"/>
     <remark page="1" value="展示对手"/>
   </controller>
-  <controller name="c2" pages="0,,1," selected="0"/>
+  <controller name="c2" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n0_psph" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="33,80" group="n28_psph"/>
     <component id="n1_psph" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="-12,95" group="n28_psph" controller="c1,12"/>
@@ -42,6 +42,10 @@
       <item/>
       <item/>
     </list>
+    <graph id="n55_u2u3" name="grhCloseComFightScore" xy="0,0" size="1080,1920" alpha="0" type="rect">
+      <gearDisplay controller="c2" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <image id="n43_jcej" name="n43" src="jcej37" fileName="images/jzsjzs_mpmpdi.png" xy="42,1454" group="n46_jcej"/>
     <image id="n44_jcej" name="n44" src="jcej32" fileName="images/jzsjzs_xtxt_1.png" xy="187,1510" group="n46_jcej"/>
     <loader id="n2_psph" name="loaDanIcon" xy="48,1464" size="149,153" group="n46_jcej" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
@@ -50,7 +54,7 @@
     <text id="n9_psph" name="txtDanTitle" xy="193,1550" size="90,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="段位名称"/>
     <text id="n10_psph" name="txtFightScore" xy="193,1581" size="145,31" group="n46_jcej" font="ui://eg2y0ldpwonotjc" fontSize="22" color="#9a7c56" text="竞技战力6666"/>
     <component id="n45_jcej" name="btnFightScoreRule" src="psphtkg" fileName="components/BtnRule.xml" pkg="eg2y0ldp" xy="165,1584" size="29,29" group="n46_jcej">
-      <Button icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
+      <Button checked="true" icon="ui://eg2y0ldpjcej2k" controller="c2" page="1"/>
     </component>
     <component id="n54_jcej" name="comFightScore" src="jcej4q" fileName="components/ComFightScore.xml" xy="144,1401" group="n46_jcej">
       <gearDisplay controller="c2" pages="1"/>

FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -13,6 +13,9 @@
     <image id="n50_f2bf" name="n50" src="f2bfey" fileName="images/dz_cdxzcdxz.png" xy="837,60" group="n51_f2bf"/>
     <text id="n49_f2bf" name="txtDressLimit" xy="855,63" size="216,35" group="n51_f2bf" fontSize="25" color="#7a5e38" text="饰品穿戴限制：0/5"/>
     <group id="n51_f2bf" name="n51" xy="837,60" size="243,44" group="n38_8lqj"/>
+    <graph id="n61_u2u3" name="grhCloseComFightScore" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <component id="n59_jcej" name="comValueInfo" src="v461f0" fileName="components/ComValueInfo.xml" xy="18,236" group="n38_8lqj"/>
     <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="components/comListType.xml" xy="850,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
@@ -39,6 +42,6 @@
       <relation target="" sidePair="bottom-bottom"/>
       <Button title="下一步"/>
     </component>
-    <group id="n38_8lqj" name="graContent" xy="18,40" size="1292,1880" advanced="true"/>
+    <group id="n38_8lqj" name="graContent" xy="0,0" size="1310,1920" advanced="true"/>
   </displayList>
 </component>

FGUIProject/assets/Union/UnionJoinUI.xml

@@ -19,5 +19,12 @@
     <component id="n6_u2u3" name="btnChange" src="u2u31c" fileName="components/Button4.xml" xy="442,1779">
       <Button title="换一批"/>
     </component>
+    <text id="n7_u2u3" name="txtUnionName" xy="224,838" size="196,41" group="n10_u2u3" fontSize="30" autoClearText="true" text="联盟名字7个字"/>
+    <loader id="n8_u2u3" name="loaUnionIcon" xy="70,794" size="136,136" group="n10_u2u3" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale"/>
+    <text id="n9_u2u3" name="txtUnionLv" xy="185,890" pivot="0.5,0" size="21,41" group="n10_u2u3" fontSize="30" align="center" text="1"/>
+    <group id="n10_u2u3" name="n10" xy="70,794" size="350,137"/>
+    <text id="n11_u2u3" name="txtMemberCount" xy="499,838" pivot="0.5,0" size="70,41" fontSize="30" align="center" vars="true" text="{value=0}/{maxValue=70}">
+      <relation target="" sidePair="middle-middle,left-right"/>
+    </text>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaDressInfoUI.cs

@@ -10,8 +10,9 @@ namespace UI.Arena
         public Controller m_c1;
         public Controller m_c2;
         public Controller m_c3;
-        public GButton m_btnBack;
         public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GGraph m_grhCloseComFightScore;
         public UI_ComValueInfo m_comValueInfo;
         public GComponent m_comListBg;
         public GList m_list;
@@ -71,8 +72,9 @@ namespace UI.Arena
             m_c1 = comp.GetController("c1");
             m_c2 = comp.GetController("c2");
             m_c3 = comp.GetController("c3");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_grhCloseComFightScore = (GGraph)comp.GetChild("grhCloseComFightScore");
             m_comValueInfo = (UI_ComValueInfo)UI_ComValueInfo.Create(comp.GetChild("comValueInfo"));
             m_comListBg = (GComponent)comp.GetChild("comListBg");
             m_list = (GList)comp.GetChild("list");
@@ -88,8 +90,9 @@ namespace UI.Arena
             m_c1 = null;
             m_c2 = null;
             m_c3 = null;
-            m_btnBack = null;
             m_loaBg = null;
+            m_btnBack = null;
+            m_grhCloseComFightScore = null;
             m_comValueInfo.Dispose();
             m_comValueInfo = null;
             m_comListBg = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Arena/UI_ArenaUI.cs

@@ -22,6 +22,7 @@ namespace UI.Arena
         public GButton m_btnReSelect;
         public GButton m_btnFight;
         public GList m_listTarget;
+        public GGraph m_grhCloseComFightScore;
         public GLoader m_loaDanIcon;
         public GTextField m_txtName;
         public GTextField m_txtRank;
@@ -104,6 +105,7 @@ namespace UI.Arena
             m_btnReSelect = (GButton)comp.GetChild("btnReSelect");
             m_btnFight = (GButton)comp.GetChild("btnFight");
             m_listTarget = (GList)comp.GetChild("listTarget");
+            m_grhCloseComFightScore = (GGraph)comp.GetChild("grhCloseComFightScore");
             m_loaDanIcon = (GLoader)comp.GetChild("loaDanIcon");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_txtRank = (GTextField)comp.GetChild("txtRank");
@@ -142,6 +144,7 @@ namespace UI.Arena
             m_btnReSelect = null;
             m_btnFight = null;
             m_listTarget = null;
+            m_grhCloseComFightScore = null;
             m_loaDanIcon = null;
             m_txtName = null;
             m_txtRank = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ArenaDressUpFightUI.cs

@@ -11,6 +11,7 @@ namespace UI.DressUp
         public GGraph m_touchPad;
         public GButton m_btnBack;
         public GTextField m_txtDressLimit;
+        public GGraph m_grhCloseComFightScore;
         public UI_ComValueInfo m_comValueInfo;
         public UI_comListType m_comListType1;
         public UI_comListType m_comListType2;
@@ -71,6 +72,7 @@ namespace UI.DressUp
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_txtDressLimit = (GTextField)comp.GetChild("txtDressLimit");
+            m_grhCloseComFightScore = (GGraph)comp.GetChild("grhCloseComFightScore");
             m_comValueInfo = (UI_ComValueInfo)UI_ComValueInfo.Create(comp.GetChild("comValueInfo"));
             m_comListType1 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType1"));
             m_comListType2 = (UI_comListType)UI_comListType.Create(comp.GetChild("comListType2"));
@@ -87,6 +89,7 @@ namespace UI.DressUp
             m_touchPad = null;
             m_btnBack = null;
             m_txtDressLimit = null;
+            m_grhCloseComFightScore = null;
             m_comValueInfo.Dispose();
             m_comValueInfo = null;
             m_comListType1.Dispose();

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -53,7 +53,8 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnDress.onClick.Add(OnBtnDressClick);
             _ui.m_btnRecommend.onClick.Add(OnBtnRecommendClick);
-
+            _ui.m_comValueInfo.m_btnFightScoreRule.onClick.Add(OnBtnFightScoreRule);
+            _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
             _ui.m_list.itemRenderer = RenderListItem;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneArenaDressUp"));
@@ -89,6 +90,8 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
+            _ui.m_grhCloseComFightScore.visible = false;
+            _ui.m_comValueInfo.m_c2.selectedIndex = 0;
         }
 
         protected override void RemoveEventListener()
@@ -114,6 +117,15 @@ namespace GFGGame
             }
             UpdateView();
         }
+        private void OnBtnFightScoreRule()
+        {
+            _ui.m_grhCloseComFightScore.visible = true;
+        }
+        private void OnCloseComFightScore()
+        {
+            _ui.m_comValueInfo.m_c2.selectedIndex = 0;
+            _ui.m_grhCloseComFightScore.visible = false;
+        }
         private void OnBtnDressClick()
         {
             ViewManager.Show<ArenaDressUpFightView>(null, new object[] { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, "" } }, true);

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -66,6 +66,7 @@ namespace GFGGame
             _ui.m_btnReSelect.onClick.Add(OnBtnReSelectClick);
             _ui.m_btnFight.onClick.Add(OnBtnFightClick);
             _ui.m_btnRule.onClick.Add(OnBtnRuleClick);
+            _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
 
             _ui.m_listTarget.itemRenderer = RenderListTargetItem;
 
@@ -151,6 +152,10 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.ARENA_FIGHT_RESULT, UpdateView);
             EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, UpdateValue);
         }
+        private void OnCloseComFightScore()
+        {
+            _ui.m_c2.selectedIndex = 0;
+        }
         private void OnBtnRuleClick()
         {
             ViewManager.Show<RuleView>(300001);

GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -86,6 +86,8 @@ namespace GFGGame
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+            _ui.m_comValueInfo.m_btnFightScoreRule.onClick.Add(OnBtnFightScoreRule);
+            _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
 
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
             _ui.m_partsList2.m_imgTop.visible = true;
@@ -157,6 +159,8 @@ namespace GFGGame
             DressUpMenuItemDataManager.Clear();
 
             Timers.inst.Remove(CheckGuide);
+            _ui.m_grhCloseComFightScore.visible = false;
+            _ui.m_comValueInfo.m_c2.selectedIndex = 0;
 
         }
         protected override void RemoveEventListener()
@@ -198,11 +202,21 @@ namespace GFGGame
         }
         private void GoBackToView()
         {
+
             _roleData.itemList = _itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
             ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
         }
+        private void OnBtnFightScoreRule()
+        {
+            _ui.m_grhCloseComFightScore.visible = true;
+        }
+        private void OnCloseComFightScore()
+        {
+            _ui.m_comValueInfo.m_c2.selectedIndex = 0;
+            _ui.m_grhCloseComFightScore.visible = false;
+        }
         private void OnClickBtnHome()
         {
             AlertUI.Show("是否返回？")