zhaoyang %!s(int64=2) %!d(string=hai) anos
pai
achega
ea6aba6e00

+ 1 - 1
FGUIProject/assets/Card/CardSkillUI.xml

@@ -18,7 +18,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n15_rhha" name="comConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="337,856" size="289,42" group="n17_mza1"/>
+    <component id="n15_rhha" name="comConsume" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="336,856" pivot="0.5,0" size="289,42" group="n17_mza1" controller="c1,1"/>
     <component id="n16_rhha" name="btnUpLv" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="374,920" group="n17_mza1">
       <Button title="升级"/>
     </component>

+ 6 - 6
FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,7 +2,7 @@
 <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="0"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
   <controller name="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <image id="n70_lc71" name="n70" src="qkjsbm" fileName="imagesNew/dikuang_back.png" xy="0,-212" size="1080,1039" group="n115_o9gh"/>
@@ -12,7 +12,7 @@
     <text id="n102_qkjs" name="txtName1" xy="199,156" pivot="0.5,0" anchor="true" size="10,62" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#915e15" autoClearText="true" text=""/>
     <text id="n103_qkjs" name="txtName2" xy="195,210" pivot="0.5,0" anchor="true" size="44,54" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#915e15" autoClearText="true" text="婵"/>
     <text id="n104_qkjs" name="txtName3" xy="237,207" pivot="0.5,0" anchor="true" size="50,61" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#915e15" autoClearText="true" text="娟"/>
-    <text id="n105_qkjs" name="txtName4" xy="256,201" size="58,72" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="54" color="#915e15" autoClearText="true" text="娟"/>
+    <text id="n105_qkjs" name="txtName4" xy="256,201" size="58,71" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="54" color="#915e15" autoClearText="true" text="娟"/>
     <image id="n107_qkjs" name="n107" src="qkjsbc" fileName="imagesNew/card_DividingLine_name.png" xy="119,212" size="56,66" group="n106_qkjs"/>
     <group id="n106_qkjs" name="grpName" xy="106,129" size="208,149" group="n115_o9gh"/>
     <component id="n36_842s" name="barLv" src="842s6q" fileName="components/ProgressBar1.xml" xy="84,684" size="912,32" group="n38_842s">
@@ -59,7 +59,7 @@
     <component id="n52_l2by" name="btnUpStar" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n79_v461">
       <Button title="升星" icon="ui://7l6lvkayqkjsb2"/>
     </component>
-    <component id="n51_l2by" name="comStarCousumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="754,278" size="289,46" group="n79_v461"/>
+    <component id="n51_l2by" name="comStarCousumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="754,278" size="289,46" group="n79_v461" controller="c1,1"/>
     <text id="n108_qkjs" name="txtTips" xy="796,279" pivot="0.5,0" size="205,46" group="n79_v461" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" vAlign="middle" ubb="true" autoClearText="true" text="需要达到15级"/>
     <list id="n47_wr9a" name="listStarConsume" xy="624,511" pivot="0.5,0" size="427,182" group="n79_v461" scale="0.8,0.8" layout="row" colGap="60" defaultItem="ui://7l6lvkaywr9a82" align="center">
       <item/>
@@ -80,7 +80,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n55_l2by" name="grpStar" xy="99,6" size="981,714" group="n115_o9gh" advanced="true">
+    <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">
@@ -103,11 +103,11 @@
       <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">
-      <Button checked="true" controller="ctrlTab" page="0"/>
+      <Button controller="ctrlTab" page="0"/>
       <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 controller="ctrlTab" page="1"/>
+      <Button checked="true" 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">

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -598,13 +598,13 @@ namespace GFGGame
                 }
                 _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级,1:材料不足
 
-                ItemUtil.UpdateItemNumAndNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
+                ItemUtil.UpdateItemNeedNum(_comFosterBottom.m_comStarCousumeGold, cardStarCfg.costID, cardStarCfg.costNum);
 
                 _comFosterBottom.m_listStarConsume.data = cardStarCfg;
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
                 _comFosterBottom.m_txtTips.text = _cardData.lv < cardStarCfg.needLv ? string.Format("需等级达到{0}级", cardStarCfg.needLv) : "";
                 _comFosterBottom.m_btnUpStar.grayed = int.Parse(_comFosterBottom.m_btnUpStar.data.ToString()) == 1 ? true : false;
-                _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
+                // _comFosterBottom.m_btnUpStar.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpStar.grayed;
 
             }
         }

BIN=BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes