阳春花曼活动战斗加分调整

GameClient/Assets/Game/HotUpdate/Views/MainStory/InstanceZonesController.cs

@@ -59,12 +59,12 @@ namespace GFGGame
         public static async ETTask CheckStoryFightResult()
         {
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-            if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
-            {
-                float addition = StudioDataManager.Instance.GetAddition();
-                addition = addition / 10000 * FightDataManager.Instance.totalScore;
-                FightDataManager.Instance.totalScore += (int)Math.Round(addition);
-            }
+            //if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            //{
+            //    float addition = StudioDataManager.Instance.GetAddition();
+            //    addition = addition / 10000 * FightDataManager.Instance.totalScore;
+            //    FightDataManager.Instance.totalScore += (int)Math.Round(addition);
+            //}
             var score = FightDataManager.Instance.totalScore;
             //客户端先做判断，成功和失败处理不同
             var success = InstanceZonesDataManager.GetFightResult(score, out var npcScore);

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -419,7 +419,15 @@ namespace GFGGame
                 }
                 else
                 {
-                    Timers.inst.Add(0.3f, 1, Skip);//评分结束
+                    /******评分结束后，添加套装加成分数******/
+                    if (SuitAddScore())
+                    {
+                        Timers.inst.Add(1.0f, 1, Skip);
+                    }
+                    else
+                    {
+                        Timers.inst.Add(0.3f, 1, Skip);//评分结束
+                    }
                 }
             }
             else
@@ -499,6 +507,28 @@ namespace GFGGame
             }
         }
 
+        private bool SuitAddScore()
+        {
+            //评分结束后，添加套装加成分数
+            StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            {
+                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;
+        }
+
         private void CheckNumImage(string Num)
         {
             string res = "ui://Main/zd_pf_sz";

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -630,7 +630,15 @@ namespace GFGGame
                 }
                 else
                 {
-                    Timers.inst.Add(0.3f, 1, Skip);
+                    /******评分结束后，添加套装加成分数******/
+                    if (SuitAddScore())
+                    {
+                        Timers.inst.Add(1.0f, 1, Skip);
+                    }
+                    else
+                    {
+                        Timers.inst.Add(0.3f, 1, Skip);
+                    }
                 }
             }
             else
@@ -697,6 +705,27 @@ namespace GFGGame
                 });
         }
 
+        private bool SuitAddScore()
+        {
+            //评分结束后，添加套装加成分数
+            StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            if (storyLevelCfg.type == ConstInstanceZonesType.Studio && storyLevelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            {
+                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;
+        }
         private void CheckNumImage(string Num)
         {
             string res = "ui://Main/zd_pf_sz";