技能

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

@@ -124,7 +124,13 @@ namespace GFGGame
             _targetData.cardId = fightCfg.targetCardId;
             _targetData.cardScore = fightCfg.targetCardScore;
             _targetData.tags = fightCfg.needTagsArr;
-            _targetData.skillLvs = new List<int>(fightCfg.targetSkillLvsArr);
+
+            List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(_targetData.cardId);
+            _targetData.skillLvs.Clear();
+            for (int i = 0; i < skillCfgs.Count; i++)
+            {
+                _targetData.skillLvs.Add(fightCfg.targetSkillLvsArr[0]);
+            }
             _targetData.itemScoreList.Clear();
             for (int i = 0; i < fightCfg.targetPartsScoreArr.Length; i++)
             {

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -438,7 +438,9 @@ namespace GFGGame
             fightData.res = string.IsNullOrEmpty(robotProto.RobotHead) ? "self" : robotProto.RobotHead;
             double cardScore = (double)robotCfg.cardScore * randoms;
             fightData.cardScore = (int)Math.Ceiling(cardScore);
+
             List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(fightData.cardId);
+            fightData.skillLvs.Clear();
             for (int i = 0; i < skillCfgs.Count; i++)
             {
                 fightData.skillLvs.Add(robotCfg.skillLvs);

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

@@ -265,7 +265,7 @@ namespace GFGGame
                     break;
                 case BeginTime.ALL_PERFECT_START:
                     _score += _skillScore;
-                    AllCirclePlayStart();//完美八连击
+                    UpdateProgress();
                     break;
             }
         }
@@ -404,8 +404,7 @@ namespace GFGGame
                 if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)//0)// 
                 {
                     _currentTime = BeginTime.ALL_PERFECT_START;
-                    // AllCirclePlayStart();//完美八连击
-                    SkillScoreStart(null);
+                    AllCirclePlayStart();//完美八连击
                 }
                 else
                 {
@@ -475,8 +474,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
                     _prefectCount = 0;
-                    UpdateProgress();
-
+                    SkillScoreStart(null);
                 });
             if (ViewManager.isViewOpen(typeof(GuideView).FullName) && GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
             {

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

@@ -432,7 +432,7 @@ namespace GFGGame
                     UpdateProgress(OnePartScoreEnd);
                     break;
                 case BeginTime.ALL_PERFECT_START:
-                    UpdateProgress(AllCirclePlayStart);
+                    UpdateProgress(OnePartScoreEnd);
                     break;
             }
         }
@@ -558,8 +558,8 @@ namespace GFGGame
             {
                 if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)// 0)// 
                 {
-                    CheckAllPerfectClickSkill();
-                    // AllCirclePlayStart();//完美八连击
+                    // CheckAllPerfectClickSkill();
+                    AllCirclePlayStart();//完美八连击
                 }
                 else
                 {
@@ -624,7 +624,7 @@ namespace GFGGame
             _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
                     _prefectCount = 0;
-                    UpdateProgress(OnePartScoreEnd);
+                    CheckAllPerfectClickSkill();
                 });
         }
         private void OnBtnSpeedUp()