zhaoyang hace 2 años
padre
commit
cb129d418d

+ 4 - 4
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -27,10 +27,10 @@
     </text>
     <group id="n33_j48o" name="n33" xy="18,230" size="209,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="830,0" group="n38_8lqj">
+    <component id="n31_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="804,0" group="n38_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="1080,0" group="n38_8lqj">
+    <component id="n32_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="804,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">
@@ -91,10 +91,10 @@
     <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="327,44" group="n38_8lqj" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
+    <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="1330,1920" advanced="true">
+    <group id="n38_8lqj" name="graContent" xy="0,0" size="1356,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

+ 4 - 4
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="830,0" group="n30_8lqj">
+    <component id="n25_f4xv" name="comListType1" src="f4xv3q" fileName="comListType.xml" xy="804,0" group="n30_8lqj">
       <relation target="" sidePair="height-height"/>
     </component>
-    <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="830,0" group="n30_8lqj">
+    <component id="n26_f4xv" name="comListType2" src="f4xv3q" fileName="comListType.xml" xy="804,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">
@@ -39,7 +39,7 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
       <Button title="保存搭配" titleColor="#fdfaed" titleFontSize="54"/>
     </component>
-    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1156" size="101,88" group="n34_wono">
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1156" size="141,120" group="n34_wono">
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
     <component id="n24_f4xv" name="btnPhoto" src="f4xv3o" fileName="components/Button6.xml" xy="56,1276" size="84,87" group="n34_wono" aspect="true">
@@ -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="1303,1920" advanced="true">
+    <group id="n30_8lqj" name="grpContent" xy="27,0" size="1329,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

+ 7 - 5
FGUIProject/assets/DressUp/components/PartsList.xml

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

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -105,6 +105,8 @@ namespace GFGGame
 
             // EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdatePartsListSort);
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
+            _ui.m_partsList2.m_imgTop.visible = true;
+            _ui.m_partsList.m_imgTop.visible = false;
 
         }
         protected override void AddEventListener()

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -100,6 +100,8 @@ namespace GFGGame
 
 
             _ui.m_partsList2.m_comboBoxRarity.visible = false;
+            _ui.m_partsList2.m_imgTop.visible = true;
+            _ui.m_partsList.m_imgTop.visible = false;
         }
         protected override void AddEventListener()
         {
@@ -909,7 +911,7 @@ namespace GFGGame
             if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里,可以查看集齐成套的服饰。");
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "点击一键换上。", 0, true, 330);
             GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰,可以保存随时查看。");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 6, "保存成功,回主界面看看吧。");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 6, "保存成功,回主界面看看吧。");
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
 
             GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.PHOTOGRAPH, 1, "完成心水搭配后,可以拍照留下纪念哦。");

BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes