卡牌

FGUIProject/assets/Card/CardUpUI.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="936,550">
-  <controller name="c1" pages="0,,1," selected="1"/>
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n10_lc1j" name="n10" src="lwri5u" fileName="images/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,550"/>
+    <image id="n10_lc1j" name="n10" src="lwri5u" fileName="imagesExport/hc_kuang_6.png" pkg="mk0fwx0x" xy="0,0" size="936,550"/>
     <image id="n11_lc1j" name="n11" src="lc1j8y" fileName="images/sj_xian.png" xy="13,79"/>
-    <text id="n12_lc1j" name="txtTitle" xy="367,50" pivot="0.5,0" size="212,69" fontSize="52" color="#876e54" text="恭喜升星">
+    <text id="n12_lc1j" name="txtTitle" xy="367,50" pivot="0.5,0" size="212,69" fontSize="52" color="#876e54" text="恭喜升级">
       <gearText controller="c1" pages="1" values="恭喜升星" default="恭喜升级"/>
     </text>
     <text id="n4_jzrr" name="txtLast" xy="402,230" pivot="1,0" anchor="true" size="117,64" group="n7_jzrr" fontSize="48" color="#876e54" text="Lv10"/>
     <text id="n5_jzrr" name="txtNow" xy="534,230" size="117,64" group="n7_jzrr" fontSize="48" color="#d27869" text="Lv20"/>
     <text id="n6_jzrr" name="n6" xy="466,231" pivot="0.5,0" anchor="true" size="62,64" group="n7_jzrr" fontSize="48" color="#949494" text="&gt;&gt;"/>
     <group id="n7_jzrr" name="n7" xy="285,230" size="366,65"/>
-    <list id="n8_jzrr" name="listProperty" xy="59,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk">
+    <list id="n8_jzrr" name="listProperty" xy="59,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk" align="center">
       <item/>
       <item/>
       <item/>

FGUIProject/assets/Card/components/ComConsumeCurrency.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n4_a713" name="n4" src="a71377" fileName="imagesExport/kp_dikuang_3.png" pkg="eg2y0ldp" xy="60,3"/>
     <text id="n2_ojlz" name="n2" xy="0,0" size="65,42" fontSize="30" color="#7d634a" autoSize="none" text="消耗"/>
-    <loader id="n1_ojlz" name="loaIcon" xy="70,-6" size="54,54" url="ui://eg2y0ldpq08x3" autoSize="true"/>
-    <text id="n3_ojlz" name="txtCount" xy="120,0" size="160,42" fontSize="28" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="999/55555"/>
+    <loader id="n1_ojlz" name="loaIcon" xy="70,-6" size="60,60" url="ui://eg2y0ldpq08x3" autoSize="true"/>
+    <text id="n3_ojlz" name="txtCount" xy="120,1" size="160,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="999/55555"/>
   </displayList>
 </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="2"/>
+  <controller name="ctrlTab" exported="true" pages="0,,1,,2," selected="1"/>
   <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"/>
@@ -17,11 +17,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 controller="ctrlTab" page="1"/>
+      <Button checked="true" controller="ctrlTab" page="1"/>
       <property target="title" propertyId="0" value="升星"/>
     </component>
     <component id="n19_ojlz" name="btnSkill" src="ojlzr" fileName="components/btnTab.xml" xy="708,1044" group="n22_842s">
-      <Button checked="true" controller="ctrlTab" page="2"/>
+      <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"/>
@@ -76,17 +76,17 @@
     <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="n47_wr9a" name="listStarConsume" xy="127,1307" size="876,196" group="n57_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkaywr9a82" align="center">
+    <list id="n47_wr9a" name="listStarConsume" xy="102,1307" size="876,196" group="n57_l2by" layout="row" colGap="166" defaultItem="ui://7l6lvkaywr9a82" align="center">
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComConsumeCurrency.xml" xy="415,1506" group="n57_l2by"/>
-    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="398,1573" size="270,74" group="n57_l2by">
+    <component id="n51_l2by" name="comStarCousumeGold" src="ojlz61" fileName="components/ComConsumeCurrency.xml" xy="395,1506" size="289,42" group="n57_l2by"/>
+    <component id="n52_l2by" name="btnUpStar" src="842s6q" fileName="components/Button9.xml" pkg="eg2y0ldp" xy="405,1573" size="270,74" group="n57_l2by">
       <Button title="升星"/>
     </component>
     <component id="n56_l2by" name="comTips" src="l2by86" fileName="components/ComTips.xml" pkg="eg2y0ldp" xy="622,1546" group="n57_l2by"/>
-    <group id="n57_l2by" name="n57" xy="127,1307" size="876,340" group="n55_l2by" advanced="true">
+    <group id="n57_l2by" name="n57" xy="102,1307" size="876,340" group="n55_l2by" advanced="true">
       <gearDisplay controller="ctrlFullStar" pages="0"/>
     </group>
     <list id="n64_l2by" name="listShowCard" xy="11,1382" size="1056,274" group="n55_l2by" layout="row" colGap="100" defaultItem="ui://7l6lvkayl2by89" align="center">

GameClient/Assets/Game/HotUpdate/ServerProxy/CardSProxy.cs

@@ -43,6 +43,9 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    CardData cardData = CardDataManager.GetCardDataById(response.CardId);
+                    cardData.lv = response.CardLvl;
+                    cardData.exp = response.CardExp;
                     return true;
                 }
             }
@@ -56,6 +59,8 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    CardData cardData = CardDataManager.GetCardDataById(response.CardId);
+                    cardData.star = response.CardStar;
                     return true;
                 }
             }
@@ -70,6 +75,8 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
+                    CardData cardData = CardDataManager.GetCardDataById(cardId);
+                    cardData.resIndex = resIndex;
                     return true;
                 }
             }

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

@@ -94,7 +94,7 @@ namespace GFGGame
             });
 
             EventAgent.AddEventListener(ConstMessage.CARD_UP_SKILL, UpdateUpSkillView);
-            EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
+            // EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, OnItemChangeListener);
 
         }
 
@@ -380,35 +380,8 @@ namespace GFGGame
         }
         private void OnClcikBtnAll()
         {
-            // bool isFullLv = false;
-            // int exp = 0;
-            // for (int i = 0; i < itemsCount.Count; i++)
-            // {
-            //     UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
-            //     int itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
-            //     int maxLv = CardRarityCfgArray.Instance.GetCfg(_cardData.itemCfg.rarity).maxCardLvl;
-            //     int needExp = CardLvlCfgArray.Instance.GetCfg(maxLv, _cardData.itemCfg.rarity).needExp;
-            //     for (int j = 1; j <= itemNum; j++)
-            //     {
-            //         exp += ItemCfgArray.Instance.GetCfg(upgradeCardItemsArr[i]).cardUpLvExp;
-            //         CardDataManager.GetPreViewLvAndExp(_cardData.itemCfg.rarity, _cardData.lv, _cardData.exp, exp, out int previewLv, out int previewExp);
-            //         itemsCount[i] = j;
-            //         listItem.m_txtUseCount.text = j.ToString();
-            //         Debug.Log("previewLv:" + previewLv + "  maxLv:" + maxLv + "   previewExp:" + previewExp + "   needExp:" + needExp);
-            //         if (previewLv >= maxLv && previewExp >= needExp)
-            //         {
-            //             isFullLv = true;
-            //             break;
-            //         }
-            //     }
-            //     if (isFullLv) break;
-            // }
-            // //  listItem.m_txtUseCount.text = itemsCount[index].ToString();
-            // this.UpdatePreView();
-
             for (int i = 0; i < itemsCount.Count; i++)
             {
-                // UI_ComConsume listItem = UI_ComConsume.Proxy(_comFosterBottom.m_listLvConsume.GetChildAt(i));
                 int itemNum = ItemDataManager.GetItemNum(upgradeCardItemsArr[i]);
                 for (int j = 0; j < itemNum; j++)
                 {
@@ -550,7 +523,6 @@ namespace GFGGame
 
         private async void OnClickShowCardListItem(EventContext context)
         {
-            // CardDataManager.SetShowCard(_cardData.id, (string)((context.data as GButton).data));
             int resIndex = (int)(context.data as GObject).data;
             if (resIndex != _cardData.resIndex)
             {