Эх сурвалжийг харах

星数显示修改,词牌升级物品框修改

huangxiaoyue 1 жил өмнө
parent
commit
85477c7425

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Data/TaskDataManager.cs

@@ -169,8 +169,9 @@ namespace GFGGame
                     var suitCfg = SuitCfgArray.Instance.GetCfg(taskCfg.paramsArr[0]);
                     return string.Format(activeRewardCfg.desc, suitCfg.name);
                 case ConstTaskType.UpgradeCardLvl:
-                case ConstTaskType.UpgradeCardStar:
                     return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), taskCfg.paramsArr[0]);
+                case ConstTaskType.UpgradeCardStar:
+                    return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount(), taskCfg.paramsArr[0]/5);
                 case ConstTaskType.FinishStory:
                 case ConstTaskType.FinishInstanceZones:
                     {

+ 0 - 4
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -80,7 +80,6 @@ namespace GFGGame
         }
         private void UpdateCardList()
         {
-
             List<CardData> cardList = CardDataManager.GetCardListByRarity(_ui.m_listRole.selectedIndex);
             if (CardDataManager.isFilter == true)
             {
@@ -156,10 +155,8 @@ namespace GFGGame
             CardDataManager._selectList.Clear();
             _ui.m_listRole.selectedIndex = 0;
             _ui.m_listCard.selectedIndex = 0;
-
         }
 
-
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.UP_CARD_LV) <= 0
@@ -183,7 +180,6 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.UP_CARD_STAR, 8, "");
             GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_STAR, 8);
-
         }
         protected override void TryCompleteGuide()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -742,7 +742,7 @@ namespace GFGGame
             listItem.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
             listItem.m_CountType.selectedIndex = 1;
             listItem.m_ButtonType.selectedIndex = 0;
-            listItem.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            listItem.m_QualityType.selectedIndex = 4;
             int needCount = cardStarCfg.materiarsArr[index][1];
             long hasCount = ItemDataManager.GetItemNum(cardStarCfg.materiarsArr[index][0]);
             listItem.m_txtDecomCount.text = StringUtil.GetColorText(hasCount.ToString(), hasCount < needCount ? "#D27869" : "#FFFFFF");// StringUtil.GetColorText(needCount.ToString(), hasCount < needCount ? "#D27869" : "#FDF3D7"); ;

BIN
GameClient/Assets/ResIn/UI/Card/Card_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Mail/Mail_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes