双人战斗评分

FGUIProject/assets/Main/components/comMineCircle.xml

@@ -17,10 +17,6 @@
     <item time="42" type="Visible" target="n15_mza1" value="false"/>
     <item time="42" type="Visible" target="n16_v3k9" value="false"/>
     <item time="42" type="Visible" target="n17_v3k9" value="false"/>
-    <item time="45" type="Visible" target="n18_mueb" value="true"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Visible" target="n18_mueb" value="true"/>
-    <item time="42" type="Visible" target="n18_mueb" value="true"/>
+    <item time="42" type="Visible" target="n18_mueb" value="false"/>
   </transition>
 </component>

FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -17,10 +17,6 @@
     <item time="42" type="Visible" target="n15_mza1" value="false"/>
     <item time="42" type="Visible" target="n16_v3k9" value="false"/>
     <item time="42" type="Visible" target="n17_v3k9" value="false"/>
-    <item time="45" type="Visible" target="n18_mueb" value="true"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Visible" target="n18_mueb" value="true"/>
-    <item time="30" type="Visible" target="n18_mueb" value="true"/>
+    <item time="42" type="Visible" target="n18_mueb" value="false"/>
   </transition>
 </component>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comMineCircle.cs

@@ -12,7 +12,6 @@ namespace UI.Main
         public GTextField m_txtPart;
         public GTextField m_txtCount;
         public Transition m_t0;
-        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kc2umeg";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "comMineCircle";
@@ -65,7 +64,6 @@ namespace UI.Main
             m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -74,7 +72,6 @@ namespace UI.Main
             m_txtPart = null;
             m_txtCount = null;
             m_t0 = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs

@@ -12,7 +12,6 @@ namespace UI.Main
         public GTextField m_txtPart;
         public GTextField m_txtCount;
         public Transition m_t0;
-        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kv3k9c4";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "comTargetCircle";
@@ -65,7 +64,6 @@ namespace UI.Main
             m_txtPart = (GTextField)comp.GetChild("txtPart");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_t0 = comp.GetTransition("t0");
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -74,7 +72,6 @@ namespace UI.Main
             m_txtPart = null;
             m_txtCount = null;
             m_t0 = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -182,7 +182,10 @@ namespace GFGGame
                 {
                     playStop = false;
 
-                    _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
+                    _ui.m_comMineCircle.m_t0.Play(() =>
+                    {
+                        CircleScoreEnd(null);
+                    });
                     _ui.m_comTargetCircle.m_t0.Play();
                 }
             });
@@ -363,25 +366,33 @@ namespace GFGGame
                 });
                 return;
             }
+            _ui.m_comMineCircle.m_holder.visible = false;
             _ui.m_comMineCircle.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comMineCircle.m_t0.timeScale = _speed;
-            _ui.m_comMineCircle.m_t0.Play(CircleScoreEnd);
-            _ui.m_comMineCircle.m_t1.ignoreEngineTimeScale = false;
-            _ui.m_comMineCircle.m_t1.timeScale = _speed;
-            _ui.m_comMineCircle.m_t1.Play(() =>
+            _ui.m_comMineCircle.m_t0.Play(() =>
             {
                 PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position);
             });
-
+            // _ui.m_comMineCircle.m_t1.ignoreEngineTimeScale = false;
+            // _ui.m_comMineCircle.m_t1.timeScale = _speed;
+            // _ui.m_comMineCircle.m_t1.Play(() =>
+            // {
+            //     PlayScoreTWEffect(_ui.m_holderPartScore, _ui.m_comMineCircle.target.position, _ui.m_proScore.target.position);
+            // });
+            _ui.m_comTargetCircle.m_holder.visible = false;
             _ui.m_comTargetCircle.m_t0.ignoreEngineTimeScale = false;
             _ui.m_comTargetCircle.m_t0.timeScale = _speed;
-            _ui.m_comTargetCircle.m_t0.Play();
-            _ui.m_comTargetCircle.m_t1.ignoreEngineTimeScale = false;
-            _ui.m_comTargetCircle.m_t1.timeScale = _speed;
-            _ui.m_comTargetCircle.m_t1.Play(() =>
+            _ui.m_comTargetCircle.m_t0.Play(() =>
             {
                 PlayScoreTWEffect(_ui.m_holderPartScoreNpc, _ui.m_comTargetCircle.target.position, _ui.m_proScore.target.position + new Vector3(_ui.m_proScore.target.width, 0, 0));
             });
+            // _ui.m_comTargetCircle.m_t1.ignoreEngineTimeScale = false;
+            // _ui.m_comTargetCircle.m_t1.timeScale = _speed;
+            // _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));
+            // });
+            Timers.inst.Add(2.5f / _speed, 1, CircleScoreEnd);
         }
         private void PlayScoreTWEffect(GGraph holderScore, Vector3 startValue, Vector3 endValue)
         {
@@ -395,7 +406,7 @@ namespace GFGGame
                 UpdateProgressBar();
             });
         }
-        private void CircleScoreEnd()
+        private void CircleScoreEnd(object param)
         {
             //当前部件评分结束
             _gameObject13.SetActive(false);