Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Card/CardSkillUI.xml

@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="962,1032">
+<component size="962,1033">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,-1" size="962,1032">
+    <component id="n0_rhha" name="n0" src="si5ztih" fileName="components/ComBg.xml" pkg="mk0fwx0x" xy="0,0" size="962,1032">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
+    <loader id="n19_fpax" name="loaSkill" xy="396,47" pivot="0.5,0.5" size="172,175" group="n6_rhha" url="ui://7l6lvkayfpaxtlp" align="center" vAlign="middle" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <image id="n4_rhha" name="n4" src="j48o99" fileName="images/kp_sjsj_di_3.png" pkg="eg2y0ldp" xy="385,38" group="n6_rhha"/>
     <text id="n3_rhha" name="txtName" xy="480,225" pivot="0.5,0" anchor="true" size="112,49" group="n6_rhha" fontSize="36" color="#85756d" text="赵钱孙"/>
-    <component id="n7_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="392,45" size="177,177" group="n6_rhha" aspect="true"/>
     <group id="n6_rhha" name="n6" xy="385,38" size="192,236"/>
     <component id="n9_rhha" name="comCurLV" src="rhha9q" fileName="components/ComSkillDiscribe.xml" xy="63,295"/>
     <component id="n10_rhha" name="comNextLv" src="rhha9q" fileName="components/ComSkillDiscribe.xml" xy="64,423" group="n17_mza1"/>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,8 +2,8 @@
 <component size="1080,831" opaque="false">
   <controller name="ctrlFullStar" pages="0,,1," selected="0"/>
   <controller name="ctrlFullLv" pages="0,,1," selected="0"/>
-  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
-  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
+  <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
     <image id="n97_qkjs" name="n97" src="qkjsbb" fileName="imagesNew/card_DividingLine.png" xy="38,426" size="972,8" group="n115_o9gh"/>
@@ -83,23 +83,24 @@
     <group id="n55_l2by" name="grpStar" xy="99,6" size="980,714" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="50,423" size="1006,289" group="n113_o9gh" layout="row" overflow="hidden" lineGap="25" colGap="170" defaultItem="ui://7l6lvkayrhha9k" align="center">
+    <list id="n77_rhha" name="listSkill" xy="37,423" size="1006,289" group="n113_o9gh" layout="row" overflow="hidden" lineGap="25" colGap="110" defaultItem="ui://7l6lvkayrhha9k" align="center">
+      <item/>
       <item/>
       <item/>
     </list>
-    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="555,520" group="n112_o9gh">
+    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="280,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="2,3"/>
     </image>
-    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="945,520" group="n112_o9gh">
+    <image id="n111_o9gh" name="n111" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="610,520" group="n112_o9gh">
       <gearDisplay controller="ctrlSkillCount" pages="3"/>
     </image>
-    <group id="n112_o9gh" name="n112" xy="555,520" size="0,0" group="n113_o9gh" advanced="true" layout="hz" colGap="200" excludeInvisibles="true">
+    <group id="n112_o9gh" name="n112" xy="280,520" size="520,40" group="n113_o9gh" advanced="true" layout="hz" colGap="140" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n114_o9gh" name="btnUpSkillLv" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n113_o9gh">
       <Button title="升级" icon="ui://7l6lvkayqkjsb4"/>
     </component>
-    <group id="n113_o9gh" name="grpSkill" xy="50,6" size="1030,706" group="n115_o9gh" advanced="true">
+    <group id="n113_o9gh" name="grpSkill" xy="37,6" size="1043,706" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="2"/>
     </group>
     <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="75,331" size="290,70" group="n22_842s">
@@ -107,11 +108,11 @@
       <property target="title" propertyId="0" value="升级"/>
     </component>
     <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="395,331" size="290,70" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="1"/>
+      <Button controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/BtnTab.xml" pkg="eg2y0ldp" xy="715,331" size="290,70" group="n22_842s">
-      <Button controller="ctrlTab" page="2"/>
+      <Button checked="true" controller="ctrlTab" page="2"/>
       <property target="title" propertyId="0" value="技能"/>
     </component>
     <group id="n22_842s" name="grpTab" xy="75,331" size="930,70" group="n115_o9gh" advanced="true" layout="hz" colGap="30" excludeInvisibles="true"/>

FGUIProject/assets/Card/components/ComSkill.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="124,124" mask="n79_v461">
   <displayList>
-    <loader id="n78_rhha" name="loaSkill" xy="-55,-61" size="234,432" url="ui://7l6lvkayr9ri9x" autoSize="true">
+    <loader id="n78_rhha" name="loaSkill" xy="-11,-13" size="147,150" url="ui://7l6lvkayfpaxtlp" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <graph id="n79_v461" name="n79" xy="0,0" size="124,124" type="eclipse" lineSize="0"/>

FGUIProject/assets/Card/components/ListSkillItem.xml

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="224,230" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <image id="n85_o9gh" name="n85" src="qkjsbk" fileName="imagesNew/choose_skill_shine.png" xy="0,0">
+    <image id="n85_o9gh" name="n85" src="qkjsbk" fileName="imagesNew/choose_skill_shine.png" xy="0,0" group="n91_fpax">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n86_o9gh" name="n86" src="qkjsbs" fileName="imagesNew/dikuang_SkillItem.png" xy="23,22">
+    <image id="n86_o9gh" name="n86" src="qkjsbs" fileName="imagesNew/dikuang_SkillItem.png" xy="23,22" group="n91_fpax">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="40,38" size="124,124" aspect="true" scale="1.2,1.2"/>
-    <image id="n84_o9gh" name="n84" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="39,37">
+    <loader id="n90_fpax" name="loaSkill" xy="39,37" pivot="0.5,0.5" size="150,150" group="n91_fpax" url="ui://7l6lvkayfpaxtlr" align="center" autoSize="true"/>
+    <image id="n84_o9gh" name="n84" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="39,37" group="n91_fpax">
       <gearDisplay controller="button" pages="0"/>
     </image>
     <image id="n77_rhha" name="n77" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="120,156" pivot="0.5,0" size="57,30" group="n88_o9gh">
       <relation target="n80_rhha" sidePair="width-width"/>
     </image>
     <text id="n80_rhha" name="txtLv" xy="122,148" pivot="0.5,0" size="52,44" group="n88_o9gh" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" text="1级"/>
-    <group id="n88_o9gh" name="n88" xy="120,148" size="57,44"/>
-    <image id="n89_o9gh" name="n89" src="qkjsbj" fileName="imagesNew/choose_skill_icon.png" xy="81,71">
+    <group id="n88_o9gh" name="n88" xy="120,148" size="57,44" group="n91_fpax"/>
+    <image id="n89_o9gh" name="n89" src="qkjsbj" fileName="imagesNew/choose_skill_icon.png" xy="81,71" group="n91_fpax">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <image id="n74_rhha" name="n74" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="23,230" size="178,40"/>
-    <text id="n81_rhha" name="txtName" xy="52,228" pivot="0.5,0" size="120,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fefef6" align="center" vAlign="middle" letterSpacing="-4" text="名字名字"/>
+    <image id="n74_rhha" name="n74" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="23,230" size="178,40" group="n91_fpax"/>
+    <text id="n81_rhha" name="txtName" xy="52,228" pivot="0.5,0" size="120,44" group="n91_fpax" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#fefef6" align="center" vAlign="middle" letterSpacing="-4" text="名字名字"/>
+    <group id="n91_fpax" name="n91" xy="0,0" size="224,272"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Card/package.xml

@@ -139,6 +139,7 @@
     <image id="fqortln" name="cp_yeqian_bg_shang.png" path="/images/"/>
     <image id="fqortlo" name="cp_yeqian_bg_xia.png" path="/images/"/>
     <image id="qik1tch" name="wz_shengxing.png" path="/imagesNew/"/>
+    <image id="fpaxtlp" name="jn_tb_jzh.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/DressUp/ArenaDressUpFightUI.xml

@@ -32,13 +32,19 @@
     <component id="n62_ofwu" name="partsListSearch" src="k6he1v" fileName="components/PartsList.xml" xy="1080,40" size="230,1880" group="n38_8lqj">
       <relation target="" sidePair="right-right,top-top,bottomext-bottom"/>
     </component>
+    <component id="n63_ebfi" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono">
+      <Button icon="ui://mbo439wbq08x6"/>
+    </component>
+    <component id="n64_ebfi" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono">
+      <Button icon="ui://mbo439wbq08xl"/>
+    </component>
     <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1458" group="n44_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
     <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1600" group="n44_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <group id="n44_wono" name="n44" xy="46,1458" size="110,252" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n44_wono" name="n44" xy="46,1174" size="110,536" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
     <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="325,1728" group="n38_8lqj">

FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -49,26 +49,32 @@
     <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,886" group="n46_wono"/>
-    <text id="n22_8xpg" name="txtHint" xy="48,885" 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,885" size="394,132" group="n38_8lqj" advanced="true">
+    <image id="n21_8xpg" name="n21" src="8xpg2s" fileName="images/dz_hz_rwdh_1.png" xy="33,602" group="n46_wono"/>
+    <text id="n22_8xpg" name="txtHint" xy="48,601" 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,601" size="394,132" group="n38_8lqj" advanced="true">
       <relation target="n15_vxw5" sidePair="bottom-bottom"/>
     </group>
-    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,1028" size="122,114" group="n44_wono">
+    <component id="n15_vxw5" name="btnHint" src="f4xv3o" fileName="components/Button6.xml" xy="27,744" size="122,114" group="n44_wono">
       <Button title="任务提示" titleColor="#ffffff" titleFontSize="42" icon="ui://mbo439wb8xpg2q"/>
     </component>
-    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,1155" group="n44_wono" visible="false">
+    <component id="n19_8xpg" name="btnClothingShop" src="f4xv3o" fileName="components/Button6.xml" xy="46,871" group="n44_wono" visible="false">
       <Button icon="ui://mbo439wb8xpg2n"/>
     </component>
-    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono"/>
-    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono"/>
+    <component id="n4_qsvd" name="btnRepeal" src="f4xv3o" fileName="components/Button6.xml" xy="46,890" group="n44_wono"/>
+    <component id="n5_qsvd" name="btnRenewal" src="f4xv3o" fileName="components/Button6.xml" xy="46,1032" group="n44_wono"/>
+    <component id="n53_ebfi" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1174" group="n44_wono">
+      <Button icon="ui://mbo439wbq08x6"/>
+    </component>
+    <component id="n54_ebfi" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="46,1316" group="n44_wono">
+      <Button icon="ui://mbo439wbq08xl"/>
+    </component>
     <component id="n6_qsvd" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="46,1458" group="n44_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
     <component id="n7_qsvd" name="btnSearch" src="f4xv3o" fileName="components/Button6.xml" xy="46,1600" group="n44_wono">
       <Button icon="ui://mbo439wbq08xo"/>
     </component>
-    <group id="n44_wono" name="n44" xy="27,1028" size="129,682" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n44_wono" name="n44" xy="27,744" size="129,966" group="n38_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
     <component id="n8_qsvd" name="btnNext" src="wonoe5" fileName="components/Button14.xml" xy="140,1728" group="n47_v95q">

FGUIProject/assets/Main/components/ListCardSkillItem.xml

@@ -2,7 +2,7 @@
 <component size="108,108" extention="Button">
   <displayList>
     <image id="n16_ofwu" name="n16" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="0,0"/>
-    <component id="n14_ofwu" name="comSkill" src="ofwup1" fileName="ListCardSkillItemMask.xml" xy="6,6"/>
+    <loader id="n20_fpax" name="loaSkill" xy="8,7" pivot="0.5,0.5" size="94,94" aspect="true" url="ui://mfvz4q8kfpaxpu" align="center" vAlign="middle" fill="scale"/>
     <image id="n17_ofwu" name="n17" src="a0cf2k" fileName="imagesNew/lm_db_lvl.png" pkg="eg2y0ldp" xy="70,71" group="n19_ofwu"/>
     <text id="n18_ofwu" name="txtLv" xy="80,65" pivot="0.5,0" size="20,44" group="n19_ofwu" fontSize="32" color="#fdfaf3" align="center" text="9"/>
     <group id="n19_ofwu" name="n19" xy="70,65" size="39,45"/>

FGUIProject/assets/Main/components/ListCardSkillItemMask.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="96,96" mask="n16_ofwu">
-  <displayList>
-    <image id="n14_ofwu" name="n14" src="ofwutoc" fileName="imagesNew/card_jn_db.png" pkg="eg2y0ldp" xy="-6,-6"/>
-    <loader id="n15_ofwu" name="loaSkill" xy="-69,-59" size="234,432" url="ui://eg2y0ldpqkjstlc" autoSize="true"/>
-    <graph id="n16_ofwu" name="n16" xy="2,2" size="92,92" type="eclipse" lineSize="0"/>
-  </displayList>
-</component>

FGUIProject/assets/Main/package.xml

@@ -646,7 +646,6 @@
     <image id="jt8doy" name="db_qipaokuang.png" path="/imagesNew/" scale="9grid" scale9grid="17,9,177,18"/>
     <image id="e050oz" name="jdt_shuangrenzd.png" path="/imagesNew/"/>
     <component id="ofwup0" name="ListCardSkillItem.xml" path="/components/"/>
-    <component id="ofwup1" name="ListCardSkillItemMask.xml" path="/components/"/>
     <component id="ofwup2" name="ComArenaSkillTips.xml" path="/components/"/>
     <image id="jx6zp3" name="zjm_dibutb_db.png" path="/imagesNew/"/>
     <image id="jx6zp4" name="fuben_bg.png" path="/"/>
@@ -670,6 +669,7 @@
     <image id="ebfipr" name="zd_tctcdi_1_zz.png" path="/imagesStory/"/>
     <image id="ebfips" name="kp_dikuang_2.png" path="/images/"/>
     <image id="ebfipt" name="kp_dikuang_1.png" path="/images/"/>
+    <image id="fpaxpu" name="jn_tb_jzh.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -64,11 +64,14 @@ namespace GFGEditor
         public static string CardBgTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Card/Bg/";
         public static string CardBgMd5FileSaveName = "CardBgMd5";
 
-
         private static string[] CardIconSrcPaths { get { return new string[] { ResRootPath + "卡牌/icon/" }; } }
         public static string CardIconTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Card/Card/";
         public static string CardMd5FileSaveName = "CardMd5";
 
+        private static string[] CardSkillSrcPaths { get { return new string[] { ResRootPath + "卡牌/skill/" }; } }
+        public static string CardSkillTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Card/Skill/";
+        public static string CardSkillMd5FileSaveName = "CardSkillMd5";
+
         private static string[] ActivitySrcPaths { get { return new string[] { ResRootPath + "activity/activity/" }; } }
         public static string ActivityTargetPath = $"{ResPathUtil.TEXTURE_DIR_PATH}/Activity/Activity/";
         public static string ActivityMd5FileSaveName = "ActivityMd5";
@@ -169,6 +172,9 @@ namespace GFGEditor
             //卡牌icon
             EditorUtility.DisplayProgressBar("进度", "正在导入卡牌图标", 1);
             ImportRes(CardIconSrcPaths, CardIconTargetPath, CardMd5FileSaveName);
+            //卡牌技能图标
+            EditorUtility.DisplayProgressBar("进度", "正在导入卡牌技能图标", 1);
+            ImportRes(CardSkillSrcPaths, CardSkillTargetPath, CardSkillMd5FileSaveName);
             //活动宣传图
             EditorUtility.DisplayProgressBar("进度", "正在导入活动宣传图", 1);
             ImportRes(ActivitySrcPaths, ActivityTargetPath, ActivityMd5FileSaveName);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -263,6 +263,7 @@ namespace GFGEditor
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardBgTargetPath, new string[] { ImportArtResTool.CardBgMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardIconTargetPath, new string[] { ImportArtResTool.CardMd5FileSaveName });
+            FileUtil.DeleteUnnecessaryImage(ImportArtResTool.CardSkillTargetPath, new string[] { ImportArtResTool.CardSkillMd5FileSaveName });
 
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityTargetPath, new string[] { ImportArtResTool.ActivityMd5FileSaveName });
             FileUtil.DeleteUnnecessaryImage(ImportArtResTool.ActivityShow1TargetPath, new string[] { ImportArtResTool.ActivityShow1Md5FileSaveName });

GameClient/Assets/Game/HotUpdate/DressUp/MyDressUpHelper.cs

@@ -21,6 +21,7 @@ namespace GFGGame
         private static int _stepIndex = -1;
         public static int stepIndex { get { return _stepIndex; } }
         private static List<DressUpData> _dressMemory = new List<DressUpData>();
+        public static List<DressUpData> dressMemory { get { return _dressMemory; } }
         public const int MAX_MEMORY_STEP = 20;//×î´ó¼Ç¼²½Êý
 
         public static CustomSuitData GetCurSuitDataClone(int index)
@@ -325,17 +326,14 @@ namespace GFGGame
             if (_stepIndex - 1 < 0) return false;
             _stepIndex--;
             MyDressUpHelper.dressUpObj.PutOnDressUpData(_dressMemory[_stepIndex]);
-            // _ui.m_comboBox.selectedIndex = _dressMemory[_stepIndex].pos;
-            // UpdateStepBtn();
             return true;
         }
         public static bool OnClickBtnNextStep()
         {
-            if (_stepIndex + 1 >= MAX_MEMORY_STEP) return false;
+            if (_stepIndex + 1 >= _dressMemory.Count) return false;
             _stepIndex++;
             MyDressUpHelper.dressUpObj.PutOnDressUpData(_dressMemory[_stepIndex]);
-            // _ui.m_comboBox.selectedIndex = _dressMemory[_stepIndex].pos;
-            // UpdateStepBtn();
+
             return true;
         }
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_CardSkillUI.cs

@@ -8,8 +8,8 @@ namespace UI.Card
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_loaSkill;
         public GTextField m_txtName;
-        public UI_ComSkill m_comSkill;
         public UI_ComSkillDiscribe m_comCurLV;
         public UI_ComSkillDiscribe m_comNextLv;
         public GList m_listConsume;
@@ -63,8 +63,8 @@ namespace UI.Card
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtName = (GTextField)comp.GetChild("txtName");
-            m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
             m_comCurLV = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comCurLV"));
             m_comNextLv = (UI_ComSkillDiscribe)UI_ComSkillDiscribe.Create(comp.GetChild("comNextLv"));
             m_listConsume = (GList)comp.GetChild("listConsume");
@@ -74,9 +74,8 @@ namespace UI.Card
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_loaSkill = null;
             m_txtName = null;
-            m_comSkill.Dispose();
-            m_comSkill = null;
             m_comCurLV.Dispose();
             m_comCurLV = null;
             m_comNextLv.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComSkill.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Card
-{
-    public partial class UI_ComSkill
-    {
-        public GComponent target;
-        public GLoader m_loaSkill;
-        public const string URL = "ui://7l6lvkayrhha9l";
-        public const string PACKAGE_NAME = "Card";
-        public const string RES_NAME = "ComSkill";
-        private static UI_ComSkill _proxy;
-
-        public static UI_ComSkill Create(GObject gObject = null)
-        {
-            var ui = new UI_ComSkill();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ComSkill Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComSkill();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaSkill = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ComSkill.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: a6072b380ab263449b0ef821df4e375c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Card/UI_ListSkillItem.cs

@@ -7,7 +7,7 @@ namespace UI.Card
     public partial class UI_ListSkillItem
     {
         public GButton target;
-        public UI_ComSkill m_comSkill;
+        public GLoader m_loaSkill;
         public GTextField m_txtLv;
         public GTextField m_txtName;
         public const string URL = "ui://7l6lvkayrhha9k";
@@ -57,14 +57,13 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
-            m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comSkill.Dispose();
-            m_comSkill = null;
+            m_loaSkill = null;
             m_txtLv = null;
             m_txtName = null;
             if(disposeTarget && target != null)

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

@@ -18,6 +18,8 @@ namespace UI.DressUp
         public UI_PartsList m_partsList;
         public UI_PartsList m_partsList2;
         public UI_PartsList m_partsListSearch;
+        public GButton m_btnLastStep;
+        public GButton m_btnNextStep;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnNext;
@@ -80,6 +82,8 @@ namespace UI.DressUp
             m_partsList = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList"));
             m_partsList2 = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsList2"));
             m_partsListSearch = (UI_PartsList)UI_PartsList.Create(comp.GetChild("partsListSearch"));
+            m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
+            m_btnNextStep = (GButton)comp.GetChild("btnNextStep");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnNext = (GButton)comp.GetChild("btnNext");
@@ -103,6 +107,8 @@ namespace UI.DressUp
             m_partsList2 = null;
             m_partsListSearch.Dispose();
             m_partsListSearch = null;
+            m_btnLastStep = null;
+            m_btnNextStep = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnNext = null;

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

@@ -29,6 +29,8 @@ namespace UI.DressUp
         public GButton m_btnClothingShop;
         public GButton m_btnRepeal;
         public GButton m_btnRenewal;
+        public GButton m_btnLastStep;
+        public GButton m_btnNextStep;
         public GButton m_btnDelete;
         public GButton m_btnSearch;
         public GButton m_btnNext;
@@ -106,6 +108,8 @@ namespace UI.DressUp
             m_btnClothingShop = (GButton)comp.GetChild("btnClothingShop");
             m_btnRepeal = (GButton)comp.GetChild("btnRepeal");
             m_btnRenewal = (GButton)comp.GetChild("btnRenewal");
+            m_btnLastStep = (GButton)comp.GetChild("btnLastStep");
+            m_btnNextStep = (GButton)comp.GetChild("btnNextStep");
             m_btnDelete = (GButton)comp.GetChild("btnDelete");
             m_btnSearch = (GButton)comp.GetChild("btnSearch");
             m_btnNext = (GButton)comp.GetChild("btnNext");
@@ -145,6 +149,8 @@ namespace UI.DressUp
             m_btnClothingShop = null;
             m_btnRepeal = null;
             m_btnRenewal = null;
+            m_btnLastStep = null;
+            m_btnNextStep = null;
             m_btnDelete = null;
             m_btnSearch = null;
             m_btnNext = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItem.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_ListCardSkillItem
     {
         public GButton target;
-        public UI_ListCardSkillItemMask m_comSkill;
+        public GLoader m_loaSkill;
         public GTextField m_txtLv;
         public const string URL = "ui://mfvz4q8kofwup0";
         public const string PACKAGE_NAME = "Main";
@@ -56,13 +56,12 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_comSkill = (UI_ListCardSkillItemMask)UI_ListCardSkillItemMask.Create(comp.GetChild("comSkill"));
+            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_comSkill.Dispose();
-            m_comSkill = null;
+            m_loaSkill = null;
             m_txtLv = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs

@@ -1,71 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.Main
-{
-    public partial class UI_ListCardSkillItemMask
-    {
-        public GComponent target;
-        public GLoader m_loaSkill;
-        public const string URL = "ui://mfvz4q8kofwup1";
-        public const string PACKAGE_NAME = "Main";
-        public const string RES_NAME = "ListCardSkillItemMask";
-        private static UI_ListCardSkillItemMask _proxy;
-
-        public static UI_ListCardSkillItemMask Create(GObject gObject = null)
-        {
-            var ui = new UI_ListCardSkillItemMask();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ListCardSkillItemMask Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ListCardSkillItemMask();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_loaSkill = (GLoader)comp.GetChild("loaSkill");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaSkill = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ListCardSkillItemMask.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 230e33fb2b095ca4480d3c8e2fe1165e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -85,6 +85,10 @@ namespace GFGGame
         {
             return $"{TEXTURE_DIR_PATH}/Card/Card/{res}.{extName}";
         }
+        public static string GetCardSkillPath(string res, string extName = "pnj")
+        {
+            return $"{TEXTURE_DIR_PATH}/Card/Skill/{res}.{extName}";
+        }
         public static string GetCardSoundPath(string res, string extName = "mp3")
         {
             return $"{SOUND_DIR_PATH}/Card/{res}.{extName}";
@@ -113,7 +117,7 @@ namespace GFGGame
 
         public static bool CheckDressUpAnimationResExist(string res, string extName = "prefab")
         {
-            if(string.IsNullOrEmpty(res))
+            if (string.IsNullOrEmpty(res))
             {
                 return false;
             }
@@ -128,7 +132,7 @@ namespace GFGGame
 
         public static string GetDressUpEffectPath(string res, bool inAniDir = false, string extName = "prefab")
         {
-            if(inAniDir)
+            if (inAniDir)
             {
                 return $"{GetDressUpEffectDirPath(res)}/{res}_2.{extName}";
             }

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -759,7 +759,7 @@ namespace GFGGame
 
             int skillLv = SkillDataManager.Instance.GetCardSkillLv(_cardData.id, skillCfg.skillId);
             CardData data = CardDataManager.GetCardDataById(InstanceZonesDataManager.currentCardId);
-            item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(_cardData.resources[_cardData.resIndex]);
+            item.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfg.res);
             item.m_txtName.text = skillCfg.name;
             item.m_txtLv.text = string.Format("{0}级", skillLv);
             PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -57,7 +57,7 @@ namespace GFGGame
             skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(_skillLv, _skillId);
 
             _ui.m_txtName.text = skillCfg.name;
-            _ui.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfg.res);
+            _ui.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfg.res);
 
             UpdateView();
         }

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

@@ -70,7 +70,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-
+            _ui.m_btnLastStep.visible = true;
+            _ui.m_btnNextStep.visible = true;
             _ui.m_btnSearch.visible = true;
             _ui.m_partsList.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
             _ui.m_partsListSearch.m_comboBoxRarity.items = new string[] { "高分优先", "低分优先" };
@@ -89,6 +90,8 @@ namespace GFGGame
             _ui.m_btnDelete.onClick.Add(OnClickBtnDelete);
             _ui.m_btnNext.onClick.Add(OnClickBtnNext);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
+            _ui.m_btnLastStep.onClick.Add(OnClickBtnLastStep);
+            _ui.m_btnNextStep.onClick.Add(OnClickBtnNextStep);
             // _ui.m_comValueInfo.m_btnFightScoreRule.onClick.Add(OnBtnFightScoreRule);
             _ui.m_comValueInfo.GetChild("btnFightScoreRule").onClick.Add(OnBtnFightScoreRule);
             _ui.m_grhCloseComFightScore.onClick.Add(OnCloseComFightScore);
@@ -142,7 +145,7 @@ namespace GFGGame
             }
             MyDressUpHelper.dressUpObj.PutOnItemList(_roleData.itemList);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-
+            UpdateStepBtn(true);
             UpdateValueInfo();
             SendLog();
             Timers.inst.AddUpdate(CheckGuide);
@@ -160,7 +163,7 @@ namespace GFGGame
             // _dressUpData.TakeOffAll();
             // _dressUpData = null;
             DressUpMenuItemDataManager.Clear();
-
+            MyDressUpHelper.ResetMemory();
             Timers.inst.Remove(CheckGuide);
             _ui.m_grhCloseComFightScore.visible = false;
             _ui.m_comValueInfo.GetController("c2").selectedIndex = 0;
@@ -300,7 +303,8 @@ namespace GFGGame
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
 
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateSearchListPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateSearchListPartsSelected();
             UpdateValueInfo();
 
         }
@@ -332,8 +336,9 @@ namespace GFGGame
                 MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
             UpdateValueInfo();
 
         }
@@ -358,9 +363,23 @@ namespace GFGGame
 
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListSuitPartsSelected();
             UpdateValueInfo();
         }
+        private void UpdateStepBtn(bool isAdd, int suitId = 0)
+        {
+            if (isAdd)
+            {
+                MyDressUpHelper.AddMemoryDressup();
+            }
+            _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
+            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.dressMemory.Count - 1;
+
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
+            UpdateSearchListPartsSelected();
+        }
         private void OnLongPress(EventContext context)
         {
             LongPressGesture gesture = (LongPressGesture)context.sender;
@@ -406,8 +425,9 @@ namespace GFGGame
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
             UpdateValueInfo();
         }
 
@@ -943,7 +963,17 @@ namespace GFGGame
         {
             ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
         }
+        private void OnClickBtnLastStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnLastStep()) return;
+            UpdateStepBtn(false);
+        }
+        private void OnClickBtnNextStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnNextStep()) return;
+            UpdateStepBtn(false);
 
+        }
         private void SendLog()
         {
 

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

@@ -68,6 +68,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
+            _ui.m_btnLastStep.visible = true;
+            _ui.m_btnNextStep.visible = true;
             _ui.m_btnClose.visible = false;
             _ui.m_grpTips.visible = false;
             _ui.m_btnRepeal.visible = false;
@@ -97,6 +99,8 @@ namespace GFGGame
             _ui.m_btnRecommend.onClick.Add(OnClickBtnRecommend);
             _ui.m_btnSearch.onClick.Add(OnClickBtnSearch);
             _ui.m_btnAutoPlay.onClick.Add(OnClickBtnAutoPlay);
+            _ui.m_btnLastStep.onClick.Add(OnClickBtnLastStep);
+            _ui.m_btnNextStep.onClick.Add(OnClickBtnNextStep);
 
             _ui.m_compNeed.target.onClick.Add(OnClickComNeed);
             _ui.m_compNeed.m_listTag.itemRenderer = RenderListTagItem;
@@ -196,6 +200,8 @@ namespace GFGGame
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 
+            UpdateStepBtn(true);
+
             UpdateScore();
             SendLog();
             Timers.inst.AddUpdate(CheckGuide);
@@ -216,7 +222,7 @@ namespace GFGGame
             _fightCfg = null;
             _levelCfg = null;
             DressUpMenuItemDataManager.Clear();
-
+            MyDressUpHelper.ResetMemory();
             Timers.inst.Remove(CheckGuide);
         }
         protected override void RemoveEventListener()
@@ -230,6 +236,17 @@ namespace GFGGame
             // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
 
         }
+        private void OnClickBtnLastStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnLastStep()) return;
+            UpdateStepBtn(false);
+        }
+        private void OnClickBtnNextStep()
+        {
+            if (!MyDressUpHelper.OnClickBtnNextStep()) return;
+            UpdateStepBtn(false);
+
+        }
         private void OnClickBtnBack()
         {
             AlertUI.Show("是否确定退出？")
@@ -357,6 +374,7 @@ namespace GFGGame
                 this.showListParts2(id);
                 this.hideListParts();
                 MyDressUpHelper.dressUpObj.PutOnItemList(MyDressUpHelper.GetSuitFightItems(id));
+                UpdateStepBtn(true);
                 // MyDressUpHelper.dressUpObj.PutOnSuitCfg(id, false);
             }
             else
@@ -371,10 +389,11 @@ namespace GFGGame
                     return;
                 }
                 MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+                UpdateStepBtn(true);
             }
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
             UpdateScore();
         }
         private void OnClickSuitPartsListItem(EventContext context)
@@ -398,9 +417,22 @@ namespace GFGGame
 
             MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListSuitPartsSelected();
             UpdateScore();
         }
+        private void UpdateStepBtn(bool isAdd, int suitId = 0)
+        {
+            if (isAdd)
+            {
+                MyDressUpHelper.AddMemoryDressup();
+            }
+            _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
+            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.dressMemory.Count - 1;
+
+            UpdateListPartsSelected();
+            UpdateListSuitPartsSelected();
+        }
         private void OnLongPress(EventContext context)
         {
             LongPressGesture gesture = (LongPressGesture)context.sender;
@@ -450,8 +482,9 @@ namespace GFGGame
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListPartsSelected();
+            // UpdateListSuitPartsSelected();
         }
 
         private void OnClickBtnClose()

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

@@ -69,8 +69,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            _ui.m_btnLastStep.visible = false;
-            _ui.m_btnNextStep.visible = false;
+            _ui.m_btnLastStep.visible = true;
+            _ui.m_btnNextStep.visible = true;
             _ui.m_btnSearch.visible = true;
             _ui.m_btnPhoto.visible = true;
             _ui.m_btnAction.visible = false;
@@ -163,6 +163,8 @@ namespace GFGGame
             _ui.m_comboBox.items = CustomSuitDataManager.GetSuitPosItems();
             _ui.m_comboBox.selectedIndex = currentIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(currentIndex);
+            UpdateStepBtn(true);
+
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -187,7 +189,8 @@ namespace GFGGame
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.CLOSE_PHOTOGRAPHVIEW, UpdateScene);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdatePartsListSort);
-            EventAgent.RemoveEventListener(ConstMessage.DRESS_SEARCH, UpdatePartsListSort);
+            EventAgent.AddEventListener(ConstMessage.DRESS_SEARCH, UpdateSerch);
+            EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
         }
         private void OnClickBtnBack()
@@ -211,12 +214,12 @@ namespace GFGGame
         private void OnClickBtnLastStep()
         {
             if (!MyDressUpHelper.OnClickBtnLastStep()) return;
-            UpdateStepBtn();
+            UpdateStepBtn(false);
         }
         private void OnClickBtnNextStep()
         {
             if (!MyDressUpHelper.OnClickBtnNextStep()) return;
-            UpdateStepBtn();
+            UpdateStepBtn(false);
 
         }
         private void OnComboBoxChanged()
@@ -236,6 +239,7 @@ namespace GFGGame
             }
             currentIndex = _ui.m_comboBox.selectedIndex;
             MyDressUpHelper.PutOnSuitSavedByPos(_ui.m_comboBox.selectedIndex);
+            UpdateStepBtn(true);
         }
 
         private void OnClickListType1Item(EventContext context)
@@ -285,10 +289,12 @@ namespace GFGGame
             }
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(context.data as GObject);// (GObject)context.data as GObject;
             int id = (int)listItem.target.data;
-            // bool isSuit = SuitCfgArray.Instance.GetTotalCountOfOneSuit(id) > 0;
+            bool isDress = true;
 
             if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
             {
+                isDress = false;
+
                 if (GuideDataManager.IsGuideFinish(ConstGuideId.FREEDOM_DRESS) <= 0 && GuideDataManager.currentGuideId == GuideCfgArray.Instance.GetCfg(ConstGuideId.FREEDOM_DRESS).id)
                 {
                     ShowSuitPartList(id, true);
@@ -329,10 +335,12 @@ namespace GFGGame
                     MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
                 }
             }
-            MyDressUpHelper.AddMemoryDressup();
-            UpdateListPartsSelected(id);
-            UpdateListSuitPartsSelected();
-            // AddMemoryDressup();
+            if (isDress)
+            {
+                UpdateStepBtn(true, id);
+            }
+            // UpdateListPartsSelected(id);
+            // UpdateListSuitPartsSelected();
         }
         private void OnBtnNormalClick(EventContext context)
         {
@@ -363,7 +371,7 @@ namespace GFGGame
             {
                 MyDressUpHelper.dressUpObj.PutOnSuitCfg(suitId, false);
             }
-
+            UpdateStepBtn(true);
         }
 
         private void OnClickSuitPartsListItem(EventContext context)
@@ -384,14 +392,20 @@ namespace GFGGame
             {
                 MyDressUpHelper.dressUpObj.PutOnOrTakeOffAction(id);
             }
-            MyDressUpHelper.AddMemoryDressup();
-            UpdateListSuitPartsSelected();
+            UpdateStepBtn(true);
+            // UpdateListSuitPartsSelected();
         }
 
-        private void UpdateStepBtn()
+        private void UpdateStepBtn(bool isAdd, int suitId = 0)
         {
+            if (isAdd)
+            {
+                MyDressUpHelper.AddMemoryDressup();
+            }
             _ui.m_btnLastStep.enabled = MyDressUpHelper.stepIndex > 0;
-            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.MAX_MEMORY_STEP - 1;
+            _ui.m_btnNextStep.enabled = MyDressUpHelper.stepIndex < MyDressUpHelper.dressMemory.Count - 1;
+            UpdateListPartsSelected(suitId);
+            UpdateListSuitPartsSelected();
         }
 
         private void OnLongPress(EventContext context)
@@ -446,7 +460,7 @@ namespace GFGGame
             UpdateBtnAction();
             _ui.m_partsList.m_list.numItems = _currentList3.Count;
             _ui.m_partsList2.m_list.numItems = _currentList4.Count;
-            MyDressUpHelper.AddMemoryDressup();
+            UpdateStepBtn(true);
         }
 
         private void OnClickBtnSave()

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -95,7 +95,7 @@ namespace GFGGame
         {
             List<PassivitySkillCfg> skillCfgs = obj.parent.data as List<PassivitySkillCfg>;
             UI_ListCardSkillItem item = UI_ListCardSkillItem.Proxy(obj);
-            item.m_comSkill.m_loaSkill.url = ResPathUtil.GetCardSmallPath(skillCfgs[index].res);
+            item.m_loaSkill.url = ResPathUtil.GetCardSkillPath(skillCfgs[index].res);
             item.m_txtLv.text = SkillDataManager.Instance.GetCardSkillLv(skillCfgs[index].cardId, skillCfgs[index].skillId).ToString();
             if (item.target.data == null)
             {