|
|
@@ -63,6 +63,8 @@ namespace GFGGame
|
|
|
_ui.m_btnBack.onClick.Add(OnBtnBackClick);
|
|
|
_ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
|
|
|
|
|
|
+ _ui.m_comClickCircle.target.onClick.Add(OnComClickCircle);
|
|
|
+
|
|
|
_ui.m_loaBg.url = ResPathUtil.GetFightBgImgPath("zd_bj_bja_2");
|
|
|
|
|
|
}
|
|
|
@@ -74,16 +76,15 @@ namespace GFGGame
|
|
|
protected override void OnShown()
|
|
|
{
|
|
|
base.OnShown();
|
|
|
+ ScoreSystemData.Instance.SetEquipDicWithType();
|
|
|
|
|
|
+ _ui.m_comClickCircle.target.touchable = false;
|
|
|
_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_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
|
|
|
_ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
|
|
|
|
|
|
-
|
|
|
- ScoreSystemData.Instance.SetEquipDicWithType();
|
|
|
-
|
|
|
StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
|
StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
|
_ui.m_proScore.target.max = fightCfg.score3;
|
|
|
@@ -106,7 +107,7 @@ namespace GFGGame
|
|
|
{
|
|
|
SkillScore(null);
|
|
|
});//评分结束
|
|
|
- Timers.inst.AddUpdate(CheckGuide);
|
|
|
+ // Timers.inst.AddUpdate(CheckGuide);
|
|
|
}
|
|
|
|
|
|
private void SkillScore(object param)
|
|
|
@@ -144,23 +145,20 @@ namespace GFGGame
|
|
|
_ui.m_comClickCircle.target.SetXY(x, y);
|
|
|
_ui.m_loaGlass.SetXY(x, y);
|
|
|
_ui.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
|
|
|
+ _ui.m_t1.ignoreEngineTimeScale = false;
|
|
|
+ _ui.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ _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);
|
|
|
|
|
|
if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
|
|
|
{
|
|
|
- _ui.m_comClickCircle.target.touchable = false;
|
|
|
-
|
|
|
- // GTween.To(100, _prefectScale, _playTime / 2).SetTarget(_gameObject7).OnUpdate((GTweener t) =>
|
|
|
- // {
|
|
|
- // _gameObject7.transform.localScale = new Vector3(t.value.x, t.value.x, t.value.x);
|
|
|
- // });
|
|
|
+ _ui.m_t1.Play(1, 0, 0, 2, () =>
|
|
|
+ {
|
|
|
+ Timers.inst.AddUpdate(UpdateToCheckGuide);
|
|
|
+ });
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
-
|
|
|
- _ui.m_t1.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
- _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_proScore.target.y);
|
|
|
_ui.m_t1.Play(UpdateProgress);
|
|
|
}
|
|
|
|
|
|
@@ -228,7 +226,11 @@ namespace GFGGame
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
+ private void OnComClickCircle()
|
|
|
+ {
|
|
|
+ _ui.m_comClickCircle.target.touchable = false;
|
|
|
+ _ui.m_t1.Play(1, 0, 2f, 2.5f, UpdateProgress);
|
|
|
+ }
|
|
|
private void OnBtnSpeedUp()
|
|
|
{
|
|
|
EquipDataCache.cacher.fightSpeed = EquipDataCache.cacher.fightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
|
|
|
@@ -285,37 +287,38 @@ namespace GFGGame
|
|
|
}
|
|
|
|
|
|
Reset();
|
|
|
- Timers.inst.Remove(CheckGuide);
|
|
|
+ Timers.inst.Remove(UpdateToCheckGuide);
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
- private void CheckGuide(object param)
|
|
|
- {
|
|
|
- if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
|
|
|
- {
|
|
|
- UpdateToCheckGuide(null);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- Timers.inst.Remove(CheckGuide);
|
|
|
- }
|
|
|
- }
|
|
|
+ // 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;
|
|
|
|
|
|
- float scaleX = 0;// _gameObject7.transform.localScale.x;
|
|
|
- if (scaleX == _prefectScale)
|
|
|
+ // float scaleX = 0;// _gameObject7.transform.localScale.x;
|
|
|
+ // if (scaleX == _prefectScale)
|
|
|
+ // {
|
|
|
+ bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧。");
|
|
|
+ if (isGuide)
|
|
|
{
|
|
|
- bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧。");
|
|
|
- if (isGuide)
|
|
|
- {
|
|
|
- _ui.m_comClickCircle.target.touchable = true;
|
|
|
- }
|
|
|
+ _ui.m_comClickCircle.target.touchable = true;
|
|
|
}
|
|
|
+ // }
|
|
|
+ // GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐，适当的整理会更加分，点击为各部位修整吧。");
|
|
|
GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 9);
|
|
|
}
|
|
|
}
|
zhaoyang