|
@@ -80,7 +80,7 @@ namespace GFGGame
|
|
|
|
|
|
_ui.m_comClickCircle.target.touchable = false;
|
|
_ui.m_comClickCircle.target.touchable = false;
|
|
_ui.m_loaRole.texture = EquipDataCache.cacher.nTexture;
|
|
_ui.m_loaRole.texture = EquipDataCache.cacher.nTexture;
|
|
- _ui.m_loaRole.SetSize(_ui.m_loaRole.width, _ui.m_loaRole.texture.height * _ui.m_loaRole.width / _ui.m_loaRole.texture.width);
|
|
|
|
|
|
+ // _ui.m_loaRole.SetSize(_ui.m_loaRole.width, _ui.m_loaRole.texture.height * _ui.m_loaRole.width / _ui.m_loaRole.texture.width);
|
|
|
|
|
|
_ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
|
|
_ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
|
|
_ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
|
|
_ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
|
|
@@ -178,7 +178,8 @@ namespace GFGGame
|
|
{
|
|
{
|
|
EquipDataCache.cacher.totalScore = _score;
|
|
EquipDataCache.cacher.totalScore = _score;
|
|
_ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
|
|
_ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
|
|
- _ui.m_comScoreStage.m_c1.selectedIndex = GetCurStar();
|
|
|
|
|
|
+ GetCurStar(out int star, out Transition transition);
|
|
|
|
+ _ui.m_comScoreStage.m_c1.selectedIndex = star;
|
|
CircleResuleEnd();
|
|
CircleResuleEnd();
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -188,14 +189,17 @@ namespace GFGGame
|
|
_index++;
|
|
_index++;
|
|
if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
|
|
if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
|
|
{
|
|
{
|
|
-
|
|
|
|
- _ui.m_comRoleResult.m_c1.selectedIndex = GetCurStar();
|
|
|
|
|
|
+ GetCurStar(out int star, out Transition transition);
|
|
|
|
+ _ui.m_comRoleResult.m_c1.selectedIndex = 0;
|
|
_ui.m_t2.Play(() =>
|
|
_ui.m_t2.Play(() =>
|
|
{
|
|
{
|
|
- _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
|
|
|
|
|
|
+ _ui.m_comRoleResult.m_c1.selectedIndex = star;
|
|
|
|
+ transition.Play(() =>
|
|
{
|
|
{
|
|
- // Skip();
|
|
|
|
- Timers.inst.Add(0.3f, 1, Skip);//评分结束
|
|
|
|
|
|
+ _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
|
|
|
|
+ {
|
|
|
|
+ Timers.inst.Add(0.3f, 1, Skip);//评分结束
|
|
|
|
+ });
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -205,26 +209,27 @@ namespace GFGGame
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- private int GetCurStar()
|
|
|
|
|
|
+ private void GetCurStar(out int star, out Transition transition)
|
|
{
|
|
{
|
|
StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
-
|
|
|
|
-
|
|
|
|
- int star = 0;
|
|
|
|
|
|
+ star = 0;
|
|
|
|
+ transition = _ui.m_comRoleResult.m_t0;
|
|
if (_score >= fightCfg.score1 && _score < fightCfg.score2)
|
|
if (_score >= fightCfg.score1 && _score < fightCfg.score2)
|
|
{
|
|
{
|
|
star = 1;
|
|
star = 1;
|
|
|
|
+ transition = _ui.m_comRoleResult.m_t1;
|
|
}
|
|
}
|
|
else if (_score >= fightCfg.score2 && _score < fightCfg.score3)
|
|
else if (_score >= fightCfg.score2 && _score < fightCfg.score3)
|
|
{
|
|
{
|
|
star = 2;
|
|
star = 2;
|
|
|
|
+ transition = _ui.m_comRoleResult.m_t2;
|
|
}
|
|
}
|
|
else if (_score >= fightCfg.score3)
|
|
else if (_score >= fightCfg.score3)
|
|
{
|
|
{
|
|
star = 3;
|
|
star = 3;
|
|
|
|
+ transition = _ui.m_comRoleResult.m_t3;
|
|
}
|
|
}
|
|
- return star;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -258,11 +263,15 @@ namespace GFGGame
|
|
}
|
|
}
|
|
private void Reset()
|
|
private void Reset()
|
|
{
|
|
{
|
|
- // _stopFight = true;
|
|
|
|
Timers.inst.Remove(SkillScore);
|
|
Timers.inst.Remove(SkillScore);
|
|
Timers.inst.Remove(Skip);
|
|
Timers.inst.Remove(Skip);
|
|
|
|
+ GTween.Kill(_ui.m_proScore.m_comBar);
|
|
_ui.m_t1.Stop(true, false);
|
|
_ui.m_t1.Stop(true, false);
|
|
_ui.m_t2.Stop(true, false);
|
|
_ui.m_t2.Stop(true, false);
|
|
|
|
+ _ui.m_comRoleResult.m_t0.Stop(true, false);
|
|
|
|
+ _ui.m_comRoleResult.m_t1.Stop(true, false);
|
|
|
|
+ _ui.m_comRoleResult.m_t2.Stop(true, false);
|
|
|
|
+ _ui.m_comRoleResult.m_t3.Stop(true, false);
|
|
_ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
|
|
_ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
|
|
|
|
|
|
_ui.m_comRoleResult.target.SetScale(0, 0);
|
|
_ui.m_comRoleResult.target.SetScale(0, 0);
|
|
@@ -273,7 +282,6 @@ namespace GFGGame
|
|
_ui.m_comClickCircle.target.SetScale(0, 0);
|
|
_ui.m_comClickCircle.target.SetScale(0, 0);
|
|
_ui.m_loaGlass.SetScale(0, 0);
|
|
_ui.m_loaGlass.SetScale(0, 0);
|
|
|
|
|
|
- // GTween.Kill(_ui.m_proScore.m_comBar);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|