卡牌分数

GameClient/Assets/Game/HotUpdate/Data/ScoreSystemData.cs

@@ -83,7 +83,7 @@ namespace GFGGame
                 }
             }
             int roleScore = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl)).baseScore;
-            int cardScore = DressUpMenuItemDataManager.GetItemScore(InstanceZonesDataManager.currentCardId);
+            int cardScore = ItemDataManager.GetScore(InstanceZonesDataManager.currentCardId, InstanceZonesDataManager.currentScoreType);
             double tagScore = tagProportion * partScore;
 
             return (partScore + tagScore + roleScore + cardScore) * ConstScoreSystem.MAIN_SCORE;
@@ -116,7 +116,7 @@ namespace GFGGame
         {
             return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE;
         }
-        
+
         /// <summary>
         /// 部件基础评分
         /// </summary>
@@ -133,27 +133,27 @@ namespace GFGGame
             }
             return partScore;
         }
-        public double GetPartItemClickScore(int partId, int clickState)
-        {
-            //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22
-            double clickCoefficient = 0;
-            switch (clickState)
-            {
-                case MISS_CLICK:
-                    clickCoefficient = ConstScoreSystem.MISS_SCORE;
-                    break;
-                case GREAT_CLICK:
-                    clickCoefficient = ConstScoreSystem.GREAT_SCORE;
-                    break;
-                case PREFACT_CLICK:
-                    clickCoefficient = ConstScoreSystem.PERFECT_SCORE;
-                    break;
-            }
-            int roleScore = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl)).baseScore;
-            int cardScore = DressUpMenuItemDataManager.GetItemScore(InstanceZonesDataManager.currentCardId);
-            double clickScore = (GetPartBaseScore(partId) + (cardScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
-            return clickScore;
-        }
+        // public double GetPartItemClickScore(int partId, int clickState)
+        // {
+        //     //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22
+        //     double clickCoefficient = 0;
+        //     switch (clickState)
+        //     {
+        //         case MISS_CLICK:
+        //             clickCoefficient = ConstScoreSystem.MISS_SCORE;
+        //             break;
+        //         case GREAT_CLICK:
+        //             clickCoefficient = ConstScoreSystem.GREAT_SCORE;
+        //             break;
+        //         case PREFACT_CLICK:
+        //             clickCoefficient = ConstScoreSystem.PERFECT_SCORE;
+        //             break;
+        //     }
+        //     int roleScore = RoleLevelCfgArray.Instance.GetCfg(GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl)).baseScore;
+        //     int cardScore = DressUpMenuItemDataManager.GetItemScore(InstanceZonesDataManager.currentCardId);
+        //     double clickScore = (GetPartBaseScore(partId) + (cardScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
+        //     return clickScore;
+        // }
         public void GetPartItemCardScore(double mainScore, int partId, out double skillScore, out bool showCard)
         {
             skillScore = 0;

GameClient/Assets/Game/HotUpdate/Data/VO/ItemData.cs

@@ -20,7 +20,7 @@ namespace GFGGame
 
         public void SetAttributes(List<int> keys, List<int> values)
         {
-            for(var i = 0; i < keys.Count; ++i)
+            for (var i = 0; i < keys.Count; ++i)
             {
                 SetAttribute(keys[i], values[i], false);
             }
@@ -29,7 +29,7 @@ namespace GFGGame
         public void SetAttribute(int key, int value, bool dispatch = true)
         {
             AttributesDic[key] = value;
-            if(dispatch)
+            if (dispatch)
             {
                 EventAgent.DispatchEvent(ConstMessage.ITEM_ATTRIBUTE_CHANGED, id);
             }
@@ -40,7 +40,7 @@ namespace GFGGame
             get
             {
                 var cfg = ItemCfgArray.Instance.GetCfg(id);
-                return GetScore(cfg.mainScore>0? cfg.mainScore:1);
+                return GetScore(cfg.mainScore > 0 ? cfg.mainScore : 1);
             }
         }
 
@@ -48,7 +48,11 @@ namespace GFGGame
         {
             int valueBase = 0;
             var cfg = ItemCfgArray.Instance.GetCfg(id);
-            switch(scoreType)
+            if (cfg.itemType == ConstItemType.CARD)
+            {
+                return CardDataManager.GetCardDataById(id).scores[scoreType];
+            }
+            switch (scoreType)
             {
                 case (int)ConstItemAttributeType.FENG:
                     valueBase = cfg.score1;