|
@@ -95,6 +95,7 @@ namespace GFGGame
|
|
_ui.m_proScore.m_comBar.target.width = 0;
|
|
_ui.m_proScore.m_comBar.target.width = 0;
|
|
_ui.m_proScore.m_comFirstScore.target.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
|
|
_ui.m_proScore.m_comFirstScore.target.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
|
|
_ui.m_proScore.m_comSecondScore.target.x = (((float)fightCfg.score2 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
|
|
_ui.m_proScore.m_comSecondScore.target.x = (((float)fightCfg.score2 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
|
|
|
|
+ _ui.m_proScore.m_comThirdScore.target.x = (((float)fightCfg.score3 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
|
|
_ui.m_proScore.m_txtCount.text = "总分 0";
|
|
_ui.m_proScore.m_txtCount.text = "总分 0";
|
|
|
|
|
|
_stopFight = false;
|
|
_stopFight = false;
|
|
@@ -154,19 +155,9 @@ namespace GFGGame
|
|
_ui.m_t1.ignoreEngineTimeScale = false;
|
|
_ui.m_t1.ignoreEngineTimeScale = false;
|
|
_ui.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
_ui.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
_ui.m_t1.SetValue("start", _ui.m_loaGlass.x, _ui.m_loaGlass.y);
|
|
_ui.m_t1.SetValue("start", _ui.m_loaGlass.x, _ui.m_loaGlass.y);
|
|
- _ui.m_t1.SetValue("end", _ui.m_proScore.m_comBar.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2, _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2);
|
|
|
|
|
|
+ _ui.m_t1.SetValue("end", _ui.m_proScore.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2, _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2);
|
|
|
|
|
|
- // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
|
|
|
|
- // {
|
|
|
|
- // _ui.m_t1.Play(1, 0, 0, 2, () =>
|
|
|
|
- // {
|
|
|
|
- // Timers.inst.AddUpdate(UpdateToCheckGuide);
|
|
|
|
- // });
|
|
|
|
- // }
|
|
|
|
- // else
|
|
|
|
- // {
|
|
|
|
_ui.m_t1.Play(UpdateProgress);
|
|
_ui.m_t1.Play(UpdateProgress);
|
|
- // }
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -184,6 +175,9 @@ namespace GFGGame
|
|
_ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
|
|
_ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
|
|
GetCurStar(out int star, out Transition transition);
|
|
GetCurStar(out int star, out Transition transition);
|
|
_ui.m_comScoreStage.m_c1.selectedIndex = star;
|
|
_ui.m_comScoreStage.m_c1.selectedIndex = star;
|
|
|
|
+ _ui.m_proScore.m_comFirstScore.m_c1.selectedIndex = star > 0 ? 1 : 0;
|
|
|
|
+ _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = star > 1 ? 1 : 0;
|
|
|
|
+ _ui.m_proScore.m_comThirdScore.m_c1.selectedIndex = star > 2 ? 1 : 0;
|
|
CircleResuleEnd();
|
|
CircleResuleEnd();
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -249,8 +243,6 @@ namespace GFGGame
|
|
|
|
|
|
private void Skip(object param = null)
|
|
private void Skip(object param = null)
|
|
{
|
|
{
|
|
- // Reset();
|
|
|
|
-
|
|
|
|
InstanceZonesController.CheckStoryFightResult().Coroutine();
|
|
InstanceZonesController.CheckStoryFightResult().Coroutine();
|
|
}
|
|
}
|
|
private void OnBtnBackClick()
|
|
private void OnBtnBackClick()
|
|
@@ -302,35 +294,6 @@ namespace GFGGame
|
|
}
|
|
}
|
|
|
|
|
|
Reset();
|
|
Reset();
|
|
- Timers.inst.Remove(UpdateToCheckGuide);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- // private void CheckGuide(object param)
|
|
|
|
- // {
|
|
|
|
- // if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
|
|
|
|
- // {
|
|
|
|
- // UpdateToCheckGuide(null);
|
|
|
|
- // }
|
|
|
|
- // else
|
|
|
|
- // {
|
|
|
|
- // Timers.inst.Remove(CheckGuide);
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
-
|
|
|
|
- protected override void UpdateToCheckGuide(object param)
|
|
|
|
- {
|
|
|
|
-
|
|
|
|
- if (!ViewManager.CheckIsTopView(this.viewCom)) return;
|
|
|
|
-
|
|
|
|
-
|
|
|
|
- // bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧。");
|
|
|
|
- // if (isGuide)
|
|
|
|
- // {
|
|
|
|
- // _ui.m_comClickCircle.target.touchable = true;
|
|
|
|
- // }
|
|
|
|
- // GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 9);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|