浏览代码

服装养护红点、ui优化

zhaoyang 2 年之前
父节点
当前提交
43e74f4453

+ 11 - 11
FGUIProject/assets/ClothingFoster/ClothingFosterFinishUI.xml

@@ -5,23 +5,23 @@
       <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="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
+    <text id="n7_l4ui" name="n7" xy="430,1822" size="217,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="155,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="355,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="555,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="755,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <group id="n20_l4ui" name="grpProperty" xy="155,592" size="770,58" visible="false" advanced="true"/>
-    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,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="355,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="555,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="755,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <group id="n21_l4ui" name="grpAddProperty" xy="155,851" size="770,58" visible="false" advanced="true"/>
+    <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"/>
   </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"/>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Data/RedDotDataManager.cs

@@ -277,8 +277,11 @@ namespace GFGGame
             int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
             List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(suitId);
             if (index >= fosterCfgs.Count) return false;
+            if (!DressUpMenuSuitDataManager.CheckHaveSuit(suitId)) return false;
+
             SuitFosterCfg fosterCfg = fosterCfgs[index];
             if (fosterCfg.materialsArr.Length == 0) return false;
+
             int itemHas = ItemDataManager.GetItemNum(fosterCfg.materialsArr[0][0]);
             int itemNeed = fosterCfg.materialsArr[0][1];
 

二进制
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes