战斗

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

@@ -477,7 +477,7 @@ namespace GFGGame
             for (int i = 0; i < scoreCfg.Length; i++)
             {
                 clickScore +=
-                    (long)ScoreSystemData.Instance.GetRobotPartScore(robotData, i + 1, ClickType.PREFACT_CLICK, 0);
+                    (long)ScoreSystemData.Instance.GetRobotPartScore(robotData, i + 1, ClickType.PERFECT_CLICK, 0);
             }
 
             return clickScore;

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

@@ -204,11 +204,11 @@ namespace GFGGame
             int clickType = ClickType.MISS_CLICK;
             if (FightDataManager.Instance.autoPlay == true)
             {
-                return ClickType.PREFACT_CLICK;
+                return ClickType.PERFECT_CLICK;
             }
             if (scale <= 0.33f && scale > 0.23f)
             {
-                clickType = ClickType.PREFACT_CLICK;
+                clickType = ClickType.PERFECT_CLICK;
             }
             else if (scale <= 0.05f)
             {
@@ -216,7 +216,7 @@ namespace GFGGame
             }
             else
             {
-                clickType = ClickType.GREAT_CLICK;
+                clickType = ClickType.GOOD_CLICK;
             }
             return clickType;
         }
@@ -334,16 +334,16 @@ namespace GFGGame
                 currentTime = BeginTime.PART_FIGHT_BEGIN;
                 GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
-                score += ScoreSystemData.Instance.GetPartScore(myRoleData, partId, ClickType.PREFACT_CLICK, 0);
+                score += ScoreSystemData.Instance.GetPartScore(myRoleData, partId, ClickType.PERFECT_CLICK, 0);
                 if (targetRoleData.type == FightTargetType.PLAYER)
                 {
-                    targetScore += ScoreSystemData.Instance.GetPartScore(targetRoleData, partId, ClickType.PREFACT_CLICK, 0);
+                    targetScore += ScoreSystemData.Instance.GetPartScore(targetRoleData, partId, ClickType.PERFECT_CLICK, 0);
                 }
                 else
                 {
-                    targetScore += ScoreSystemData.Instance.GetRobotPartScore(targetRoleData, partId, ClickType.PREFACT_CLICK, 0);
+                    targetScore += ScoreSystemData.Instance.GetRobotPartScore(targetRoleData, partId, ClickType.PERFECT_CLICK, 0);
                 }
-                currentTime = BeginTime.PART_PREFACT_CLICK;
+                currentTime = BeginTime.PART_PERFECT_CLICK;
                 GetSkillScore(FightRoleType.MINE, roundIndex, currentTime, partId, mainScore, cardId, skillLvs, roundTime, ref score, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore);
                 GetSkillScore(FightRoleType.TAEGET, roundIndex, currentTime, partId, targetMainScore, targetCardId, targetSkillLvs, targetRoundTime, ref targetScore, mainScore, cardId, skillLvs, roundTime, ref score);
                 currentTime = BeginTime.PART_FIGHT_END;

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

@@ -8,8 +8,8 @@ namespace GFGGame
     public class ClickType
     {
         public const int MISS_CLICK = 0;
-        public const int GREAT_CLICK = 1;
-        public const int PREFACT_CLICK = 2;
+        public const int GOOD_CLICK = 1;
+        public const int PERFECT_CLICK = 2;
     }
     public class BeginTime
     {
@@ -20,7 +20,7 @@ namespace GFGGame
         public const int PART_SCORE_5 = 5;//作用第五回合
         public const int PART_SCORE_6 = 6;//作用第六回合
         public const int PART_ALL_FIGHT_BEGIN = 7;//对战开始
-        public const int PART_PREFACT_CLICK = 8;//每次优秀点击
+        public const int PART_PERFECT_CLICK = 8;//每次完美点击
         public const int PART_FIGHT_BEGIN = 9;//每回合开始
         public const int PART_FIGHT_END = 10;//每回合结束
         public const int ALL_PERFECT_START = 11;//登封造极开始
@@ -241,10 +241,10 @@ namespace GFGGame
                 case ClickType.MISS_CLICK:
                     clickCoefficient = ConstScoreSystem.MISS_SCORE;
                     break;
-                case ClickType.GREAT_CLICK:
+                case ClickType.GOOD_CLICK:
                     clickCoefficient = ConstScoreSystem.GREAT_SCORE;
                     break;
-                case ClickType.PREFACT_CLICK:
+                case ClickType.PERFECT_CLICK:
                     clickCoefficient = ConstScoreSystem.PERFECT_SCORE;
                     break;
             }
@@ -325,7 +325,7 @@ namespace GFGGame
         {
 
             if (skillLvlCfg.beginTime == BeginTime.PART_ALL_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
-          || skillLvlCfg.beginTime == BeginTime.PART_PREFACT_CLICK && currentTime == BeginTime.PART_PREFACT_CLICK
+          || skillLvlCfg.beginTime == BeginTime.PART_PERFECT_CLICK && currentTime == BeginTime.PART_PERFECT_CLICK
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_BEGIN && currentTime == BeginTime.PART_FIGHT_BEGIN
           || skillLvlCfg.beginTime == BeginTime.PART_FIGHT_END && currentTime == BeginTime.PART_FIGHT_END
           || skillLvlCfg.beginTime == BeginTime.ALL_PERFECT_START && currentTime == BeginTime.ALL_PERFECT_START

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

@@ -195,7 +195,7 @@ namespace GFGGame
             {
                 // _ui.m_comClick.target.touchable = true;
                 _ui.m_btnBack.visible = true;
-                Timers.inst.Add(0.5f, 1, SkillScoreStart);//评分结束
+                Timers.inst.Add(0.5f, 1, SkillScoreStart);
             }
             tryGuide = false;
             Timers.inst.AddUpdate(CheckGuide);
@@ -229,9 +229,9 @@ namespace GFGGame
                     //这里不把技能分加到总分里，因为技能分会算到部件分里
                     PartScoreStart();
                     break;
-                case BeginTime.PART_PREFACT_CLICK:
+                case BeginTime.PART_PERFECT_CLICK:
                     _allSkillScore += _skillScore;
-                    PartScoreResultStart(ClickType.PREFACT_CLICK);
+                    PartScoreResultStart(ClickType.PERFECT_CLICK);
                     break;
                 case BeginTime.PART_FIGHT_END:
                     _score += _skillScore;
@@ -300,9 +300,9 @@ namespace GFGGame
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
 
 
-            if (clickType == ClickType.PREFACT_CLICK)
+            if (clickType == ClickType.PERFECT_CLICK)
             {
-                _currentTime = BeginTime.PART_PREFACT_CLICK;
+                _currentTime = BeginTime.PART_PERFECT_CLICK;
                 SkillScoreStart(null);
             }
             else
@@ -327,10 +327,10 @@ namespace GFGGame
                 case ClickType.MISS_CLICK:
                     _ui.m_comClick.m_comResult.m_txtCount0.text = _partScore.ToString();
                     break;
-                case ClickType.GREAT_CLICK:
+                case ClickType.GOOD_CLICK:
                     _ui.m_comClick.m_comResult.m_txtCount1.text = _partScore.ToString();
                     break;
-                case ClickType.PREFACT_CLICK:
+                case ClickType.PERFECT_CLICK:
                     _prefectCount++;
                     _ui.m_comClick.m_comResult.m_txtCount2.text = _partScore.ToString();
                     break;

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

@@ -295,7 +295,7 @@ namespace GFGGame
         }
         private void CheckPartPerfectClickSkill()
         {
-            _currentTime = BeginTime.PART_PREFACT_CLICK;
+            _currentTime = BeginTime.PART_PERFECT_CLICK;
 
             UpdateSkill1();
         }
@@ -398,17 +398,17 @@ namespace GFGGame
                 case BeginTime.PART_FIGHT_BEGIN:
                     PartScoreStart();
                     break;
-                case BeginTime.PART_PREFACT_CLICK:
+                case BeginTime.PART_PERFECT_CLICK:
                     if (_skillScore < 0)
                     {
                         Timers.inst.Add(0.3f, 1, (object param) =>
                         {
-                            PartScoreResultStart(ClickType.PREFACT_CLICK);
+                            PartScoreResultStart(ClickType.PERFECT_CLICK);
                         });
                     }
                     else
                     {
-                        PartScoreResultStart(ClickType.PREFACT_CLICK);
+                        PartScoreResultStart(ClickType.PERFECT_CLICK);
                     }
                     break;
                 case BeginTime.PART_FIGHT_END:
@@ -463,7 +463,7 @@ namespace GFGGame
             int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
             _ui.m_comClick.m_comResult.m_t0.Stop(true, false);
 
-            if (clickType == ClickType.PREFACT_CLICK)
+            if (clickType == ClickType.PERFECT_CLICK)
             {
                 CheckPartPerfectClickSkill();
             }
@@ -483,11 +483,11 @@ namespace GFGGame
             int _targetPartScore;
             if (targetData.type == FightTargetType.PLAYER)
             {
-                _targetPartScore = ScoreSystemData.Instance.GetPartScore(targetData, _partId, ClickType.PREFACT_CLICK, _targetSkillScore);
+                _targetPartScore = ScoreSystemData.Instance.GetPartScore(targetData, _partId, ClickType.PERFECT_CLICK, _targetSkillScore);
             }
             else
             {
-                _targetPartScore = ScoreSystemData.Instance.GetRobotPartScore(targetData, _partId, ClickType.PREFACT_CLICK, _targetSkillScore);
+                _targetPartScore = ScoreSystemData.Instance.GetRobotPartScore(targetData, _partId, ClickType.PERFECT_CLICK, _targetSkillScore);
             }
             // Debug.Log("partId:" + _partId + "    skillScore:" + _partScore);
             // Debug.Log("partId:" + _partId + "   targetSkillScore: " + _targetPartScore);
@@ -499,10 +499,10 @@ namespace GFGGame
                 case ClickType.MISS_CLICK:
                     _ui.m_comClick.m_comResult.m_txtCount0.text = _partScore.ToString();
                     break;
-                case ClickType.GREAT_CLICK:
+                case ClickType.GOOD_CLICK:
                     _ui.m_comClick.m_comResult.m_txtCount1.text = _partScore.ToString();
                     break;
-                case ClickType.PREFACT_CLICK:
+                case ClickType.PERFECT_CLICK:
                     _prefectCount++;
                     _ui.m_comClick.m_comResult.m_txtCount2.text = _partScore.ToString();
                     break;

GameClient/Assets/Resources/DOTweenSettings.asset

@@ -49,6 +49,6 @@ MonoBehaviour:
     deAudioEnabled: 0
     deUnityExtendedEnabled: 0
     epoOutlineEnabled: 0
-  createASMDEF: 0
+  createASMDEF: 1
   showPlayingTweens: 0
   showPausedTweens: 0