|
@@ -25,8 +25,9 @@ namespace GFGGame
|
|
|
|
|
|
private int _skillCount;
|
|
|
|
|
|
- // private float _speed = 1;
|
|
|
- private bool isAutoPlay = false;
|
|
|
+ private float _speed = 1;
|
|
|
+ private bool _isAutoPlay = false;
|
|
|
+ private StoryLevelCfg _levelCfg;
|
|
|
|
|
|
private GameObject _gameObject0;
|
|
|
// private GoWrapper _wrapper0;
|
|
@@ -202,15 +203,21 @@ namespace GFGGame
|
|
|
EventAgent.AddEventListener(ConstMessage.CARD_SKILL, UpdateCircleResult);
|
|
|
|
|
|
SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
|
|
|
- StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
|
- StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
|
+ _levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
|
+ StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
|
|
|
SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);
|
|
|
|
|
|
UpdateNormal();
|
|
|
_ui.m_selfName.m_txtName.text = RoleDataManager.roleName;
|
|
|
_ui.m_targetName.m_txtName.text = fightCfg.targetName;
|
|
|
- _ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
|
|
|
- _ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
|
|
|
+ // StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
|
+ _speed = EquipDataCache.cacher.fightSpeed;
|
|
|
+ if (_levelCfg.type == ConstInstanceZonesType.Field)
|
|
|
+ {
|
|
|
+ _speed = EquipDataCache.cacher.fieldFightSpeed;
|
|
|
+ }
|
|
|
+ _ui.m_btnSpeedUp.visible = _isAutoPlay;
|
|
|
+ _ui.m_btnSpeedUp.title = "x" + _speed;
|
|
|
|
|
|
|
|
|
ScoreSystemData.Instance.SetEquipDicWithType();
|
|
@@ -225,7 +232,7 @@ namespace GFGGame
|
|
|
{
|
|
|
_ui.m_btnSkill0.target.touchable = false;
|
|
|
}
|
|
|
- Timers.inst.Add(0.5f / EquipDataCache.cacher.fightSpeed, 1, CircleScoreStart);//评分开始
|
|
|
+ Timers.inst.Add(0.5f / _speed, 1, CircleScoreStart);//评分开始
|
|
|
|
|
|
}
|
|
|
private void UpdateNormal()
|
|
@@ -234,19 +241,26 @@ namespace GFGGame
|
|
|
|
|
|
if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.TARGET_FIGHT) <= 0)//引导中禁止自动战斗
|
|
|
{
|
|
|
- EquipDataCache.cacher.fightSpeed = 1;
|
|
|
+ _speed = 1;
|
|
|
EquipDataCache.cacher.autoPlay = false;
|
|
|
}
|
|
|
+
|
|
|
+ if (_levelCfg.type == ConstInstanceZonesType.Field || EquipDataCache.cacher.autoPlay)
|
|
|
+ {
|
|
|
+ _isAutoPlay = true;
|
|
|
+ // _speed = EquipDataCache.cacher.fieldFightSpeed;
|
|
|
+ }
|
|
|
+
|
|
|
RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
|
|
|
for (int i = 0; i < roleSkillCfgs.Length; i++)
|
|
|
{
|
|
|
GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
|
|
|
UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
|
|
|
item.m_txtCount.text = roleSkillCfgs[i].limiteCount.ToString();
|
|
|
- if (EquipDataCache.cacher.autoPlay)
|
|
|
+ if (_isAutoPlay)
|
|
|
{
|
|
|
- isAutoPlay = true;
|
|
|
- btnSkill.touchable = EquipDataCache.cacher.autoPlay;
|
|
|
+
|
|
|
+ btnSkill.touchable = !EquipDataCache.cacher.autoPlay;
|
|
|
OnBtnSkillClick(btnSkill);
|
|
|
}
|
|
|
}
|
|
@@ -282,8 +296,7 @@ namespace GFGGame
|
|
|
EquipDataCache.cacher.totalScore = (int)Math.Round(_score);
|
|
|
|
|
|
|
|
|
- StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
|
- StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
|
+ StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
|
|
|
double targetScore = fightCfg.targetPartsScoreArr[_index] * ConstScoreSystem.PART_SCORE;
|
|
|
Debug.Log("targetScore:" + targetScore);
|
|
|
_ui.m_comTargetCircle.m_txtCount.text = ((int)targetScore).ToString();
|
|
@@ -296,8 +309,7 @@ namespace GFGGame
|
|
|
//顶部评分进度条
|
|
|
private void UpdateProgressBar()
|
|
|
{
|
|
|
- StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
|
|
|
- StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
|
|
|
+ StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
|
|
|
_ui.m_proScore.m_txtNpcScore.text = string.Format("{0}{1}", fightCfg.targetName, (int)_targetScore);
|
|
|
_ui.m_proScore.m_txtMineScore.text = string.Format("{0}{1}", RoleDataManager.roleName, (int)_score);
|
|
|
// _ui.m_proScore.m_comBar.m_imgAni.visible = true;
|
|
@@ -343,17 +355,17 @@ namespace GFGGame
|
|
|
return;
|
|
|
}
|
|
|
_ui.m_comMineCircle.m_t0.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comMineCircle.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ _ui.m_comMineCircle.m_t0.timeScale = _speed;
|
|
|
_ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
|
|
|
_ui.m_comMineCircle.m_t1.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comMineCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ _ui.m_comMineCircle.m_t1.timeScale = _speed;
|
|
|
_ui.m_comMineCircle.m_t1.Play(() => { PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position); });
|
|
|
|
|
|
_ui.m_comTargetCircle.m_t0.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comTargetCircle.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ _ui.m_comTargetCircle.m_t0.timeScale = _speed;
|
|
|
_ui.m_comTargetCircle.m_t0.Play();
|
|
|
_ui.m_comTargetCircle.m_t1.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comTargetCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ _ui.m_comTargetCircle.m_t1.timeScale = _speed;
|
|
|
_ui.m_comTargetCircle.m_t1.Play(() => { PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0)); });
|
|
|
}
|
|
|
private void PlayScoreTWEffect(GGraph holderScore, Vector3 startValue, Vector3 endValue)
|
|
@@ -381,7 +393,7 @@ namespace GFGGame
|
|
|
{
|
|
|
_ui.m_comTargetCircle.target.visible = false;
|
|
|
_ui.m_comMineCircle.target.visible = false;
|
|
|
- Timers.inst.Add(0.5f / EquipDataCache.cacher.fightSpeed, 1, CircleScoreStart);//评分结束
|
|
|
+ Timers.inst.Add(0.5f / _speed, 1, CircleScoreStart);//评分结束
|
|
|
}
|
|
|
|
|
|
}
|
|
@@ -391,7 +403,7 @@ namespace GFGGame
|
|
|
|
|
|
private void OnBtnSkillClick(GComponent obj)
|
|
|
{
|
|
|
- if (EquipDataCache.cacher.autoPlay && !isAutoPlay) return;
|
|
|
+ // if (_isAutoPlay) return;
|
|
|
UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(obj);
|
|
|
RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
|
|
|
int count = (int)item.m_icon.data;
|
|
@@ -409,7 +421,7 @@ namespace GFGGame
|
|
|
GProgressBar bar = item.m_proCD;
|
|
|
bar.visible = true;
|
|
|
bar.value = 100;
|
|
|
- bar.TweenValue(0, time / EquipDataCache.cacher.fightSpeed).OnComplete((GTweener tweener) =>
|
|
|
+ bar.TweenValue(0, time / _speed).OnComplete((GTweener tweener) =>
|
|
|
{
|
|
|
GProgressBar bar1 = (GProgressBar)tweener.target;
|
|
|
UI_ComBtnSkill item1 = UI_ComBtnSkill.Proxy(bar1.parent);
|
|
@@ -418,7 +430,7 @@ namespace GFGGame
|
|
|
item1.m_c1.selectedIndex = count >= cfg.limiteCount ? 2 : 0;
|
|
|
|
|
|
item1.m_proCD.visible = false;
|
|
|
- if (EquipDataCache.cacher.autoPlay && isAutoPlay)
|
|
|
+ if (_isAutoPlay)
|
|
|
{
|
|
|
OnBtnSkillClick(item1.target);
|
|
|
}
|
|
@@ -464,7 +476,7 @@ namespace GFGGame
|
|
|
// comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
|
|
|
comRoleSkillScore.m_txtScore.SetVar("count", "+" + score.ToString()).FlushVars();
|
|
|
comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
- comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ comRoleSkillScore.m_t0.timeScale = _speed;
|
|
|
comRoleSkillScore.m_t0.Play(() =>
|
|
|
{
|
|
|
comRoleSkillScore.target.visible = false;
|
|
@@ -486,7 +498,7 @@ namespace GFGGame
|
|
|
|
|
|
comSkillMinus.visible = true;
|
|
|
comSkillMinus.value = 0;
|
|
|
- comSkillMinus.TweenValue(100, 2f / EquipDataCache.cacher.fightSpeed).OnComplete(() =>
|
|
|
+ comSkillMinus.TweenValue(100, 2f / _speed).OnComplete(() =>
|
|
|
{
|
|
|
comSkillMinus.visible = false;
|
|
|
|
|
@@ -517,7 +529,7 @@ namespace GFGGame
|
|
|
|
|
|
comRoleSkillScore.m_txtScore.SetVar("count", "-" + score.ToString()).FlushVars();
|
|
|
comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
- comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ comRoleSkillScore.m_t0.timeScale = _speed;
|
|
|
comRoleSkillScore.m_t0.Play(() =>
|
|
|
{
|
|
|
comRoleSkillScore.target.visible = false;
|
|
@@ -536,7 +548,7 @@ namespace GFGGame
|
|
|
UI_ComRoleSkill1 comSkillBreak = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineBreak : _ui.m_ComRoleSkillNpcBreak;
|
|
|
comSkillBreak.target.visible = true;
|
|
|
comSkillBreak.m_t0.ignoreEngineTimeScale = false;
|
|
|
- comSkillBreak.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ comSkillBreak.m_t0.timeScale = _speed;
|
|
|
comSkillBreak.m_t0.Play(() =>
|
|
|
{
|
|
|
comSkillBreak.target.visible = false;
|
|
@@ -556,7 +568,7 @@ namespace GFGGame
|
|
|
comSkillShield.m_holder.visible = true;
|
|
|
comSkillShield.m_holder1.visible = false;
|
|
|
|
|
|
- Timers.inst.Add(cfg.duration / EquipDataCache.cacher.fightSpeed, 1, (param) =>
|
|
|
+ Timers.inst.Add(cfg.duration / _speed, 1, (param) =>
|
|
|
{
|
|
|
// comSkillShield.target.visible = false;
|
|
|
comSkillShield.m_holder.visible = false;
|
|
@@ -566,7 +578,7 @@ namespace GFGGame
|
|
|
UI_ComRoleSkill1 comSkillShieldEff = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillMineShield : _ui.m_ComRoleSkillNpcShield;
|
|
|
comSkillShieldEff.target.visible = true;
|
|
|
comSkillShieldEff.m_t0.ignoreEngineTimeScale = false;
|
|
|
- comSkillShieldEff.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ comSkillShieldEff.m_t0.timeScale = _speed;
|
|
|
comSkillShieldEff.m_t0.Play(() =>
|
|
|
{
|
|
|
comSkillShieldEff.target.visible = false;
|
|
@@ -575,8 +587,19 @@ namespace GFGGame
|
|
|
}
|
|
|
private void OnBtnSpeedUp()
|
|
|
{
|
|
|
- EquipDataCache.cacher.fightSpeed = EquipDataCache.cacher.fightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
|
|
|
- _ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
|
|
|
+ if (_levelCfg.type == ConstInstanceZonesType.Field)
|
|
|
+ {
|
|
|
+ EquipDataCache.cacher.fieldFightSpeed = EquipDataCache.cacher.fieldFightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
|
|
|
+ _speed = EquipDataCache.cacher.fieldFightSpeed;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+
|
|
|
+ EquipDataCache.cacher.fightSpeed = EquipDataCache.cacher.fightSpeed == 1 ? EquipDataCache.cacher.maxFightSpeed : 1;
|
|
|
+ _speed = EquipDataCache.cacher.fightSpeed;
|
|
|
+
|
|
|
+ }
|
|
|
+ _ui.m_btnSpeedUp.title = "x" + _speed;
|
|
|
}
|
|
|
|
|
|
private void OnBtnBackClick()
|
|
@@ -646,7 +669,7 @@ namespace GFGGame
|
|
|
btnSkill.GetController("c1").selectedIndex = 0;
|
|
|
// btnSkill.GetTransition("t0").Stop();
|
|
|
}
|
|
|
- isAutoPlay = false;
|
|
|
+ _isAutoPlay = false;
|
|
|
Timers.inst.Remove(CircleScoreStart);
|
|
|
Timers.inst.Remove(Skip);
|
|
|
_gameObjects.Clear();
|