|
@@ -48,6 +48,10 @@ namespace GFGGame
|
|
|
private GameObject _gameObject12;
|
|
|
private GameObject _gameObject13;
|
|
|
private GameObject _gameObject14;
|
|
|
+ private GameObject _gameObject15;
|
|
|
+ private GameObject _gameObject16;
|
|
|
+ private GameObject _gameObject17;
|
|
|
+ private GameObject _gameObject18;
|
|
|
private List<GameObject> _gameObjects = new List<GameObject>();
|
|
|
// private GoWrapper _wrapper5;
|
|
|
private Dictionary<int, RoleSkillCfg> _npcSkillDic;
|
|
@@ -68,6 +72,17 @@ namespace GFGGame
|
|
|
SceneController.DestroyObjectFromView(_gameObject4);
|
|
|
SceneController.DestroyObjectFromView(_gameObject5);
|
|
|
SceneController.DestroyObjectFromView(_gameObject6);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject7);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject8);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject9);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject11);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject12);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject13);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject14);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject15);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject16);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject17);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject18);
|
|
|
for (int i = 0; i < _gameObjects.Count; i++)
|
|
|
{
|
|
|
SceneController.DestroyObjectFromView(_gameObjects[i]);
|
|
@@ -75,7 +90,53 @@ namespace GFGGame
|
|
|
}
|
|
|
base.Dispose();
|
|
|
}
|
|
|
+ private void AddEffect()
|
|
|
+ {
|
|
|
+ string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
|
|
|
+ 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, 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_jn_tg");
|
|
|
+ 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_jn_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_jn_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_jn_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 resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
|
|
|
+ SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 55);
|
|
|
+ SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8, out _gameObject14, out GoWrapper _wrapper14, 55);
|
|
|
+ string resPath9 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
|
|
|
+ SceneController.AddObjectToView(_gameObject15, null, _ui.m_holderPartScore, resPath9, out _gameObject15, out GoWrapper _wrapper15);
|
|
|
+ SceneController.AddObjectToView(_gameObject16, null, _ui.m_holderPartScoreNpc, resPath9, out _gameObject16, out GoWrapper _wrapper16);
|
|
|
+ SceneController.AddObjectToView(_gameObject17, null, _ui.m_holderAddScore, resPath9, out _gameObject17, out GoWrapper _wrapper17);
|
|
|
+ SceneController.AddObjectToView(_gameObject18, null, _ui.m_holderAddScoreNpc, resPath9, out _gameObject18, out GoWrapper _wrapper18);
|
|
|
|
|
|
+
|
|
|
+ string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_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;
|
|
|
+ _ui.m_ComShieldNpc.m_holder1.visible = false;
|
|
|
+ }
|
|
|
protected override void Init()
|
|
|
{
|
|
|
base.Init();
|
|
@@ -186,48 +247,7 @@ namespace GFGGame
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- private void AddEffect()
|
|
|
- {
|
|
|
- string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_hd_sc");
|
|
|
- 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, 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_jn_tg");
|
|
|
- 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_jn_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_jn_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_jn_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 resPath8 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
|
|
|
- SceneController.AddObjectToView(_gameObject13, null, _ui.m_comMineCircle.m_holder, resPath8, out _gameObject13, out GoWrapper _wrapper13, 55);
|
|
|
- SceneController.AddObjectToView(_gameObject14, null, _ui.m_comTargetCircle.m_holder, resPath8, out _gameObject14, out GoWrapper _wrapper14, 55);
|
|
|
-
|
|
|
-
|
|
|
- string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_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;
|
|
|
- _ui.m_ComShieldNpc.m_holder1.visible = false;
|
|
|
- }
|
|
|
|
|
|
private void CircleScoreStart(object param)
|
|
|
{
|
|
@@ -266,7 +286,11 @@ namespace GFGGame
|
|
|
_targetScore += targetScore;
|
|
|
EquipDataCache.cacher.npcTotalScore = (int)Math.Round(_targetScore);
|
|
|
|
|
|
- UpdateProgressBar();
|
|
|
+ // GTween.To(_ui.m_comMineCircle.target.position, _ui.m_proScore.target.position, 0.2f).SetTarget(_ui.m_holderParttScore).OnUpdate((GTweener t) =>
|
|
|
+ // {
|
|
|
+ // _ui.m_holderParttScore.position = t.value.vec2;
|
|
|
+ // }).OnComplete(UpdateProgressBar);
|
|
|
+ // UpdateProgressBar();
|
|
|
ReleaseNpcSkill();
|
|
|
PlayScoreAni();
|
|
|
}
|
|
@@ -316,14 +340,33 @@ namespace GFGGame
|
|
|
_ui.m_comMineCircle.m_t0.ignoreEngineTimeScale = false;
|
|
|
_ui.m_comMineCircle.m_t0.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
_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.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.Play();
|
|
|
-
|
|
|
+ _ui.m_comTargetCircle.m_t1.ignoreEngineTimeScale = false;
|
|
|
+ _ui.m_comTargetCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
|
|
|
+ _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)
|
|
|
+ {
|
|
|
+ holderScore.visible = true;
|
|
|
+ GTween.To(startValue, endValue, 0.5f).SetTarget(holderScore).OnUpdate((GTweener t) =>
|
|
|
+ {
|
|
|
+ holderScore.position = t.value.vec2;
|
|
|
+ }).OnComplete(() =>
|
|
|
+ {
|
|
|
+ holderScore.visible = false;
|
|
|
+ UpdateProgressBar();
|
|
|
+ });
|
|
|
}
|
|
|
private void CircleScoreEnd()
|
|
|
{
|
|
|
//当前部件评分结束
|
|
|
+
|
|
|
_index++;
|
|
|
if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
|
|
|
{
|
|
@@ -335,6 +378,7 @@ namespace GFGGame
|
|
|
_ui.m_comMineCircle.target.visible = false;
|
|
|
Timers.inst.Add(0.5f / EquipDataCache.cacher.fightSpeed, 1, CircleScoreStart);//评分结束
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
@@ -419,9 +463,13 @@ namespace GFGGame
|
|
|
comRoleSkillScore.m_t0.Play(() =>
|
|
|
{
|
|
|
comRoleSkillScore.target.visible = false;
|
|
|
+ GGraph graph = role == SkillDataManager.MINE ? _ui.m_holderAddScore : _ui.m_holderAddScoreNpc;
|
|
|
+ Vector3 targetPos = role == SkillDataManager.MINE ? _ui.m_proScore.target.position : _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0);
|
|
|
+ PlayScoreTWEffect(graph, comRoleSkillScore.target.position, targetPos);
|
|
|
});
|
|
|
|
|
|
- UpdateProgressBar();
|
|
|
+ // UpdateProgressBar();
|
|
|
+ // _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)); });
|
|
|
|
|
|
}
|
|
|
|
|
@@ -462,26 +510,14 @@ 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_t0.Play(() =>
|
|
|
- // {
|
|
|
- // comRoleSkillScore.target.visible = false;
|
|
|
- // });
|
|
|
- // }
|
|
|
+
|
|
|
|
|
|
UpdateProgressBar();
|
|
|
|