|
@@ -207,6 +207,9 @@ namespace GFGGame
|
|
_ui.m_proScore.m_txtCount.text = "0";
|
|
_ui.m_proScore.m_txtCount.text = "0";
|
|
_ui.m_comClick.target.touchable = false;
|
|
_ui.m_comClick.target.touchable = false;
|
|
_ui.m_comClick.m_comAllPerfect.target.visible = false;
|
|
_ui.m_comClick.m_comAllPerfect.target.visible = false;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_starEffect.visible = false;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_ppEffect.visible = false;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_t0.ClearHooks();
|
|
_isAllPerfect = false;
|
|
_isAllPerfect = false;
|
|
|
|
|
|
_currentTime = SkillBeginTime.FIGHT_BEGIN;
|
|
_currentTime = SkillBeginTime.FIGHT_BEGIN;
|
|
@@ -370,12 +373,17 @@ namespace GFGGame
|
|
_effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
|
|
_effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
|
|
_ui.m_comClick.m_comResult.m_starEffect.visible = true;
|
|
_ui.m_comClick.m_comResult.m_starEffect.visible = true;
|
|
}
|
|
}
|
|
|
|
+ for (int i = 0; i < 3; i++)
|
|
|
|
+ {
|
|
|
|
+ _ui.m_comClick.m_comResult.target.GetChild("holder" + i).visible = false;
|
|
|
|
+ }
|
|
|
|
|
|
- PartScoreResultEnd();
|
|
|
|
|
|
+ PartScoreResultEnd(clickType);
|
|
//这里后面去掉第四个参数,因为不需要他参与计算了
|
|
//这里后面去掉第四个参数,因为不需要他参与计算了
|
|
_partScore = ScoreSystemData.Instance.GetRoundScore(roleData, _partId, clickType , _allSkillScore);
|
|
_partScore = ScoreSystemData.Instance.GetRoundScore(roleData, _partId, clickType , _allSkillScore);
|
|
_score += _partScore;
|
|
_score += _partScore;
|
|
- _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
|
|
|
|
|
|
+
|
|
|
|
+
|
|
_ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
|
|
_ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
|
|
|
|
|
|
switch (clickType)
|
|
switch (clickType)
|
|
@@ -394,8 +402,28 @@ namespace GFGGame
|
|
_allSkillScore = 0;
|
|
_allSkillScore = 0;
|
|
}
|
|
}
|
|
|
|
|
|
- private void PartScoreResultEnd()
|
|
|
|
|
|
+ private void PartScoreResultEnd(int clickType = -1)
|
|
{
|
|
{
|
|
|
|
+ switch (clickType)
|
|
|
|
+ {
|
|
|
|
+ case 0:
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder0_2.ignoreEngineTimeScale = false;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder0_2.timeScale = FightDataManager.Instance.fightSpeed;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder0_2.Play();
|
|
|
|
+ break;
|
|
|
|
+ case 1:
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder1_2.ignoreEngineTimeScale = false;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder1_2.timeScale = FightDataManager.Instance.fightSpeed;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder1_2.Play();
|
|
|
|
+ break;
|
|
|
|
+ case 2:
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder2_2.ignoreEngineTimeScale = false;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder2_2.timeScale = FightDataManager.Instance.fightSpeed;
|
|
|
|
+ _ui.m_comClick.m_comResult.m_holder2_2.Play();
|
|
|
|
+ break;
|
|
|
|
+ default:
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
_ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
|
|
_ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
|
|
_ui.m_comClick.m_comResult.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
|
|
_ui.m_comClick.m_comResult.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
|
|
_ui.m_comClick.m_comResult.m_t1.SetValue("start", 130, 130);
|
|
_ui.m_comClick.m_comResult.m_t1.SetValue("start", 130, 130);
|