|
|
@@ -17,8 +17,6 @@ namespace GFGGame
|
|
|
private FightData targetData;
|
|
|
private GameObject _scenePrefab;
|
|
|
private GameObject _sceneObject;
|
|
|
- // private FightRoleData targetRoleData;
|
|
|
- // private FightRobotData targetRobotData;
|
|
|
|
|
|
|
|
|
private GameObject _gameObject1;
|
|
|
@@ -32,6 +30,10 @@ namespace GFGGame
|
|
|
private GameObject _gameObject10;
|
|
|
private GameObject _gameObject11;
|
|
|
private GameObject _gameObject12;
|
|
|
+ private GameObject _gameObject13;
|
|
|
+ private GameObject _gameObject14;
|
|
|
+ private GameObject _gameObject15;
|
|
|
+ private GameObject _gameObject16;
|
|
|
|
|
|
private GoWrapper _wrapper2;
|
|
|
private GoWrapper _wrapper21;
|
|
|
@@ -44,6 +46,10 @@ namespace GFGGame
|
|
|
private GoWrapper _wrapper10;
|
|
|
private GoWrapper _wrapper11;
|
|
|
private GoWrapper _wrapper12;
|
|
|
+ private GoWrapper _wrapper13;
|
|
|
+ private GoWrapper _wrapper14;
|
|
|
+ private GoWrapper _wrapper15;
|
|
|
+ private GoWrapper _wrapper16;
|
|
|
private NTexture _nTexture;
|
|
|
private bool _isAutoPlay = false;
|
|
|
// private float _speed = 1;
|
|
|
@@ -54,6 +60,8 @@ namespace GFGGame
|
|
|
private double _targetMainScore;//战斗目标总主属性分
|
|
|
private int _skillScore = 0;//当前卡牌技能分
|
|
|
private int _targetSkillScore = 0;//当前卡牌技能分
|
|
|
+ private bool _isAllPerfect = false;//登峰造极中
|
|
|
+
|
|
|
private List<int> _roundTimes = new List<int>();//作用时机为对战开始的技能持续的回合数，为0表示技能未被触发或技能作用时机不是对战开始
|
|
|
private List<int> _targetRoundTimes = new List<int>();//对方作用时机为对战开始的技能持续的回合数，为0表示技能未被触发或技能作用时机不是对战开始
|
|
|
|
|
|
@@ -75,6 +83,11 @@ namespace GFGGame
|
|
|
SceneController.DestroyObjectFromView(_gameObject10, _wrapper10);
|
|
|
SceneController.DestroyObjectFromView(_gameObject11, _wrapper11);
|
|
|
SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject12, _wrapper12);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject13, _wrapper13);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject14, _wrapper14);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject15, _wrapper15);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject16, _wrapper16);
|
|
|
|
|
|
if (_ui != null)
|
|
|
{
|
|
|
@@ -111,6 +124,15 @@ namespace GFGGame
|
|
|
SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderResult, resPath11, out _gameObject11, out _wrapper11);
|
|
|
string resPath12 = ResPathUtil.GetViewEffectPath("ui_fight_new", "botton_Highlight");
|
|
|
SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comResult.m_holderHigh, resPath12, out _gameObject12, out _wrapper12);
|
|
|
+
|
|
|
+ string resPath13 = ResPathUtil.GetViewEffectPath("ui_fight_new", "loop_tx");
|
|
|
+ SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holderLoop, resPath13, out _gameObject13, out _wrapper13);
|
|
|
+ string resPath14 = ResPathUtil.GetViewEffectPath("ui_fight_new", "3S_textAppear01");
|
|
|
+ SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holder, resPath14, out _gameObject14, out _wrapper14);
|
|
|
+ string resPath15 = ResPathUtil.GetViewEffectPath("ui_fight_new", "smoke_Approach");
|
|
|
+ SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holderSmokeIn, resPath15, out _gameObject15, out _wrapper15);
|
|
|
+ string resPath16 = ResPathUtil.GetViewEffectPath("ui_fight_new", "smoke_out");
|
|
|
+ SceneController.AddObjectToView(null, null, _ui.m_comClick.m_comAllPerfect.m_holderSmokeOut, resPath16, out _gameObject16, out _wrapper16);
|
|
|
}
|
|
|
|
|
|
protected override void OnInit()
|
|
|
@@ -126,13 +148,17 @@ namespace GFGGame
|
|
|
|
|
|
_ui.m_btnBack.onClick.Add(OnBtnBackClick);
|
|
|
_ui.m_comClick.target.onClick.Add(PartScoreEnd);
|
|
|
+ _ui.m_comClick.target.onTouchBegin.Add(OnComAllCircleClickBegin);
|
|
|
+ _ui.m_comClick.target.onTouchEnd.Add(AllCircleScoreEnd);
|
|
|
+
|
|
|
_ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
|
|
|
_ui.m_btnSkip.onClick.Add(OnBtnSKip);
|
|
|
|
|
|
_ui.m_comClick.m_comResult.m_t0.ignoreEngineTimeScale = false;
|
|
|
_ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comAllPerfect.m_t0.ignoreEngineTimeScale = false;
|
|
|
- _ui.m_comAllPerfect.m_t1.ignoreEngineTimeScale = false;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t0.ignoreEngineTimeScale = false;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t1.ignoreEngineTimeScale = false;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t2.ignoreEngineTimeScale = false;
|
|
|
_ui.m_t1.ignoreEngineTimeScale = false;
|
|
|
_ui.m_t2.ignoreEngineTimeScale = false;
|
|
|
|
|
|
@@ -177,7 +203,7 @@ namespace GFGGame
|
|
|
}
|
|
|
_ui.m_btnSpeedUp.visible = _isAutoPlay;
|
|
|
_ui.m_btnSpeedUp.title = "x" + FightDataManager.Instance.fightSpeed;
|
|
|
- _ui.m_comAllPerfect.target.visible = false;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.target.visible = false;
|
|
|
// _ui.m_LoaMask.visible = false;
|
|
|
_ui.m_proScore.m_comBar.target.width = 0;
|
|
|
_ui.m_btnSkip.visible = InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena;
|
|
|
@@ -212,11 +238,11 @@ namespace GFGGame
|
|
|
_partId = 0;
|
|
|
_score = 0;
|
|
|
_targetScore = 0;
|
|
|
- if (!_isAutoPlay)
|
|
|
- {
|
|
|
- _ui.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
|
|
|
- _ui.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
|
|
|
- }
|
|
|
+ // if (!_isAutoPlay)
|
|
|
+ // {
|
|
|
+ // _ui.m_comClick.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
|
|
|
+ // _ui.m_comClick.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
|
|
|
+ // }
|
|
|
|
|
|
CheckPartAllFightBegin();
|
|
|
}
|
|
|
@@ -430,6 +456,7 @@ namespace GFGGame
|
|
|
}
|
|
|
private void PartScoreEnd()
|
|
|
{
|
|
|
+ if (_partId > FightScoreCfgArray.Instance.dataArray.Length) return;
|
|
|
|
|
|
_ui.m_comClick.target.touchable = false;
|
|
|
int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
|
|
|
@@ -518,15 +545,14 @@ namespace GFGGame
|
|
|
_partId++;
|
|
|
if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
|
|
|
{
|
|
|
- if (_prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)
|
|
|
+ if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= 0)// FightScoreCfgArray.Instance.dataArray.Length)
|
|
|
{
|
|
|
- _ui.m_comAllPerfect.target.visible = true;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.target.visible = true;
|
|
|
AllCirclePlayStart();//完美八连击
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
Timers.inst.Add(0.3f, 1, Skip);
|
|
|
- // Timers.inst.Add(0.5f, 1, FightEnd);//评分结束
|
|
|
}
|
|
|
}
|
|
|
else
|
|
|
@@ -535,39 +561,32 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // private void FightEnd(object param = null)
|
|
|
- // {
|
|
|
- // _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
|
|
|
- // _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
|
|
|
- // _ui.m_comRoleResult.m_c1.selectedIndex = 0;
|
|
|
-
|
|
|
- // _ui.m_comRoleResult.m_t0.Play();
|
|
|
- // _ui.m_t0.Play(() =>
|
|
|
- // {
|
|
|
- // Timers.inst.Add(0.3f, 1, Skip);
|
|
|
- // });
|
|
|
- // }
|
|
|
|
|
|
private void AllCirclePlayStart()
|
|
|
{
|
|
|
//登峰造极评分开始
|
|
|
- _ui.m_comAllPerfect.target.visible = true;
|
|
|
- _ui.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
|
|
|
- _ui.m_comAllPerfect.m_t0.Play(() =>
|
|
|
+ _isAllPerfect = true;
|
|
|
+ _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.target.visible = true;
|
|
|
+ // _ui.m_comClick.m_comAllPerfect.m_img3Second.visible = !FightDataManager.Instance.autoPlay;
|
|
|
+
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
|
|
|
+ if (FightDataManager.Instance.autoPlay)
|
|
|
{
|
|
|
- AllCircleScoreEnd();
|
|
|
- });
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t0.Play(OnComAllCircleClickBegin);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t0.Play();
|
|
|
+ }
|
|
|
}
|
|
|
private void OnComAllCircleClickBegin()
|
|
|
{
|
|
|
- // if (_ui.m_comAllPerfect.m_imgCircle.visible == false)
|
|
|
- // {
|
|
|
- // Timers.inst.Remove(ComAllCirclePressTime);
|
|
|
- // }
|
|
|
- // else
|
|
|
- // {
|
|
|
+ if (!_isAllPerfect) return;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t0.Stop(true, false);
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t1.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t1.Play(AllCircleScoreEnd);
|
|
|
Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
|
|
|
- // }
|
|
|
}
|
|
|
private void ComAllCirclePressTime(object param = null)
|
|
|
{
|
|
|
@@ -576,24 +595,22 @@ namespace GFGGame
|
|
|
}
|
|
|
private void AllCircleScoreEnd()
|
|
|
{
|
|
|
+ if (!_isAllPerfect) return;
|
|
|
+ _isAllPerfect = false;
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t1.Stop(true, false);
|
|
|
Timers.inst.Remove(ComAllCirclePressTime);
|
|
|
- _ui.m_comAllPerfect.m_t0.Stop();
|
|
|
- _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
|
|
|
- _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
|
|
|
-
|
|
|
- _targetScore += ScoreSystemData.Instance.GetAllCircleAddScore(_targetMainScore);
|
|
|
|
|
|
int allCircleScore = 0;
|
|
|
- if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || _isAutoPlay)
|
|
|
+ if (_time >= ConstScoreSystem.LONG_PRESS_TIME / FightDataManager.Instance.fightSpeed || FightDataManager.Instance.autoPlay)
|
|
|
{
|
|
|
allCircleScore = ScoreSystemData.Instance.GetAllCircleAddScore(_mainScore);
|
|
|
}
|
|
|
- _ui.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
|
|
|
+ _ui.m_comClick.m_comResult.target.visible = false;
|
|
|
|
|
|
_time = 0;
|
|
|
_score += allCircleScore;
|
|
|
- _ui.m_comAllPerfect.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
|
|
|
- _ui.m_comAllPerfect.m_t1.Play(() =>
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
|
|
|
{
|
|
|
_prefectCount = 0;
|
|
|
UpdateProgress(OnePartScoreEnd);
|
|
|
@@ -650,27 +667,21 @@ namespace GFGGame
|
|
|
}
|
|
|
private void Reset()
|
|
|
{
|
|
|
- _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
|
|
|
- _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
|
|
|
+ // _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
|
|
|
+ // _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
|
|
|
|
|
|
// Timers.inst.Remove(SkillScoreStart);
|
|
|
Timers.inst.Remove(Skip);
|
|
|
+ Timers.inst.Remove(ComAllCirclePressTime);
|
|
|
GTween.Kill(_ui.m_proScore.m_comBar);
|
|
|
|
|
|
_ui.m_t1.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_imgRole.alpha = 0;
|
|
|
- // _ui.m_comRoleResult.target.SetScale(0, 0);
|
|
|
-
|
|
|
- _ui.m_comAllPerfect.m_t0.Stop(true, false);
|
|
|
- _ui.m_comAllPerfect.m_t1.Stop(true, false);
|
|
|
- _ui.m_comAllPerfect.target.onTouchBegin.Remove(OnComAllCircleClickBegin);
|
|
|
- _ui.m_comAllPerfect.target.onTouchEnd.Remove(AllCircleScoreEnd);
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t0.Stop(true, false);
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t1.Stop(true, false);
|
|
|
+ _ui.m_comClick.m_comAllPerfect.m_t2.Stop(true, false);
|
|
|
+
|
|
|
+ _isAllPerfect = false;
|
|
|
|
|
|
_ui.m_proScore.m_txtNpcScore.text = "";
|
|
|
_ui.m_proScore.m_txtMineScore.text = "";
|
zhaoyang