结算表现

FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -10,7 +10,7 @@
     <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,141" pivot="0.5,0" size="265,601">
       <relation target="n10_wono" sidePair="top-top"/>
     </component>
-    <component id="n10_wono" name="ComRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="129,222">
+    <component id="n10_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="175,222">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="0,1673" alpha="0">
@@ -24,4 +24,9 @@
     <item time="6" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
     <item time="18" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
   </transition>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n2_8xpg" value="0"/>
+    <item time="0" type="Size" target="n8_wono" value="265,0"/>
+    <item time="0" type="XY" target="n10_wono" value="175,222"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/ComRole.xml

@@ -11,6 +11,7 @@
     <image id="n17_wono" name="n17" src="wonogx" fileName="imagesFight/jz_yjd_f.png" xy="0,0" visible="false"/>
   </displayList>
   <transition name="t0">
+    <item time="0" type="Alpha" target="n18_wono" value="0"/>
     <item time="0" type="Visible" target="n17_wono" value="true"/>
     <item time="0" type="XY" target="n17_wono" tween="true" startValue="0,-1000" endValue="0,1300" duration="12" ease="Linear"/>
     <item time="12" type="Alpha" target="n18_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>

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

@@ -10,9 +10,10 @@ namespace UI.Main
         public GLoader m_loaBg;
         public GGraph m_btnClose;
         public UI_ComResult m_comResult;
-        public UI_ComRoleResult m_ComRoleResult;
+        public UI_ComRoleResult m_comRoleResult;
         public UI_CompFightExpBar m_comExpBar;
         public Transition m_t1;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8k8xpg3y";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightResultUI";
@@ -63,9 +64,10 @@ namespace UI.Main
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
-            m_ComRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("ComRoleResult"));
+            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
             m_comExpBar = (UI_CompFightExpBar)UI_CompFightExpBar.Create(comp.GetChild("comExpBar"));
             m_t1 = comp.GetTransition("t1");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -73,11 +75,12 @@ namespace UI.Main
             m_btnClose = null;
             m_comResult.Dispose();
             m_comResult = null;
-            m_ComRoleResult.Dispose();
-            m_ComRoleResult = null;
+            m_comRoleResult.Dispose();
+            m_comRoleResult = null;
             m_comExpBar.Dispose();
             m_comExpBar = null;
             m_t1 = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -408,16 +408,16 @@ namespace GFGGame
                 AlertUI.Show("未穿戴必需品。").SetRightButton(true, "好的");
                 return;
             }
-            if (CardDataManager.GetCardListByRarity(0).Count > 0)
-            {
-
-                ViewManager.Show<StoryCardChoose>(_fightCfg.scoreType);
-            }
-            else
-            {
-                // StartCalculateScore();
-                OnClickBtnPhotograph();
-            }
+            // if (CardDataManager.GetCardListByRarity(0).Count > 0)
+            // {
+
+            //     ViewManager.Show<StoryCardChoose>(_fightCfg.scoreType);
+            // }
+            // else
+            // {
+            //     // StartCalculateScore();
+            // }
+            OnClickBtnPhotograph();
         }
 
         private void OnClickBtnPhotograph()
@@ -446,7 +446,17 @@ namespace GFGGame
             bg.SetActive(true);
             Camera.main.backgroundColor = backgroundColor;
 
-            StartCalculateScore();
+            if (CardDataManager.GetCardListByRarity(0).Count > 0)
+            {
+
+                ViewManager.Show<StoryCardChoose>(_fightCfg.scoreType);
+            }
+            else
+            {
+                // StartCalculateScore();
+                // OnClickBtnPhotograph();
+                StartCalculateScore();
+            }
         }
         private void StartCalculateScore()
         {

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

@@ -193,7 +193,7 @@ namespace GFGGame
             _index++;
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
-                GetCurStar(out int star, out Transition transition);
+                // GetCurStar(out int star, out Transition transition);
 
                 _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
                 _ui.m_comRoleResult.m_comRole.m_imgRole.texture = _nTexture;
@@ -203,14 +203,15 @@ namespace GFGGame
                 _ui.m_comRoleResult.m_t0.Play();
                 _ui.m_t2.Play(() =>
                 {
-                    _ui.m_comRoleResult.m_c1.selectedIndex = star;
-                    _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
-                    {
-                        transition.Play(() =>
-                        {
-                            Timers.inst.Add(0.3f, 1, Skip);//评分结束});
-                        });
-                    });
+                    Timers.inst.Add(0.3f, 1, Skip);
+                    // _ui.m_comRoleResult.m_c1.selectedIndex = star;
+                    // _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
+                    // {
+                    //     transition.Play(() =>
+                    //     {
+                    //         Timers.inst.Add(0.3f, 1, Skip);//评分结束});
+                    //     });
+                    // });
                 });
             }
             else

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

@@ -77,13 +77,12 @@ namespace GFGGame
             InstanceZonesDataManager.usedRecommend = false;
             InstanceZonesDataManager.isResultFighting = true;
 
-            _ui.m_ComRoleResult.m_c1.selectedIndex = _resultData.Star;
 
             NTexture nTexture = new NTexture(EquipDataCache.cacher.RoleTextuex);
-
-            _ui.m_ComRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
-            _ui.m_ComRoleResult.m_comRole.m_imgRole.texture = nTexture;
-            _ui.m_ComRoleResult.m_comRole.m_imgRole.alpha = 1;
+            _ui.m_comRoleResult.m_c1.selectedIndex = _resultData.Star;
+            _ui.m_comRoleResult.m_comRole.m_imgRole.SetSize(GRoot.inst.width, GRoot.inst.height);
+            _ui.m_comRoleResult.m_comRole.m_imgRole.texture = nTexture;
+            _ui.m_comRoleResult.m_comRole.m_imgRole.alpha = 1;
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
             _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;
@@ -112,14 +111,37 @@ namespace GFGGame
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
-            _ui.m_t1.Play(AddExp);
-            // _ui.m_ComRoleResult.m_comRole.m_t1.Play(() =>
-            // {
-            //     _ui.m_t1.Play(AddExp);
-            // });
 
-        }
+            GetCurStar(out Transition transition);
+            _ui.m_t0.Play();//播放重置动画
+            _ui.m_comRoleResult.m_t0.Play();//播放重置动画
+            _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
+            {
+                transition.Play(() =>
+                {
+                    _ui.m_t1.Play(AddExp);
+                });
+            });
 
+        }
+        private void GetCurStar(out Transition transition)
+        {
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+            transition = _ui.m_comRoleResult.m_t0;
+            if (_resultData.Star == 1)
+            {
+                transition = _ui.m_comRoleResult.m_t1;
+            }
+            else if (_resultData.Star == 2)
+            {
+                transition = _ui.m_comRoleResult.m_t2;
+            }
+            else if (_resultData.Star == 3)
+            {
+                transition = _ui.m_comRoleResult.m_t3;
+            }
+        }
         protected override void OnHide()
         {
             base.OnHide();
@@ -195,6 +217,7 @@ namespace GFGGame
             UpdateToCheckGuide(null);
             Timers.inst.AddUpdate(CheckGuide);
         }
+
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.FIRST_FIGHT_FAILED) <= 0