战斗动画

FGUIProject/assets/Main/StorySkillUI.xml

@@ -10,8 +10,8 @@
     <component id="n7_psph" name="comSkillShow" src="psphiy" fileName="components/ComSkillShow.xml" xy="540,960" pivot="0.5,0.5" anchor="true"/>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Scale" target="n7_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
-    <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,225" duration="12" ease="Linear"/>
+    <item time="0" type="Scale" target="n7_psph" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Circ.In"/>
+    <item time="0" type="XY" target="n7_psph" tween="true" startValue="540,960" endValue="926,225" duration="12" ease="Circ.In"/>
   </transition>
   <transition name="t2">
     <item time="0" type="Scale" target="n7_psph" value="1,1"/>

GameClient/Assets/Game/HotUpdate/ServerProxy/ArenaSproxy.cs

@@ -331,9 +331,9 @@ namespace GFGGame
                         list[i].cardId = response.DressupList[i].CardId;
                         for (int j = 0; j < response.SkillAttrs.Count; j++)
                         {
-                            if (response.SkillAttrs[i].Score == list[i].scoreType)
+                            if (response.SkillAttrs[j].Score == list[i].scoreType)
                             {
-                                list[i].leagueSkillScore = response.SkillAttrs[i].Value;
+                                list[i].leagueSkillScore = response.SkillAttrs[j].Value;
                             }
                         }
                         List<PassivitySkillCfg> skillCfgs = PassivitySkillCfgArray.Instance.GetCfgsBycardId(response.data[i].CardId);

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

@@ -113,7 +113,7 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUp);
 
-            _ui.m_comClick.target.onClick.Add(CheckPerfectSkill);
+            _ui.m_comClick.target.onClick.Add(OnComResultComplete);
             _ui.m_comClick.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             _ui.m_comClick.target.onTouchEnd.Add(AllCircleScoreEnd);
 
@@ -306,15 +306,21 @@ namespace GFGGame
             else
             {
                 _ui.m_comClick.m_comResult.m_t0.ClearHooks();
-                _ui.m_comClick.m_comResult.m_t0.Play(CheckPerfectSkill);
+                _ui.m_comClick.m_comResult.m_t0.Play(OnComResultComplete);
             }
             _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/pf_picture_{0}", _partId);
         }
+        private void OnComResultComplete()
+        {
+            if (_ui.m_comClick.target.touchable == false) return;
+            CheckPerfectSkill();
+        }
         private void CheckPerfectSkill()
         {
             // if (_isAllPerfect) return;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length) return;
             // _skillScore = 0;
+
             _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);

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

@@ -147,7 +147,7 @@ namespace GFGGame
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_comClick.target.onClick.Add(PartScoreEnd);
+            _ui.m_comClick.target.onClick.Add(OnComResultComplete);
             _ui.m_comClick.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             _ui.m_comClick.target.onTouchEnd.Add(AllCircleScoreEnd);
 
@@ -468,10 +468,16 @@ namespace GFGGame
             else
             {
                 _ui.m_comClick.m_comResult.m_t0.ClearHooks();
-                _ui.m_comClick.m_comResult.m_t0.Play(PartScoreEnd);
+                _ui.m_comClick.m_comResult.m_t0.Play(OnComResultComplete);
             }
             _ui.m_comClick.m_comResult.m_loaPart.url = string.Format("ui://Main/pf_picture_{0}", _partId);
         }
+
+        private void OnComResultComplete()
+        {
+            if (_ui.m_comClick.target.touchable == false) return;
+            PartScoreEnd();
+        }
         private void PartScoreEnd()
         {
             if (_partId <= 0 || _partId > FightScoreCfgArray.Instance.dataArray.Length) return;
@@ -489,6 +495,7 @@ namespace GFGGame
                 PartScoreResultStart(clickType);
             }
         }
+
         private void PartScoreResultStart(int clickType)
         {
             Debug.Log("_partId:" + _partId);