整理

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit c692aea37165383607a1c58afb1dfdfdaf9d9ad9
+Subproject commit 2d0f99aee53069f7a3bb6c04876470e024302803

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

@@ -286,7 +286,7 @@ namespace GFGGame
             {
                 return 0;
             }
-            return GetStarCount(currentLevelID, score);
+            return CalculateHelper.GetStoryChapterStar(currentLevelID, score);
         }
 
         public static int GetStarCountHistory(string levelID, int score)
@@ -298,30 +298,7 @@ namespace GFGGame
             {
                 return 0;
             }
-            return GetStarCount(levelID, score);
-        }
-
-        public static int GetStarCount(string levelID, int score)
-        {
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(levelID);
-            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-            int starCount = 0;
-            if (score > fightCfg.score1)
-            {
-                if (score > fightCfg.score3)
-                {
-                    starCount = 3;
-                }
-                else if (score > fightCfg.score2)
-                {
-                    starCount = 2;
-                }
-                else
-                {
-                    starCount = 1;
-                }
-            }
-            return starCount;
+            return CalculateHelper.GetStoryChapterStar(levelID, score);
         }
 
         public static bool CheckCurrentScoreEnough(int score)

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

@@ -67,9 +67,9 @@ namespace GFGGame
                     valueBase = cfg.score4;
                     break;
             }
-            AttributesDic.TryGetValue(CalculateUtil.GetItemScoreKey(scoreType, (int)ConstItemAttributeActionType.ADD_VALUE), out var valueAdd);
-            AttributesDic.TryGetValue(CalculateUtil.GetItemScoreKey(scoreType, (int)ConstItemAttributeActionType.ADD_PERCENT), out var percentAdd);
-            return CalculateUtil.GetItemAttribute(valueBase, percentAdd, valueAdd);
+            AttributesDic.TryGetValue(CalculateHelper.GetItemScoreKey(scoreType, (int)ConstItemAttributeActionType.ADD_VALUE), out var valueAdd);
+            AttributesDic.TryGetValue(CalculateHelper.GetItemScoreKey(scoreType, (int)ConstItemAttributeActionType.ADD_PERCENT), out var percentAdd);
+            return CalculateHelper.GetItemAttribute(valueBase, percentAdd, valueAdd);
         }
     }
 }