换装界面优化

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -22,15 +22,15 @@
       <relation target="n2_qsvd" sidePair="left-left,top-top"/>
     </image>
     <loader id="n24_d4iw" name="scoreType" xy="18,233" size="50,50" group="n33_j48o" url="ui://eg2y0ldp842s6h" fill="scale"/>
-    <text id="n14_vxw5" name="txtScore" xy="84,232" size="143,54" group="n33_j48o" fontSize="28" color="#b08649" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
+    <text id="n14_vxw5" name="txtScore" xy="83,232" size="118,54" group="n33_j48o" fontSize="28" color="#b08649" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="9999">
       <relation target="n16_8xpg" sidePair="center-center,middle-middle"/>
     </text>
-    <group id="n33_j48o" name="n33" xy="18,230" size="209,57" group="n38_8lqj"/>
+    <group id="n33_j48o" name="n33" xy="18,230" size="208,57" group="n38_8lqj"/>
     <component id="n29_pjip" name="compNeed" src="pjip31" fileName="components/Component1.xml" xy="0,305" group="n38_8lqj"/>
-    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="804,0" group="n38_8lqj">
+    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="804,0" group="n38_8lqj">
+    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
     <component id="n10_qsvd" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n38_8lqj">
@@ -39,39 +39,26 @@
     <component id="n40_afs6" name="partsList2" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
-    <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n23_8xpg" alpha="0" type="rect" fillColor="#ffff0000">
+    <graph id="n20_8xpg" name="btnClose" xy="0,0" size="1080,1920" group="n38_8lqj" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,978" group="n46_wono">
-      <relation target="" sidePair="bottom-bottom"/>
-    </image>
-    <text id="n22_8xpg" name="txtHint" xy="48,977" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦">
-      <relation target="" sidePair="bottom-bottom"/>
-    </text>
-    <group id="n46_wono" name="n46" xy="33,977" size="394,132" group="n23_8xpg" advanced="true">
-      <relation target="n44_wono" sidePair="top-bottom"/>
+    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,978" group="n46_wono"/>
+    <text id="n22_8xpg" name="txtHint" xy="48,977" size="364,107" group="n46_wono" fontSize="30" color="#997350" align="center" vAlign="middle" ubb="true" autoSize="none" autoClearText="true" text="清梦清梦清梦清梦清梦清梦 清梦清梦清梦清梦"/>
+    <group id="n46_wono" name="grpTips" xy="33,977" size="394,132" group="n38_8lqj" advanced="true">
+      <relation target="n15_vxw5" sidePair="bottom-bottom"/>
     </group>
-    <group id="n23_8xpg" name="groupTaskHint" xy="0,0" size="1080,1920" group="n38_8lqj" advanced="true"/>
     <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1120" size="122,114" group="n44_wono">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
     </component>
     <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,1247" size="122,114" group="n44_wono" visible="false">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wb8xpg2n"/>
     </component>
-    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1266" size="84,87" group="n44_wono">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-    </component>
-    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1385" size="84,87" group="n44_wono">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-    </component>
+    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1266" size="84,87" group="n44_wono"/>
+    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1385" size="84,87" group="n44_wono"/>
     <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1504" size="84,87" group="n44_wono">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
     <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1623" size="84,87" group="n44_wono">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
     <group id="n44_wono" name="n44" xy="27,1120" size="122,590" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
@@ -94,7 +81,7 @@
     <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="327,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数：{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
-    <group id="n38_8lqj" name="graContent" xy="0,0" size="1356,1920" advanced="true">
+    <group id="n38_8lqj" name="graContent" xy="0,0" size="1310,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -23,10 +23,10 @@
         <item title="5"/>
       </ComboBox>
     </component>
-    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="804,0" group="n30_8lqj">
+    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="804,0" group="n30_8lqj">
+    <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="850,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
     <component id="n17_k6he" name="partsList" src="k6he1v" fileName="components/PartsList.xml" xy="1080,0" group="n30_8lqj">
@@ -63,7 +63,7 @@
     <group id="n34_wono" name="n34" xy="27,1156" size="145,564" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </group>
-    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1329,1920" advanced="true">
+    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1293,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

FGUIProject/assets/DressUp/comListType.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="276,1920">
+<component size="230,1920">
   <displayList>
-    <image id="n15_wono" name="n15" src="wonoe4" fileName="images/hz_zdikuang_1.png" xy="13,94" size="226,1826" group="n17_wono">
+    <image id="n15_wono" name="n15" src="wonoe4" fileName="images/hz_zdikuang_1.png" xy="3,94" size="226,1826" group="n17_wono">
       <relation target="" sidePair="height-height"/>
     </image>
-    <list id="n14_k6he" name="listType" xy="13,164" size="216,1757" group="n17_wono" overflow="scroll" lineGap="40" defaultItem="ui://mbo439wbk6he16" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
+    <list id="n14_k6he" name="listType" xy="3,164" size="216,1757" group="n17_wono" overflow="scroll" lineGap="40" defaultItem="ui://mbo439wbk6he16" align="center" autoClearItems="true" scrollItemToViewOnClick="false">
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>

FGUIProject/assets/DressUp/components/Component1.xml

@@ -6,7 +6,7 @@
     <image id="n28_pjip" name="n28" src="j48o3y" fileName="images/dz_hz_bxbx.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n30_pjip" name="txtNeedName" xy="80,16" size="188,39" fontSize="28" color="#b08649" vAlign="middle" letterSpacing="-2" autoClearText="true" text="孔雀东南飞·绣">
+    <text id="n30_pjip" name="txtNeedName" xy="84,16" size="221,39" fontSize="28" color="#b08649" align="center" vAlign="middle" letterSpacing="-2" autoSize="none" autoClearText="true" text="孔雀东南飞·绣">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <list id="n31_oixc" name="listTag" xy="18,18" size="220,38" layout="row" lineGap="12" colGap="22" defaultItem="ui://eg2y0ldpih7566" vAlign="middle" autoClearItems="true">

FGUIProject/assets/DressUp/components/PartsList.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="276,1920" opaque="false">
+<component size="230,1920" opaque="false">
   <displayList>
-    <image id="n2_wono" name="n2" src="wonoe4" fileName="images/hz_zdikuang_1.png" xy="16,91" size="226,1829" group="n3_wono">
+    <image id="n2_wono" name="n2" src="wonoe4" fileName="images/hz_zdikuang_1.png" xy="3,91" size="226,1829" group="n3_wono">
       <relation target="" sidePair="height-height"/>
     </image>
     <image id="n4_wono" name="imgTop" src="wonoe6" fileName="images/hz_zdikuang_2.png" xy="0,72" group="n3_wono"/>
-    <component id="n0_k6he" name="comboBoxRarity" src="k6he25" fileName="components/ComboBoxRarity.xml" xy="16,80" size="226,62" group="n3_wono">
+    <component id="n0_k6he" name="comboBoxRarity" src="k6he25" fileName="components/ComboBoxRarity.xml" xy="3,80" size="226,62" group="n3_wono">
       <ComboBox visibleItemCount="10" autoClearItems="true">
         <item title="高稀有度"/>
         <item title="中稀有度"/>
         <item title="低稀有度"/>
       </ComboBox>
     </component>
-    <list id="n1_k6he" name="list" xy="13,156" size="232,1764" group="n3_wono" overflow="scroll" lineGap="55" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
+    <list id="n1_k6he" name="list" xy="3,156" size="232,1764" group="n3_wono" overflow="scroll" lineGap="55" defaultItem="ui://mbo439wbk6he26" autoClearItems="true">
       <relation target="" sidePair="top-top"/>
       <item/>
       <item/>

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -273,7 +273,11 @@ namespace GFGEditor
             }
             return "FU_ZHUANG_HE_CHENG=" + suitCfg.id;
         }
-
+        /// <summary>
+        /// 套装图鉴
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
         private static string GetSuitGuideApproach(int itemId)
         {
             SuitCfgArray manager = SuitCfgArray.Instance;
@@ -289,6 +293,11 @@ namespace GFGEditor
             return null;
         }
 
+        /// <summary>
+        /// 套装合成
+        /// </summary>
+        /// <param name="itemId"></param>
+        /// <returns></returns>
         private static string GetSuitSyntheticApproach(int itemId)
         {
 
@@ -318,35 +327,20 @@ namespace GFGEditor
             return null;
         }
 
-        // /// <summary>
-        // /// 检测掉落表是否产出该物品
-        // /// </summary>
-        // /// <param name="itemId"></param>
-        // /// <returns></returns>
-        // private static bool CheckDropApproach(int itemId, int dropId)
-        // {
-        //     DropOutCfgArray manager = DropOutCfgArray.Instance;
-        //     List<DropOutCfg> dataArray = manager.GetCfgs(dropId);
-        //     for (int i = 0; i < dataArray.Count; i++)
-        //     {
-        //         if (dataArray[i].item == itemId)
-        //         {
-        //             return true;
-        //         }
-        //         if (manager.GetCfgs(dataArray[i].item).Count > 0)
-        //         {
-        //             if (dataArray[i].item == 11000003)
-        //             {
-        //                 ET.Log.Debug("");
-        //             }
-        //             if (CheckDropApproach(itemId, dataArray[i].item))
-        //             {
-        //                 return true;
-        //             }
-        //         }
-        //     }
-        //     return false;
-        // }
+        private static string GetStudioFilingApproach(int itemId)
+        {
+            SuitCfgArray manager = SuitCfgArray.Instance;
+            SuitCfg[] dataArray = manager.dataArray;
+            foreach (SuitCfg cfg in dataArray)
+            {
+                bool result = CheckItemInBonus(itemId, cfg.guideBoxBonusArr);
+                if (result)
+                {
+                    return "TAO_ZHUANG_TU_JIAN";
+                }
+            }
+            return null;
+        }
 
         private static bool CheckItemInBonus(int itemId, StoryLevelCfg cfg)
         {

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

@@ -21,7 +21,7 @@ namespace UI.DressUp
         public UI_PartsList m_partsList2;
         public GGraph m_btnClose;
         public GTextField m_txtHint;
-        public GGroup m_groupTaskHint;
+        public GGroup m_grpTips;
         public GButton m_btnHint;
         public GButton m_btnClothingShop;
         public GButton m_btnRepeal;
@@ -95,7 +95,7 @@ namespace UI.DressUp
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_txtHint = (GTextField)comp.GetChild("txtHint");
-            m_groupTaskHint = (GGroup)comp.GetChild("groupTaskHint");
+            m_grpTips = (GGroup)comp.GetChild("grpTips");
             m_btnHint = (GButton)comp.GetChild("btnHint");
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
@@ -130,7 +130,7 @@ namespace UI.DressUp
             m_partsList2 = null;
             m_btnClose = null;
             m_txtHint = null;
-            m_groupTaskHint = null;
+            m_grpTips = null;
             m_btnHint = null;
             m_btnClothingShop = null;
             m_btnRepeal = null;

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

@@ -68,7 +68,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            _ui.m_groupTaskHint.visible = false;
+            _ui.m_btnClose.visible = false;
+            _ui.m_grpTips.visible = false;
             _ui.m_btnRepeal.visible = false;
             _ui.m_btnRenewal.visible = false;
             _ui.m_btnSearch.visible = true;
@@ -193,7 +194,8 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            _ui.m_groupTaskHint.visible = false;
+            _ui.m_btnClose.visible = false;
+            _ui.m_grpTips.visible = false;
 
             if (_sceneObject != null)
             {
@@ -391,7 +393,8 @@ namespace GFGGame
 
         private void OnClickBtnClose()
         {
-            _ui.m_groupTaskHint.visible = false;
+            _ui.m_btnClose.visible = false;
+            _ui.m_grpTips.visible = false;
         }
 
         private void OnClickBtnNext()
@@ -901,7 +904,8 @@ namespace GFGGame
         }
         private void ShowTaskHint()
         {
-            _ui.m_groupTaskHint.visible = true;
+            _ui.m_btnClose.visible = true;
+            _ui.m_grpTips.visible = true;
             _ui.m_txtHint.text = _levelCfg.hint;
             if (this._ui.m_txtHint.textHeight > this._ui.m_txtHint.textFormat.size * 2)
             {

GameClient/Assets/Game/HotUpdate/Views/Login/ServerListView.cs

@@ -22,6 +22,7 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            packageName = UI_ServerListUI.PACKAGE_NAME;
             _ui = UI_ServerListUI.Create();
             this.viewCom = _ui.target;
             this.viewCom.Center();