卡牌替换资源

FGUIProject/assets/Card/CardDetailUI.xml

@@ -4,40 +4,37 @@
     <loader id="n10_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <image id="n6_pq5x" name="n6" src="pq5x5z" fileName="images/kp_bejing_di.png" pkg="eg2y0ldp" xy="28,334" size="1024,1586">
-      <relation target="" sidePair="width-width,height-height,center-center"/>
-    </image>
-    <image id="n7_pq5x" name="n7" src="pq5x62" fileName="images/kp_xian_di.png" xy="30,269" size="1020,2">
+    <image id="n7_pq5x" name="n7" src="qkjsbu" fileName="imagesNew/TAB_DividingLine.png" xy="54,300">
       <relation target="" sidePair="center-center,top-top"/>
     </image>
-    <component id="n1_ojlz" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_ojlz" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <relation target="" sidePair="left-left,top-top"/>
       <Button icon="ui://7l6lvkayysx99y"/>
     </component>
-    <component id="n5_ojlz" name="btnFilter" src="ojlzd" fileName="components/btnFilter.xml" xy="854,96">
+    <component id="n5_ojlz" name="btnFilter" src="ojlzd" fileName="components/btnFilter.xml" xy="854,108">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <list id="n3_ojlz" name="listRole" xy="41,207" size="997,66" layout="row" overflow="scroll" scroll="horizontal">
+    <list id="n3_ojlz" name="listRole" xy="41,211" size="997,66" layout="row" overflow="scroll" scroll="horizontal">
       <relation target="" sidePair="center-center,top-top"/>
-      <item url="ui://7l6lvkayojlz6">
+      <item url="ui://eg2y0ldpojlz6">
         <property target="title" propertyId="0" value="全部"/>
       </item>
-      <item url="ui://7l6lvkayojlz6">
+      <item url="ui://eg2y0ldpojlz6">
         <property target="title" propertyId="0" value="风"/>
       </item>
-      <item url="ui://7l6lvkayojlz6">
+      <item url="ui://eg2y0ldpojlz6">
         <property target="title" propertyId="0" value="花"/>
       </item>
-      <item url="ui://7l6lvkayojlz6">
+      <item url="ui://eg2y0ldpojlz6">
         <property target="title" propertyId="0" value="雪"/>
       </item>
-      <item url="ui://7l6lvkayojlz6">
+      <item url="ui://eg2y0ldpojlz6">
         <property target="title" propertyId="0" value="月"/>
       </item>
     </list>
     <list id="n4_ojlz" name="listCard" xy="32,342" size="1015,1554" layout="flow_hz" overflow="scroll" lineGap="63" colGap="20" defaultItem="ui://7l6lvkayojlzi" autoClearItems="true">
       <relation target="" sidePair="bottomext-bottom"/>
     </list>
-    <text id="n8_wr9a" name="txtTips" xy="398,933" size="284,54" fontSize="40" color="#736b64" text="无满足条件卡牌"/>
+    <text id="n8_wr9a" name="txtTips" xy="398,933" size="284,54" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#716660" text="无满足条件卡牌"/>
   </displayList>
 </component>

FGUIProject/assets/Card/CardFosterUI.xml

@@ -5,7 +5,7 @@
     <loader id="n80_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n77_qgxy" name="comImgCard" src="qgxy9r" fileName="ComImgCard.xml" xy="540,0" pivot="0.5,0" anchor="true">
+    <component id="n77_qgxy" name="comImgCard" src="qgxy9r" fileName="components/ComImgCard.xml" xy="540,0" pivot="0.5,0" anchor="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
@@ -20,7 +20,7 @@
       <gearDisplay controller="c1" pages="0"/>
     </loader>
     <component id="n71_lc71" name="ComFosterTop" src="j4c69e" fileName="components/ComFosterTop.xml" xy="0,0"/>
-    <component id="n70_lc71" name="ComFosterBottom" src="j4c69d" fileName="components/ComFosterBottom.xml" xy="0,211">
+    <component id="n70_lc71" name="ComFosterBottom" src="j4c69d" fileName="components/ComFosterBottom.xml" xy="0,1089">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
     <loader id="n81_nasr" name="loaGuide" xy="0,0" size="1080,1920">
@@ -28,13 +28,13 @@
     </loader>
   </displayList>
   <transition name="t0">
-    <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="5" label2="scale" ease="Linear"/>
-    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,211" endValue="0,1920" duration="18" ease="Linear"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-475" duration="12" ease="Linear"/>
+    <item time="0" type="Scale" target="n73_sxk4" label="normal" tween="true" startValue="0.8,0.8" endValue="1,1" duration="6" label2="scale" ease="Linear"/>
+    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1089" endValue="0,1920" duration="12" ease="Cubic.In"/>
+    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-634" duration="12" ease="Cubic.In"/>
   </transition>
   <transition name="t1">
     <item time="0" type="Scale" target="n73_sxk4" label="scale" tween="true" startValue="1,1" endValue="0.8,0.8" duration="6" label2="normal" ease="Linear"/>
-    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1350" endValue="0,211" duration="6" ease="Linear"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,-475" endValue="0,0" duration="6" ease="Linear"/>
+    <item time="0" type="XY" target="n70_lc71" tween="true" startValue="0,1920" endValue="0,1089" duration="12" ease="Cubic.Out"/>
+    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,-634" endValue="0,0" duration="12" ease="Cubic.Out"/>
   </transition>
 </component>

FGUIProject/assets/Card/CardSkillUI.xml

@@ -9,8 +9,8 @@
     <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="ComSkillDiscribe.xml" xy="63,295"/>
-    <component id="n10_rhha" name="comNextLv" src="rhha9q" fileName="ComSkillDiscribe.xml" xy="64,423" group="n17_mza1"/>
+    <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"/>
     <image id="n12_rhha" name="n12" src="pq5x6d" fileName="images/kp_bz_1.png" pkg="eg2y0ldp" xy="74,596" group="n17_mza1"/>
     <text id="n13_rhha" name="n13" xy="112,578" size="148,49" group="n17_mza1" fontSize="36" color="#876e54" text="升级消耗"/>
     <list id="n14_rhha" name="listConsume" xy="39,658" pivot="0.5,0" size="884,191" group="n17_mza1" aspect="true" layout="row" overflow="hidden" colGap="160" defaultItem="ui://7l6lvkaywr9a82" align="center" vAlign="middle">
@@ -19,10 +19,10 @@
       <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="n16_rhha" name="btnUpLv" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="347,920" size="270,74" group="n17_mza1">
+    <component id="n16_rhha" name="btnUpLv" src="rv091e" fileName="components/BtnSmall.xml" pkg="mk0fwx0x" xy="374,920" group="n17_mza1">
       <Button title="升级"/>
     </component>
-    <group id="n17_mza1" name="n17" xy="39,423" size="884,571" advanced="true">
+    <group id="n17_mza1" name="n17" xy="39,423" size="884,548" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
     </group>
     <text id="n18_mza1" name="n18" xy="326,596" size="284,54" fontSize="40" color="#736b64" text="当前技能已满级">

FGUIProject/assets/Card/components/Button1.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="97,101" extention="Button">
+<component size="90,88" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_f2bf" name="n3" src="f2bfa5" fileName="images/cpjl_rkrkan.png" xy="0,0"/>
+    <loader id="n4_qkjs" name="icon" xy="0,0" size="90,88" url="ui://7l6lvkayqkjsb8" autoSize="true"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/Card/components/ComConsume.xml

@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="170,175">
+<component size="180,180">
   <displayList>
-    <loader id="n35_842s" name="loaBg" xy="5,15" size="160,160" url="ui://7l6lvkay842s6g" fill="scaleFree"/>
-    <loader id="n36_842s" name="loaItem" xy="29,41" size="112,112" touchable="false" url="ui://eg2y0ldppq5x62" fill="scaleFree">
+    <loader id="n35_842s" name="loaBg" xy="0,0" size="180,180" url="ui://7l6lvkayqkjsbs" fill="scaleFree" autoSize="true"/>
+    <image id="n41_qkjs" name="n41" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="13,15"/>
+    <loader id="n36_842s" name="loaItem" xy="37,38" size="106,109" touchable="false" url="ui://eg2y0ldppq5x62" fill="scaleFree">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="32,5"/>
-    <component id="n34_842s" name="btnMinus" src="vek88j" fileName="components/btnMinus.xml" pkg="eg2y0ldp" xy="115,-3"/>
-    <text id="n39_a713" name="txtUseCount" xy="85,4" pivot="0.5,0" anchor="true" size="82,34" fontSize="24" color="#fff8ea" align="center" autoSize="none" text="1222"/>
-    <image id="n37_a713" name="n37" src="a7137b" fileName="images/kp_dikuang_7.png" xy="15,145"/>
-    <text id="n38_a713" name="txtNum" xy="53,150" pivot="0.5,0" size="64,34" fontSize="24" color="#fff8ea" text="6666"/>
+    <image id="n33_842s" name="n33" src="qkjsbr" fileName="imagesNew/dikuang_number_item.png" xy="34,0"/>
+    <component id="n34_842s" name="btnMinus" src="vek88j" fileName="components/btnMinus.xml" xy="117,-4"/>
+    <text id="n39_a713" name="txtUseCount" xy="85,-2" pivot="0.5,0" anchor="true" size="82,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#6f4224" align="center" autoSize="none" text="1222"/>
+    <image id="n37_a713" name="n37" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="84,134" size="66,30">
+      <relation target="n46_qkjs" sidePair="width-width,center-center,middle-middle"/>
+    </image>
+    <text id="n45_qkjs" name="n45" xy="93,134" pivot="0.5,0" size="18,32" group="n46_qkjs" font="ui://eg2y0ldpa0cftl0" fontSize="22" color="#716660" text="X"/>
+    <text id="n38_a713" name="txtNum" xy="109,125" pivot="0.5,0" size="35,44" group="n46_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" text="66"/>
+    <group id="n46_qkjs" name="n46" xy="93,125" size="51,44" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -1,119 +1,126 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1709" overflow="hidden" opaque="false">
+<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="ctrlSkillCount" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <image id="n70_lc71" name="n70" src="842s6e" fileName="images/kp_bj_2.png" xy="0,209"/>
-    <component id="n67_lc71" name="btnStory" src="ojlzl" fileName="components/btnStory.xml" xy="791,621"/>
-    <text id="n27_842s" name="txtName" xy="540,902" pivot="0.5,0" anchor="true" size="244,79" group="n30_842s" fontSize="60" color="#fdfbf3" autoClearText="true" text="许墨萌牙"/>
-    <image id="n28_842s" name="n28" src="842s6j" fileName="images/kp_xiantiao.png" xy="731,948" size="341,10" group="n30_842s"/>
-    <image id="n29_842s" name="n29" src="842s6j" fileName="images/kp_xiantiao.png" xy="13,948" size="341,10" group="n30_842s" flip="hz"/>
-    <group id="n30_842s" name="grpName" xy="13,902" size="1059,79"/>
-    <loader id="n73_lc1j" name="n73" xy="30,1008" size="1020,673" url="ui://7l6lvkay842s6h" fill="scaleFree"/>
-    <component id="n17_ojlz" name="btnLv" src="ojlzr" fileName="components/btnTab.xml" xy="136,1044" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="0"/>
-      <property target="title" propertyId="0" value="升级"/>
-    </component>
-    <component id="n18_ojlz" name="btnStar" src="ojlzr" fileName="components/btnTab.xml" xy="422,1044" group="n22_842s">
-      <Button controller="ctrlTab" page="1"/>
-      <property target="title" propertyId="0" value="升星"/>
-    </component>
-    <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/btnTab.xml" xy="708,1044" group="n22_842s">
-      <Button controller="ctrlTab" page="2"/>
-      <property target="title" propertyId="0" value="技能"/>
-    </component>
-    <group id="n22_842s" name="grpTab" xy="136,1044" size="808,66" advanced="true" layout="hz" colGap="50" excludeInvisibles="true"/>
-    <list id="n4_ojlz" name="listProperty" xy="169,1120" size="819,68" layout="row" colGap="10" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
-      <gearDisplay controller="ctrlTab" pages="0,1"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <component id="n36_842s" name="barLv" src="842s6q" fileName="components/ProgressBar1.xml" xy="251,1254" group="n38_842s">
+    <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"/>
+    <loader id="n101_qkjs" name="loaScore" xy="55,143" size="44,94" group="n115_o9gh" url="ui://eg2y0ldpo9ghtll" autoSize="true"/>
+    <text id="n27_842s" name="txtName0" xy="143,129" pivot="0.5,0" anchor="true" size="74,91" group="n106_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="70" color="#915e15" autoClearText="true" text="斗"/>
+    <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="娟"/>
+    <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">
       <ProgressBar value="100" max="100"/>
     </component>
-    <text id="n46_wr9a" name="n46" xy="358,1413" size="364,54" group="n38_842s" fontSize="40" color="#736b64" text="当前等级已达到上限">
+    <text id="n46_wr9a" name="n46" xy="358,530" size="364,54" group="n38_842s" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#716660" text="当前等级已达到上限">
       <gearDisplay controller="ctrlFullLv" pages="1"/>
     </text>
-    <text id="n37_842s" name="txtCurLv" xy="117,1240" pivot="1,0" size="72,44" group="n38_842s" fontSize="32" color="#7d6956" align="right" ubb="true" autoSize="none" text="100">
-      <relation target="n41_wr9a" sidePair="right-left,top-top"/>
-    </text>
-    <text id="n41_wr9a" name="n41" xy="191,1239" pivot="0.5,0" anchor="true" size="13,44" group="n38_842s" fontSize="32" color="#7d6956" text="/"/>
-    <text id="n42_wr9a" name="txtMaxLv" xy="195,1239" size="57,44" group="n38_842s" fontSize="32" color="#7d6956" text="500">
-      <relation target="n41_wr9a" sidePair="left-right,top-top"/>
-    </text>
-    <text id="n39_a713" name="txtCurExp" xy="916,1224" pivot="1,0" size="31,34" group="n58_l2by" fontSize="24" color="#7d6956" text="30">
-      <relation target="n44_wr9a" sidePair="right-left,top-top"/>
-    </text>
-    <text id="n44_wr9a" name="n44" xy="950,1224" pivot="0.5,0" anchor="true" size="11,34" group="n58_l2by" fontSize="24" color="#7d6956" text="/">
-      <relation target="" sidePair="right-right"/>
-    </text>
-    <text id="n45_wr9a" name="txtMaxExp" xy="953,1224" size="57,34" group="n58_l2by" fontSize="24" color="#94897e" text="5000">
-      <relation target="n44_wr9a" sidePair="left-right,top-top"/>
-    </text>
-    <list id="n13_ojlz" name="listLvConsume" xy="127,1307" size="876,196" group="n58_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkay842s6n">
+    <text id="n37_842s" name="txtCurLv" xy="93,634" size="62,54" group="n96_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#fff3bd" ubb="true" strokeColor="#e5aa68" strokeSize="2" text="100"/>
+    <text id="n41_wr9a" name="n41" xy="150,642" size="18,44" group="n96_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" text="/"/>
+    <text id="n42_wr9a" name="txtMaxLv" xy="163,642" size="50,44" group="n96_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" text="500"/>
+    <group id="n96_qkjs" name="n96" xy="93,634" size="120,54" group="n38_842s" advanced="true" layout="hz" colGap="-5" excludeInvisibles="true"/>
+    <image id="n98_qkjs" name="n98" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="287,531" size="190,40" group="n58_l2by"/>
+    <image id="n99_qkjs" name="n99" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="637,531" size="190,40" group="n58_l2by"/>
+    <list id="n13_ojlz" name="listLvConsume" xy="124,454" size="876,187" group="n58_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkay842s6n">
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n14_ojlz" name="ComLvConsumeGold" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="415,1506" size="235,46" group="n58_l2by"/>
-    <component id="n24_842s" name="btnAll" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="237,1573" size="270,74" group="n58_l2by">
+    <component id="n24_842s" name="btnAll" src="842s6q" fileName="components/BtnNormal1.xml" pkg="eg2y0ldp" xy="566,146" size="126,132" group="n58_l2by">
+      <Button title="自动选择"/>
+    </component>
+    <component id="n100_qkjs" name="btnClearAll" src="842s6q" fileName="components/BtnNormal1.xml" pkg="eg2y0ldp" xy="410,146" size="126,132" group="n58_l2by">
       <Button title="自动选择"/>
+      <property target="title0" propertyId="0" value="取消"/>
+      <property target="title1" propertyId="0" value="选择"/>
     </component>
-    <component id="n25_842s" name="btnUpLv" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="597,1573" size="270,74" group="n58_l2by">
-      <Button title="升级"/>
+    <component id="n25_842s" name="btnUpLv" src="qkjstlg" fileName="components/BtnNormal0.xml" pkg="eg2y0ldp" xy="706,6" size="374,342" group="n58_l2by">
+      <Button title="升级" icon="ui://7l6lvkayqkjsb4"/>
     </component>
-    <group id="n58_l2by" name="n58" xy="127,1224" size="883,423" group="n38_842s" advanced="true">
+    <component id="n14_ojlz" name="ComLvConsumeGold" src="qkjstlh" fileName="components/ComCost.xml" pkg="eg2y0ldp" xy="780,278" size="235,46" group="n58_l2by"/>
+    <text id="n39_a713" name="txtCurExp" xy="854,646" pivot="1,0" size="31,39" group="n95_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#716660" align="right" text="30"/>
+    <text id="n44_wr9a" name="n44" xy="900,646" pivot="1,0" anchor="true" size="17,39" group="n95_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#716660" text="/"/>
+    <text id="n45_wr9a" name="txtMaxExp" xy="898,646" pivot="1,0" size="85,39" group="n95_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#716660" align="right" text="500000"/>
+    <group id="n95_qkjs" name="n95" xy="854,646" size="129,39" group="n58_l2by" advanced="true" layout="hz" colGap="-2" excludeInvisibles="true">
+      <relation target="" sidePair="right-right"/>
+    </group>
+    <group id="n58_l2by" name="n58" xy="124,6" size="956,679" group="n38_842s" advanced="true">
       <gearDisplay controller="ctrlFullLv" pages="0"/>
     </group>
-    <group id="n38_842s" name="grpLv" xy="117,1224" size="902,423" advanced="true">
+    <group id="n38_842s" name="grpLv" xy="84,6" size="996,710" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="0"/>
     </group>
-    <component id="n88_v461" name="comStarItem0" src="v461ad" fileName="components/ComStarItem.xml" xy="71,1224" group="n92_v461"/>
-    <component id="n89_v461" name="comStarItem1" src="v461ad" fileName="components/ComStarItem.xml" xy="225,1224" group="n92_v461"/>
-    <component id="n90_v461" name="comStarItem2" src="v461ad" fileName="components/ComStarItem.xml" xy="379,1224" group="n92_v461"/>
-    <component id="n91_v461" name="comStarItem3" src="v461ad" fileName="components/ComStarItem.xml" xy="533,1224" group="n92_v461"/>
-    <group id="n92_v461" name="n92" xy="71,1224" size="596,416" group="n55_l2by" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
-      <gearDisplay controller="ctrlFullStar" pages="0"/>
-    </group>
-    <text id="n82_v461" name="n82" xy="710,1217" size="152,42" group="n85_v461" fontSize="30" color="#ffebc1" text="当前星级："/>
-    <text id="n83_v461" name="txtCurStar" xy="863,1218" size="20,42" group="n85_v461" fontSize="30" color="#c5645a" text="0"/>
-    <text id="n84_v461" name="txtAllStar" xy="887,1218" size="45,42" group="n85_v461" fontSize="30" color="#ffebc1" vars="true" text="/{value=20}"/>
-    <image id="n81_v461" name="n81" src="wr9a7z" fileName="images/kp_xingx.png" xy="952,1210" group="n85_v461"/>
-    <group id="n85_v461" name="n85" xy="710,1210" size="304,56" group="n93_v461" advanced="true"/>
-    <list id="n47_wr9a" name="listStarConsume" xy="672,1288" pivot="0.5,0" size="378,196" group="n57_l2by" scale="0.8,0.8" layout="row" colGap="40" defaultItem="ui://7l6lvkaywr9a82" align="center">
+    <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"/>
+    <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/>
       <item/>
     </list>
-    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComCostCurrencyWithHas.xml" pkg="eg2y0ldp" xy="717,1478" size="289,42" group="n79_v461"/>
-    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="727,1533" size="270,74" group="n79_v461">
-      <Button title="升星"/>
-    </component>
-    <component id="n56_l2by" name="comTips" src="l2by86" fileName="components/ComTips.xml" pkg="eg2y0ldp" xy="826,1504" group="n79_v461"/>
-    <group id="n79_v461" name="n79" xy="717,1478" size="289,129" group="n57_l2by"/>
-    <group id="n57_l2by" name="n57" xy="672,1288" size="378,319" group="n93_v461"/>
-    <group id="n93_v461" name="n93" xy="672,1210" size="378,397" group="n55_l2by" advanced="true">
+    <group id="n79_v461" name="n79" xy="624,6" size="455,687" group="n55_l2by" advanced="true">
       <gearDisplay controller="ctrlFullStar" pages="0"/>
     </group>
-    <text id="n59_l2by" name="n59" xy="540,1325" pivot="0.5,0" anchor="true" size="324,54" group="n55_l2by" fontSize="40" color="#736b64" text="已提升至最高等级">
-      <gearDisplay controller="ctrlFullStar" pages="1"/>
-    </text>
-    <list id="n64_l2by" name="listShowCard" xy="11,1382" size="1056,274" group="n55_l2by" layout="row" colGap="100" defaultItem="ui://7l6lvkayl2by89" align="center">
+    <component id="n88_v461" name="comStarItem0" src="v461ad" fileName="components/ComStarItem.xml" xy="99,482" size="116,192" group="n92_v461"/>
+    <component id="n89_v461" name="comStarItem1" src="v461ad" fileName="components/ComStarItem.xml" xy="235,482" size="116,192" group="n92_v461" controller="c1,4"/>
+    <component id="n90_v461" name="comStarItem2" src="v461ad" fileName="components/ComStarItem.xml" xy="371,482" size="116,192" group="n92_v461"/>
+    <component id="n91_v461" name="comStarItem3" src="v461ad" fileName="components/ComStarItem.xml" xy="507,482" size="116,192" group="n92_v461" controller="c1,5"/>
+    <group id="n92_v461" name="n92" xy="99,482" size="524,192" group="n55_l2by" advanced="true" layout="hz" colGap="20" excludeInvisibles="true">
+      <relation target="" sidePair="middle-middle"/>
+    </group>
+    <list id="n64_l2by" name="listShowCard" xy="612,494" pivot="0.5,0" size="446,226" group="n55_l2by" scale="0.8,0.8" layout="row" colGap="20" defaultItem="ui://7l6lvkayl2by89" align="center">
       <gearDisplay controller="ctrlFullStar" pages="1"/>
       <item/>
       <item/>
-      <item/>
     </list>
-    <group id="n55_l2by" name="grpStar" xy="11,1210" size="1056,446" advanced="true">
+    <group id="n55_l2by" name="grpStar" xy="99,6" size="981,714" group="n115_o9gh" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="76,1140" size="928,505" lineGap="25" defaultItem="ui://7l6lvkayrhha9k">
+    <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">
+      <item/>
+      <item/>
+    </list>
+    <image id="n110_o9gh" name="n110" src="qkjsau" fileName="imagesNew/lIne_ItemConect.png" xy="555,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">
+      <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">
+      <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">
       <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"/>
+      <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"/>
+      <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"/>
+      <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"/>
+    <list id="n4_ojlz" name="listProperty" xy="66,733" size="948,54" group="n115_o9gh" layout="row" colGap="40" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
+      <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <group id="n115_o9gh" name="n115" xy="0,-212" size="1080,1039"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComFosterTop.xml

@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,460">
+<component size="1080,627" opaque="false">
   <displayList>
-    <image id="n71_lc71" name="n71" src="842s6d" fileName="images/kp_bj_1.png" xy="0,0"/>
-    <component id="n69_lc71" name="btnback" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <image id="n71_lc71" name="n71" src="qkjsb6" fileName="imagesNew/back_jiguang.png" xy="0,0"/>
+    <component id="n69_lc71" name="btnback" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n68_lc71" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
-    <component id="n72_xtmo" name="btnStarReward" src="xtmoa1" fileName="components/Button1.xml" xy="35,353" aspect="true"/>
+    <component id="n74_qkjs" name="btnStory" src="xtmoa1" fileName="components/Button1.xml" xy="40,245" group="n75_o9gh" aspect="true">
+      <Button icon="ui://7l6lvkayqkjsba"/>
+    </component>
+    <component id="n73_qkjs" name="btnLook" src="xtmoa1" fileName="components/Button1.xml" xy="40,363" group="n75_o9gh" aspect="true">
+      <Button icon="ui://7l6lvkayqkjsb9"/>
+    </component>
+    <component id="n72_xtmo" name="btnStarReward" src="xtmoa1" fileName="components/Button1.xml" xy="40,481" group="n75_o9gh" aspect="true">
+      <Button icon="ui://7l6lvkayqkjsb8"/>
+    </component>
+    <group id="n75_o9gh" name="n75" xy="40,245" size="90,324" advanced="true" layout="vt" lineGap="30" excludeInvisibles="true"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComStarCard.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="274,274" pivot="0.5,0.5" anchor="true" mask="n60_l2by">
+<component size="180,180" pivot="0.5,0.5" anchor="true" mask="n64_qkjs">
   <displayList>
-    <image id="n60_l2by" name="n60" src="wr9a7x" fileName="images/kp_kpkuang_1.png" xy="0,0" pivot="0.5,0.5" size="274,274"/>
-    <loader id="n62_l2by" name="loaStarCard" xy="137,0" pivot="0.5,0" anchor="true" size="274,1246" url="ui://7l6lvkayojlz2" fill="scaleMatchWidth"/>
+    <loader id="n62_l2by" name="loaStarCard" xy="90,0" pivot="0.5,0" anchor="true" size="274,1246" url="ui://eg2y0ldpqkjstlc" fill="scaleMatchWidth"/>
+    <graph id="n64_qkjs" name="n64" xy="0,0" size="180,180" type="eclipse" lineSize="0"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComStarConsume.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="170,175">
+<component size="180,180">
   <displayList>
-    <loader id="n35_842s" name="n35" xy="5,8" size="160,160" url="ui://7l6lvkay842s6g" fill="scaleFree"/>
+    <loader id="n35_842s" name="n35" xy="0,0" size="180,180" url="ui://7l6lvkayqkjsbs" fill="scaleFree"/>
+    <image id="n43_qkjs" name="n43" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="13,15"/>
     <loader id="n36_842s" name="loaItem" xy="34,37" size="104,104" url="ui://eg2y0ldppq5x62" fill="scaleFree"/>
-    <image id="n33_842s" name="n33" src="842s6f" fileName="images/kp_dikuang_4.png" xy="20,139" size="135,30"/>
-    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" pkg="eg2y0ldp" xy="124,129"/>
-    <text id="n39_a713" name="txtHasCount" xy="46,137" size="32,34" group="n42_94m1" fontSize="24" color="#fdf3d7" ubb="true" text="12"/>
-    <text id="n41_wr9a" name="n41" xy="76,137" size="16,34" group="n42_94m1" fontSize="24" color="#fff8ea" text="/"/>
-    <text id="n38_a713" name="txtNeedCount" xy="90,137" size="32,34" group="n42_94m1" fontSize="24" color="#fdf3d7" ubb="true" text="66"/>
-    <group id="n42_94m1" name="n42" xy="46,137" size="78,34" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
+    <image id="n33_842s" name="n33" src="qkjsb5" fileName="imagesNew/dikuang_SkillLevel.png" xy="24,139" size="131,30"/>
+    <component id="n34_842s" name="btnPlus" src="wr9a83" fileName="components/btnPlus.xml" xy="124,131"/>
+    <text id="n39_a713" name="txtHasCount" xy="50,130" size="35,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="12"/>
+    <text id="n41_wr9a" name="n41" xy="81,130" size="18,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" text="/"/>
+    <text id="n38_a713" name="txtNeedCount" xy="95,130" size="35,44" group="n42_94m1" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" ubb="true" text="66"/>
+    <group id="n42_94m1" name="n42" xy="50,130" size="80,44" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

FGUIProject/assets/Card/components/ComStarItem.xml

@@ -1,32 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="134,416">
-  <controller name="c1" pages="0,,1,,2,,3,,4,,5," selected="0"/>
+<component size="116,192">
+  <controller name="c1" exported="true" pages="4,,5," selected="0">
+    <remark page="0" value="可见"/>
+    <remark page="1" value="不可见"/>
+  </controller>
   <displayList>
-    <image id="n86_v461" name="n86" src="v461a8" fileName="images/kpkp_cipziddi.png" xy="0,-22" size="134,530">
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <text id="n93_v461" name="txtContent" xy="42,5" size="51,401" fontSize="47" color="#9a7957" leading="0" autoSize="height" text="春眠不觉晓春眠"/>
-    <image id="n91_v461" name="n91" src="v461a7" fileName="images/kpkp_cipziz_5.png" xy="29,0" size="76,416" group="n92_v461">
-      <gearDisplay controller="c1" pages="0"/>
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n87_v461" name="n87" src="v461a9" fileName="images/kpkp_cipziz_1.png" xy="29,24" size="76,392" group="n92_v461">
-      <gearDisplay controller="c1" pages="1"/>
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n88_v461" name="n88" src="v461aa" fileName="images/kpkp_cipziz_2.png" xy="29,24" size="76,392" group="n92_v461">
-      <gearDisplay controller="c1" pages="2"/>
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n89_v461" name="n89" src="v461ab" fileName="images/kpkp_cipziz_3.png" xy="29,24" size="76,392" group="n92_v461">
-      <gearDisplay controller="c1" pages="3"/>
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n90_v461" name="n90" src="v461ac" fileName="images/kpkp_cipziz_4.png" xy="29,28" size="76,388" group="n92_v461">
+    <text id="n93_v461" name="txtContent" xy="35,0" pivot="0,0.5" size="45,192" font="ui://eg2y0ldpa0cftks" fontSize="36" color="#716660" align="center" vAlign="middle" leading="-8" ubb="true" autoSize="height" text="春眠不觉晓">
+      <relation target="" sidePair="middle-middle"/>
+    </text>
+    <graph id="n97_qkjs" name="n97" xy="114,0" size="2,192" type="rect" lineSize="0" fillColor="#ff716660">
       <gearDisplay controller="c1" pages="4"/>
       <relation target="" sidePair="height-height"/>
-    </image>
-    <group id="n92_v461" name="n92" xy="29,0" size="76,416"/>
+    </graph>
   </displayList>
   <relation target="n93_v461" sidePair="height-height"/>
 </component>

FGUIProject/assets/Card/components/ListCardItem.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="238,477">
+<component size="238,487">
   <displayList>
     <component id="n6_ojlz" name="comCard" src="jzrr8n" fileName="components/ComCardMask.xml" xy="0,0"/>
+    <image id="n27_qkjs" name="n27" src="qkjsav" fileName="imagesNew/name_underprint_card.png" xy="30,445" size="178,40"/>
     <image id="n20_pq5x" name="n20" src="pq5x60" fileName="images/kp_dikuang_1.png" xy="2,342"/>
     <loader id="n23_94m1" name="loaBorder" xy="-2,-2" size="242,441" url="ui://7l6lvkay94m19w" autoSize="true"/>
     <loader id="n19_pq5x" name="loaRarity" xy="178,14" size="44,94" url="ui://eg2y0ldpd4iw52" autoSize="true"/>
-    <text id="n8_ojlz" name="txtLv" xy="170,394" size="55,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
-    <text id="n9_ojlz" name="txtName" xy="46,432" pivot="0.5,0" size="146,49" fontSize="36" color="#6a5d56" text="赵钱孙里"/>
+    <text id="n8_ojlz" name="txtLv" xy="170,394" pivot="1,0" size="55,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30级"/>
+    <text id="n9_ojlz" name="txtName" xy="56,443" pivot="0.5,0" size="126,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffee" letterSpacing="-2" text="微光一瞬"/>
     <loader id="n24_qr4e" name="loaMainScore" xy="20,21" size="46,46" aspect="true" url="ui://eg2y0ldp842s6h" fill="scaleMatchWidth"/>
     <image id="n25_v461" name="n25" src="pq5x64" fileName="imagesExport/kp_xingx.png" pkg="eg2y0ldp" xy="200,373"/>
-    <text id="n26_v461" name="txtStarLv" xy="170,369" pivot="1,0" size="32,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
+    <text id="n26_v461" name="txtStarLv" xy="171,369" pivot="1,0" size="31,34" fontSize="24" color="#fff9f1" align="right" leading="-5" text="30"/>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ListSkillItem.xml

@@ -1,16 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="928,151">
+<component size="224,230" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n74_rhha" name="n74" src="v461a6" fileName="images/kp_jnditptp.png" xy="0,0"/>
-    <component id="n76_rhha" name="btnUp" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="659,46" size="230,70">
-      <Button title="升级"/>
-    </component>
-    <text id="n81_rhha" name="txtName" xy="197,21" size="132,44" fontSize="32" color="#554a45" align="center" vAlign="middle" text="名字名字"/>
-    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="40,18" group="n82_f2bf" scale="0.91,0.91"/>
-    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="35,12" size="124,124" group="n82_f2bf" aspect="true"/>
-    <image id="n77_rhha" name="n77" src="wr9a7o" fileName="images/kp_dengj_1.png" xy="93,114" group="n82_f2bf"/>
-    <text id="n80_rhha" name="txtLv" xy="107,111" pivot="0.5,0" size="41,34" group="n82_f2bf" fontSize="24" color="#fdf9e7" align="center" text="1级"/>
-    <group id="n82_f2bf" name="n82" xy="35,12" size="130,133"/>
-    <text id="n83_v461" name="txtDesc" xy="200,65" size="431,73" fontSize="26" color="#71635d" vAlign="middle" autoSize="none" text="每回合结束均有4.5%概率立即获得主属性22.2%的分数"/>
+    <image id="n85_o9gh" name="n85" src="qkjsbk" fileName="imagesNew/choose_skill_shine.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n86_o9gh" name="n86" src="qkjsbs" fileName="imagesNew/dikuang_SkillItem.png" xy="23,22">
+      <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">
+      <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">
+      <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="名字名字"/>
   </displayList>
+  <Button mode="Radio"/>
 </component>

FGUIProject/assets/Card/components/ProgressBar1.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="768,10" extention="ProgressBar">
+<component size="912,32" extention="ProgressBar">
   <displayList>
-    <image id="n0_842s" name="n0" src="842s6o" fileName="images/kp_jdt_1.png" xy="0,0" size="768,10">
+    <image id="n2_qkjs" name="n2" src="qkjsaz" fileName="imagesNew/progress_bk_out.png" xy="0,0"/>
+    <image id="n0_842s" name="n0" src="qkjsay" fileName="imagesNew/progress_bk_in.png" xy="3,4" size="905,24">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n1_842s" name="bar" src="842s6p" fileName="images/kp_jdt_2.png" xy="0,2" size="768,6"/>
+    <image id="n1_842s" name="bar" src="qkjsax" fileName="imagesNew/progress_activate.png" xy="4,4" fillMethod="hz"/>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/Card/components/btnFilter.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="174,67" extention="Button">
+<component size="210,55" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ojlz" name="n0" src="pq5x5y" fileName="image/kp_anniu_2.png" xy="0,0" size="174,67">
+    <image id="n0_ojlz" name="n0" src="qkjsbq" fileName="imagesNew/dikuang_btn_shaixuan.png" xy="0,2" size="210,54">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <image id="n1_qkjs" name="n1" src="qkjsbp" fileName="imagesNew/dikuang_btn_picture.png" xy="45,11"/>
+    <text id="n2_qkjs" name="title" xy="95,5" size="68,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#ffffee" text="筛选"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/components/btnMinus.xml → FGUIProject/assets/Card/components/btnMinus.xml

@@ -2,7 +2,7 @@
 <component size="44,44" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_842s" name="n0" src="vek88l" fileName="images/kp_anniu_8.png" xy="0,0" size="44,44">
+    <image id="n0_842s" name="n0" src="o9ghtlm" fileName="imagesNew/number_item_jian.png" xy="0,0" size="44,44">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/CommonGame/components/btnPlus.xml → FGUIProject/assets/Card/components/btnPlus.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="44,44" extention="Button">
+<component size="50,50" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_842s" name="n0" src="vek88k" fileName="images/kp_anniu_7.png" xy="0,0" size="44,44">
+    <image id="n0_842s" name="n0" src="qkjsaw" fileName="imagesNew/number_item_jia.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/Card/components/btnRole.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="206,66" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
-  <displayList>
-    <loader id="n1_ojlz" name="n0" xy="0,0" size="206,66" url="ui://eg2y0ldppq5x67" autoSize="true">
-      <gearDisplay controller="button" pages="1"/>
-    </loader>
-    <text id="n2_pq5x" name="title" xy="13,2" size="180,61" fontSize="40" color="#fef7ea" align="center" autoSize="none" text="全部">
-      <gearColor controller="button" pages="1" values="#fef7ea,#000000" default="#9b8867,#000000"/>
-    </text>
-  </displayList>
-  <Button mode="Radio"/>
-  <customProperty target="title" propertyId="0"/>
-</component>

FGUIProject/assets/Card/components/btnShowCard.xml

@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="274,274" extention="Button">
+<component size="224,224" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
-    <component id="n3_l2by" name="ComStarCard" src="l2by87" fileName="components/ComStarCard.xml" xy="137,137" scale="0.9,0.9"/>
-    <image id="n4_l2by" name="n4" src="wr9a7x" fileName="images/kp_kpkuang_1.png" xy="0,0">
+    <image id="n6_qkjs" name="n6" src="qkjsbs" fileName="imagesNew/dikuang_SkillItem.png" xy="22,22">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n5_l2by" name="n5" src="wr9a7y" fileName="images/kp_kpkuang_2.png" xy="0,0">
+    <image id="n7_qkjs" name="n7" src="qkjsbk" fileName="imagesNew/choose_skill_shine.png" xy="-1,-1">
       <gearDisplay controller="button" pages="1"/>
     </image>
+    <component id="n3_l2by" name="ComStarCard" src="l2by87" fileName="components/ComStarCard.xml" xy="112,112" size="180,180" group="n9_qkjs" aspect="true" scale="0.825,0.825"/>
+    <image id="n8_qkjs" name="n8" src="qkjsb7" fileName="imagesNew/bk_SKillItem.png" xy="37,37" group="n9_qkjs"/>
+    <group id="n9_qkjs" name="n9" xy="22,22" size="180,180"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

FGUIProject/assets/Card/components/btnTab.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="236,66" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
-  <displayList>
-    <image id="n1_ojlz" name="n1" src="842s6c" fileName="images/kp_anniu_6.png" xy="0,0" size="236,66">
-      <gearDisplay controller="button" pages="1,6"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n2_ojlz" name="title" xy="118,-4" pivot="0.5,0" anchor="true" size="236,66" fontSize="40" color="#6a5e57" align="center" vAlign="middle" autoSize="none" singleLine="true" text="升级">
-      <gearColor controller="button" pages="0,1" values="#6a5e57,#000000|#fdf6ea,#000000"/>
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-  </displayList>
-  <Button mode="Radio"/>
-  <customProperty target="title" propertyId="0"/>
-</component>

FGUIProject/assets/Card/package.xml

@@ -3,12 +3,10 @@
   <resources>
     <component id="ojlz5x" name="CardUI.xml" path="/" exported="true"/>
     <component id="ojlz4" name="CardDetailUI.xml" path="/" exported="true"/>
-    <component id="ojlz6" name="btnRole.xml" path="/components/"/>
     <component id="ojlzd" name="btnFilter.xml" path="/components/"/>
     <component id="ojlzi" name="ListCardItem.xml" path="/components/"/>
     <component id="ojlzj" name="CardFosterUI.xml" path="/" exported="true"/>
     <component id="ojlzl" name="btnStory.xml" path="/components/"/>
-    <component id="ojlzr" name="btnTab.xml" path="/components/"/>
     <image id="pq5x5y" name="kp_anniu_2.png" path="/images/"/>
     <image id="pq5x60" name="kp_dikuang_1.png" path="/images/"/>
     <image id="pq5x61" name="kp_dikuang_2.png" path="/images/"/>
@@ -89,9 +87,9 @@
     <component id="rhha9m" name="CardSkillUI.xml" path="/" exported="true"/>
     <image id="rhha9o" name="kp_sjsj_di_2.png" path="/images/"/>
     <image id="rhha9p" name="kp_sjsj_di_1.png" path="/images/" scale="9grid" scale9grid="26,26,52,52"/>
-    <component id="rhha9q" name="ComSkillDiscribe.xml" path="/"/>
-    <component id="qgxy9r" name="ComImgCard.xml" path="/"/>
-    <component id="qgxy9s" name="ComCardImgRes.xml" path="/"/>
+    <component id="rhha9q" name="ComSkillDiscribe.xml" path="/components/"/>
+    <component id="qgxy9r" name="ComImgCard.xml" path="/components/"/>
+    <component id="qgxy9s" name="ComCardImgRes.xml" path="/components/"/>
     <image id="94m19t" name="kp_kuang_3.png" path="/images/" exported="true"/>
     <image id="94m19u" name="kp_kuang_2.png" path="/images/" exported="true"/>
     <image id="94m19v" name="kp_kuang_1.png" path="/images/" exported="true"/>
@@ -112,34 +110,17 @@
     <image id="v461ab" name="kpkp_cipziz_3.png" path="/images/" scale="9grid" scale9grid="19,273,38,34"/>
     <image id="v461ac" name="kpkp_cipziz_4.png" path="/images/" scale="9grid" scale9grid="18,299,38,12"/>
     <component id="v461ad" name="ComStarItem.xml" path="/components/"/>
-    <image id="qkjsae" name="back_card.png" path="/imagesNew/"/>
-    <image id="qkjsaf" name="font_LevelCard_0.png" path="/imagesNew/"/>
-    <image id="qkjsag" name="font_LevelCard_1.png" path="/imagesNew/"/>
-    <image id="qkjsah" name="font_LevelCard_2.png" path="/imagesNew/"/>
-    <image id="qkjsai" name="font_LevelCard_3.png" path="/imagesNew/"/>
-    <image id="qkjsaj" name="font_LevelCard_4.png" path="/imagesNew/"/>
-    <image id="qkjsak" name="font_LevelCard_5.png" path="/imagesNew/"/>
-    <image id="qkjsal" name="font_LevelCard_6.png" path="/imagesNew/"/>
-    <image id="qkjsam" name="font_LevelCard_7.png" path="/imagesNew/"/>
-    <image id="qkjsan" name="font_LevelCard_8.png" path="/imagesNew/"/>
-    <image id="qkjsao" name="font_LevelCard_9.png" path="/imagesNew/"/>
-    <image id="qkjsap" name="fzd_jia.png" path="/imagesNew/"/>
-    <image id="qkjsaq" name="hz_sxicon_1.png" path="/imagesNew/"/>
-    <image id="qkjsar" name="hz_sxicon_2.png" path="/imagesNew/"/>
-    <image id="qkjsas" name="hz_sxicon_3.png" path="/imagesNew/"/>
-    <image id="qkjsat" name="hz_sxicon_4.png" path="/imagesNew/"/>
     <image id="qkjsau" name="lIne_ItemConect.png" path="/imagesNew/"/>
-    <image id="qkjsav" name="name_underprint_card.png" path="/imagesNew/"/>
+    <image id="qkjsav" name="name_underprint_card.png" path="/imagesNew/" scale="9grid" scale9grid="29,10,14,20"/>
     <image id="qkjsaw" name="number_item_jia.png" path="/imagesNew/"/>
     <image id="qkjsax" name="progress_activate.png" path="/imagesNew/"/>
-    <image id="qkjsay" name="progress_bk_in.png" path="/imagesNew/"/>
+    <image id="qkjsay" name="progress_bk_in.png" path="/imagesNew/" scale="9grid" scale9grid="25,6,50,12"/>
     <image id="qkjsaz" name="progress_bk_out.png" path="/imagesNew/"/>
     <image id="qkjsb0" name="progress_dikuang.png" path="/imagesNew/"/>
     <image id="qkjsb1" name="progress_jiguang.png" path="/imagesNew/"/>
     <image id="qkjsb2" name="font_buftton_1_tianci.png" path="/imagesNew/"/>
-    <image id="qkjsb3" name="Resources_Underprint.png" path="/imagesNew/"/>
     <image id="qkjsb4" name="font_btn_1_shengji.png" path="/imagesNew/"/>
-    <image id="qkjsb5" name="dikuang_SkillLevel.png" path="/imagesNew/"/>
+    <image id="qkjsb5" name="dikuang_SkillLevel.png" path="/imagesNew/" scale="9grid" scale9grid="10,7,20,14"/>
     <image id="qkjsb6" name="back_jiguang.png" path="/imagesNew/"/>
     <image id="qkjsb7" name="bk_SKillItem.png" path="/imagesNew/"/>
     <image id="qkjsb8" name="btn_box.png" path="/imagesNew/"/>
@@ -147,24 +128,18 @@
     <image id="qkjsba" name="btn_plot.png" path="/imagesNew/"/>
     <image id="qkjsbb" name="card_DividingLine.png" path="/imagesNew/"/>
     <image id="qkjsbc" name="card_DividingLine_name.png" path="/imagesNew/"/>
-    <image id="qkjsbd" name="card_sx_1.png" path="/imagesNew/"/>
-    <image id="qkjsbe" name="card_sx_2.png" path="/imagesNew/"/>
-    <image id="qkjsbf" name="card_sx_3.png" path="/imagesNew/"/>
-    <image id="qkjsbg" name="card_sx_4.png" path="/imagesNew/"/>
     <image id="qkjsbh" name="card_touying.png" path="/imagesNew/"/>
-    <image id="qkjsbi" name="choose_CardTab.png" path="/imagesNew/"/>
     <image id="qkjsbj" name="choose_skill_icon.png" path="/imagesNew/"/>
     <image id="qkjsbk" name="choose_skill_shine.png" path="/imagesNew/"/>
-    <image id="qkjsbl" name="choose_tab.png" path="/imagesNew/"/>
     <image id="qkjsbm" name="dikuang_back.png" path="/imagesNew/"/>
-    <image id="qkjsbn" name="dikuang_btn_1.png" path="/imagesNew/"/>
-    <image id="qkjsbo" name="dikuang_btn_2.png" path="/imagesNew/"/>
     <image id="qkjsbp" name="dikuang_btn_picture.png" path="/imagesNew/"/>
-    <image id="qkjsbq" name="dikuang_btn_shaixuan.png" path="/imagesNew/"/>
+    <image id="qkjsbq" name="dikuang_btn_shaixuan.png" path="/imagesNew/" scale="9grid" scale9grid="31,13,24,26"/>
     <image id="qkjsbr" name="dikuang_number_item.png" path="/imagesNew/"/>
     <image id="qkjsbs" name="dikuang_SkillItem.png" path="/imagesNew/"/>
-    <image id="qkjsbt" name="dikuang_sx.png" path="/imagesNew/"/>
     <image id="qkjsbu" name="TAB_DividingLine.png" path="/imagesNew/"/>
+    <component id="wr9a83" name="btnPlus.xml" path="/components/"/>
+    <image id="o9ghtlm" name="number_item_jian.png" path="/imagesNew/"/>
+    <component id="vek88j" name="btnMinus.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Card" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/components/BtnNormal0.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="374,342" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_842s" name="n0" src="qkjsbn" fileName="imagesNew/dikuang_btn_1.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <loader id="n4_qkjs" name="icon" xy="162,140" pivot="0.5,0.5" size="50,50" autoSize="true"/>
+  </displayList>
+  <Button/>
+  <customProperty target="title0" propertyId="0"/>
+  <customProperty target="title1" propertyId="0"/>
+</component>

FGUIProject/assets/CommonGame/components/BtnNormal1.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="126,132" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_842s" name="n0" src="qkjsbo" fileName="imagesNew/dikuang_btn_2.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n1_842s" name="title0" xy="55,29" pivot="0.5,0" anchor="true" size="70,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#6f4224" autoSize="height" text="自动">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n3_qkjs" name="title1" xy="68,59" pivot="0.5,0" anchor="true" size="70,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#6f4224" autoSize="height" text="选择">
+      <relation target="" sidePair="center-center"/>
+    </text>
+  </displayList>
+  <Button/>
+  <customProperty target="title0" propertyId="0"/>
+  <customProperty target="title1" propertyId="0"/>
+</component>

FGUIProject/assets/CommonGame/components/BtnTab.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="290,70" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <image id="n1_ojlz" name="n1" src="qkjsbl" fileName="imagesNew/choose_tab.png" xy="0,0">
+      <gearDisplay controller="button" pages="1,6"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <text id="n2_ojlz" name="title" xy="145,0" pivot="0.5,0" anchor="true" size="290,70" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="升级">
+      <gearColor controller="button" pages="0,1" values="#5a3e16,#000000|#5a3e16,#000000"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <customProperty target="title" propertyId="0"/>
+</component>

FGUIProject/assets/CommonGame/components/BtnTabSmall.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="206,70" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <loader id="n1_ojlz" name="n0" xy="0,0" size="204,70" url="ui://eg2y0ldpqkjsbi" autoSize="true">
+      <gearDisplay controller="button" pages="1"/>
+    </loader>
+    <text id="n2_pq5x" name="title" xy="13,6" size="180,61" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#716660" align="center" autoSize="none" text="全部">
+      <gearColor controller="button" pages="0,1" values="#716660,#000000|#5a3e16,#000000"/>
+    </text>
+  </displayList>
+  <Button mode="Radio"/>
+  <customProperty target="title" propertyId="0"/>
+</component>

FGUIProject/assets/CommonGame/components/Button9.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="270,70" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_842s" name="n0" src="wr9a7p" fileName="images/kp_jnanniu_1.png" xy="0,0" size="270,70">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n1_842s" name="title" xy="135,7" pivot="0.5,0" anchor="true" size="148,49" fontSize="36" color="#926651" text="自动选择">
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <movieclip id="n2_lj7e" name="ani" src="lj7ea8" fileName="effect/MovieClip1.jta" xy="-12,-18" size="294,105" visible="false" blend="screen">
-      <relation target="" sidePair="width-width,height-height"/>
-    </movieclip>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -2,11 +2,11 @@
 <component size="240,70" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-7,13" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="183,11" group="n4_qqat"/>
-    <text id="n1_r9gf" name="title" xy="53,14" pivot="0.5,0" size="117,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
-    <loader id="n2_r9gf" name="icon" xy="4,13" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
-    <group id="n4_qqat" name="n4" xy="-7,11" size="236,47"/>
+    <image id="n0_r9gf" name="n0" src="qkjstle" fileName="imagesNew/Resources_Underprint.png" xy="1,13" size="238,42" group="n4_qqat"/>
+    <image id="n3_r9gf" name="n3" src="qkjstld" fileName="imagesNew/fzd_jia.png" xy="175,9" group="n4_qqat"/>
+    <text id="n1_r9gf" name="title" xy="83,14" pivot="0.5,0" size="72,39" group="n4_qqat" font="ui://eg2y0ldpa0cftks" fontSize="28" color="#ffffff" vAlign="middle" singleLine="true" autoClearText="true" text="66666"/>
+    <loader id="n2_r9gf" name="icon" xy="17,14" pivot="0.5,0.5" size="40,40" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" fill="scale"/>
+    <group id="n4_qqat" name="n4" xy="1,9" size="238,50"/>
   </displayList>
   <Button/>
 </component>

FGUIProject/assets/CommonGame/components/ComCost.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,46">
+  <controller name="c1" pages="0,,1," selected="1">
+    <remark page="0" value="免费"/>
+    <remark page="1" value="付费"/>
+  </controller>
+  <displayList>
+    <text id="n12_qkjs" name="n12" xy="0,0" size="71,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" vAlign="middle" ubb="true" text="消耗"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="81,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
+    <text id="n6_j5a5" name="txtNeed" xy="141,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
+    <group id="n7_si5z" name="n7" xy="0,-2" size="210,50" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+      <gearDisplay controller="c1" pages="1"/>
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <text id="n11_a0cf" name="n11" xy="69,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716660" align="center" text="免费">
+      <gearDisplay controller="c1" pages="0"/>
+      <relation target="" sidePair="center-center"/>
+    </text>
+  </displayList>
+  <relation target="n7_si5z" sidePair="width-width"/>
+</component>

FGUIProject/assets/CommonGame/components/ComCostCurrency.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="133,46">
-  <controller name="c1" pages="0,,1," selected="0">
+<component size="134,46">
+  <controller name="c1" pages="0,,1," selected="1">
     <remark page="0" value="免费"/>
     <remark page="1" value="付费"/>
   </controller>
   <displayList>
     <loader id="n1_ojlz" name="loaIcon" xy="0,-2" size="50,50" group="n7_si5z" aspect="true" url="ui://eg2y0ldpq08x3" fill="scale"/>
-    <text id="n6_j5a5" name="txtNeed" xy="65,0" size="68,45" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="33" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
-    <group id="n7_si5z" name="n7" xy="0,-2" size="133,50" advanced="true" layout="hz" colGap="15" excludeInvisibles="true">
+    <text id="n6_j5a5" name="txtNeed" xy="65,0" size="69,46" group="n7_si5z" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" vAlign="middle" ubb="true" autoClearText="true" text="9999"/>
+    <group id="n7_si5z" name="n7" xy="0,-2" size="134,50" advanced="true" layout="hz" colGap="15" excludeInvisibles="true">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n11_a0cf" name="n11" xy="31,0" pivot="0.5,0" size="70,45" font="ui://eg2y0ldpa0cftks" fontSize="33" color="#716b59" align="center" text="免费">
+    <text id="n11_a0cf" name="n11" xy="31,0" pivot="0.5,0" size="71,46" font="ui://eg2y0ldpa0cftks" fontSize="34" color="#716b59" align="center" text="免费">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </text>

FGUIProject/assets/CommonGame/components/ComHead.xml

@@ -15,7 +15,7 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" url="ui://eg2y0ldpwm60tl7" autoSize="true">
+    <loader id="n37_r9ri" name="loaBorder" xy="0,13" pivot="0.5,0.5" size="230,203" group="n41_r9ri" touchable="false" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <group id="n41_r9ri" name="n41" xy="0,13" size="230,203"/>

FGUIProject/assets/CommonGame/components/ComTips.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="170,51">
-  <displayList>
-    <image id="n53_l2by" name="n53" src="j539t" fileName="images/hc_kuang_3.png" xy="0,0" size="170,51">
-      <relation target="" sidePair="left-left"/>
-      <relation target="n54_l2by" sidePair="width-width,height-height"/>
-    </image>
-    <text id="n54_l2by" name="txtTips" xy="4,2" size="154,34" fontSize="24" color="#a27b56" vars="true" text="花费{v1=1000}{v2=金币}">
-      <relation target="" sidePair="left-left"/>
-    </text>
-  </displayList>
-  <customProperty target="txtTips" propertyId="0"/>
-</component>

FGUIProject/assets/CommonGame/components/ListPropertyItem.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="170,58" overflow="hidden">
+<component size="200,54" overflow="hidden">
   <displayList>
-    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="96,44" fontSize="32" color="#7d6956" ubb="true" text="66666"/>
-    <loader id="n6_ojlz" name="loaIcon" xy="0,0" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>
+    <image id="n7_qkjs" name="n7" src="qkjstlf" fileName="imagesNew/dikuang_sx.png" xy="0,0"/>
+    <text id="n5_ojlz" name="txtProperty" xy="78,5" pivot="0.5,0" size="82,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#716660" align="center" ubb="true" text="66666"/>
+    <loader id="n6_ojlz" name="loaIcon" xy="10,5" size="44,44" url="ui://eg2y0ldp842s6h" autoSize="true"/>
   </displayList>
 </component>

FGUIProject/assets/CommonGame/package.xml

@@ -6,10 +6,6 @@
     <image id="slb41b" name="hz_fanhuizjm.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw4x" name="zx_bq_shuxing_3.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw4y" name="zx_bq_shuxing_4.png" path="/imagesExport/" exported="true"/>
-    <image id="d4iw4z" name="hz_bq_shuxing_1.png" path="/imagesExport/" exported="true"/>
-    <image id="d4iw50" name="hz_bq_shuxing_2.png" path="/imagesExport/" exported="true"/>
-    <image id="d4iw51" name="hz_bq_shuxing_3.png" path="/imagesExport/" exported="true"/>
-    <image id="d4iw52" name="hz_bq_shuxing_4.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw53" name="zx_bq_shuxing_1.png" path="/imagesExport/" exported="true"/>
     <image id="d4iw54" name="zx_bq_shuxing_2.png" path="/imagesExport/" exported="true"/>
     <component id="d4iw55" name="DressUpItemTips.xml" path="/" exported="true"/>
@@ -63,20 +59,17 @@
     <image id="pq5x6d" name="kp_bz_1.png" path="/images/" exported="true"/>
     <component id="pq5x6e" name="Button7.xml" path="/components/" exported="true"/>
     <component id="pq5x6f" name="Button8.xml" path="/components/" exported="true"/>
-    <image id="842s6h" name="kp_sx_1.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6i" name="kp_sx_2.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6j" name="kp_sx_3.png" path="/imagesExport/" exported="true"/>
-    <image id="842s6k" name="kp_sx_4.png" path="/imagesExport/" exported="true"/>
-    <component id="842s6q" name="Button9.xml" path="/components/" exported="true"/>
+    <image id="842s6h" name="kp_sx_1.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6i" name="kp_sx_2.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6j" name="kp_sx_3.png" path="/imagesNew/" exported="true"/>
+    <image id="842s6k" name="kp_sx_4.png" path="/imagesNew/" exported="true"/>
+    <component id="842s6q" name="BtnNormal1.xml" path="/components/" exported="true"/>
     <image id="j539t" name="hc_kuang_3.png" path="/images/" exported="true" scale="9grid" scale9grid="42,12,84,24"/>
-    <component id="l2by86" name="ComTips.xml" path="/components/" exported="true"/>
     <image id="wr9a7p" name="kp_jnanniu_1.png" path="/images/" scale="9grid" scale9grid="58,17,116,34"/>
     <image id="lc718g" name="kp_cp_di_2.png" path="/images/" exported="true" scale="9grid" scale9grid="16,37,32,74"/>
     <image id="j539p" name="hc_btkuang.png" path="/images/" exported="true"/>
     <image id="vek88h" name="hongzuan.png" path="/imgItemIcon/" exported="true"/>
     <image id="vek88i" name="zizuan.png" path="/imgItemIcon/" exported="true"/>
-    <component id="vek88j" name="btnMinus.xml" path="/components/" exported="true"/>
-    <component id="wr9a83" name="btnPlus.xml" path="/components/" exported="true"/>
     <image id="vek88k" name="kp_anniu_7.png" path="/images/" exported="true"/>
     <image id="vek88l" name="kp_anniu_8.png" path="/images/" exported="true"/>
     <image id="ly9g8m" name="xingxie.png" path="/imgItemIcon/" exported="true"/>
@@ -261,6 +254,21 @@
     <image id="qkjskh" name="txk_dikuang.png" path="/imagesNew/"/>
     <image id="qkjstl9" name="grxx_xtkk_2.png" path="/images/"/>
     <image id="qkjstlc" name="kp_mengying.jpg" path="/images/"/>
+    <image id="qkjstld" name="fzd_jia.png" path="/imagesNew/"/>
+    <image id="qkjstle" name="Resources_Underprint.png" path="/imagesNew/"/>
+    <image id="qkjstlf" name="dikuang_sx.png" path="/imagesNew/"/>
+    <component id="ojlzr" name="BtnTab.xml" path="/components/" exported="true"/>
+    <component id="ojlz6" name="BtnTabSmall.xml" path="/components/" exported="true"/>
+    <image id="qkjsbi" name="choose_CardTab.png" path="/imagesNew/"/>
+    <image id="qkjsbl" name="choose_tab.png" path="/imagesNew/"/>
+    <image id="qkjsbn" name="dikuang_btn_1.png" path="/imagesNew/"/>
+    <image id="qkjsbo" name="dikuang_btn_2.png" path="/imagesNew/"/>
+    <component id="qkjstlg" name="BtnNormal0.xml" path="/components/" exported="true"/>
+    <component id="qkjstlh" name="ComCost.xml" path="/components/" exported="true"/>
+    <image id="o9ghtli" name="hz_bq_shuxing_1.png" path="/imagesNew/" exported="true"/>
+    <image id="o9ghtlj" name="hz_bq_shuxing_2.png" path="/imagesNew/" exported="true"/>
+    <image id="o9ghtlk" name="hz_bq_shuxing_3.png" path="/imagesNew/" exported="true"/>
+    <image id="o9ghtll" name="hz_bq_shuxing_4.png" path="/imagesNew/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Main/package.xml

@@ -612,6 +612,8 @@
     <font id="qkjsnx" name="Font_Result.fnt" path="/FontNew/" exported="true"/>
     <font id="qkjsny" name="Font_Score.fnt" path="/FontNew/" exported="true"/>
     <image id="qkjsnz" name="zspf_picture.png" path="/imagesNew/"/>
+    <component id="o9gho0" name="ComSkillCardMask.xml" path="/components/"/>
+    <component id="o9gho1" name="ProgressBar3.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -10,36 +10,42 @@ namespace UI.Card
         public Controller m_ctrlFullStar;
         public Controller m_ctrlFullLv;
         public Controller m_ctrlTab;
-        public GButton m_btnStory;
-        public GTextField m_txtName;
-        public GButton m_btnLv;
-        public GButton m_btnStar;
-        public GButton m_btnSkill;
-        public GGroup m_grpTab;
-        public GList m_listProperty;
+        public Controller m_ctrlSkillCount;
+        public GLoader m_loaScore;
+        public GTextField m_txtName0;
+        public GTextField m_txtName1;
+        public GTextField m_txtName2;
+        public GTextField m_txtName3;
+        public GTextField m_txtName4;
         public GProgressBar m_barLv;
         public GTextField m_txtCurLv;
         public GTextField m_txtMaxLv;
-        public GTextField m_txtCurExp;
-        public GTextField m_txtMaxExp;
         public GList m_listLvConsume;
-        public GComponent m_ComLvConsumeGold;
         public GButton m_btnAll;
+        public GButton m_btnClearAll;
         public GButton m_btnUpLv;
+        public GComponent m_ComLvConsumeGold;
+        public GTextField m_txtCurExp;
+        public GTextField m_txtMaxExp;
         public GGroup m_grpLv;
+        public GButton m_btnUpStar;
+        public GComponent m_comStarCousumeGold;
+        public GTextField m_txtTips;
+        public GList m_listStarConsume;
         public UI_ComStarItem m_comStarItem0;
         public UI_ComStarItem m_comStarItem1;
         public UI_ComStarItem m_comStarItem2;
         public UI_ComStarItem m_comStarItem3;
-        public GTextField m_txtCurStar;
-        public GTextField m_txtAllStar;
-        public GList m_listStarConsume;
-        public GComponent m_comStarCousumeGold;
-        public GButton m_btnUpStar;
-        public GComponent m_comTips;
         public GList m_listShowCard;
         public GGroup m_grpStar;
         public GList m_listSkill;
+        public GButton m_btnUpSkillLv;
+        public GGroup m_grpSkill;
+        public GButton m_btnLv;
+        public GButton m_btnStar;
+        public GButton m_btnSkill;
+        public GGroup m_grpTab;
+        public GList m_listProperty;
         public const string URL = "ui://7l6lvkayj4c69d";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ComFosterBottom";
@@ -90,59 +96,70 @@ namespace UI.Card
             m_ctrlFullStar = comp.GetController("ctrlFullStar");
             m_ctrlFullLv = comp.GetController("ctrlFullLv");
             m_ctrlTab = comp.GetController("ctrlTab");
-            m_btnStory = (GButton)comp.GetChild("btnStory");
-            m_txtName = (GTextField)comp.GetChild("txtName");
-            m_btnLv = (GButton)comp.GetChild("btnLv");
-            m_btnStar = (GButton)comp.GetChild("btnStar");
-            m_btnSkill = (GButton)comp.GetChild("btnSkill");
-            m_grpTab = (GGroup)comp.GetChild("grpTab");
-            m_listProperty = (GList)comp.GetChild("listProperty");
+            m_ctrlSkillCount = comp.GetController("ctrlSkillCount");
+            m_loaScore = (GLoader)comp.GetChild("loaScore");
+            m_txtName0 = (GTextField)comp.GetChild("txtName0");
+            m_txtName1 = (GTextField)comp.GetChild("txtName1");
+            m_txtName2 = (GTextField)comp.GetChild("txtName2");
+            m_txtName3 = (GTextField)comp.GetChild("txtName3");
+            m_txtName4 = (GTextField)comp.GetChild("txtName4");
             m_barLv = (GProgressBar)comp.GetChild("barLv");
             m_txtCurLv = (GTextField)comp.GetChild("txtCurLv");
             m_txtMaxLv = (GTextField)comp.GetChild("txtMaxLv");
-            m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
-            m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
             m_listLvConsume = (GList)comp.GetChild("listLvConsume");
-            m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
             m_btnAll = (GButton)comp.GetChild("btnAll");
+            m_btnClearAll = (GButton)comp.GetChild("btnClearAll");
             m_btnUpLv = (GButton)comp.GetChild("btnUpLv");
+            m_ComLvConsumeGold = (GComponent)comp.GetChild("ComLvConsumeGold");
+            m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
+            m_txtMaxExp = (GTextField)comp.GetChild("txtMaxExp");
             m_grpLv = (GGroup)comp.GetChild("grpLv");
+            m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
+            m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
+            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_listStarConsume = (GList)comp.GetChild("listStarConsume");
             m_comStarItem0 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem0"));
             m_comStarItem1 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem1"));
             m_comStarItem2 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem2"));
             m_comStarItem3 = (UI_ComStarItem)UI_ComStarItem.Create(comp.GetChild("comStarItem3"));
-            m_txtCurStar = (GTextField)comp.GetChild("txtCurStar");
-            m_txtAllStar = (GTextField)comp.GetChild("txtAllStar");
-            m_listStarConsume = (GList)comp.GetChild("listStarConsume");
-            m_comStarCousumeGold = (GComponent)comp.GetChild("comStarCousumeGold");
-            m_btnUpStar = (GButton)comp.GetChild("btnUpStar");
-            m_comTips = (GComponent)comp.GetChild("comTips");
             m_listShowCard = (GList)comp.GetChild("listShowCard");
             m_grpStar = (GGroup)comp.GetChild("grpStar");
             m_listSkill = (GList)comp.GetChild("listSkill");
+            m_btnUpSkillLv = (GButton)comp.GetChild("btnUpSkillLv");
+            m_grpSkill = (GGroup)comp.GetChild("grpSkill");
+            m_btnLv = (GButton)comp.GetChild("btnLv");
+            m_btnStar = (GButton)comp.GetChild("btnStar");
+            m_btnSkill = (GButton)comp.GetChild("btnSkill");
+            m_grpTab = (GGroup)comp.GetChild("grpTab");
+            m_listProperty = (GList)comp.GetChild("listProperty");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_ctrlFullStar = null;
             m_ctrlFullLv = null;
             m_ctrlTab = null;
-            m_btnStory = null;
-            m_txtName = null;
-            m_btnLv = null;
-            m_btnStar = null;
-            m_btnSkill = null;
-            m_grpTab = null;
-            m_listProperty = null;
+            m_ctrlSkillCount = null;
+            m_loaScore = null;
+            m_txtName0 = null;
+            m_txtName1 = null;
+            m_txtName2 = null;
+            m_txtName3 = null;
+            m_txtName4 = null;
             m_barLv = null;
             m_txtCurLv = null;
             m_txtMaxLv = null;
-            m_txtCurExp = null;
-            m_txtMaxExp = null;
             m_listLvConsume = null;
-            m_ComLvConsumeGold = null;
             m_btnAll = null;
+            m_btnClearAll = null;
             m_btnUpLv = null;
+            m_ComLvConsumeGold = null;
+            m_txtCurExp = null;
+            m_txtMaxExp = null;
             m_grpLv = null;
+            m_btnUpStar = null;
+            m_comStarCousumeGold = null;
+            m_txtTips = null;
+            m_listStarConsume = null;
             m_comStarItem0.Dispose();
             m_comStarItem0 = null;
             m_comStarItem1.Dispose();
@@ -151,15 +168,16 @@ namespace UI.Card
             m_comStarItem2 = null;
             m_comStarItem3.Dispose();
             m_comStarItem3 = null;
-            m_txtCurStar = null;
-            m_txtAllStar = null;
-            m_listStarConsume = null;
-            m_comStarCousumeGold = null;
-            m_btnUpStar = null;
-            m_comTips = null;
             m_listShowCard = null;
             m_grpStar = null;
             m_listSkill = null;
+            m_btnUpSkillLv = null;
+            m_grpSkill = null;
+            m_btnLv = null;
+            m_btnStar = null;
+            m_btnSkill = null;
+            m_grpTab = null;
+            m_listProperty = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,6 +9,8 @@ namespace UI.Card
         public GComponent target;
         public GButton m_btnback;
         public GComponent m_comValueBar;
+        public GButton m_btnStory;
+        public GButton m_btnLook;
         public GButton m_btnStarReward;
         public const string URL = "ui://7l6lvkayj4c69e";
         public const string PACKAGE_NAME = "Card";
@@ -59,12 +61,16 @@ namespace UI.Card
         {
             m_btnback = (GButton)comp.GetChild("btnback");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
+            m_btnStory = (GButton)comp.GetChild("btnStory");
+            m_btnLook = (GButton)comp.GetChild("btnLook");
             m_btnStarReward = (GButton)comp.GetChild("btnStarReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnback = null;
             m_comValueBar = null;
+            m_btnStory = null;
+            m_btnLook = null;
             m_btnStarReward = null;
             if(disposeTarget && target != null)
             {

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

@@ -6,12 +6,10 @@ namespace UI.Card
 {
     public partial class UI_ListSkillItem
     {
-        public GComponent target;
-        public GButton m_btnUp;
-        public GTextField m_txtName;
+        public GButton target;
         public UI_ComSkill m_comSkill;
         public GTextField m_txtLv;
-        public GTextField m_txtDesc;
+        public GTextField m_txtName;
         public const string URL = "ui://7l6lvkayrhha9k";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListSkillItem";
@@ -21,9 +19,9 @@ namespace UI.Card
         {
             var ui = new UI_ListSkillItem();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -36,9 +34,9 @@ namespace UI.Card
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -59,20 +57,16 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
-            m_btnUp = (GButton)comp.GetChild("btnUp");
-            m_txtName = (GTextField)comp.GetChild("txtName");
             m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
             m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_txtName = (GTextField)comp.GetChild("txtName");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_btnUp = null;
-            m_txtName = null;
             m_comSkill.Dispose();
             m_comSkill = null;
             m_txtLv = null;
-            m_txtDesc = null;
+            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button9.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnNormal1.cs

@@ -4,18 +4,19 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_Button9
+    public partial class UI_BtnNormal1
     {
         public GButton target;
-        public GMovieClip m_ani;
+        public GTextField m_title0;
+        public GTextField m_title1;
         public const string URL = "ui://eg2y0ldp842s6q";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "Button9";
-        private static UI_Button9 _proxy;
+        public const string RES_NAME = "BtnNormal1";
+        private static UI_BtnNormal1 _proxy;
 
-        public static UI_Button9 Create(GObject gObject = null)
+        public static UI_BtnNormal1 Create(GObject gObject = null)
         {
-            var ui = new UI_Button9();
+            var ui = new UI_BtnNormal1();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +25,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_Button9 Proxy(GObject gObject = null)
+        public static UI_BtnNormal1 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_Button9();
+                _proxy = new UI_BtnNormal1();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +56,13 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_ani = (GMovieClip)comp.GetChild("ani");
+            m_title0 = (GTextField)comp.GetChild("title0");
+            m_title1 = (GTextField)comp.GetChild("title1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_ani = null;
+            m_title0 = null;
+            m_title1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button9.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_BtnNormal1.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5cedce002f5d8484ebefd119f1d735c9
+guid: 8b80c6949f27d21408681cc126a95f99
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTips.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCost.cs

@@ -4,18 +4,20 @@ using FairyGUI;
 
 namespace UI.CommonGame
 {
-    public partial class UI_ComTips
+    public partial class UI_ComCost
     {
         public GComponent target;
-        public GTextField m_txtTips;
-        public const string URL = "ui://eg2y0ldpl2by86";
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public GTextField m_txtNeed;
+        public const string URL = "ui://eg2y0ldpqkjstlh";
         public const string PACKAGE_NAME = "CommonGame";
-        public const string RES_NAME = "ComTips";
-        private static UI_ComTips _proxy;
+        public const string RES_NAME = "ComCost";
+        private static UI_ComCost _proxy;
 
-        public static UI_ComTips Create(GObject gObject = null)
+        public static UI_ComCost Create(GObject gObject = null)
         {
-            var ui = new UI_ComTips();
+            var ui = new UI_ComCost();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -24,11 +26,11 @@ namespace UI.CommonGame
             return ui;
         }
 
-        public static UI_ComTips Proxy(GObject gObject = null)
+        public static UI_ComCost Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ComTips();
+                _proxy = new UI_ComCost();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -55,11 +57,15 @@ namespace UI.CommonGame
 
         private void Init(GComponent comp)
         {
-            m_txtTips = (GTextField)comp.GetChild("txtTips");
+            m_c1 = comp.GetController("c1");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_txtTips = null;
+            m_c1 = null;
+            m_loaIcon = null;
+            m_txtNeed = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComTips.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_ComCost.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e6927c112f3e7e246a8aa50b944e2406
+guid: 42969ee5b56513b48b6a36e2a5e7107b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -56,7 +56,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
             CardSProxy.GetCardInfos().Coroutine();
             int listRoleSelect = this.viewData != null ? (int)this.viewData : 0;

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

@@ -17,7 +17,7 @@ namespace GFGGame
         private UI_CardFosterUI _ui;
         private UI_ComFosterBottom _comFosterBottom;
         private ValueBarController _valueBarController;
-        private UI_ComCostCurrency _comLvConsumeGold;
+        private UI_ComCost _comLvConsumeGold;
         private UI_ComCostCurrencyWithHas _comStarCousumeGold;
         private CardData _cardData = new CardData();
         private int _selectTab = 0;
@@ -80,13 +80,15 @@ namespace GFGGame
             _ui.m_ComFosterBottom.m_listProperty.itemRenderer = RenderListPropertyItem;
 
             //卡面和故事界面
-            _ui.m_ComFosterBottom.m_btnStory.onClick.Add(OnClickBtnStroy);
+            _ui.m_ComFosterTop.m_btnStory.onClick.Add(OnClickBtnStroy);
 
 
             //升级升星按钮
             _ui.m_ComFosterBottom.m_btnUpLv.onClick.Add(OnClickBtnUpLv);
             _ui.m_ComFosterBottom.m_btnAll.onClick.Add(OnClcikBtnAll);
+            _ui.m_ComFosterBottom.m_btnClearAll.onClick.Add(OnClcikBtnClearAll);
             _ui.m_ComFosterBottom.m_btnUpStar.onClick.Add(OnClickBtnUpStar);
+            _ui.m_ComFosterBottom.m_btnUpSkillLv.onClick.Add(OnBtnUpSkill);
 
             //升级升星消耗材料列表
             _ui.m_ComFosterBottom.m_listLvConsume.itemRenderer = RenderListLvConsumeItem;
@@ -156,21 +158,49 @@ namespace GFGGame
         }
         private void UpdateNormal()
         {
-            _comFosterBottom.m_txtName.text = _cardData.itemCfg.name;
-            _comFosterBottom.m_btnStory.visible = CardDataManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
-            _comFosterBottom.m_btnUpLv.grayed = true;
-            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;
+            _ui.m_ComFosterTop.m_btnStory.visible = CardDataManager.GetStoryCfgsById(_cardData.id).Count > 0 ? true : false;
+            // _comFosterBottom.m_btnUpLv.grayed = true;
+            // _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;
             _valueBarController = new ValueBarController(_ui.m_ComFosterTop.m_comValueBar, 5);
             _valueBarController.OnShown();
 
+            string names = _cardData.itemCfg.name;
+            switch (names.Length)
+            {
+                case 1:
+                    _comFosterBottom.m_txtName0.text = names.Substring(0, 1);
+                    break;
+                case 2:
+                    _comFosterBottom.m_txtName0.text = names.Substring(0, 1);
+                    _comFosterBottom.m_txtName2.text = names.Substring(1, 1);
+                    break;
+                case 3:
+                    _comFosterBottom.m_txtName0.text = names.Substring(0, 1);
+                    _comFosterBottom.m_txtName1.text = names.Substring(1, 1);
+                    _comFosterBottom.m_txtName2.text = names.Substring(2, 1);
+                    break;
+                case 4:
+                    _comFosterBottom.m_txtName0.text = names.Substring(0, 1);
+                    _comFosterBottom.m_txtName1.text = names.Substring(1, 1);
+                    _comFosterBottom.m_txtName2.text = names.Substring(2, 1);
+                    _comFosterBottom.m_txtName3.text = names.Substring(3, 1);
+                    break;
+                default:
+                    _comFosterBottom.m_txtName0.text = names.Substring(0, 1);
+                    _comFosterBottom.m_txtName1.text = names.Substring(1, 1);
+                    _comFosterBottom.m_txtName2.text = names.Substring(2, 1);
+                    _comFosterBottom.m_txtName3.text = names.Substring(3, 1);
+                    _comFosterBottom.m_txtName4.text = names.Substring(4);
+                    break;
+            }
         }
         private void UpdateCommon()
         {
             _comFosterBottom.m_listProperty.numItems = _cardData.scores.Count;
-            _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
+            _comLvConsumeGold = UI_ComCost.Proxy(_comFosterBottom.m_ComLvConsumeGold);
             _comLvConsumeGold.m_txtNeed.text = "0";
-            UI_ComCostCurrency.ProxyEnd();
-
+            _comLvConsumeGold.m_c1.selectedIndex = 1;
+            UI_ComCost.ProxyEnd();
         }
         private void UpdateCardRes()
         {
@@ -199,7 +229,7 @@ namespace GFGGame
                 {
                     _ui.m_comImgCard.m_ComCardImgRes.m_loaCard.url = ResPathUtil.GetCardPath(_cardData.resources[_cardData.resIndex]);
                     GLoader loaCard = _ui.m_comImgCard.m_ComCardImgRes.m_loaCard;
-                    float scale = _ui.target.height * 0.8f / loaCard.initHeight;
+                    float scale = _ui.target.height * _cardScale / loaCard.initHeight;
                     comCardImgResInitSize = new Vector2(loaCard.initWidth * scale, loaCard.initHeight * scale);
                     _ui.m_comImgCard.target.scrollPane.SetPercX(0.5f, false);
                     _ui.m_comImgCard.m_ComCardImgRes.target.size = comCardImgResInitSize;
@@ -233,15 +263,15 @@ namespace GFGGame
             _comFosterBottom.m_barLv.value = _showExp;
             int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
             _comFosterBottom.m_txtMaxLv.text = maxLv.ToString();
-            _comFosterBottom.m_txtCurLv.text = StringUtil.GetColorText(_showLv.ToString(), _showLv < maxLv ? "#D27869" : "#7D6956");
+            _comFosterBottom.m_txtCurLv.text = _showLv.ToString();
             _comFosterBottom.m_txtMaxExp.text = cardLvCfg.needExp.ToString();
             _comFosterBottom.m_txtCurExp.text = _showExp.ToString();
             //    = "0";
-            _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
-            _comFosterBottom.m_btnUpLv.grayed = _comLvConsumeGold.m_txtNeed.text == "0" ? true : false;
-            UI_ComCostCurrency.ProxyEnd();
+            // _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
+            // _comFosterBottom.m_btnUpLv.grayed = _comLvConsumeGold.m_txtNeed.text == "0" ? true : false;
+            // UI_ComCostCurrency.ProxyEnd();
 
-            _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpLv.grayed;
+            // _comFosterBottom.m_btnUpLv.GetChild("ani").asMovieClip.visible = false;// !_comFosterBottom.m_btnUpLv.grayed;
 
             _comFosterBottom.m_ctrlFullLv.selectedIndex = CardDataManager.isFullLv(_cardData.id, _cardData.lv, false) ? 1 : 0;
 
@@ -414,9 +444,9 @@ namespace GFGGame
                 hasExp += itemCfg.cardUpLvExp * itemsCount[i];
 
             }
-            _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
+            _comLvConsumeGold = UI_ComCost.Proxy(_comFosterBottom.m_ComLvConsumeGold);
             _comLvConsumeGold.m_txtNeed.text = count.ToString();
-            UI_ComCostCurrency.ProxyEnd();
+            UI_ComCost.ProxyEnd();
 
             int previewLv = 0;
             int previewExp = 0;
@@ -438,14 +468,25 @@ namespace GFGGame
                 }
             }
         }
+        private void OnClcikBtnClearAll()
+        {
+            this.ClearItemsCountList();
+            _comFosterBottom.m_listLvConsume.numItems = upgradeCardItemsArr.Length;
+            this.UpdatePreView();
+        }
 
         private void OnClickBtnUpLv()
         {
 
             int itemMoneyId = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[0]).cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1][0];
-            _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
+            _comLvConsumeGold = UI_ComCost.Proxy(_comFosterBottom.m_ComLvConsumeGold);
             int itemMoneyNum = int.Parse(_comLvConsumeGold.m_txtNeed.text);
-            UI_ComCostCurrency.ProxyEnd();
+            UI_ComCost.ProxyEnd();
+            if (itemMoneyNum == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("未选择升级材料");
+                return;
+            }
             if (itemMoneyNum > ItemDataManager.GetItemNum(itemMoneyId))
             {
                 ItemUtil.AddGold(itemMoneyNum - ItemDataManager.GetItemNum(itemMoneyId), UpLv);
@@ -540,26 +581,19 @@ namespace GFGGame
             else
             {
                 _comFosterBottom.m_ctrlFullStar.selectedIndex = 0;
-                _comFosterBottom.m_txtCurStar.text = _cardData.star.ToString();
-                List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
-                _comFosterBottom.m_txtAllStar.SetVar("value", starCfgs.Count.ToString()).FlushVars();
+                // List<CardStarCfg> starCfgs = CardStarCfgArray.Instance.GetCfgsBycardId(_cardData.id);
+                int index = 1;
                 for (int i = 0; i < 4; i++)
                 {
                     UI_ComStarItem comStarItem = UI_ComStarItem.Proxy(_comFosterBottom.target.GetChild("comStarItem" + i));
-                    int count = _cardData.star % 5;
-                    if (i * 5 + count < _cardData.star)
-                    {
-                        comStarItem.m_c1.selectedIndex = 5;
-                    }
-                    else if (i * 5 + count > _cardData.star)
-                    {
-                        comStarItem.m_c1.selectedIndex = 0;
-                    }
-                    else
+                    string starDesc = "";
+                    for (int j = 0; j < _cardData.itemCfg.starDescArr[i].Length; j++)
                     {
-                        comStarItem.m_c1.selectedIndex = count;
+                        char str = _cardData.itemCfg.starDescArr[i][j];
+                        starDesc += index <= _cardData.star ? StringUtil.GetColorText(str.ToString(), "#D07D40") : StringUtil.GetColorText(str.ToString(), "#716660");
+                        index++;
                     }
-                    comStarItem.m_txtContent.text = _cardData.itemCfg.starDescArr[i];
+                    comStarItem.m_txtContent.text = starDesc;
                     UI_ComStarItem.ProxyEnd();
                 }
                 _comFosterBottom.m_btnUpStar.data = 0;//data  0:可以升级，1：材料不足
@@ -568,12 +602,7 @@ namespace GFGGame
 
                 _comFosterBottom.m_listStarConsume.data = cardStarCfg;
                 _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
-
-                _comFosterBottom.m_comTips.visible = _cardData.lv < cardStarCfg.needLv ? true : false;
-                UI_ComTips comTips = UI_ComTips.Proxy(_comFosterBottom.m_comTips);
-                comTips.m_txtTips.text = _comFosterBottom.m_comTips.visible == true ? string.Format("需等级达到{0}级", cardStarCfg.needLv) : "";
-
-
+                _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;
 
@@ -701,6 +730,8 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_ui.m_ComFosterBottom.m_btnSkill, RedDotDataManager.Instance.GetCardSkillsRed(_cardData.id));
             _comFosterBottom.m_listSkill.numItems = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id).Count;
+            _comFosterBottom.m_listSkill.selectedIndex = 0;
+            _comFosterBottom.m_ctrlSkillCount.selectedIndex = _comFosterBottom.m_listSkill.numItems;
         }
 
         private void RenderListSkilItem(int index, GObject obj)
@@ -715,22 +746,21 @@ namespace GFGGame
             item.m_txtName.text = skillCfg.name;
             item.m_txtLv.text = string.Format("{0}级", skillLv);
             PassivitySkillLvlCfg skillLvlCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv, skillCfg.skillId);
-            item.m_txtDesc.text = skillLvlCfg.describe;
-            item.m_btnUp.visible = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillCfg.skillId) != null;
-            RedDotController.Instance.SetComRedDot(item.m_btnUp, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", 9, -8);
+            // item.m_txtDesc.text = skillLvlCfg.describe;
+            // item.m_btnUp.visible = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(skillLv + 1, skillCfg.skillId) != null;
+            RedDotController.Instance.SetComRedDot(item.target, RedDotDataManager.Instance.GetCardSkillRed(skillCfg.skillId), "", 9, -8);
 
-            if (item.m_btnUp.data == null)
+            if (item.target.data == null)
             {
-                item.m_btnUp.onClick.Add(() =>
-                {
-                    ViewManager.Show<CardSkillView>(new object[] { _cardData.id, skillCfg.skillId });
-                });
+                item.target.onClick.Add(OnBtnUpSkill);
             }
         }
 
-        private void UpSkill()
+        private void OnBtnUpSkill()
         {
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_cardData.id);
 
+            ViewManager.Show<CardSkillView>(new object[] { _cardData.id, skillCfgs[_comFosterBottom.m_listSkill.selectedIndex].skillId });
         }
         private void OnClickLoaCard()
         {
@@ -840,20 +870,6 @@ namespace GFGGame
             }
             this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
         }
-        // private void OnItemChangeListener()
-        // {
-        //     if (!CardDataManager.isFullLv(_cardData.id, _cardData.lv, false))
-        //     {
-        //         CardLvlCfg cardLvCfg = CardLvlCfgArray.Instance.GetCfgBycardLvlAndcardRarity(_showLv, _cardData.itemCfg.rarity);
-        //         _comFosterBottom.m_listLvConsume.numItems = upgradeCardItemsArr.Length;
-        //     }
-        //     if (!CardDataManager.isFullStar(_cardData.id, _cardData.star, false))
-        //     {
-        //         CardStarCfg cardStarCfg = CardStarCfgArray.Instance.GetCfgBycardIdAndstarLvl(_cardData.id, _cardData.star);
-        //         _comFosterBottom.m_listStarConsume.numItems = cardStarCfg.materiarsArr.Length;
-
-        //     }
-        // }
         private void UpdateItemChange()
         {
             _ui.m_ComFosterBottom.m_listLvConsume.numItems = _ui.m_ComFosterBottom.m_listLvConsume.numItems;

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

@@ -67,10 +67,6 @@ namespace GFGGame
             _skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             skillCfg = PassivitySkillCfgArray.Instance.GetCfg(_skillId);// SkillDataManager.Instance.GetPassivitySkillCfg(_cardId, _skillId);
             skillLvCfg = PassivitySkillLvlCfgArray.Instance.GetCfgByskilllvlAndskillId(_skillLv, _skillId);
-            ET.Log.Debug("_skillLv000:" + _skillLv);
-            ET.Log.Debug("skillCfg000:" + skillCfg.skillId);
-            ET.Log.Debug("_skillLv000:" + skillLvCfg.skilllvl);
-
             int skillLv = SkillDataManager.Instance.GetSkillLv(_cardId, _skillId);
             UpdateComLv(_ui.m_comCurLV, skillLv, skillLv + "级");
 
@@ -82,9 +78,6 @@ namespace GFGGame
             UI_ComCostCurrency costCurrency = UI_ComCostCurrency.Proxy(_ui.m_comConsume);
             costCurrency.m_txtNeed.text = skillLvCfg.costNum.ToString();
             UI_ComCostCurrency.ProxyEnd();
-            ET.Log.Debug("_skillLv111:" + _skillLv);
-            ET.Log.Debug("skillCfg111:" + skillCfg.skillId);
-            ET.Log.Debug("_skillLv111:" + skillLvCfg.skilllvl);
             UpdateComLv(_ui.m_comNextLv, skillLv + 1, "下一级");
             _ui.m_listConsume.numItems = skillLvCfg.materiarsArr.Length;