|
|
@@ -17,6 +17,7 @@ namespace GFGGame
|
|
|
private int _curIndex;//当前评分index
|
|
|
private int _score;//当前总分数
|
|
|
private int _skillScore = 0;//当前卡牌技能分
|
|
|
+ private int _allSkillScore = 0;//当前卡牌技能叠加分，加到部件里的分，（部件开始、完美点击）
|
|
|
private int _partScore = 0;//当前部件分+技能评分（_skillScore）
|
|
|
private int _currentTime = BeginTime.PART_ALL_FIGHT_BEGIN;
|
|
|
private double _mainScore;//总主属性分
|
|
|
@@ -250,11 +251,12 @@ namespace GFGGame
|
|
|
CheckPartBeginSkill(null);
|
|
|
break;
|
|
|
case BeginTime.PART_FIGHT_BEGIN:
|
|
|
+ _allSkillScore += _skillScore;
|
|
|
//这里不把技能分加到总分里，因为技能分会算到部件分里
|
|
|
PartScoreStart();
|
|
|
break;
|
|
|
case BeginTime.PART_PREFACT_CLICK:
|
|
|
- _score += _skillScore;
|
|
|
+ _allSkillScore += _skillScore;
|
|
|
PartScoreResultStart(ClickType.PREFACT_CLICK);
|
|
|
break;
|
|
|
case BeginTime.PART_FIGHT_END:
|
|
|
@@ -308,7 +310,7 @@ namespace GFGGame
|
|
|
{
|
|
|
// if (_isAllPerfect) return;
|
|
|
if (_partId > FightScoreCfgArray.Instance.dataArray.Length) return;
|
|
|
- _skillScore = 0;
|
|
|
+ // _skillScore = 0;
|
|
|
_ui.m_comClick.target.touchable = false;
|
|
|
int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
|
|
|
_ui.m_comClick.m_comResult.m_t0.Stop(true, false);
|
|
|
@@ -332,7 +334,7 @@ namespace GFGGame
|
|
|
_ui.m_comClick.target.touchable = false;
|
|
|
|
|
|
PartScoreResultEnd();
|
|
|
- _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _skillScore);
|
|
|
+ _partScore = ScoreSystemData.Instance.GetPartScore(roleData, _partId, clickType, _allSkillScore);
|
|
|
_score += _partScore;
|
|
|
_ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
|
|
|
_ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
|
|
|
@@ -349,6 +351,7 @@ namespace GFGGame
|
|
|
_ui.m_comClick.m_comResult.m_txtCount2.text = _partScore.ToString();
|
|
|
break;
|
|
|
}
|
|
|
+ _allSkillScore = 0;
|
|
|
}
|
|
|
|
|
|
private void PartScoreResultEnd()
|
zhaoyang