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

茶话会属性计算优化调整

huangxiaoyue 1 жил өмнө
parent
commit
478b9ee252

+ 13 - 2
GameClient/Assets/Game/HotUpdate/Data/DressUpMenuItemDataManager.cs

@@ -854,8 +854,19 @@ namespace GFGGame
             {
                 haveCount += _itemDatasBySubTypeDic[ConstDressUpItemType.TE_SHU].Count;
             }
+        }
         
-    }
- 
+        //整理配置表数据
+        public static Dictionary<int, Dictionary<string, int>> GetTidyTagCfgArray(ItemCfg itemCfg)
+        {
+            Dictionary<int, Dictionary<string, int>> tagsArr = new Dictionary<int, Dictionary<string, int>>();
+            for (int t = 0; t < itemCfg.tagsArr.Length; t++)
+            {
+                Dictionary<string, int> arr = new Dictionary<string, int>();
+                arr.Add(itemCfg.tagsArr[t][0], Convert.ToInt32(itemCfg.tagsArr[t][1]));
+                tagsArr[t] = arr;
+            }
+            return tagsArr;
+        }
     }
 }

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

@@ -1040,22 +1040,6 @@ namespace GFGGame
 
         private void ListTagItem(int index, GObject item)
         {
-            ItemCfg itemCfg = (ItemCfg)item.parent.data;
-            UI_ComTagItem listItem = UI_ComTagItem.Proxy(item);
-            string name = itemCfg.tagsArr[index][0].ToString();
-            string score = itemCfg.tagsArr[index][1];
-            int tagType = TagCfgArray.Instance.GetCfg(name).type;
-            UI.CommonGame.UI_ComTag itemTag = UI.CommonGame.UI_ComTag.Proxy(listItem.m_loaTag);
-            itemTag.m_txtTag.text = name;
-            itemTag.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tagType);
-            itemTag.m_loaTag.scale = new Vector2(0.8f, 0.8f);
-            UI.CommonGame.UI_ComTag.ProxyEnd();
-            listItem.m_txtScore.text = score;
-            UI_ComTagItem.ProxyEnd();
-        }
-
-        private void ListSuitTagItem(int index, GObject item)
-        {
             Dictionary<int, Dictionary<string, int>> tagsArr = (Dictionary<int, Dictionary<string, int>>)item.parent.data;
             UI_ComTagItem listItem = UI_ComTagItem.Proxy(item);
             string name = "";
@@ -1095,7 +1079,7 @@ namespace GFGGame
                 else
                 {
                     if (listItem.m_ListTag.data == null)
-                        listItem.m_ListTag.itemRenderer = ListSuitTagItem;
+                        listItem.m_ListTag.itemRenderer = ListTagItem;
 
                     var tagCfg = DressUpMenuSuitDataManager.GetSuitTagCfgArray(id);
                     listItem.m_ListTag.data = tagCfg;
@@ -1121,8 +1105,9 @@ namespace GFGGame
                     if (listItem.m_ListTag.data == null)
                         listItem.m_ListTag.itemRenderer = ListTagItem;
 
-                    listItem.m_ListTag.data = itemCfg;
-                    listItem.m_ListTag.numItems = itemCfg.tagsArr.Length;
+                    var tagsArr = DressUpMenuItemDataManager.GetTidyTagCfgArray(itemCfg);
+                    listItem.m_ListTag.data = tagsArr;
+                    listItem.m_ListTag.numItems = tagsArr.Count;
                     listItem.m_itemType.selectedIndex = 1;
                 }
 
@@ -1173,15 +1158,19 @@ namespace GFGGame
             partName = itemCfg.name;
             listItem.m_iconSelected.visible = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
 
-            if (!IsTeaPart)
+            if (!IsTeaPart) { 
                 listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _fightCfg.needTagsArr);
+                listItem.m_itemType.selectedIndex = 0;
+            }
             else
             {
                 if (listItem.m_ListTag.data == null)
                     listItem.m_ListTag.itemRenderer = ListTagItem;
 
-                listItem.m_ListTag.data = itemCfg;
-                listItem.m_ListTag.numItems = itemCfg.tagsArr.Length;
+                var tagsArr = DressUpMenuItemDataManager.GetTidyTagCfgArray(itemCfg);
+                listItem.m_ListTag.data = tagsArr;
+                listItem.m_ListTag.numItems = tagsArr.Count;
+                listItem.m_itemType.selectedIndex = 1;
             }
 
             listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
@@ -1203,8 +1192,9 @@ namespace GFGGame
                 {
                     listItem.m_ListTag.itemRenderer = ListTagItem;
                 }
-                listItem.m_ListTag.data = itemCfg;
-                listItem.m_ListTag.numItems = itemCfg.tagsArr.Length;
+                var tagsArr = DressUpMenuItemDataManager.GetTidyTagCfgArray(itemCfg);
+                listItem.m_ListTag.data = tagsArr;
+                listItem.m_ListTag.numItems = tagsArr.Count;
                 listItem.m_itemType.selectedIndex = 1;
             }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

@@ -183,7 +183,7 @@ namespace GFGGame
 
             _ui.m_teaPartyItemTips.target.visible = true;
             _ui.m_teaPartyItemTips.m_txtName.text = teapartyRoleCfg[index].name;
-            _ui.m_teaPartyItemTips.m_txtDesc.text = teapartyRoleCfg[index].hint;
+            _ui.m_teaPartyItemTips.m_txtDesc.text = teapartyRoleCfg[index].desc;
         }
 
         private void OnTeaPartyItemTipsClick()