Browse Source

修改套装加分的判断

zhangyuqian 1 year ago
parent
commit
cff8d58d92

+ 14 - 11
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -511,19 +511,22 @@ namespace GFGGame
         {
         {
             //评分结束后,添加套装加成分数
             //评分结束后,添加套装加成分数
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            if (storyLevelCfg != null && storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            if (storyLevelCfg != null)
             {
             {
-                float addition = StudioDataManager.Instance.GetAddition();
-                addition = addition / 10000 * FightDataManager.Instance.totalScore;
-                _score += (int)Math.Round(addition);
-                UpdateProgressA();
-                if (addition > 0)
+                if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
                 {
                 {
-                    return true;
-                }
-                else
-                {
-                    return false;
+                    float addition = StudioDataManager.Instance.GetAddition();
+                    addition = addition / 10000 * FightDataManager.Instance.totalScore;
+                    _score += (int)Math.Round(addition);
+                    UpdateProgressA();
+                    if (addition > 0)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
                 }
             }
             }
             return false;
             return false;

+ 14 - 11
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -734,19 +734,22 @@ namespace GFGGame
         {
         {
             //评分结束后,添加套装加成分数
             //评分结束后,添加套装加成分数
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            if (storyLevelCfg != null && InstanceZonesDataManager.FightScene != ConstInstanceZonesType.Arena && storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            if (storyLevelCfg != null)
             {
             {
-                float addition = StudioDataManager.Instance.GetAddition();
-                addition = addition / 10000 * FightDataManager.Instance.totalScore;
-                _score += (int)Math.Round(addition);
-                UpdateProgressA();
-                if (addition > 0)
+                if (InstanceZonesDataManager.FightScene != ConstInstanceZonesType.Arena && storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
                 {
                 {
-                    return true;
-                }
-                else
-                {
-                    return false;
+                    float addition = StudioDataManager.Instance.GetAddition();
+                    addition = addition / 10000 * FightDataManager.Instance.totalScore;
+                    _score += (int)Math.Round(addition);
+                    UpdateProgressA();
+                    if (addition > 0)
+                    {
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
                 }
                 }
             }
             }
             return false;
             return false;