zhangyuqian 1 год назад
Родитель
Сommit
ef9b7feb49

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -216,7 +216,7 @@ namespace GFGGame
             {
                 return ClickType.PERFECT_CLICK;
             }
-            if (scale <= 0.38f && scale > 0.27f)
+            if (scale <= 0.55f && scale > 0.45f)
             {
                 clickType = ClickType.PERFECT_CLICK;
             }

+ 9 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreResult.cs

@@ -30,6 +30,9 @@ namespace UI.Main
         public GGraph m_starEffect3;
         public Transition m_t0;
         public Transition m_t1;
+        public Transition m_holder0_2;
+        public Transition m_holder1_2;
+        public Transition m_holder2_2;
         public const string URL = "ui://mfvz4q8kvuz5bi";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComScoreResult";
@@ -100,6 +103,9 @@ namespace UI.Main
             m_starEffect3 = (GGraph)comp.GetChild("starEffect3");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
+            m_holder0_2 = comp.GetTransition("holder0");
+            m_holder1_2 = comp.GetTransition("holder1");
+            m_holder2_2 = comp.GetTransition("holder2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -126,6 +132,9 @@ namespace UI.Main
             m_starEffect3 = null;
             m_t0 = null;
             m_t1 = null;
+            m_holder0_2 = null;
+            m_holder1_2 = null;
+            m_holder2_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 31 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -207,6 +207,9 @@ namespace GFGGame
             _ui.m_proScore.m_txtCount.text = "0";
             _ui.m_comClick.target.touchable = false;
             _ui.m_comClick.m_comAllPerfect.target.visible = false;
+            _ui.m_comClick.m_comResult.m_starEffect.visible = false;
+            _ui.m_comClick.m_comResult.m_ppEffect.visible = false;
+            _ui.m_comClick.m_comResult.m_t0.ClearHooks();
             _isAllPerfect = false;
 
             _currentTime = SkillBeginTime.FIGHT_BEGIN;
@@ -370,12 +373,17 @@ namespace GFGGame
                 _effectUI20 = EffectUIPool.CreateEffectUI(_ui.m_comClick.m_comResult.m_starEffect, "ui_fight_new", starEffectName[clickType]);
                 _ui.m_comClick.m_comResult.m_starEffect.visible = true;
             }
+            for (int i = 0; i < 3; i++)
+            {
+                _ui.m_comClick.m_comResult.target.GetChild("holder" + i).visible = false;
+            }
 
-            PartScoreResultEnd();
+            PartScoreResultEnd(clickType);
             //这里后面去掉第四个参数,因为不需要他参与计算了  
             _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;
 
             switch (clickType)
@@ -394,8 +402,28 @@ namespace GFGGame
             _allSkillScore = 0;
         }
 
-        private void PartScoreResultEnd()
+        private void PartScoreResultEnd(int clickType = -1)
         {
+            switch (clickType)
+            {
+                case 0:
+                    _ui.m_comClick.m_comResult.m_holder0_2.ignoreEngineTimeScale = false;
+                    _ui.m_comClick.m_comResult.m_holder0_2.timeScale = FightDataManager.Instance.fightSpeed;
+                    _ui.m_comClick.m_comResult.m_holder0_2.Play();
+                    break;
+                case 1:
+                    _ui.m_comClick.m_comResult.m_holder1_2.ignoreEngineTimeScale = false;
+                    _ui.m_comClick.m_comResult.m_holder1_2.timeScale = FightDataManager.Instance.fightSpeed;
+                    _ui.m_comClick.m_comResult.m_holder1_2.Play();
+                    break;
+                case 2:
+                    _ui.m_comClick.m_comResult.m_holder2_2.ignoreEngineTimeScale = false;
+                    _ui.m_comClick.m_comResult.m_holder2_2.timeScale = FightDataManager.Instance.fightSpeed;
+                    _ui.m_comClick.m_comResult.m_holder2_2.Play();
+                    break;
+                default:
+                    break;
+            }
             _ui.m_comClick.m_comResult.m_t1.ignoreEngineTimeScale = false;
             _ui.m_comClick.m_comResult.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
             _ui.m_comClick.m_comResult.m_t1.SetValue("start", 130, 130);

+ 30 - 4
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -212,7 +212,9 @@ namespace GFGGame
             // _ui.m_LoaMask.visible = false;
             _ui.m_proScore.m_comBar.target.width = _ui.m_proScore.m_comBar.target.width / 2;
             _ui.m_btnSkip.visible = InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena;
-
+            _ui.m_comClick.m_comResult.m_starEffect.visible = false;
+            _ui.m_comClick.m_comResult.m_ppEffect.visible = false;
+            _ui.m_comClick.m_comResult.m_t0.ClearHooks();
 
             if (targetData.type == FightTargetType.PLAYER)
             {
@@ -652,13 +654,37 @@ namespace GFGGame
                     break;
             }
 
-            PartScoreResultEnd();
+            PartScoreResultEnd(clickType);
             _ui.m_comClick.m_comResult.m_c1.selectedIndex = clickType;
-            _ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
+            //_ui.m_comClick.m_comResult.target.GetChild("holder" + clickType).visible = true;
+            for (int i = 0; i < 3; i++)
+            {
+                _ui.m_comClick.m_comResult.target.GetChild("holder" + i).visible = false;
+            }
             _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/zd_wz_pf_{0}", partImage[_partId]);
         }
-        private void PartScoreResultEnd()
+        private void PartScoreResultEnd(int clickType = -1)
         {
+            switch (clickType)
+            {
+                case 0:
+                    _ui.m_comClick.m_comResult.m_holder0_2.ignoreEngineTimeScale = false;
+                    _ui.m_comClick.m_comResult.m_holder0_2.timeScale = FightDataManager.Instance.fightSpeed;
+                    _ui.m_comClick.m_comResult.m_holder0_2.Play();
+                    break;
+                case 1:
+                    _ui.m_comClick.m_comResult.m_holder1_2.ignoreEngineTimeScale = false;
+                    _ui.m_comClick.m_comResult.m_holder1_2.timeScale = FightDataManager.Instance.fightSpeed;
+                    _ui.m_comClick.m_comResult.m_holder1_2.Play();
+                    break;
+                case 2:
+                    _ui.m_comClick.m_comResult.m_holder2_2.ignoreEngineTimeScale = false;
+                    _ui.m_comClick.m_comResult.m_holder2_2.timeScale = FightDataManager.Instance.fightSpeed;
+                    _ui.m_comClick.m_comResult.m_holder2_2.Play();
+                    break;
+                default:
+                    break;
+            }
 
             _ui.m_comClick.m_comResult.m_t1.timeScale = FightDataManager.Instance.fightSpeed;
             _ui.m_comClick.m_comResult.m_t1.SetValue("start", 130, 130);

BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes