zhaoyang 2 жил өмнө
parent
commit
def6918c00

+ 0 - 29
GameClient/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs

@@ -312,31 +312,6 @@ namespace GFGGame
             // return GetItemScore(itemId, InstanceZonesDataManager.currentScoreType);
             // return GetItemScore(itemId, InstanceZonesDataManager.currentScoreType);
         }
         }
 
 
-        public static int GetItemScore(int itemId, int scoreType)
-        {
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
-
-            if (itemCfg == null) return 0;
-
-            int score = itemCfg.baseScore;
-            switch (scoreType)
-            {
-                case ConstDressUpScoreType.SCORE_FENG:
-                    score += itemCfg.score1;
-                    break;
-                case ConstDressUpScoreType.SCORE_HUA:
-                    score += itemCfg.score2;
-                    break;
-                case ConstDressUpScoreType.SCORE_XUE:
-                    score += itemCfg.score3;
-                    break;
-                case ConstDressUpScoreType.SCORE_YUE:
-                    score += itemCfg.score4;
-                    break;
-            }
-            return score;
-        }
-
         public static List<int> DressSearch(List<int> list, bool isTaoZhuang)
         public static List<int> DressSearch(List<int> list, bool isTaoZhuang)
         {
         {
             List<int> searchList = new List<int>();
             List<int> searchList = new List<int>();
@@ -357,10 +332,6 @@ namespace GFGGame
                     searchList.Add(list[i]);
                     searchList.Add(list[i]);
                 }
                 }
             }
             }
-            // if (searchList.Count == 0)
-            // {
-            //     PromptController.Instance.ShowFloatTextPrompt("搜索不到相关物品");
-            // }
             return searchList;
             return searchList;
         }
         }
         public static List<int> DressFilter(List<int> list, bool isTaoZhuang)
         public static List<int> DressFilter(List<int> list, bool isTaoZhuang)

+ 2 - 2
GameClient/Assets/Game/HotUpdate/ExcelConfig/Manager/ClothingShopCfgManager.cs

@@ -96,8 +96,8 @@ namespace GFGGame
                 }
                 }
                 else if (scoreType > 0 && !hasA && !hasB)
                 else if (scoreType > 0 && !hasA && !hasB)
                 {
                 {
-                    int scoreA = DressUpMenuItemDataManager.GetItemScore(a.itemID, scoreType);
-                    int scoreB = DressUpMenuItemDataManager.GetItemScore(b.itemID, scoreType);
+                    int scoreA = ItemDataManager.GetItemAdditionScore(a.itemID, scoreType);
+                    int scoreB = ItemDataManager.GetItemAdditionScore(b.itemID, scoreType);
                     if (scoreB > scoreA)
                     if (scoreB > scoreA)
                     {
                     {
                         return 1;
                         return 1;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -843,7 +843,7 @@ namespace GFGGame
             // int mainValuel;
             // int mainValuel;
             // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
             // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
             listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _fightCfg.scoreType);
             listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + _fightCfg.scoreType);
-            listItem.m_txtScore.text = "" + DressUpMenuItemDataManager.GetItemScore(id, _fightCfg.scoreType);
+            listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, _fightCfg.scoreType);
 
 
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_txtTitle.text = partName;
             listItem.m_txtTitle.text = partName;