卡牌升级消耗区分稀有度

FGUIProject/assets/Card/CardFosterUI.xml

@@ -29,12 +29,12 @@
   </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="12" ease="Linear"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,0" endValue="0,-475" duration="8" 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"/>
   </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,1920" endValue="0,211" duration="3" ease="Linear"/>
-    <item time="0" type="XY" target="n71_lc71" tween="true" startValue="0,-475" endValue="0,0" duration="3" 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"/>
   </transition>
 </component>

FGUIProject/assets/Card/components/ComFosterBottom.xml

@@ -2,7 +2,7 @@
 <component size="1080,1709" overflow="hidden" 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="1"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="2"/>
   <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"/>
@@ -16,11 +16,11 @@
       <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 checked="true" controller="ctrlTab" page="1"/>
+      <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"/>
+      <Button checked="true" 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"/>
@@ -97,10 +97,11 @@
     <group id="n55_l2by" name="grpStar" xy="11,1221" size="1056,435" advanced="true">
       <gearDisplay controller="ctrlTab" pages="1"/>
     </group>
-    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" overflow="hidden" lineGap="33" defaultItem="ui://7l6lvkayrhha9k">
+    <list id="n77_rhha" name="listSkill" xy="76,1241" size="928,412" overflow="scroll" lineGap="25" defaultItem="ui://7l6lvkayrhha9k">
       <gearDisplay controller="ctrlTab" pages="2"/>
       <item/>
       <item/>
+      <item/>
     </list>
   </displayList>
 </component>

FGUIProject/assets/Card/components/ComSkill.xml

@@ -4,7 +4,7 @@
     <loader id="n78_rhha" name="loaSkill" xy="-32,-61" size="234,432" url="ui://7l6lvkayr9ri9x" autoSize="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n75_rhha" name="n75" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="3,3">
+    <image id="n75_rhha" name="n75" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="10,10" size="150,150" aspect="true">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

FGUIProject/assets/Card/components/ListSkillItem.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="928,181">
+<component size="928,163">
   <displayList>
-    <image id="n74_rhha" name="n74" src="wr9a7q" fileName="images/kp_jndik_1.png" xy="0,0" size="928,181"/>
-    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="48,16" size="165,165" scale="0.91,0.91"/>
-    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="41,9"/>
-    <image id="n77_rhha" name="n77" src="wr9a7o" fileName="images/kp_dengj_1.png" xy="124,139"/>
-    <component id="n76_rhha" name="btnUp" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="659,55" size="230,70">
+    <image id="n74_rhha" name="n74" src="wr9a7q" fileName="images/kp_jndik_1.png" xy="0,0" size="928,163"/>
+    <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="n80_rhha" name="txtLv" xy="140,135" pivot="0.5,0" size="43,34" fontSize="24" color="#fdf9e7" align="center" text="1级"/>
-    <text id="n81_rhha" name="txtName" xy="247,66" size="148,49" fontSize="36" color="#60544e" align="center" vAlign="middle" text="名字名字"/>
+    <text id="n81_rhha" name="txtName" xy="247,58" size="146,49" fontSize="36" color="#60544e" align="center" vAlign="middle" text="名字名字"/>
+    <component id="n75_rhha" name="comSkill" src="rhha9l" fileName="components/ComSkill.xml" xy="38,6" size="165,165" group="n82_f2bf" scale="0.91,0.91"/>
+    <image id="n79_rhha" name="n79" src="wr9a7r" fileName="images/kp_jnkuang_1.png" xy="38,5" size="150,150" group="n82_f2bf" aspect="true"/>
+    <image id="n77_rhha" name="n77" src="wr9a7o" fileName="images/kp_dengj_1.png" xy="114,125" group="n82_f2bf"/>
+    <text id="n80_rhha" name="txtLv" xy="131,125" 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="38,5" size="165,166"/>
   </displayList>
 </component>

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

@@ -7,10 +7,10 @@ namespace UI.Card
     public partial class UI_ListSkillItem
     {
         public GComponent target;
-        public UI_ComSkill m_comSkill;
         public GButton m_btnUp;
-        public GTextField m_txtLv;
         public GTextField m_txtName;
+        public UI_ComSkill m_comSkill;
+        public GTextField m_txtLv;
         public const string URL = "ui://7l6lvkayrhha9k";
         public const string PACKAGE_NAME = "Card";
         public const string RES_NAME = "ListSkillItem";
@@ -58,18 +58,18 @@ namespace UI.Card
 
         private void Init(GComponent comp)
         {
-            m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
             m_btnUp = (GButton)comp.GetChild("btnUp");
-            m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
+            m_comSkill = (UI_ComSkill)UI_ComSkill.Create(comp.GetChild("comSkill"));
+            m_txtLv = (GTextField)comp.GetChild("txtLv");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_btnUp = null;
+            m_txtName = null;
             m_comSkill.Dispose();
             m_comSkill = null;
-            m_btnUp = null;
             m_txtLv = null;
-            m_txtName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -394,7 +394,7 @@ namespace GFGGame
                 // if (int.Parse(listItem.m_txtUseCount.text) == 0) { continue; }
                 if (itemsCount[i] == 0) continue;
                 ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]);
-                count += itemCfg.cardUpLvGoldArr[1] * itemsCount[i];
+                count += itemCfg.cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1][1] * itemsCount[i];
                 hasExp += itemCfg.cardUpLvExp * itemsCount[i];
 
             }
@@ -425,7 +425,7 @@ namespace GFGGame
         private void OnClickBtnUpLv()
         {
 
-            int itemMoneyId = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[0]).cardUpLvGoldArr[0];
+            int itemMoneyId = ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[0]).cardUpLvGoldsArr[_cardData.itemCfg.rarity - 1][0];
             _comLvConsumeGold = UI_ComCostCurrency.Proxy(_comFosterBottom.m_ComLvConsumeGold);
             int itemMoneyNum = int.Parse(_comLvConsumeGold.m_txtNeed.text);
             UI_ComCostCurrency.ProxyEnd();