卡牌

FGUIProject/assets/Card/CardMoodUI.xml

@@ -20,7 +20,7 @@
     <component id="n2_lc71" name="btnPlay" src="lc718j" fileName="components/btnPlay.xml" xy="485,1771">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n4_lc71" name="comProgress" src="lc718l" fileName="components/ComProgress.xml" xy="540,2560">
+    <component id="n4_lc71" name="comProgress" src="lc718l" fileName="components/ComProgress.xml" xy="540,2560" touchable="false">
       <relation target="" sidePair="bottom-bottom"/>
     </component>
   </displayList>

FGUIProject/assets/Card/CardUpUI.xml

@@ -11,7 +11,7 @@
     <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" align="center">
+    <list id="n8_jzrr" name="listProperty" xy="59,389" size="860,68" layout="row" defaultItem="ui://eg2y0ldpojlzk" align="center" autoClearItems="true">
       <item/>
       <item/>
       <item/>

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit de965c0b7b29ba1382c6ef238abc68e4ccba019a
+Subproject commit 506b34d9c3b9400de0fabb78d0dda1d2ecc46802

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

@@ -46,6 +46,10 @@ namespace GFGGame
                     CardData cardData = CardDataManager.GetCardDataById(response.CardId);
                     cardData.lv = response.CardLvl;
                     cardData.exp = response.CardExp;
+                    for (int i = 0; i < response.KsAttribute.Count; i++)
+                    {
+                        cardData.scores[response.KsAttribute[i]] = response.VsAttribute[i];
+                    }
                     return true;
                 }
             }
@@ -61,6 +65,10 @@ namespace GFGGame
                 {
                     CardData cardData = CardDataManager.GetCardDataById(response.CardId);
                     cardData.star = response.CardStar;
+                    for (int i = 0; i < response.KsAttribute.Count; i++)
+                    {
+                        cardData.scores[response.KsAttribute[i]] = response.VsAttribute[i];
+                    }
                     return true;
                 }
             }
@@ -69,8 +77,8 @@ namespace GFGGame
         //resIndex:0默认，1特殊
         public static async ETTask<bool> ChangeCardRes(int cardId, int resIndex)
         {
-            M2C_ChangeCardLvl response = null;
-            response = (M2C_ChangeCardLvl)await MessageHelper.SendToServer(new C2M_ChangeCardLvl() { CardId = cardId, ResIndex = resIndex });
+            M2C_ChangeCardRes response = null;
+            response = (M2C_ChangeCardRes)await MessageHelper.SendToServer(new C2M_ChangeCardRes() { CardId = cardId, ResIndex = resIndex });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)

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

@@ -66,7 +66,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("词牌星级达到{0}级解锁", _viewData.itemCfg.cardMoodStar));
                 return;
             }
-            ViewManager.Show(ViewName.CARD_Mood_VIEW, _viewData);
+            ViewManager.Show(ViewName.CARD_Mood_VIEW, _viewData, new object[] { typeof(CardStoryView).Name, _viewData });
         }
         protected override void OnHide()
         {