Browse Source

飞花令暂用修改

zhangyuqian 1 year ago
parent
commit
1438dfac48

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -41,7 +41,7 @@ namespace GFGGame
 
             for (int i = 0; i < roleData.itemList.Count; i++)
             {
-                score += ItemDataManager.GetItemAdditionScore(roleData.itemList[i], roleData.scoreType, roleData.tags);
+                score += ItemDataManager.GetArenaScore(roleData.itemList[i], roleData.scoreType, roleData.tags);
             }
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
@@ -187,7 +187,7 @@ namespace GFGGame
             _roleData.itemScoreDic.Clear();
             for (int i = 0; i < _roleData.itemList.Count; i++)
             {
-                int score = ItemDataManager.GetItemAdditionScore(_roleData.itemList[i], _roleData.scoreType);
+                int score = ItemDataManager.GetArenaScore(_roleData.itemList[i], _roleData.scoreType);
                 _roleData.itemScoreList.Add(score);
                 _roleData.itemScoreDic[_roleData.itemList[i]] = score;
             }
@@ -198,7 +198,7 @@ namespace GFGGame
             float itemSum = 0;
             for (int i = 0; i < itemList.Count; i++)
             {
-                itemSum += ItemDataManager.GetItemAdditionScore(itemList[i], scoreType);
+                itemSum += ItemDataManager.GetArenaScore(itemList[i], scoreType);
             }
             return itemSum;
         }

+ 32 - 0
GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -296,6 +296,38 @@ namespace GFGGame
             return 0;
         }
 
+        /// 飞花令临时接口
+        public static int GetArenaScore(int itemId, int scoreType, string[] tags = null)
+        {
+            if (_dataDic.TryGetValue(itemId, out var itemData))
+            {
+                int scroe = 0;
+                if (tags != null)
+                {
+                    scroe += GetItemTagScore(itemId, tags);
+                }
+                scroe += itemData.GetScore(scoreType);
+                return scroe;
+            }
+            else
+            {
+                ItemCfg itemdate = ItemCfgArray.Instance.GetCfg(itemId);
+                ItemData itemDate = new ItemData() { };
+                if (itemdate != null)
+                {
+                    itemDate.id = itemdate.id;
+                    int scroe = 0;
+                    if (tags != null)
+                    {
+                        scroe += ItemDataManager.GetItemTagScore(itemId, tags);
+                    }
+                    scroe += itemDate.GetScore(scoreType);
+                    return scroe;
+                }
+            }
+            return 0;
+        }
+
         /// <summary>
         /// 获取茶话会item物品的属性
         /// </summary>