zhaoyang 3 жил өмнө
parent
commit
3249cdcba2

+ 1 - 0
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -23,5 +23,6 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
+    <graph id="n37_wgy9" name="holderPartScore" xy="512,489" size="1,1" visible="false"/>
   </displayList>
 </component>

+ 5 - 0
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -57,5 +57,10 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
+    <graph id="n44_t6aj" name="holderPartScore" xy="380,1428" size="1,1" group="n46_t6aj" visible="false"/>
+    <graph id="n45_t6aj" name="holderPartScoreNpc" xy="700,1426" size="1,1" group="n46_t6aj" visible="false"/>
+    <graph id="n47_wgy9" name="holderAddScore" xy="320,1132" size="1,1" group="n46_t6aj" visible="false"/>
+    <graph id="n48_wgy9" name="holderAddScoreNpc" xy="750,1132" size="1,1" group="n46_t6aj" visible="false"/>
+    <group id="n46_t6aj" name="n46" xy="320,1132" size="431,297"/>
   </displayList>
 </component>

+ 2 - 2
FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -6,10 +6,10 @@
     </image>
     <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="0,9" flip="hz"/>
     <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,9" size="836,24"/>
-    <text id="n4_uj53" name="txtMineScore" xy="287,52" size="148,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="middle" strokeColor="#796135" strokeSize="2" text="赵四10086">
+    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="148,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" vAlign="bottom" strokeColor="#796135" strokeSize="2" text="赵四10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <text id="n5_uj53" name="txtNpcScore" xy="640,52" pivot="1,0" size="180,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" align="right" vAlign="middle" strokeColor="#796135" strokeSize="2" text="小宫女10086">
+    <text id="n5_uj53" name="txtNpcScore" xy="826,50" pivot="1,0" anchor="true" size="180,44" font="ui://eg2y0ldpk1kha2" fontSize="32" color="#fcf5ec" align="right" vAlign="bottom" strokeColor="#796135" strokeSize="2" text="小宫女10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
   </displayList>

+ 4 - 0
FGUIProject/assets/Main/components/comTargetCircle.xml

@@ -16,4 +16,8 @@
     <item time="30" type="Visible" target="n17_v3k9" value="false"/>
     <item time="72" type="Visible" target="n18_mueb" value="true"/>
   </transition>
+  <transition name="t1" autoPlay="true">
+    <item time="0" type="Visible" target="n18_mueb" value="true"/>
+    <item time="30" type="Visible" target="n18_mueb" value="true"/>
+  </transition>
 </component>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs

@@ -21,6 +21,7 @@ namespace UI.Main
         public GGraph m_grh_7;
         public UI_ProgressBar1 m_proScore;
         public GButton m_btnSpeedUp;
+        public GGraph m_holderPartScore;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -82,6 +83,7 @@ namespace UI.Main
             m_grh_7 = (GGraph)comp.GetChild("grh_7");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_holderPartScore = (GGraph)comp.GetChild("holderPartScore");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -103,6 +105,7 @@ namespace UI.Main
             m_proScore.Dispose();
             m_proScore = null;
             m_btnSpeedUp = null;
+            m_holderPartScore = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 12 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightTargetScoreUI.cs

@@ -31,6 +31,10 @@ namespace UI.Main
         public UI_ComBtnSkill m_btnSkill2;
         public UI_ComBtnSkill m_btnSkill3;
         public GButton m_btnSpeedUp;
+        public GGraph m_holderPartScore;
+        public GGraph m_holderPartScoreNpc;
+        public GGraph m_holderAddScore;
+        public GGraph m_holderAddScoreNpc;
         public const string URL = "ui://mfvz4q8k8xpg3w";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightTargetScoreUI";
@@ -102,6 +106,10 @@ namespace UI.Main
             m_btnSkill2 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill2"));
             m_btnSkill3 = (UI_ComBtnSkill)UI_ComBtnSkill.Create(comp.GetChild("btnSkill3"));
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_holderPartScore = (GGraph)comp.GetChild("holderPartScore");
+            m_holderPartScoreNpc = (GGraph)comp.GetChild("holderPartScoreNpc");
+            m_holderAddScore = (GGraph)comp.GetChild("holderAddScore");
+            m_holderAddScoreNpc = (GGraph)comp.GetChild("holderAddScoreNpc");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -148,6 +156,10 @@ namespace UI.Main
             m_btnSkill3.Dispose();
             m_btnSkill3 = null;
             m_btnSpeedUp = null;
+            m_holderPartScore = null;
+            m_holderPartScoreNpc = null;
+            m_holderAddScore = null;
+            m_holderAddScoreNpc = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_comTargetCircle.cs

@@ -12,6 +12,7 @@ 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";
@@ -64,6 +65,7 @@ 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)
         {
@@ -72,6 +74,7 @@ namespace UI.Main
             m_txtPart = null;
             m_txtCount = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 28 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -22,6 +22,8 @@ namespace GFGGame
 
         private float _playTime = 1.25f;
 
+        private GameObject _gameObject0;
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -33,6 +35,8 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
 
+            AddEffect();
+
         }
 
         protected override void OnShown()
@@ -159,7 +163,8 @@ namespace GFGGame
 
             // int partId = FightScoreCfgArray.Instance.dataArray[_index].id;
             _score += ScoreSystemData.Instance.GetPartScore(partId, clickState, _mainScore, _skillScore);
-            SetScoreUI();
+            // SetScoreUI();
+            PlayScoreTWEffect();
         }
 
         private void CircleResuleEnd()
@@ -229,11 +234,12 @@ namespace GFGGame
 
             _time = 0;
             _score += allCircleScore;
-            SetScoreUI();
+            // SetScoreUI();
             _ui.m_comAllCircle.m_t1.ignoreEngineTimeScale = false;
             _ui.m_comAllCircle.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;// 1 / _speed;
             _ui.m_comAllCircle.m_t1.Play(() =>
             {
+                PlayScoreTWEffect();
                 Timers.inst.Add(1f, 1, Skip);
             });
 
@@ -275,6 +281,24 @@ namespace GFGGame
             _ui.m_proScore.target.value = 0;
             _ui.m_proScore.m_txtCount.text = "总分:0";
         }
+
+        private void PlayScoreTWEffect()
+        {
+            _ui.m_holderPartScore.visible = true;
+            GTween.To(_ui.m_comClickCircle.target.position, _ui.m_proScore.target.position, 0.5f).SetTarget(_ui.m_holderPartScore).OnUpdate((GTweener t) =>
+            {
+                _ui.m_holderPartScore.position = t.value.vec2;
+            }).OnComplete(() =>
+            {
+                _ui.m_holderPartScore.visible = false;
+                SetScoreUI();
+            });
+        }
+        private void AddEffect()
+        {
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
+            SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out GoWrapper _wrapper0);
+        }
         protected override void OnHide()
         {
             base.OnHide();
@@ -293,6 +317,8 @@ namespace GFGGame
                 GameObject.Destroy(_scenePrefab);
                 _scenePrefab = null;
             }
+            SceneController.DestroyObjectFromView(_gameObject0);
+
             base.Dispose();
 
         }

+ 93 - 57
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -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();
 

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