修改单人战斗点击公式

GameClient/Assets/Game/HotUpdate/Constant/ConstScoreSystem.cs

@@ -9,9 +9,11 @@ namespace GFGGame
         //点击完美附加评分系数
         public const double PERFECT_SCORE = 0.2;
         //点击优秀附加评分系数
-        public const double GREAT_SCORE = 0.1;
+        public const double GREAT_SCORE = 0.13;
         //点击Miss附加评分系数
         public const double MISS_SCORE = 0;
+        //点击系数
+        public const double CLICK_SCORE = 2.22;
         //完美八连击附加评分系数
         public const double ALL_PERFECT_SCORE = 0.2;
         //每个标签的加成系数

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

@@ -116,21 +116,20 @@ namespace GFGGame
         {
 
             //部件评分=部件基础分*部件系数
-            //点击评分=部件评分*点击系数
+            //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22   (新点击公式，防止点击优秀却因为未穿衣服结果是0分)
             //卡牌评分=总属性*技能配表百分比
             double partScore = GetPartItemScore(partId);
-            double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(mainScore, clickState);
+            double clickScore = ScoreSystemData.Instance.GetPartItemClickScore(partId, clickState);
 
-            // GetCardItemScore(mainScore, partId, out cardScore, out showCard);
             return (partScore + clickScore + skillScore);
         }
         public double GetPartItemScore(int partId)
         {
             return GetPartBaseScore(partId) * ConstScoreSystem.PART_SCORE;
         }
-        public double GetPartItemClickScore(double mainScore, int clickState)
+        public double GetPartItemClickScore(int partId, int clickState)
         {
-            //点击评分=部件评分*点击系数
+            //点击评分=（部件基础分+（+人物基础分+卡牌属性分数）*点击系数）*2.22
             double clickCoefficient = 0;
             switch (clickState)
             {
@@ -144,7 +143,9 @@ namespace GFGGame
                     clickCoefficient = ConstScoreSystem.PERFECT_SCORE;
                     break;
             }
-            double clickScore = mainScore * clickCoefficient;
+            int roleScore = RoleLevelCfgArray.Instance.GetCfg(RoleDataManager.lvl).baseScore;
+            int cardScore = DressUpMenuItemDataManager.GetItemScore(StoryDataManager.currentCardId);
+            double clickScore = (GetPartBaseScore(partId) + (cardScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
             return clickScore;
         }
         public void GetPartItemCardScore(double mainScore, int partId, out double skillScore, out bool showCard)
@@ -197,12 +198,12 @@ namespace GFGGame
         /// <returns></returns>
         public PassivitySkillCfg GetShowSkillCfg(int cardId)
         {
-            Dictionary<int, List<PassivitySkillCfg>> cfgs = SkillDataManager.Instance.dicPassivitySkill[cardId];
-            if (cfgs.Count == 0)
+            if (!SkillDataManager.Instance.dicPassivitySkill.ContainsKey(cardId))
             {
                 Debug.LogWarning(cardId + " 这张卡片没有配置技能");
                 return null;
             }
+            Dictionary<int, List<PassivitySkillCfg>> cfgs = SkillDataManager.Instance.dicPassivitySkill[cardId];
             foreach (int key in cfgs.Keys)
             {
                 if (cfgs[key][0].showSkill == 1)

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

@@ -131,7 +131,7 @@ namespace GFGGame
             UI_ComScoreResult comScoreResult = UI_ComScoreResult.Proxy(_ui.m_comClickCircle.m_ComScoreResult.target);
             int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             double partScore = ScoreSystemData.Instance.GetPartItemScore(partId);
-            double clickScore = +ScoreSystemData.Instance.GetPartItemClickScore(_mainScore, clickState);
+            double clickScore = +ScoreSystemData.Instance.GetPartItemClickScore(partId, clickState);
             int count = (int)(partScore + clickScore);
 
             comScoreResult.m_txtCount0.text = count.ToString();