|
@@ -31,6 +31,9 @@ namespace GFGGame
|
|
|
private float offsetX = 150.0f;
|
|
|
//部位图片
|
|
|
private List<string> partImage = new List<string> { "","fx","zr","sp","scw","fz","zb"};
|
|
|
+ //点击特效
|
|
|
+ private List<string> ppEffectName = new List<string> { "PaoPao_Lose","PaoPao_prefectgood", "PaoPao_prefectgood" };
|
|
|
+ private List<string> starEffectName = new List<string> { "zd_Lose","zd_Good","zd_prefect"};
|
|
|
|
|
|
private EffectUI _effectUI1;
|
|
|
private EffectUI _effectUI2;
|
|
@@ -50,6 +53,9 @@ namespace GFGGame
|
|
|
private EffectUI _effectUI16;
|
|
|
private EffectUI _effectUI17;
|
|
|
private EffectUI _effectUI18;
|
|
|
+ private EffectUI _effectUI19;
|
|
|
+ private EffectUI _effectUI20;
|
|
|
+ private EffectUI _effectUI21;
|
|
|
|
|
|
public override void Dispose()
|
|
|
{
|
|
@@ -94,6 +100,12 @@ namespace GFGGame
|
|
|
_effectUI17 = null;
|
|
|
EffectUIPool.Recycle(_effectUI18);
|
|
|
_effectUI18 = null;
|
|
|
+ EffectUIPool.Recycle(_effectUI19);
|
|
|
+ _effectUI19 = null;
|
|
|
+ EffectUIPool.Recycle(_effectUI20);
|
|
|
+ _effectUI20 = null;
|
|
|
+ EffectUIPool.Recycle(_effectUI21);
|
|
|
+ _effectUI21 = null;
|
|
|
if (_ui != null)
|
|
|
{
|
|
|
_ui.Dispose();
|
|
@@ -135,7 +147,7 @@ namespace GFGGame
|
|
|
_effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_holder1, "ui_fight_new", "Progress_fixed");
|
|
|
_effectUI6 = EffectUIPool.CreateEffectUI(_ui.m_proScore.m_comBar.m_holder, "ui_fight_new", "Progress_liuguang");
|
|
|
//_effectUI7 = EffectUIPool.CreateEffectUI(_ui.m_comAllPerfect.m_holder, "ui_fight_new", "zd_df_dfzj");
|
|
|
- _effectUI8 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderNormal, "ui_fight_new", "bottom_appear");
|
|
|
+ _effectUI8 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderNormal, "ui_fight_new", "bottom_Highlight");
|
|
|
_effectUI9 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holderCircle, "ui_fight_new", "circle");
|
|
|
_effectUI10 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holder0, "ui_fight_new", "Lose_animation");
|
|
|
_effectUI11 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_holder1, "ui_fight_new", "Good_animation");
|
|
@@ -146,6 +158,7 @@ namespace GFGGame
|
|
|
_effectUI16 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holder, "ui_fight_new", "3S_textAppear01");
|
|
|
_effectUI17 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeIn, "ui_fight_new", "smoke_Approach");
|
|
|
_effectUI18 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comAllPerfect.m_holderSmokeOut, "ui_fight_new", "smoke_out");
|
|
|
+ _effectUI21 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_HaiZhiShi", "Bg_All_Tx");
|
|
|
}
|
|
|
protected override void AddEventListener()
|
|
|
{
|
|
@@ -284,16 +297,18 @@ namespace GFGGame
|
|
|
x = pos.x;
|
|
|
y = pos.y;
|
|
|
_ui.m_comClick.m_comResult.target.visible = true;
|
|
|
- _ui.m_comClick.m_comResult.m_holderNormal.scale = new Vector2(1.6f, 1.6f);
|
|
|
+ _ui.m_comClick.m_comResult.m_paopao.visible = true;
|
|
|
+ _ui.m_comClick.m_comResult.m_holderNormal.scale = new Vector2(1.6f, 1.6f);
|
|
|
_ui.m_comClick.m_comResult.m_holderResult.SetXY(130, 130);
|
|
|
// _ui.m_comClick.m_comResult.m_loaGlass.url = string.Format("ui://Main/zd_bl_{0}", UnityEngine.Random.Range(0, 3));
|
|
|
+ _ui.m_comClick.m_comResult.m_evaluatext.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
|
|
|
_ui.m_comClick.m_comResult.target.SetXY(x, y);
|
|
|
_ui.m_comClick.m_comResult.m_t0.ignoreEngineTimeScale = false;
|
|
|
_ui.m_comClick.m_comResult.m_t0.timeScale = FightDataManager.Instance.fightSpeed;
|
|
|
if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0)
|
|
|
{
|
|
|
_ui.m_comClick.target.touchable = false;
|
|
|
- _ui.m_comClick.m_comResult.m_t0.Play(1, 0, 0, 1.25f, UpdateToCheckGuide);
|
|
|
+ _ui.m_comClick.m_comResult.m_t0.Play(1, 0, 0, 1.0f, UpdateToCheckGuide);
|
|
|
}
|
|
|
else if (FightDataManager.Instance.autoPlay)
|
|
|
{
|
|
@@ -321,7 +336,11 @@ namespace GFGGame
|
|
|
_ui.m_comClick.target.touchable = false;
|
|
|
int clickType = FightDataManager.Instance.GetClickType(_ui.m_comClick.m_comResult.m_holderCircle.scale.x);
|
|
|
_ui.m_comClick.m_comResult.m_t0.Stop(true, false);
|
|
|
-
|
|
|
+ if (clickType == 2)
|
|
|
+ {
|
|
|
+ _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
|
|
|
+ _ui.m_comClick.m_comResult.m_starEffect.visible = true;
|
|
|
+ }
|
|
|
|
|
|
if (clickType == ClickType.PERFECT_CLICK)
|
|
|
{
|
|
@@ -337,16 +356,28 @@ namespace GFGGame
|
|
|
private void PartScoreResultStart(int clickType)
|
|
|
{
|
|
|
Debug.Log("_partId:" + _partId);
|
|
|
-
|
|
|
// _ui.m_comClick.target.touchable = false;
|
|
|
+ _effectUI19 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_ppEffect, "ui_fight_new", ppEffectName[clickType]);
|
|
|
+
|
|
|
+ _ui.m_comClick.m_comResult.m_ppEffect.visible = true;
|
|
|
+ _ui.m_comClick.m_comResult.m_paopao.visible = false;
|
|
|
+ if(clickType == 2)
|
|
|
+ {
|
|
|
+ _ui.m_t0.Play();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
|
|
|
+ _ui.m_comClick.m_comResult.m_starEffect.visible = true;
|
|
|
+ }
|
|
|
|
|
|
PartScoreResultEnd();
|
|
|
- //这里后面去掉第四个参数,因为不需要他参与计算了
|
|
|
+ //这里后面去掉第四个参数,因为不需要他参与计算了
|
|
|
_partScore = ScoreSystemData.Instance.GetRoundScore(roleData, _partId, clickType , _allSkillScore);
|
|
|
_score += _partScore;
|
|
|
_ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
|
|
|
_ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
|
|
|
- _ui.m_comClick.m_comResult.m_evaluatext.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
|
|
|
+
|
|
|
switch (clickType)
|
|
|
{
|
|
|
case ClickType.MISS_CLICK:
|
|
@@ -376,6 +407,13 @@ namespace GFGGame
|
|
|
private void CheckPartEndSkill()
|
|
|
{
|
|
|
// _ui.m_comClick.m_comResult.target.visible = _partId == FightScoreCfgArray.Instance.dataArray.Length ? false : true;
|
|
|
+ _ui.m_comClick.m_comResult.m_ppEffect.visible = false;
|
|
|
+ _ui.m_comClick.m_comResult.m_starEffect.visible = false;
|
|
|
+ EffectUIPool.Recycle(_effectUI19);
|
|
|
+ _effectUI19 = null;
|
|
|
+ EffectUIPool.Recycle(_effectUI20);
|
|
|
+ _effectUI20 = null;
|
|
|
+
|
|
|
_skillScore = 0;
|
|
|
_currentTime = SkillBeginTime.ERVERY_ROUND_END;
|
|
|
TryShowCardSkill(null);
|