Browse Source

竞技场

zhaoyang 2 năm trước cách đây
mục cha
commit
bd179ea115

+ 2 - 2
FGUIProject/assets/Arena/ArenaRoundResultUI.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1183" designImage="ui://4lc5fhlbpsphi" designImageOffsetX="-10" designImageAlpha="0">
+<component size="1080,1183" opaque="false" designImage="ui://4lc5fhlbpsphi" designImageOffsetX="-10" designImageAlpha="0">
   <displayList>
     <image id="n15_jcej" name="n15" src="jcej2g" fileName="images/jjsjs_mbmb.png" xy="0,0"/>
     <list id="n16_jcej" name="list" xy="61,124" size="958,507" group="n24_jcej" defaultItem="ui://4lc5fhlbjcej30" align="center" vAlign="middle">
@@ -7,7 +7,7 @@
       <item/>
       <item/>
     </list>
-    <component id="n17_jcej" name="ComResult" src="jcej4m" fileName="ComResult.xml" xy="237,681" group="n24_jcej"/>
+    <component id="n17_jcej" name="ComResult" src="jcej4m" fileName="components/ComAllScoreResult.xml" xy="237,681" group="n24_jcej"/>
     <group id="n24_jcej" name="n24" xy="61,124" size="958,935" advanced="true" layout="vt" lineGap="50" excludeInvisibles="true">
       <relation target="" sidePair="middle-middle"/>
     </group>

+ 27 - 1
GameClient/Assets/Game/HotUpdate/Data/ArenaDataManager.cs

@@ -90,7 +90,33 @@ namespace GFGGame
         {
             return arenaTarget.RobotDressupList[index];
         }
-
+        /// <summary>
+        /// 获取推荐卡牌
+        /// </summary>
+        public int GetRecommentCardId(int scoreType, List<int> itemList)
+        {
+            List<CardData> cardDatas = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRarity(0), itemList, scoreType);
+            int cardId = 0;
+            for (int j = 0; j < cardDatas.Count; j++)
+            {
+                bool isSame = false;
+                for (int k = 0; k < ArenaDataManager.Instance.ThemeList.Count; k++)
+                {
+                    FightRoleData roleData = ArenaDataManager.Instance.DressupList[k];
+                    if (cardDatas[j].id == roleData.cardId)
+                    {
+                        isSame = true;
+                        break;
+                    }
+                }
+                if (isSame == false)
+                {
+                    cardId = cardDatas[j].id;
+                    break;
+                }
+            }
+            return cardId;
+        }
         /// <summary>
         /// 获取推荐列表
         /// </summary>

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -128,7 +128,7 @@ namespace GFGGame
                 FightRoleData roleData = ArenaDataManager.Instance.DressupList[i];
                 roleData.scoreType = scoreType;
                 roleData.itemList = ArenaDataManager.Instance.GetRecommentItemList(scoreType, roleData.tags);
-                roleData.cardId = FightDataManager.Instance.SortCardList(CardDataManager.GetCardListByRarity(0), roleData.itemList, scoreType)[0].id;
+                roleData.cardId = ArenaDataManager.Instance.GetRecommentCardId(scoreType, roleData.itemList);
                 roleData.cardScore = ItemDataManager.GetItemAdditionScore(roleData.cardId, roleData.scoreType, roleData.tags);
                 roleData.skillLvs = SkillDataManager.Instance.GetSkillLvs(roleData.cardId);
                 FightDataManager.Instance.SetItemScoreList(roleData);
@@ -172,6 +172,7 @@ namespace GFGGame
             }
             _ui.m_comCard.m_c1.selectedIndex = 1;
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cardId);
+            _ui.m_comCard.m_txtCardName.text = itemCfg.name;
             _ui.m_comCard.m_comCard.m_loaCard.url = ResPathUtil.GetCardSmallPath(itemCfg.res);
             _ui.m_comCard.m_loaScore.url = ResPathUtil.GetScorePath(ArenaDataManager.Instance.ThemeList[_themeIndex]);
             RarityIconController.UpdateRarityIcon(_ui.m_comCard.m_loaRarity, cardId, false);

+ 0 - 2
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -206,8 +206,6 @@ namespace GFGGame
                 }
             }
 
-
-
             GetFightResult();
             if (_ui.m_btnQuickFight.selected)
             {

BIN
GameClient/Assets/ResIn/UI/Arena/Arena_fui.bytes