换装动作

FGUIProject/assets/DressUp/DressUpUI.xml

@@ -53,7 +53,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,1019" size="157,133" group="n34_wono">
+    <component id="n27_j48o" name="btnAction" src="f4xv3o" fileName="components/Button6.xml" xy="27,1184" size="157,133" group="n34_wono" visible="false">
       <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbj48o3x"/>
     </component>
@@ -61,10 +61,10 @@
       <gearDisplay controller="c2" pages="0"/>
       <Button icon="ui://mbo439wbq08xm"/>
     </component>
-    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1299" group="n34_wono" visible="false">
+    <component id="n20_f4xv" name="btnLastStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1464" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08x6"/>
     </component>
-    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1413" group="n34_wono" visible="false">
+    <component id="n21_f4xv" name="btnNextStep" src="f4xv3o" fileName="components/Button6.xml" xy="56,1578" group="n34_wono" visible="false">
       <Button icon="ui://mbo439wbq08xl"/>
     </component>
     <component id="n29_8lqj" name="btnHide" src="f4xv3o" fileName="components/Button6.xml" xy="56,1326" group="n34_wono">
@@ -76,10 +76,10 @@
     <component id="n22_f4xv" name="btnDelete" src="f4xv3o" fileName="components/Button6.xml" xy="56,1610" group="n34_wono">
       <Button icon="ui://mbo439wbq08xn"/>
     </component>
-    <group id="n34_wono" name="n34" xy="27,1019" size="157,701" group="n30_8lqj" advanced="true" layout="vt" lineGap="32" excludeInvisibles="true">
+    <group id="n34_wono" name="n34" xy="56,1184" size="110,536" 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="1283,1920" advanced="true">
+    <group id="n30_8lqj" name="grpContent" xy="35,0" size="1275,1920" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
   </displayList>

FGUIProject/assets/DressUp/components/Button15.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="119,119" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_ygap" name="n0" src="ygapeo" fileName="images/hz_qhdzfz.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n1_ygap" name="icon" xy="12,12" size="95,95" aspect="true" url="ui://mbo439wbygaper" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button/>
+</component>

FGUIProject/assets/DressUp/components/ComActionSelect.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="228,192">
+  <displayList>
+    <image id="n12_ygap" name="n12" src="ygapen" fileName="images/hz_hzhzmbmb.png" xy="18,0"/>
+    <component id="n13_ygap" name="btnNormal" src="ygapep" fileName="components/Button15.xml" xy="0,53" group="n18_ygap" aspect="true"/>
+    <component id="n14_ygap" name="btnAction" src="ygapep" fileName="components/Button15.xml" xy="109,53" group="n18_ygap" aspect="true"/>
+    <group id="n18_ygap" name="n18" xy="0,53" size="228,119" advanced="true"/>
+  </displayList>
+</component>

FGUIProject/assets/DressUp/components/PartsListItem.xml

@@ -2,17 +2,18 @@
 <component size="232,240">
   <displayList>
     <loader id="n9_94m1" name="loaBorder" xy="39,0" size="178,178" visible="false" url="ui://mbo439wb94m1dl" autoSize="true"/>
-    <image id="n4_qsvd" name="iconSelected" src="qsvd2l" fileName="images/hz_xzyfxz.png" xy="22,0"/>
+    <image id="n4_qsvd" name="iconSelected" src="qsvd2l" fileName="images/hz_xzyfxz.png" xy="22,0" size="192,192"/>
     <loader id="n1_k6he" name="icon" xy="35,13" pivot="0.5,0.5" size="166,166" aspect="true" url="ui://mbo439wbk6he1z" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <loader id="n7_d4iw" name="rarity" xy="173,10" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
     <loader id="n5_8xpg" name="ScoreType" xy="24,142" size="50,50" touchable="false" url="ui://eg2y0ldp842s6h" fill="scale"/>
     <text id="n6_8xpg" name="txtScore" xy="143,160" pivot="0.5,0" size="69,36" font="ui://eg2y0ldpwonotjc" fontSize="26" color="#a07b41" align="center" autoClearText="true" text="3500"/>
-    <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0"/>
-    <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70"/>
-    <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" group="n11_wono"/>
+    <image id="n8_pjip" name="imgNeed" src="pjip2z" fileName="images/hz_bcbc_1.png" xy="13,0" size="67,68"/>
+    <image id="n10_ovm4" name="imgNew" src="pzq19p" fileName="imagesExport/cj_hd_xin.png" pkg="eg2y0ldp" xy="0,70" size="70,70"/>
+    <image id="n2_k6he" name="n2" src="k6he1y" fileName="images/hz_minzikuang.png" xy="13,198" size="208,42" group="n11_wono"/>
     <text id="n3_k6he" name="txtTitle" xy="42,199" pivot="0.5,0" size="152,41" group="n11_wono" font="ui://eg2y0ldpwonotjc" fontSize="30" color="#b58f54" align="center" leading="0" text="繁星点点啊"/>
     <group id="n11_wono" name="n11" xy="13,198" size="208,43"/>
+    <component id="n12_ygap" name="comAxtionSelect" src="ygapet" fileName="components/ComActionSelect.xml" xy="4,0" visible="false"/>
   </displayList>
 </component>

FGUIProject/assets/DressUp/package.xml

@@ -19,7 +19,7 @@
     <image id="q08xh" name="hz_fenleitu_9.png" path="/imagesExport/" exported="true" atlas="1"/>
     <image id="q08xi" name="hz_fenleitu_10.png" path="/imagesExport/" exported="true" atlas="1"/>
     <image id="q08xj" name="hz_fenleitu_11.png" path="/imagesExport/" exported="true" atlas="1"/>
-    <image id="q08xk" name="hz_fenleitu_12.png" path="/imagesExport/" exported="true" atlas="1"/>
+    <image id="q08xk" name="hz_fenleitu_13.png" path="/imagesExport/" exported="true" atlas="1"/>
     <image id="q08xl" name="hz_huifubu.png" path="/images/"/>
     <image id="q08xm" name="hz_paizhao.png" path="/images/"/>
     <image id="q08xn" name="hz_shanchu.png" path="/images/"/>
@@ -49,7 +49,7 @@
     <image id="slb42f" name="hz_fenleituej_6.png" path="/imagesExport/" exported="true"/>
     <image id="slb42g" name="hz_fenleituej_7.png" path="/imagesExport/" exported="true"/>
     <image id="slb42h" name="hz_fenleituej_9.png" path="/imagesExport/" exported="true"/>
-    <image id="slb42i" name="hz_fenleitu_13.png" path="/imagesExport/" exported="true"/>
+    <image id="slb42i" name="hz_fenleitu_14.png" path="/imagesExport/" exported="true"/>
     <image id="slb42j" name="hz_fenleituej_10.png" path="/imagesExport/" exported="true"/>
     <component id="slb42k" name="ButtonStoryTitle.xml" path="/components/"/>
     <image id="qsvd2l" name="hz_xzyfxz.png" path="/images/"/>
@@ -180,6 +180,15 @@
     <image id="r9riek" name="hl_ciskuang.png" path="/images/"/>
     <image id="r9riel" name="hz_fenleituej_4.png" path="/imagesExport/" exported="true"/>
     <image id="r9riem" name="hz_fenleituej_8.png" path="/imagesExport/" exported="true"/>
+    <image id="ygapen" name="hz_hzhzmbmb.png" path="/images/"/>
+    <image id="ygapeo" name="hz_qhdzfz.png" path="/images/"/>
+    <component id="ygapep" name="Button15.xml" path="/components/"/>
+    <image id="ygaper" name="tz_yuexiazy.png" path="/images/"/>
+    <image id="ygapes" name="tz_yimenglh.png" path="/images/"/>
+    <component id="ygapet" name="ComActionSelect.xml" path="/components/"/>
+    <image id="ygapev" name="scw_danxiaozj.png" path="/images/"/>
+    <image id="ygapew" name="scw_dengyingly.png" path="/images/"/>
+    <image id="ygapex" name="hz_fenleitu_12.png" path="/imagesExport/" exported="true" atlas="1"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\DressUp" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs

@@ -22,6 +22,7 @@ namespace GFGGame
         private static List<int> _itemDatas = new List<int>();
 
         private static Dictionary<int, List<int>> _newItemdata = new Dictionary<int, List<int>>();
+        private static List<int> _newSuitData = new List<int>();
 
         public static void InitData()
         {
@@ -295,13 +296,15 @@ namespace GFGGame
         //     return ItemDataManager.GetItemAdditionScore(itemId, InstanceZonesDataManager.currentScoreType);
         // }
 
-        public static List<int> DressSearch(List<int> list, bool isTaoZhuang)
+        public static List<int> DressSearch(List<int> list)
         {
             List<int> searchList = new List<int>();
             for (int i = 0; i < list.Count; i++)
             {
                 bool isSearch = true;
-                string name = isTaoZhuang ? SuitCfgArray.Instance.GetCfg(list[i]).name : ItemCfgArray.Instance.GetCfg(list[i]).name;
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(list[i]);
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(list[i]);
+                string name = itemCfg != null ? itemCfg.name : suitCfg.name;
                 for (int j = 0; j < dressSearchTxt.Length; j++)
                 {
                     if (name.IndexOf(dressSearchTxt[j]) < 0)
@@ -317,7 +320,7 @@ namespace GFGGame
             }
             return searchList;
         }
-        public static List<int> DressFilter(List<int> list, bool isTaoZhuang)
+        public static List<int> DressFilter(List<int> list)
         {
             List<int> filterList = new List<int>();
 
@@ -326,11 +329,11 @@ namespace GFGGame
                 ItemCfg cfg = ItemCfgArray.Instance.GetCfg(list[i]);
                 SuitCfg tzCfg = SuitCfgArray.Instance.GetCfg(list[i]);
 
-                bool isRarity = isTaoZhuang ? FilterRarity(tzCfg) : FilterRarity(cfg);
+                bool isRarity = cfg == null ? FilterRarity(tzCfg) : FilterRarity(cfg);
 
-                bool isScore = isTaoZhuang ? true : FilterScore(cfg);
+                bool isScore = cfg == null ? true : FilterScore(cfg);
 
-                bool isTag = isTaoZhuang ? true : FilterTag(cfg);
+                bool isTag = cfg == null ? true : FilterTag(cfg);
 
                 if (isRarity && isScore && isTag)
                 {
@@ -452,6 +455,13 @@ namespace GFGGame
                 _newItemdata.Add(subType, new List<int>());
             }
             _newItemdata[subType].Add(value);
+
+            // ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(value);
+            // if (itemCfg.suitId > 0 && DressUpMenuSuitDataManager.CheckHaveSuit(itemCfg.suitId))
+            // {
+            //     SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
+
+            // }
         }
         public static void RemoveNewDressItem(int itemId)
         {

GameClient/Assets/Game/HotUpdate/Data/DressUpMenuSuitDataManager.cs

@@ -8,6 +8,7 @@ namespace GFGGame
     public class DressUpMenuSuitDataManager
     {
         private static List<int> _suitIDList = new List<int>();
+        private static List<int> _actionIDList = new List<int>();//拥有的特殊动作列表列表
         private static List<int> _travelSuitIDList = new List<int>();//拥有的游历套装列表
         public static List<int> TravelSuitIDList
         {
@@ -31,6 +32,7 @@ namespace GFGGame
             _travelSuitIDList.Clear();
             _progressBySuitIdDic.Clear();
             _progressByItemIdDic.Clear();
+            _actionIDList.Clear();
         }
 
         public static void SetSuitInfo(List<SuitInfoProto> suitInfoList)
@@ -70,6 +72,10 @@ namespace GFGGame
                 {
                     _travelSuitIDList.Add(travelSuitCfg.id);
                 }
+                if (SuitCfgArray.Instance.CheckSuitHasAction(value))
+                {
+                    _actionIDList.Add(value);
+                }
             }
         }
 
@@ -83,6 +89,10 @@ namespace GFGGame
                 {
                     _travelSuitIDList.Remove(travelSuitCfg.id);
                 }
+                if (SuitCfgArray.Instance.CheckSuitHasAction(value) && _actionIDList.Contains(value))
+                {
+                    _actionIDList.Remove(travelSuitCfg.id);
+                }
             }
         }
 
@@ -184,43 +194,15 @@ namespace GFGGame
                 GetSuitItemController.AddItemId(itemId);
             }
         }
-        // //检测当前穿戴是否是一件完整套装，且只穿了一件套装,返回套装id
-        // public static int CheckCurDressIsSuit()
-        // {
-        //     if (EquipDataCache.cacher.suitId > 0) return EquipDataCache.cacher.suitId;
-
-        //     var equipDatas = EquipDataCache.cacher.equipDatas;
-        //     int dressSuitId = 0;
-        //     List<int> _equipDatas = new List<int>();
-        //     for (int i = 0; i < equipDatas.Count; i++)
-        //     {
-        //         if (DressUpMenuItemDataManager.CheckIsSceneType(equipDatas[i])) continue;
-        //         if (equipDatas[i] != ConstItemID.DEFULT_FA_XING && equipDatas[i] != ConstItemID.DEFULT_LIAN_YI_QUN && equipDatas[i] != ConstItemID.DEFULT_NEI_DA && equipDatas[i] != ConstItemID.DEFULT_XIA_ZHUANG)
-        //         {
-        //             int suitId = SuitCfgManager.Instance.GetItemSuitId(equipDatas[i]);
-        //             if (suitId <= 0) return 0;//有任何不属于套装的部件且不是原始服装，则当前穿戴不属于套装
-
-        //             if (dressSuitId != 0 && dressSuitId != suitId) return 0;//当前穿戴不同套装的部件，则当前穿戴不属于套装
-        //             dressSuitId = suitId;
-
-        //             _equipDatas.Add(equipDatas[i]);
-        //         }
-        //     }
-        //     if (dressSuitId == 0) return dressSuitId;
-        //     int[] itemIds = SuitCfgManager.Instance.GetSuitItems(dressSuitId);
-        //     for (int i = 0; i < itemIds.Length; i++)
-        //     {
-        //         if (DressUpMenuItemDataManager.CheckIsSceneType(itemIds[i])) continue;
-        //         if (_equipDatas.IndexOf(itemIds[i]) < 0) return 0;//套装部件穿戴不完整
-        //     }
-
-        //     return dressSuitId;
-        // }
 
         public static List<int> GetSuitIDList()
         {
             return (List<int>)_suitIDList.GetRange(0, _suitIDList.Count);
         }
+        public static List<int> GetActionIDList()
+        {
+            return _actionIDList;
+        }
 
 
         public static int GetSuitGuideBonusStatus(int suitId)

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

@@ -116,9 +116,9 @@ namespace GFGGame
             int[] items = suitCfg.partsArr;
             foreach (int itemId in items)
             {
-                if(_dressUpData.actionId == id)
+                if (_dressUpData.actionId == id)
                 {
-                    if(SuitCfgArray.Instance.CheckActionContainsItem(itemId, id))
+                    if (SuitCfgArray.Instance.CheckActionContainsItem(itemId, id))
                     {
                         continue;
                     }
@@ -276,7 +276,7 @@ namespace GFGGame
             }
             TakeOffAll(false);
             _dressUpData.suitId = id;
-            _dressUpData.actionId = (HasSuitActionRes && tryShowAction)?id:0;
+            _dressUpData.actionId = (HasSuitActionRes && tryShowAction) ? id : 0;
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_dressUpData.suitId);
             List<int> items = new List<int>(suitCfg.partsArr);
             if (showOptional)
@@ -306,7 +306,7 @@ namespace GFGGame
             checkDefaultItem();
             UpdateWholeBodyView();
         }
-        
+
         //穿戴一组换装数据
         public void PutOnDressUpData(DressUpData dressUpData)
         {
@@ -520,7 +520,7 @@ namespace GFGGame
         }
 
         //穿上一个动作
-        private void PutOnAction(int actionId)
+        public void PutOnAction(int actionId)
         {
             _dressUpData.actionId = actionId;
             foreach (int itemId in itemList)
@@ -536,7 +536,7 @@ namespace GFGGame
         }
 
         //取消动作
-        private void CancelAction()
+        public void CancelAction()
         {
             if (_dressUpData.actionId <= 0)
             {

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_ComActionSelect
+    {
+        public GComponent target;
+        public GButton m_btnNormal;
+        public GButton m_btnAction;
+        public const string URL = "ui://mbo439wbygapet";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ComActionSelect";
+        private static UI_ComActionSelect _proxy;
+
+        public static UI_ComActionSelect Create(GObject gObject = null)
+        {
+            var ui = new UI_ComActionSelect();
+            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_ComActionSelect Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComActionSelect();
+            }
+            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_btnNormal = (GButton)comp.GetChild("btnNormal");
+            m_btnAction = (GButton)comp.GetChild("btnAction");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnNormal = null;
+            m_btnAction = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComActionSelect.cs.meta

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

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

@@ -16,6 +16,7 @@ namespace UI.DressUp
         public GImage m_imgNeed;
         public GImage m_imgNew;
         public GTextField m_txtTitle;
+        public UI_ComActionSelect m_comAxtionSelect;
         public const string URL = "ui://mbo439wbk6he26";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PartsListItem";
@@ -72,6 +73,7 @@ namespace UI.DressUp
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_comAxtionSelect = (UI_ComActionSelect)UI_ComActionSelect.Create(comp.GetChild("comAxtionSelect"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -84,6 +86,8 @@ namespace UI.DressUp
             m_imgNeed = null;
             m_imgNew = null;
             m_txtTitle = null;
+            m_comAxtionSelect.Dispose();
+            m_comAxtionSelect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -168,7 +168,7 @@ namespace GFGGame
             InstanceZonesDataManager.currentScoreType = _fightCfg.scoreType;
             //一级菜单
             _ui.m_comListType1.m_listType.RemoveChildrenToPool();
-            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 2;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 3;
             //_ui.m_comListType1.m_listType1.ResizeToFit(_ui.m_listType1.numItems);
             float maxHeight = _ui.target.height - _ui.m_comListType1.m_listType.y - DressUpView.BOTTOM_BLANK;
             if (_ui.m_comListType1.m_listType.height > maxHeight)
@@ -425,7 +425,7 @@ namespace GFGGame
         {
             int _suitId = MyDressUpHelper.dressUpObj.suitId;
             bool isNoSuit = _fightCfg.needSuitId > 0 && _suitId != _fightCfg.needSuitId;//需要套装但未穿套装
-            
+
             bool isNoItem = _fightCfg.needItemId > 0 && (_suitId <= 0 && !MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(_fightCfg.needItemId) || _suitId > 0 && Array.IndexOf(SuitCfgArray.Instance.GetCfg(_suitId).partsArr, _fightCfg.needItemId) < 0);
 
             if (isNoSuit || isNoItem)
@@ -525,7 +525,7 @@ namespace GFGGame
         {
             _currentList2 = null;
             currentListType = DressUpListType.List1;
-            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 2;
+            _ui.m_comListType1.m_listType.numItems = DressUpMenuItemCfg1Array.Instance.dataArray.Length - 3;
             GTween.To(_ui.target.width, listType1X, 0.5f)
                 .SetTarget(_ui.m_comListType1.target)
                 .OnUpdate((GTweener t) =>
@@ -654,11 +654,11 @@ namespace GFGGame
             }
             if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
             {
-                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3, _currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG);
+                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
             }
             else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
             {
-                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3, _currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG);
+                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
             }
 
             //必穿品放在列表最前面
@@ -694,11 +694,11 @@ namespace GFGGame
 
             if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
             {
-                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4, false);
+                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
             }
             else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
             {
-                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4, false);
+                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
             }
 
             _ui.m_partsList2.m_list.RemoveChildrenToPool();

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

@@ -14,6 +14,7 @@ namespace GFGGame
         private const int SORT_BY_HIGH_RARITY = 0;
         private const int SORT_BY_LOW_RARITY = 1;
         private const int SORT_BY_GET_TIME = 2;
+
         private UI_DressUpUI _ui;
         private float listType1X = 0;
         private float partsListX = 0;
@@ -28,8 +29,8 @@ namespace GFGGame
         private List<int> _currentList4 = new List<int>();
         private int _currentMenuType;
         private int _currentSuitId;
+        private bool _isNormalSuitType = false;//当前套装部件列表是否为普通动作列表
         private int _rarityIndex = SORT_BY_HIGH_RARITY;
-
         private UI_TypeItem listTypeItem_FreedomDress;
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
 
@@ -249,26 +250,82 @@ namespace GFGGame
             {
                 return;
             }
-            GObject listItem = (GObject)context.data as GObject;
-            int id = (int)listItem.data;
-            bool isSuit = SuitCfgArray.Instance.GetTotalCountOfOneSuit(id) > 0;
-            if (isSuit)
+            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;
+            if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
             {
-                this.showListParts2(id);
-                this.hideListParts();
-                MyDressUpHelper.dressUpObj.PutOnSuitCfg(id, true);
-                UpdateBtnAction();
+                if (SuitCfgArray.Instance.CheckSuitHasAction(id))
+                {
+                    listItem.m_comAxtionSelect.target.visible = true;
+                    UI_PartsListItem.ProxyEnd();
+                }
+                else
+                {
+                    ShowSuitPartList(id, false);
+                }
+            }
+            else if (_currentMenuType == ConstDressUpItemType.DONG_ZUO)
+            {
+                MyDressUpHelper.dressUpObj.PutOnOrTakeOffAction(id);
             }
             else
             {
-                MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(id);
-                MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+                if (MyDressUpHelper.dressUpObj.IsAction)
+                {
+                    if (SuitCfgArray.Instance.CheckItemReaplaceableByAction(id, MyDressUpHelper.dressUpObj.actionId))
+                    {
+                        MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+                    }
+                    else
+                    {
+                        if (!SuitCfgArray.Instance.CheckActionContainsItem(id, MyDressUpHelper.dressUpObj.actionId))
+                        {
+                            MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+                        }
+                        MyDressUpHelper.dressUpObj.CancelAction();
+                    }
+                }
+                else
+                {
+                    MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+                }
             }
-            UpdateListPartsSelected();
-            UpdateListSuitPartsSelected(); ;
+
+            UpdateListPartsSelected(id);
+            UpdateListSuitPartsSelected();
             // AddMemoryDressup();
         }
+        private void OnBtnNormalClick(EventContext context)
+        {
+            _isNormalSuitType = true;
+            GObject gObject = context.sender as GObject;
+            int suitId = (int)gObject.data;
+            ShowSuitPartList(suitId, false);
+        }
+        private void OnBtnActionClick(EventContext context)
+        {
+            _isNormalSuitType = false;
+            GObject gObject = context.sender as GObject;
+            int suitId = (int)gObject.data;
+            ShowSuitPartList(suitId, true);
+        }
+        private void ShowSuitPartList(int suitId, bool showAction)
+        {
+            this.showListParts2(suitId);
+            this.hideListParts();
+            if (showAction)
+            {
+                MyDressUpHelper.dressUpObj.PutOnSuitCfg(suitId, true);
+                MyDressUpHelper.dressUpObj.PutOnAction(suitId);
+            }
+            else
+            {
+                MyDressUpHelper.dressUpObj.CancelAction();
+                MyDressUpHelper.dressUpObj.PutOnSuitCfg(suitId, false);
+            }
 
+        }
 
         private void OnClickSuitPartsListItem(EventContext context)
         {
@@ -279,12 +336,17 @@ namespace GFGGame
             GObject listItem = (GObject)context.data as GObject;
             int id = (int)listItem.data;
 
-            MyDressUpHelper.dressUpObj.CheckCancelActionWhenPutOn(id);
-            MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
+            if (itemCfg != null)
+            {
+                MyDressUpHelper.dressUpObj.AddOrRemove(id, true);
+            }
+            else
+            {
+                MyDressUpHelper.dressUpObj.PutOnOrTakeOffAction(id);
+            }
 
             UpdateListSuitPartsSelected();
-            UpdateBtnAction();
-            // AddMemoryDressup();
         }
         private void AddMemoryDressup()
         {
@@ -388,11 +450,7 @@ namespace GFGGame
                 _ui.m_comListType1.m_listType.height = maxHeight;
             }
         }
-        // private void ShowSubList()
-        // {
-        //     _ui.m_comListType1.m_listType.numItems = _ui.m_comListType1.m_listType.numItems;
-        //     _ui.m_comListType2.m_listType.numItems = _ui.m_comListType2.m_listType.numItems;
-        // }
+
         private void showListType1()
         {
             _currentList2 = null;
@@ -476,7 +534,15 @@ namespace GFGGame
             }
             if (selectItem)
             {
-                int itemId = MyDressUpHelper.dressUpObj.GetItemIdBuyType(_currentMenuType);
+                int itemId = 0;
+                if (type == (int)ConstDressUpItemType.TAO_ZHUANG)
+                {
+                    itemId = _currentSuitId;
+                }
+                else
+                {
+                    itemId = MyDressUpHelper.dressUpObj.GetItemIdBuyType(_currentMenuType);
+                }
                 if (itemId > 0)
                 {
                     int index = _currentList3.IndexOf(itemId);
@@ -583,6 +649,7 @@ namespace GFGGame
             string iconRes = "";
             string partName = "";
             string ext = "png";
+            listItem.m_comAxtionSelect.target.visible = false;
             if (_currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(id);
@@ -594,6 +661,36 @@ namespace GFGGame
 
                 listItem.m_ScoreType.visible = false;
                 listItem.m_imgNew.visible = false;
+
+                listItem.m_comAxtionSelect.m_btnNormal.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
+                listItem.m_comAxtionSelect.m_btnAction.icon = ResPathUtil.GetIconPath(suitCfg.res, ext);
+
+                if (listItem.m_comAxtionSelect.m_btnNormal.data == null)
+                {
+                    listItem.m_comAxtionSelect.m_btnNormal.onClick.Add(OnBtnNormalClick);
+                }
+                listItem.m_comAxtionSelect.m_btnNormal.data = id;
+
+                if (listItem.m_comAxtionSelect.m_btnAction.data == null)
+                {
+                    listItem.m_comAxtionSelect.m_btnAction.onClick.Add(OnBtnActionClick);
+                }
+                listItem.m_comAxtionSelect.m_btnAction.data = id;
+
+
+            }
+            else if (_currentMenuType == (int)ConstDressUpItemType.DONG_ZUO)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(id);
+                iconRes = suitCfg.res;
+                partName = suitCfg.name;
+                listItem.m_iconSelected.visible = false;
+                RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, true);
+                listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + suitCfg.rarity;
+
+                listItem.m_ScoreType.visible = false;
+                listItem.m_imgNew.visible = false;
+
             }
             else
             {
@@ -604,12 +701,9 @@ namespace GFGGame
                 listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
 
                 RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
-                ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+                // ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
 
                 listItem.m_ScoreType.visible = true;
-                // int mainScore;
-                // int mainValuel;
-                // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
                 listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
 
                 bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);
@@ -618,7 +712,6 @@ namespace GFGGame
                 {
                     ItemProxy.ReqSetItemRead(id).Coroutine();
                 }
-                // DressUpMenuItemDataManager.RemoveNewDressItem(_currentMenuType, id);
             }
             if (listItem.target.data == null)
             {
@@ -645,7 +738,7 @@ namespace GFGGame
             int id = (int)_currentList4[index];
             string iconRes = "";
             string partName = "";
-            string ext = "png";
+            // string ext = "png";
 
             if (listItem.target.data == null)
             {
@@ -656,20 +749,24 @@ namespace GFGGame
             }
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(id);
-            iconRes = itemCfg.res;
-            partName = itemCfg.name;
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(id);
+            iconRes = itemCfg != null ? itemCfg.res : suitCfg.res;
+            partName = itemCfg != null ? itemCfg.name : suitCfg.name;
             listItem.m_iconSelected.visible = !_ui.m_btnAction.grayed || MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
-            listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
-            RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false);
-            ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
+            // listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
+            RarityIconController.UpdateRarityIcon(listItem.m_rarity, id, false, itemCfg == null);
+            // ext = ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType, true);
 
-            listItem.m_ScoreType.visible = true;
+            listItem.m_ScoreType.visible = false;
             // int mainScore;
             // int mainValuel;
             // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
-
-            listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
-            listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
+            if (itemCfg != null)
+            {
+                listItem.m_ScoreType.visible = true;
+                listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + itemCfg.mainScore);
+            }
+            listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, "png");
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
             listItem.m_txtScore.visible = false;
@@ -684,7 +781,7 @@ namespace GFGGame
             UI_PartsListItem.ProxyEnd();
 
         }
-        private void UpdateListPartsSelected()
+        private void UpdateListPartsSelected(int selectSuitId = 0)
         {
             int count = _ui.m_partsList.m_list.numChildren;
             int suitId = MyDressUpHelper.dressUpObj.suitId;
@@ -696,33 +793,34 @@ namespace GFGGame
                 if (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG)
                 {
                     listItem.m_iconSelected.visible = suitId > 0 && id == suitId;
+                    listItem.m_comAxtionSelect.target.visible = id == selectSuitId;
+                }
+                else if (_currentMenuType == ConstDressUpItemType.DONG_ZUO)
+                {
+                    listItem.m_iconSelected.visible = MyDressUpHelper.dressUpObj.IsAction && MyDressUpHelper.dressUpObj.actionId == id;
                 }
                 else
                 {
-                    bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//非套装判断是否穿戴
-                    bool isSceneType = DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id);
-                    bool isSuit = !isSceneType && suitId > 0 && SuitCfgArray.Instance.GetSuitIdOfItem(id) == suitId;//非场景类， 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
+                    bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
+                    bool isAction = MyDressUpHelper.dressUpObj.IsAction && SuitCfgArray.Instance.CheckActionContainsItem(id, MyDressUpHelper.dressUpObj.actionId);
 
-                    isSuit = !isSceneType && suitId > 0 && suitId == id;
-                    bool isSceneSuit = isSceneType && suitId > 0 && isPutOn;//场景类， 若当前穿戴套装要判断item是否属已穿戴
-                    listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;
+                    listItem.m_iconSelected.visible = isPutOn || isAction;
                 }
                 UI_PartsListItem.ProxyEnd();
             }
         }
+
         private void UpdateListSuitPartsSelected()
         {
             int count = _ui.m_partsList2.m_list.numChildren;
-            int suitId = MyDressUpHelper.dressUpObj.suitId;
+
             for (int i = 0; i < count; i++)
             {
                 UI_PartsListItem listItem = UI_PartsListItem.Proxy(_ui.m_partsList2.m_list.GetChildAt(i));
                 int id = (int)listItem.target.data;
-
-                bool isPutOn = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//非套装判断是否穿戴
-                bool isSuit = !DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id) && suitId > 0 && SuitCfgArray.Instance.GetSuitIdOfItem(id) == suitId;//非场景类， 若当前穿戴套装要判断item是否属于套装(更换场景类不会改变套装穿戴状态)
-                bool isSceneSuit = DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(id) && suitId > 0 && isPutOn;//场景类， 若当前穿戴套装要判断item是否属已穿戴
-                listItem.m_iconSelected.visible = isPutOn || isSuit || isSceneSuit;
+                bool isSuitSelect = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);//可换部件是否穿戴
+                bool isActionSelect = MyDressUpHelper.dressUpObj.actionId == id;
+                listItem.m_iconSelected.visible = isSuitSelect || isActionSelect;
                 UI_PartsListItem.ProxyEnd();
             }
         }
@@ -747,6 +845,23 @@ namespace GFGGame
                     _currentList3.Reverse();
                 }
             }
+            else if (_currentMenuType == (int)ConstDressUpItemType.DONG_ZUO)
+            {
+
+                _currentList3 = DressUpMenuSuitDataManager.GetActionIDList();
+                if (_rarityIndex == SORT_BY_HIGH_RARITY)
+                {
+                    _currentList3 = SuitUtil.SortSuitListByHighRarity(_currentList3);
+                }
+                else if (_rarityIndex == SORT_BY_LOW_RARITY)
+                {
+                    _currentList3 = SuitUtil.SortSuitListByLowRarity(_currentList3);
+                }
+                else
+                {
+                    _currentList3.Reverse();
+                }
+            }
             else
             {
                 _currentList3 = DressUpMenuItemDataManager.getItemDatasByType(_currentMenuType);
@@ -766,11 +881,11 @@ namespace GFGGame
             }
             if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
             {
-                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3, _currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG);
+                _currentList3 = DressUpMenuItemDataManager.DressSearch(_currentList3);
             }
             else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
             {
-                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3, _currentMenuType == (int)ConstDressUpItemType.TAO_ZHUANG);
+                _currentList3 = DressUpMenuItemDataManager.DressFilter(_currentList3);
             }
 
             _ui.m_partsList.m_list.RemoveChildrenToPool();
@@ -780,28 +895,23 @@ namespace GFGGame
         private void UpdateSuitPartsListSort()
         {
             if (_currentMenuType == 0) return;
-
-            _currentList4 = new List<int>(SuitCfgArray.Instance.GetSuitItems(_currentSuitId));
-            if (_rarityIndex == SORT_BY_HIGH_RARITY)
+            if (_isNormalSuitType)
             {
-                _currentList4 = DressUpMenuItemDataManager.SortItemListByHighRarity(_currentList4);
-            }
-            else if (_rarityIndex == SORT_BY_LOW_RARITY)
-            {
-                _currentList4 = DressUpMenuItemDataManager.SortItemListByLowRarity(_currentList4);
+                _currentList4 = new List<int>(SuitCfgArray.Instance.GetSuitItems(_currentSuitId));
             }
             else
             {
-                _currentList4.Reverse();
+                _currentList4 = SuitCfgArray.Instance.GetOneSuitAllNotActionParts(_currentSuitId);
+                _currentList4.Add(_currentSuitId);
             }
 
             if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Search)
             {
-                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4, false);
+                _currentList4 = DressUpMenuItemDataManager.DressSearch(_currentList4);
             }
             else if (DressUpMenuItemDataManager.dressFilterType == DressFilterType.Filter)
             {
-                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4, false);
+                _currentList4 = DressUpMenuItemDataManager.DressFilter(_currentList4);
             }
 
             _ui.m_partsList2.m_list.RemoveChildrenToPool();
@@ -811,11 +921,11 @@ namespace GFGGame
 
         private void UpdateBtnAction()
         {
-            _ui.m_btnAction.visible = (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG) || this.currentListType == DressUpListType.List4;
-            if (_ui.m_btnAction.visible)
-            {
-                //_ui.m_btnAction.grayed = !EquipDataCache.cacher.HasSuitActionRes;
-            }
+            // _ui.m_btnAction.visible = (_currentMenuType == ConstDressUpItemType.TAO_ZHUANG) || this.currentListType == DressUpListType.List4;
+            // if (_ui.m_btnAction.visible)
+            // {
+            //_ui.m_btnAction.grayed = !EquipDataCache.cacher.HasSuitActionRes;
+            // }
         }
 
         private void OnClickBtnShow()