|
|
@@ -23,21 +23,31 @@ namespace GFGGame
|
|
|
private double _targetMainScore;//战斗目标总主属性分
|
|
|
private const int _range = 30;//圆圈随机范围
|
|
|
|
|
|
+ private int _skillCount;
|
|
|
+
|
|
|
// private float _speed = 1;
|
|
|
private bool isAutoPlay = false;
|
|
|
|
|
|
private GameObject _gameObject0;
|
|
|
- private GoWrapper _wrapper0;
|
|
|
+ // private GoWrapper _wrapper0;
|
|
|
private GameObject _gameObject1;
|
|
|
- private GoWrapper _wrapper1;
|
|
|
+ // private GoWrapper _wrapper1;
|
|
|
private GameObject _gameObject2;
|
|
|
- private GoWrapper _wrapper2;
|
|
|
+ // private GoWrapper _wrapper2;
|
|
|
private GameObject _gameObject3;
|
|
|
- private GoWrapper _wrapper3;
|
|
|
+ // private GoWrapper _wrapper3;
|
|
|
private GameObject _gameObject4;
|
|
|
- private GoWrapper _wrapper4;
|
|
|
+ // private GoWrapper _wrapper4;
|
|
|
private GameObject _gameObject5;
|
|
|
- private GoWrapper _wrapper5;
|
|
|
+ private GameObject _gameObject6;
|
|
|
+ private GameObject _gameObject7;
|
|
|
+ private GameObject _gameObject8;
|
|
|
+ private GameObject _gameObject9;
|
|
|
+ private GameObject _gameObject10;
|
|
|
+ private GameObject _gameObject11;
|
|
|
+ private GameObject _gameObject12;
|
|
|
+ private List<GameObject> _gameObjects = new List<GameObject>();
|
|
|
+ // private GoWrapper _wrapper5;
|
|
|
private Dictionary<int, RoleSkillCfg> _npcSkillDic;
|
|
|
|
|
|
private bool playStop = false;
|
|
|
@@ -53,7 +63,14 @@ namespace GFGGame
|
|
|
SceneController.DestroyObjectFromView(_gameObject1);
|
|
|
SceneController.DestroyObjectFromView(_gameObject2);
|
|
|
SceneController.DestroyObjectFromView(_gameObject3);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject4);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject5);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject6);
|
|
|
+ for (int i = 0; i < _gameObjects.Count; i++)
|
|
|
+ {
|
|
|
+ SceneController.DestroyObjectFromView(_gameObjects[i]);
|
|
|
|
|
|
+ }
|
|
|
base.Dispose();
|
|
|
}
|
|
|
|
|
|
@@ -67,6 +84,7 @@ namespace GFGGame
|
|
|
_scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTargetScore"));
|
|
|
|
|
|
RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
|
|
|
+ _skillCount = roleSkillCfgs.Length;
|
|
|
for (int i = 0; i < roleSkillCfgs.Length; i++)
|
|
|
{
|
|
|
GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
|
|
|
@@ -103,6 +121,7 @@ namespace GFGGame
|
|
|
}
|
|
|
});
|
|
|
_ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
|
|
|
+ AddEffect();
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -121,7 +140,6 @@ namespace GFGGame
|
|
|
SceneController.UpdateFightTarget(fightCfg.targetRes, _sceneObject);
|
|
|
|
|
|
UpdateNormal();
|
|
|
- AddEffect();
|
|
|
_ui.m_selfName.m_txtName.text = RoleDataManager.roleName;
|
|
|
_ui.m_targetName.m_txtName.text = fightCfg.targetName;
|
|
|
_ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
|
|
|
@@ -169,14 +187,37 @@ namespace GFGGame
|
|
|
private void AddEffect()
|
|
|
{
|
|
|
string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
|
|
|
- SceneController.AddObjectToView(_gameObject0, _wrapper0, _ui.m_ComShieldMine.m_holder, resPath0, out _gameObject0, out _wrapper0);
|
|
|
- SceneController.AddObjectToView(_gameObject2, _wrapper2, _ui.m_ComShieldNpc.m_holder, resPath0, out _gameObject2, out _wrapper2);
|
|
|
+ SceneController.AddObjectToView(_gameObject0, null, _ui.m_ComShieldMine.m_holder, resPath0, out _gameObject0, out GoWrapper _wrapper0);
|
|
|
+ SceneController.AddObjectToView(_gameObject2, null, _ui.m_ComShieldNpc.m_holder, resPath0, out _gameObject2, out GoWrapper _wrapper2);
|
|
|
string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_ps");
|
|
|
- SceneController.AddObjectToView(_gameObject1, _wrapper1, _ui.m_ComShieldMine.m_holder1, resPath1, out _gameObject1, out _wrapper1);
|
|
|
- SceneController.AddObjectToView(_gameObject3, _wrapper3, _ui.m_ComShieldNpc.m_holder1, resPath1, out _gameObject3, out _wrapper3);
|
|
|
+ SceneController.AddObjectToView(_gameObject1, null, _ui.m_ComShieldMine.m_holder1, resPath1, out _gameObject1, out GoWrapper _wrapper1);
|
|
|
+ SceneController.AddObjectToView(_gameObject3, null, _ui.m_ComShieldNpc.m_holder1, resPath1, out _gameObject3, out GoWrapper _wrapper3);
|
|
|
string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_tb_tg");
|
|
|
- SceneController.AddObjectToView(_gameObject4, _wrapper4, _ui.m_ComRoleSkillMineAdd.m_holder, resPath2, out _gameObject4, out _wrapper4, 70);
|
|
|
- SceneController.AddObjectToView(_gameObject5, _wrapper5, _ui.m_ComRoleSkillNpcAdd.m_holder, resPath2, out _gameObject5, out _wrapper5, 70);
|
|
|
+ SceneController.AddObjectToView(_gameObject4, null, _ui.m_ComRoleSkillMineAdd.m_holder, resPath2, out _gameObject4, out GoWrapper _wrapper4, 70);
|
|
|
+ SceneController.AddObjectToView(_gameObject5, null, _ui.m_ComRoleSkillNpcAdd.m_holder, resPath2, out _gameObject5, out GoWrapper _wrapper5, 70);
|
|
|
+ string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_tb_jc");
|
|
|
+ SceneController.AddObjectToView(_gameObject7, null, _ui.m_ComRoleSkillMineMinus.m_holder, resPath5, out _gameObject7, out GoWrapper _wrapper7, 70);
|
|
|
+ SceneController.AddObjectToView(_gameObject8, null, _ui.m_ComRoleSkillNpcMinus.m_holder, resPath5, out _gameObject8, out GoWrapper _wrapper8, 70);
|
|
|
+ string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_tb_dz");
|
|
|
+ SceneController.AddObjectToView(_gameObject9, null, _ui.m_ComRoleSkillMineBreak.m_holder, resPath6, out _gameObject9, out GoWrapper _wrapper9, 70);
|
|
|
+ SceneController.AddObjectToView(_gameObject10, null, _ui.m_ComRoleSkillNpcBreak.m_holder, resPath6, out _gameObject10, out GoWrapper _wrapper10, 70);
|
|
|
+ string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_tb_jy");
|
|
|
+ SceneController.AddObjectToView(_gameObject11, null, _ui.m_ComRoleSkillMineShield.m_holder, resPath7, out _gameObject11, out GoWrapper _wrapper11, 70);
|
|
|
+ SceneController.AddObjectToView(_gameObject12, null, _ui.m_ComRoleSkillNpcShield.m_holder, resPath7, out _gameObject12, out GoWrapper _wrapper12, 70);
|
|
|
+
|
|
|
+
|
|
|
+ string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_tb_an");
|
|
|
+ for (int i = 0; i < _skillCount; i++)
|
|
|
+ {
|
|
|
+ GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
|
|
|
+ UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(btnSkill);
|
|
|
+ SceneController.AddObjectToView(null, null, item.m_holder, resPath3, out GameObject _gameObject, out GoWrapper _wrapper);
|
|
|
+ _gameObjects.Add(_gameObject);
|
|
|
+ }
|
|
|
+
|
|
|
+ string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
|
|
|
+ SceneController.AddObjectToView(_gameObject6, null, _ui.m_proScore.m_comBar.m_holder, resPath4, out _gameObject6, out GoWrapper _wrapper6);
|
|
|
+
|
|
|
_ui.m_ComShieldMine.m_holder.visible = false;
|
|
|
_ui.m_ComShieldMine.m_holder1.visible = false;
|
|
|
_ui.m_ComShieldNpc.m_holder.visible = false;
|
|
|
@@ -365,7 +406,7 @@ namespace GFGGame
|
|
|
_targetScore += score;
|
|
|
}
|
|
|
// comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 0;
|
|
|
- comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
|
|
|
+ comRoleSkillScore.m_txtScore.SetVar("count", "+" + score.ToString()).FlushVars();
|
|
|
comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
comRoleSkillScore.m_t0.Play(() =>
|
|
|
@@ -396,9 +437,9 @@ namespace GFGGame
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
- UI_ComRoleSkill1 comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
|
|
|
+ UI_ComRoleSkill comRoleSkillScore = role == SkillDataManager.MINE ? _ui.m_ComRoleSkillNpcMinus : _ui.m_ComRoleSkillMineMinus;
|
|
|
comRoleSkillScore.target.visible = true;
|
|
|
- comRoleSkillScore.m_c1.selectedIndex = role == SkillDataManager.MINE ? 0 : 1;
|
|
|
+ // comRoleSkillScore.m_c1.selectedIndex = role == SkillDataManager.MINE ? 0 : 1;
|
|
|
int score = 0;
|
|
|
if (role == SkillDataManager.MINE)
|
|
|
{
|
|
|
@@ -413,25 +454,25 @@ namespace GFGGame
|
|
|
}
|
|
|
|
|
|
// comRoleSkillScore.m_comRoleSkill.m_c1.selectedIndex = 1;
|
|
|
- comRoleSkillScore.m_txtScore.SetVar("count", score.ToString()).FlushVars();
|
|
|
- if (role == SkillDataManager.MINE)
|
|
|
- {
|
|
|
- comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
- comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
- comRoleSkillScore.m_t0.Play(() =>
|
|
|
- {
|
|
|
- comRoleSkillScore.target.visible = false;
|
|
|
- });
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
- comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
- comRoleSkillScore.m_t1.Play(() =>
|
|
|
+ comRoleSkillScore.m_txtScore.SetVar("count", "-" + score.ToString()).FlushVars();
|
|
|
+ // if (role == SkillDataManager.MINE)
|
|
|
+ // {
|
|
|
+ comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
+ comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ comRoleSkillScore.m_t0.Play(() =>
|
|
|
{
|
|
|
comRoleSkillScore.target.visible = false;
|
|
|
});
|
|
|
- }
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // {
|
|
|
+ // comRoleSkillScore.m_t0.ignoreEngineTimeScale = false;
|
|
|
+ // comRoleSkillScore.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ // comRoleSkillScore.m_t0.Play(() =>
|
|
|
+ // {
|
|
|
+ // comRoleSkillScore.target.visible = false;
|
|
|
+ // });
|
|
|
+ // }
|
|
|
|
|
|
UpdateProgressBar();
|
|
|
|
|
|
@@ -442,6 +483,14 @@ namespace GFGGame
|
|
|
|
|
|
GProgressBar targetSkillMinus = role == SkillDataManager.MINE ? _ui.m_proMinusNpc : _ui.m_proMinusMine;
|
|
|
targetSkillMinus.visible = false;
|
|
|
+ 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.Play(() =>
|
|
|
+ {
|
|
|
+ comSkillBreak.target.visible = false;
|
|
|
+ });
|
|
|
|
|
|
GTweener twener = GTween.GetTween(targetSkillMinus, TweenPropType.Progress);
|
|
|
if (twener != null)
|
|
|
@@ -463,6 +512,16 @@ namespace GFGGame
|
|
|
comSkillShield.m_holder.visible = false;
|
|
|
|
|
|
});
|
|
|
+
|
|
|
+ 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.Play(() =>
|
|
|
+ {
|
|
|
+ comSkillShieldEff.target.visible = false;
|
|
|
+ });
|
|
|
+
|
|
|
}
|
|
|
private void OnBtnSpeedUp()
|
|
|
{
|
|
|
@@ -523,9 +582,13 @@ namespace GFGGame
|
|
|
_ui.m_ComRoleSkillMineMinus.target.visible = false;
|
|
|
_ui.m_ComRoleSkillNpcAdd.target.visible = false;
|
|
|
_ui.m_ComRoleSkillNpcMinus.target.visible = false;
|
|
|
+ _ui.m_ComRoleSkillMineBreak.target.visible = false;
|
|
|
+ _ui.m_ComRoleSkillNpcBreak.target.visible = false;
|
|
|
+ _ui.m_ComRoleSkillMineShield.target.visible = false;
|
|
|
+ _ui.m_ComRoleSkillNpcShield.target.visible = false;
|
|
|
|
|
|
- RoleSkillCfg[] roleSkillCfgs = RoleSkillCfgArray.Instance.dataArray;
|
|
|
- for (int i = 0; i < roleSkillCfgs.Length; i++)
|
|
|
+
|
|
|
+ for (int i = 0; i < _skillCount; i++)
|
|
|
{
|
|
|
GComponent btnSkill = _ui.target.GetChild("btnSkill" + i).asCom;
|
|
|
|
|
|
@@ -536,6 +599,7 @@ namespace GFGGame
|
|
|
isAutoPlay = false;
|
|
|
Timers.inst.Remove(CircleScoreStart);
|
|
|
Timers.inst.Remove(Skip);
|
|
|
+ _gameObjects.Clear();
|
|
|
}
|
|
|
|
|
|
protected override void UpdateToCheckGuide(object param)
|
zhaoyang
