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

FGUIProject/assets/ClothingFoster/ClothingFosterFinishUI.xml

@@ -5,34 +5,34 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n5_l4ui" name="n5" src="bd1c1x" fileName="images/fzyc_wcyh_1.png" xy="0,300"/>
-    <text id="n7_l4ui" name="n7" xy="430,1822" size="217,49" fontSize="36" color="#958163" text="点击屏幕继续">
+    <text id="n7_l4ui" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <image id="n6_l4ui" name="n6" src="bd1c1w" fileName="images/fzyc_wcyh_3.png" xy="115,1138" pivot="0.5,0" group="n8_l4ui"/>
     <text id="n3_bd1c" name="txtRenewTips" xy="376,1140" pivot="0.5,0" size="328,49" group="n8_l4ui" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
     <group id="n8_l4ui" name="grpRenew" xy="115,1138" size="850,60" visible="false" advanced="true"/>
     <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,724" size="72,56" fillMethod="vt"/>
-    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="197,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="397,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="597,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="797,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <group id="n20_l4ui" name="grpProperty" xy="197,592" size="770,58" visible="false" advanced="true"/>
-    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="197,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="397,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="597,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="797,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <group id="n21_l4ui" name="grpAddProperty" xy="197,851" size="770,58" visible="false" advanced="true"/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="110,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="330,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="550,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="770,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <group id="n20_l4ui" name="grpProperty" xy="110,592" size="860,54" visible="false" advanced="true" layout="hz" colGap="20"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="110,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="330,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="550,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="770,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <group id="n21_l4ui" name="grpAddProperty" xy="110,851" size="860,54" visible="false" advanced="true" layout="hz" colGap="20"/>
   </displayList>
   <transition name="t0" autoPlay="true">
-    <item time="0" type="Size" target="n10_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n11_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n12_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n10_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n11_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n12_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n15_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n16_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n17_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n15_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n16_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n17_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
   </transition>
 </component>

FGUIProject/assets/CommonGame/ItemExchangeUI.xml

@@ -1,16 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1116">
+<component size="1080,1250">
   <displayList>
-    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1115"/>
-    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="77,124" size="346,336" group="n12_si5z" aspect="true"/>
-    <loader id="n8_si5z" name="loaRarity" xy="130,193" size="44,94" group="n12_si5z" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
-    <loader id="n9_si5z" name="loaIcon" xy="251,291" pivot="0.5,0.5" anchor="true" size="180,180" group="n12_si5z" aspect="true" autoSize="true"/>
-    <text id="n28_s5s9" name="txtExchangeCount" xy="328,349" pivot="1,0" size="56,49" group="n12_si5z" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
+    <component id="n37_qdaz" name="comBg" src="qik1tcb" fileName="componentsBg/ComBg000.xml" xy="0,0" size="1080,1250">
+      <relation target="n33_l500" sidePair="height-height"/>
+      <relation target="" sidePair="middle-middle"/>
+    </component>
     <image id="n40_x8jz" name="n40" src="x8jztnr" fileName="images/lm_db_3.png" xy="403,192" size="575,230" group="n12_si5z"/>
     <text id="n6_si5z" name="txtOwned" xy="840,146" pivot="1,0" size="129,41" group="n12_si5z" fontSize="30" color="#b08d5c" vars="true" text="已拥有:{count=20}"/>
     <text id="n11_si5z" name="txtDesc" xy="439,214" size="506,166" group="n12_si5z" fontSize="32" color="#b08d5c" leading="1" ubb="true" autoSize="shrink" autoClearText="true" text="手机课程很快就要开课咯！！同学们有没有很期待哇过 几天课上见昂！！28节课希望大家都可以跟下来一起度 过有趣儿的两个月吧。"/>
-    <group id="n12_si5z" name="n12" xy="77,124" size="901,336" group="n33_l500" advanced="true"/>
-    <list id="n32_l500" name="listItem" xy="110,480" pivot="0.5,0" size="859,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="15" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
+    <image id="n39_x8jz" name="n39" src="x8jztnq" fileName="images/wplb_db.png" xy="64,124" size="346,336" group="n55_ofwu" aspect="true"/>
+    <loader id="n8_si5z" name="loaRarity" xy="117,193" size="44,94" group="n55_ofwu" url="ui://eg2y0ldpd4iw4z" autoSize="true"/>
+    <loader id="n9_si5z" name="loaIcon" xy="238,291" pivot="0.5,0.5" anchor="true" size="180,180" group="n55_ofwu" aspect="true" autoSize="true"/>
+    <text id="n28_s5s9" name="txtExchangeCount" xy="315,349" pivot="1,0" size="56,49" group="n55_ofwu" fontSize="36" color="#8e7c6b" vars="true" text="x{count=20}"/>
+    <group id="n55_ofwu" name="n55" xy="64,124" size="346,336" group="n12_si5z"/>
+    <group id="n12_si5z" name="n12" xy="64,124" size="914,336" group="n33_l500" advanced="true"/>
+    <image id="n45_ofwu" name="n45" src="842s6h" fileName="imagesNew/kp_sx_1.png" xy="142,480" size="50,50" group="n53_ofwu"/>
+    <image id="n46_ofwu" name="n46" src="842s6j" fileName="imagesNew/kp_sx_2.png" xy="367,480" size="50,50" group="n53_ofwu"/>
+    <image id="n47_ofwu" name="n47" src="842s6i" fileName="imagesNew/kp_sx_3.png" xy="592,480" size="50,50" group="n53_ofwu"/>
+    <image id="n48_ofwu" name="n48" src="842s6k" fileName="imagesNew/kp_sx_4.png" xy="817,480" size="50,50" group="n53_ofwu"/>
+    <text id="n49_ofwu" name="txtGong" xy="202,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n50_ofwu" name="txtShang" xy="427,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n51_ofwu" name="txtJue" xy="652,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <text id="n52_ofwu" name="txtZhi" xy="877,484" size="61,41" group="n53_ofwu" fontSize="30" color="#8d6f45" autoClearText="true" text="5000"/>
+    <group id="n53_ofwu" name="grpScore" xy="142,480" size="796,50" group="n33_l500" advanced="true"/>
+    <list id="n54_ofwu" name="listTag" xy="138,550" size="377,41" group="n33_l500" layout="row" colGap="20" defaultItem="ui://eg2y0ldpu2u3tkr">
+      <item/>
+      <item/>
+    </list>
+    <list id="n32_l500" name="listItem" xy="127,611" pivot="0.5,0" size="841,131" group="n33_l500" layout="flow_vt" overflow="scroll" scroll="horizontal" colGap="10" defaultItem="ui://eg2y0ldp9jv6tls" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -19,32 +36,34 @@
       <item/>
       <item/>
     </list>
-    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,657" group="n4_si5z"/>
-    <text id="n3_si5z" name="txtShow" xy="435,649" pivot="0.5,0" size="210,48" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
-    <graph id="n44_ofwu" name="n44" xy="530,631" size="20,20" group="n4_si5z"/>
-    <group id="n4_si5z" name="n4" xy="176,631" size="727,67" group="n34_l500"/>
-    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,726" group="n19_si5z"/>
-    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,724" group="n19_si5z">
+    <image id="n2_si5z" name="n2" src="9jv66j" fileName="imagesNew/lm_zsx0.png" xy="176,788" group="n4_si5z"/>
+    <text id="n3_si5z" name="txtShow" xy="435,780" pivot="0.5,0" size="210,47" group="n4_si5z" fontSize="35" color="#b69566" align="center" text="选择使用数量"/>
+    <graph id="n44_ofwu" name="n44" xy="530,762" size="20,20" group="n4_si5z"/>
+    <group id="n4_si5z" name="n4" xy="176,762" size="727,67" group="n34_l500"/>
+    <image id="n13_si5z" name="n13" src="si5ztik" fileName="imgnew/tc_tyjjdi.png" xy="256,857" group="n19_si5z"/>
+    <component id="n17_si5z" name="btnMinus" src="si5ztin" fileName="components/Button2.xml" xy="234,855" group="n19_si5z">
       <Button icon="ui://eg2y0ldps5s9tip"/>
     </component>
-    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,725" group="n19_si5z"/>
-    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,723" group="n19_si5z">
+    <component id="n16_si5z" name="btnAdd" src="si5ztip" fileName="components/Button16.xml" xy="549,856" group="n19_si5z"/>
+    <component id="n18_si5z" name="btnMax" src="si5ztio" fileName="components/Button3.xml" xy="656,854" group="n19_si5z">
       <Button icon="ui://eg2y0ldpsi5ztil"/>
     </component>
-    <text id="n22_si5z" name="txtCostCount" xy="402,731" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
-    <group id="n19_si5z" name="n19" xy="234,723" size="612,70" group="n34_l500"/>
-    <text id="n24_si5z" name="txtTips" xy="377,813" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
-    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,893" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
-    <text id="n36_l500" name="txtRmbCost" xy="509,895" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
-    <group id="n26_si5z" name="n26" xy="376,813" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
-    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,962" group="n20_si5z">
+    <text id="n22_si5z" name="txtCostCount" xy="402,862" pivot="0.5,0" size="43,54" group="n19_si5z" fontSize="40" color="#816e57" text="50"/>
+    <group id="n19_si5z" name="n19" xy="234,854" size="612,70" group="n34_l500"/>
+    <text id="n24_si5z" name="txtTips" xy="377,944" pivot="0.5,0" size="323,51" group="n26_si5z" fontSize="38" color="#8e7c6b" align="center" text="是否使用1个道具？"/>
+    <component id="n25_si5z" name="comCost" src="n3xha1" fileName="components/ComCostCurrency.xml" xy="474,1024" pivot="0.5,0" size="115,46" group="n26_si5z" scale="1.2,1.2" visible="false" controller="c1,1"/>
+    <text id="n36_l500" name="txtRmbCost" xy="509,1026" pivot="0.5,0" size="62,54" group="n26_si5z" fontSize="40" color="#716b59" align="center" text="999"/>
+    <group id="n26_si5z" name="n26" xy="376,944" size="326,136" group="n34_l500" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
+    <component id="n14_si5z" name="btnCancle" src="si5ztim" fileName="components/Button1.xml" xy="183,1093" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9tim"/>
     </component>
-    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,962" size="294,89" group="n20_si5z">
+    <component id="n15_si5z" name="btnConfirm" src="si5ztim" fileName="components/Button1.xml" xy="603,1093" size="294,89" group="n20_si5z">
       <Button icon="ui://eg2y0ldps5s9til"/>
     </component>
-    <group id="n20_si5z" name="n20" xy="183,962" size="714,89" group="n34_l500"/>
-    <group id="n34_l500" name="n34" xy="176,631" size="727,420" group="n33_l500" advanced="true"/>
-    <group id="n33_l500" name="n33" xy="77,124" size="901,927" advanced="true"/>
+    <group id="n20_si5z" name="n20" xy="183,1093" size="714,89" group="n34_l500"/>
+    <group id="n34_l500" name="n34" xy="176,762" size="727,420" group="n33_l500" advanced="true"/>
+    <group id="n33_l500" name="n33" xy="64,124" size="914,1058" advanced="true" layout="vt" lineGap="20" excludeInvisibles="true">
+      <relation target="n37_qdaz" sidePair="top-top"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Main/StorySkillUI.xml

@@ -13,4 +13,8 @@
     <item time="0" type="Scale" target="n7_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
     <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,225" duration="12" ease="Linear"/>
   </transition>
+  <transition name="t2">
+    <item time="0" type="Scale" target="n7_psph" value="1,1"/>
+    <item time="0" type="XY" target="n7_psph" value="540,960"/>
+  </transition>
 </component>

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

@@ -313,6 +313,19 @@ namespace GFGGame
             }
             return false;
         }
+        /// <summary>
+        /// 服装养护红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetClothingFosterRed()
+        {
+            List<int> _suitIds = SuitUtil.GetClothingFosterSuitIdList(true, true, 0);
+            for (int i = 0; i < _suitIds.Count; i++)
+            {
+                if (GetClothingFosterRed(_suitIds[i]) || GetClothingRenewRed(_suitIds[i])) return true;
+            }
+            return false;
+        }
 
         /// <summary>
         /// 服装养护红点
@@ -323,7 +336,10 @@ namespace GFGGame
         {
             int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
             List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(suitId);
-            if (index >= fosterCfgs.Count) return false;
+            if (index >= fosterCfgs.Count)
+            {
+                return false;
+            }
             if (!DressUpMenuSuitDataManager.CheckHaveSuit(suitId)) return false;
 
             SuitFosterCfg fosterCfg = fosterCfgs[index];
@@ -336,7 +352,72 @@ namespace GFGGame
             int costNeed = fosterCfg.costNum;
             return itemHas >= itemNeed && costHas >= costNeed;
         }
+        /// <summary>
+        /// 服装换新红点
+        /// </summary>
+        /// <param name="suitId"></param>
+        /// <returns></returns>
+        public bool GetClothingRenewRed(int suitId)
+        {
+            int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
+            List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(suitId);
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            SuitRenewCfg renewCfg = SuitRenewCfgArray.Instance.GetCfg(suitCfg.rarity);
+            if (index >= fosterCfgs.Count
+            && ItemDataManager.GetItemNum(renewCfg.costId) >= renewCfg.costNum
+            && ItemDataManager.GetItemNum(renewCfg.materialsArr[0][0]) >= renewCfg.materialsArr[0][1])
+            {
+                return true;
+            }
+            return false;
+        }
+        /// <summary>
+        /// 服装合成红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetClothingSyntheticRed()
+        {
+            return GetClothingSyntheticTabRed(1) || GetClothingSyntheticTabRed(2) || GetClothingSyntheticTabRed(3);
+        }
+        /// <summary>
+        /// 服装合成页签红点
+        /// </summary>
+        /// <param name="tab"></param>
+        /// <returns></returns>
+        public bool GetClothingSyntheticTabRed(int tab)
+        {
+            List<SuitCfg> suitCfgs = SuitCfgArray.Instance.GetCfgsBysyntheticType(tab);
+            for (int i = 0; i < suitCfgs.Count; i++)
+            {
+                bool isLevelPass = InstanceZonesDataManager.CheckLevelPass(suitCfgs[i].syntheticStoryLevelId);
+                if (!isLevelPass) continue;
+                if (GetClothingSyntheticRed(suitCfgs[i].id)) return true;
+            }
+            return false;
+        }
+
+        public bool GetClothingSyntheticRed(int suitId)
+        {
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            if (suitCfg == null) return false;
+            for (int i = 0; i < suitCfg.partsArr.Length; i++)
+            {
+                ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);
+                if (ItemDataManager.GetItemNum(itemCfg.syntheticCostID) < itemCfg.syntheticCostNum) continue;
 
+                bool isEnough = true;
+                for (int j = 0; j < itemCfg.syntheticMateriarsArr.Length; j++)
+                {
+                    if (ItemDataManager.GetItemNum(itemCfg.syntheticMateriarsArr[j][0]) < itemCfg.syntheticMateriarsArr[j][1])
+                    {
+                        isEnough = false;
+                        break;
+                    }
+                }
+                if (isEnough) return true;
+            }
+            return false;
+        }
         /// <summary>
         /// 商城
         /// </summary>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ItemExchangeUI.cs

@@ -8,11 +8,17 @@ namespace UI.CommonGame
     {
         public GComponent target;
         public UI_ComBg000 m_comBg;
+        public GTextField m_txtOwned;
+        public GTextField m_txtDesc;
         public GLoader m_loaRarity;
         public GLoader m_loaIcon;
         public GTextField m_txtExchangeCount;
-        public GTextField m_txtOwned;
-        public GTextField m_txtDesc;
+        public GTextField m_txtGong;
+        public GTextField m_txtShang;
+        public GTextField m_txtJue;
+        public GTextField m_txtZhi;
+        public GGroup m_grpScore;
+        public GList m_listTag;
         public GList m_listItem;
         public GTextField m_txtShow;
         public UI_Button2 m_btnMinus;
@@ -72,11 +78,17 @@ namespace UI.CommonGame
         private void Init(GComponent comp)
         {
             m_comBg = (UI_ComBg000)UI_ComBg000.Create(comp.GetChild("comBg"));
+            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtExchangeCount = (GTextField)comp.GetChild("txtExchangeCount");
-            m_txtOwned = (GTextField)comp.GetChild("txtOwned");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtGong = (GTextField)comp.GetChild("txtGong");
+            m_txtShang = (GTextField)comp.GetChild("txtShang");
+            m_txtJue = (GTextField)comp.GetChild("txtJue");
+            m_txtZhi = (GTextField)comp.GetChild("txtZhi");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
+            m_listTag = (GList)comp.GetChild("listTag");
             m_listItem = (GList)comp.GetChild("listItem");
             m_txtShow = (GTextField)comp.GetChild("txtShow");
             m_btnMinus = (UI_Button2)UI_Button2.Create(comp.GetChild("btnMinus"));
@@ -93,11 +105,17 @@ namespace UI.CommonGame
         {
             m_comBg.Dispose();
             m_comBg = null;
+            m_txtOwned = null;
+            m_txtDesc = null;
             m_loaRarity = null;
             m_loaIcon = null;
             m_txtExchangeCount = null;
-            m_txtOwned = null;
-            m_txtDesc = null;
+            m_txtGong = null;
+            m_txtShang = null;
+            m_txtJue = null;
+            m_txtZhi = null;
+            m_grpScore = null;
+            m_listTag = null;
             m_listItem = null;
             m_txtShow = null;
             m_btnMinus.Dispose();

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

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public UI_ComSkillShow m_comSkillShow;
         public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://mfvz4q8kpy009l";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StorySkillUI";
@@ -58,12 +59,14 @@ namespace UI.Main
         {
             m_comSkillShow = (UI_ComSkillShow)UI_ComSkillShow.Create(comp.GetChild("comSkillShow"));
             m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_comSkillShow.Dispose();
             m_comSkillShow = null;
             m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs

@@ -174,7 +174,7 @@ namespace GFGGame
                 }
             });
 
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingFosterRed(suitId), "", 8, -3);
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingFosterRed(suitId) || RedDotDataManager.Instance.GetClothingRenewRed(suitId), "", 8, -3);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -43,6 +43,7 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         protected override void OnShown()
         {
@@ -57,6 +58,7 @@ namespace GFGGame
             }
             // _ui.m_listMenu.GetChildAt(1).visible = false;
             UpdateSuitList();
+            UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -70,6 +72,7 @@ namespace GFGGame
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.SUIT_BOX_STATUS_CHANGED, UpdateSuitBoxStatus);
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
         }
         private void OnClickBtnBack()
         {
@@ -168,6 +171,7 @@ namespace GFGGame
                     ViewManager.Show(ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { suitId }, new object[] { ViewName.SUIT_SYNTHETIC_LIST_VIEW, suitId });
                 }
             });
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingSyntheticRed(suitId), "", 0, 0);
             UI_SuitListItem.ProxyEnd();
         }
 
@@ -206,6 +210,14 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(listItem.target, false, "", -20, 670);
             }
         }
+
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(0).asCom, RedDotDataManager.Instance.GetClothingSyntheticTabRed(1), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(1).asCom, RedDotDataManager.Instance.GetClothingSyntheticTabRed(2), "", 0, 0);
+            RedDotController.Instance.SetComRedDot(_ui.m_listMenu.GetChildAt(2).asCom, RedDotDataManager.Instance.GetClothingSyntheticTabRed(3), "", 0, 0);
+        }
+
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.CLOTHING_SYNTHETIC) <= 0)

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -191,7 +191,7 @@ namespace GFGGame
                     }
                     _ui.m_comHolder.target.visible = !NoTips;
                     _ui.m_mask.target.visible = !NoTips;
-                    _ui.m_grhMask.visible = NoTips;
+                    _ui.m_grhMask.visible = false;
                     _ui.m_compTxt.target.visible = !String.IsNullOrEmpty(txtContent);
 
 

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

@@ -109,6 +109,7 @@ namespace GFGGame
             _ui.m_comSkillShow.m_t0.Stop(true, false);
             _ui.m_comSkillShow.m_t1.Stop(true, false);
             _ui.m_t1.Stop(true, false);
+            _ui.m_t2.Play();
             EventAgent.DispatchEvent(ConstMessage.SHOW_CARD_SKILL_END);
         }
     }

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1023,6 +1023,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
+
+            RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/Store/ItemExchangeView.cs

@@ -45,6 +45,7 @@ namespace GFGGame
             _ui.m_comBg.m_btnClose.onClick.Add(Hide);
 
             _ui.m_listItem.itemRenderer = ListItemRenderer;
+            _ui.m_listTag.itemRenderer = RenderListTagItem;
         }
 
         protected override void OnShown()
@@ -89,14 +90,31 @@ namespace GFGGame
             _ui.m_txtOwned.SetVar("count", ItemDataManager.GetItemNum(_shopCfg.itemId).ToString()).FlushVars();
             _ui.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             _ui.m_loaRarity.visible = false;
+            _ui.m_listTag.visible = false;
+            _ui.m_grpScore.visible = false;
             if (ItemUtilCS.IsDressUpItem(_shopCfg.itemId))
             {
                 _ui.m_loaRarity.visible = true;
                 RarityIconController.UpdateRarityIcon(_ui.m_loaRarity, _shopCfg.itemId, false);
+                _ui.m_grpScore.visible = true;
+                _ui.m_txtGong.text = "" + itemCfg.score1;
+                _ui.m_txtShang.text = "" + itemCfg.score2;
+                _ui.m_txtJue.text = "" + itemCfg.score3;
+                _ui.m_txtZhi.text = "" + itemCfg.score4;
+                _ui.m_listTag.visible = true;
+                _ui.m_listTag.numItems = itemCfg.tagsArr.Length;
             }
             _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
             _ui.m_listItem.visible = itemCfg.itemsArr.Length > 0;
         }
+        private void RenderListTagItem(int index, GObject obj)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);
+            UI_ListTagItem item = UI_ListTagItem.Proxy(obj);
+            ItemUtil.UpdateTag(item.m_comTag.target, itemCfg.tagsArr[index][0]);
+            item.m_txtTagScore.text = itemCfg.tagsArr[index][1].ToString();
+            UI_ListTagItem.ProxyEnd();
+        }
         private void ListItemRenderer(int index, GObject obj)
         {
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(_shopCfg.itemId);

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -35,7 +35,11 @@ namespace GFGGame
             _ui.m_component.m_btnClothingUpgrade.target.onClick.Add(OnClickBtnClothingUpgrade);
             _ui.m_component.m_btnDecompose.target.onClick.Add(OnClickBtnDecompose);
         }
-
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -54,6 +58,7 @@ namespace GFGGame
                 _ui.m_component.target.scrollPane.SetPosX(400, false);
             }
 
+            UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -62,7 +67,11 @@ namespace GFGGame
             base.OnHide();
             Timers.inst.Remove(CheckGuide);
         }
-
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
         private void OnClickBtnBack()
         {
             this.Hide();
@@ -111,6 +120,12 @@ namespace GFGGame
             }
         }
 
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_component.m_btnClothingUpgrade.target, RedDotDataManager.Instance.GetClothingFosterRed(), "", 0, 200);
+            RedDotController.Instance.SetComRedDot(_ui.m_component.m_btnSuitSynthetic.target, RedDotDataManager.Instance.GetClothingSyntheticRed(), "", 0, 200);
+        }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;