|
@@ -124,7 +124,6 @@ namespace GFGGame
|
|
|
{
|
|
|
|
|
|
//部件评分=部件基础分*部件系数
|
|
|
- //点击评分=(部件基础分+(人物基础分+雅集技能分+词牌属性分数)*点击系数)*2.22 (新点击公式,防止点击优秀却因为未穿衣服结果是0分)
|
|
|
//词牌评分=总属性*技能配表百分比
|
|
|
double partBaseScore = GetPartBaseScore(roleData, partId);
|
|
|
|
|
@@ -135,17 +134,20 @@ namespace GFGGame
|
|
|
int cardScore = roleData.cardScore;
|
|
|
|
|
|
double clickCoefficient = GetPartItemClickScore(clickType);
|
|
|
- double clickScore = (partBaseScore + (roleScore + leagueSkillScore + cardScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
|
|
|
-
|
|
|
+ //start------------------------------------------------------
|
|
|
+ //本段注释为上个版本的计算公式,留做备份参考
|
|
|
+ //点击评分=(部件基础分+(人物基础分+雅集技能分+词牌属性分数)*点击系数)*2.22 (防止点击优秀却因为未穿衣服结果是0分)
|
|
|
+ //double clickScore = (partBaseScore + (roleScore + leagueSkillScore + cardScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
|
|
|
+ //end--------------------------------------------------------
|
|
|
+ //改为 点击评分 =(部件基础分+人物基础分)*点击系数
|
|
|
+ double clickScore = (partBaseScore + roleScore) * clickCoefficient;
|
|
|
int score = (int)Math.Ceiling(partScore + clickScore + skillScore);
|
|
|
- Debug.Log("clickScore:" + clickScore + " score:" + score);
|
|
|
return Math.Max(0, score);
|
|
|
}
|
|
|
|
|
|
public int GetRobotPartScore(FightData robotData, int partId, int clickType, double skillScore)
|
|
|
{
|
|
|
//部件评分=部件基础分*部件系数
|
|
|
- //点击评分=(部件基础分+(人物基础分+词牌属性分数)*点击系数)*2.22 (新点击公式,防止点击优秀却因为未穿衣服结果是0分)
|
|
|
//词牌评分=总属性*技能配表百分比
|
|
|
double partBaseScore = GetRobotPartBaseScore(robotData, partId);
|
|
|
|
|
@@ -156,8 +158,13 @@ namespace GFGGame
|
|
|
int cardScore = robotData.cardScore;
|
|
|
|
|
|
double clickCoefficient = GetPartItemClickScore(clickType);
|
|
|
- double clickScore = (partBaseScore + (cardScore + leagueSkillScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
|
|
|
-
|
|
|
+ //start------------------------------------------------------
|
|
|
+ //本段注释为上个版本的计算公式,留做备份参考
|
|
|
+ //点击评分=(部件基础分+(人物基础分+词牌属性分数)*点击系数)*2.22 (防止点击优秀却因为未穿衣服结果是0分)
|
|
|
+ //double clickScore = (partBaseScore + (cardScore + leagueSkillScore + roleScore) * clickCoefficient) * ConstScoreSystem.CLICK_SCORE;
|
|
|
+ //end--------------------------------------------------------
|
|
|
+ //改为 点击评分 =(部件基础分+人物基础分)*点击系数
|
|
|
+ double clickScore = (partBaseScore + roleScore) * clickCoefficient;
|
|
|
int score = (int)Math.Ceiling(partScore + clickScore + skillScore);
|
|
|
return Math.Max(0, score);
|
|
|
}
|
|
@@ -197,6 +204,23 @@ namespace GFGGame
|
|
|
return partScore + tagScore;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 部件基础分之和
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="roleData"></param>
|
|
|
+ /// <returns></returns>
|
|
|
+ public double GetAllPartBaseScore(FightData roleData)
|
|
|
+ {
|
|
|
+ double baseScore = 0;
|
|
|
+
|
|
|
+ for (int i = 0; i < FightScoreCfgArray.Instance.dataArray.Length; i++)
|
|
|
+ {
|
|
|
+ baseScore += GetPartBaseScore(roleData, i + 1);
|
|
|
+ }
|
|
|
+ return baseScore;
|
|
|
+ }
|
|
|
+
|
|
|
private double GetRobotPartBaseScore(FightData robotData, int partId)
|
|
|
{
|
|
|
double partBaseScore = robotData.itemScoreList[partId - 1];
|
|
@@ -365,10 +389,11 @@ namespace GFGGame
|
|
|
/// </summary>
|
|
|
/// <param name="mainScore"></param>
|
|
|
/// <returns></returns>
|
|
|
- public int GetAllCircleAddScore(double mainScore)
|
|
|
+ public int GetAllCircleAddScore(FightData fightData)
|
|
|
{
|
|
|
- //主属性20%的加分
|
|
|
- return (int)Math.Ceiling(mainScore * ConstScoreSystem.ALL_PERFECT_SCORE);
|
|
|
+ //登峰造极评分 = (部件基础分之和 + 人物基础分)*卓越点击系数 * 3
|
|
|
+ double allPartsBaseScore = GetAllPartBaseScore(fightData);
|
|
|
+ return (int)Math.Ceiling((allPartsBaseScore + (double)fightData.baseScore)* ConstScoreSystem.PERFECT_SCORE * ConstScoreSystem.ALL_CIRCLE_SCORE);
|
|
|
}
|
|
|
|
|
|
|