浏览代码

战斗表现

zhaoyang 2 年之前
父节点
当前提交
1f8fc17db3
共有 37 个文件被更改,包括 171 次插入226 次删除
  1. 8 5
      FGUIProject/assets/Main/StoryFightResultUI.xml
  2. 1 1
      FGUIProject/assets/Main/StoryFightSingleScoreUI.xml
  3. 4 1
      FGUIProject/assets/Main/components/ComRole.xml
  4. 58 9
      FGUIProject/assets/Main/components/ComRoleResult.xml
  5. 8 0
      FGUIProject/assets/Main/components/ComRoleResult0.xml
  6. 8 0
      FGUIProject/assets/Main/components/ComRoleResult1.xml
  7. 8 0
      FGUIProject/assets/Main/components/ComRoleResult2.xml
  8. 8 0
      FGUIProject/assets/Main/components/ComRoleResult3.xml
  9. 8 0
      FGUIProject/assets/Main/components/ComRoleResult4.xml
  10. 二进制
      FGUIProject/assets/Main/imagesFight/jz_shan_1.png
  11. 二进制
      FGUIProject/assets/Main/imagesFight/jz_shan_2.png
  12. 二进制
      FGUIProject/assets/Main/imagesFight/jz_shan_3.png
  13. 二进制
      FGUIProject/assets/Main/imagesFight/jz_yzi_1.png
  14. 二进制
      FGUIProject/assets/Main/imagesFight/jz_yzi_2.png
  15. 二进制
      FGUIProject/assets/Main/imagesFight/jz_zuozi.png
  16. 11 1
      FGUIProject/assets/Main/package.xml
  17. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRole.cs
  18. 12 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRoleResult.cs
  19. 22 14
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  20. 12 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  21. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  22. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  23. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  24. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  25. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  26. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  27. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  28. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  29. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  30. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  31. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  32. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  33. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  34. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta
  35. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  36. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta
  37. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 8 - 5
FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -7,10 +7,10 @@
     <graph id="n1_8xpg" name="btnClose" xy="0,0" size="1080,1920" alpha="0" type="rect" fillColor="#ffff0000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="815,0" pivot="0.5,0" size="265,0">
-      <relation target="n10_wono" sidePair="right-right,top-top"/>
+    <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,106">
+    <component id="n10_wono" name="ComRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="129,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">
@@ -18,7 +18,10 @@
     </component>
   </displayList>
   <transition name="t1">
-    <item time="0" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
-    <item time="12" type="Alpha" target="n2_8xpg" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <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" tween="true" startValue="175,222" endValue="129,222" duration="6" ease="Linear"/>
+    <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>
 </component>

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

@@ -4,7 +4,7 @@
     <loader id="n39_wono" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <loader id="n38_wono" name="loaRole" xy="0,0" size="1080,1920">
+    <loader id="n38_wono" name="loaRole" xy="0,0" size="1080,1920" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,60">

+ 4 - 1
FGUIProject/assets/Main/components/ComRole.xml

@@ -5,7 +5,7 @@
     <loader id="n16_wono" name="loaBg" xy="1,0" size="583,1317" url="ui://mfvz4q8kwonogw" fill="scaleMatchWidth" autoSize="true">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <loader id="n15_wono" name="loaRole" xy="-233,-575" size="1150,2555" aspect="true" fill="scaleMatchHeight">
+    <loader id="n15_wono" name="loaRole" xy="342,690" pivot="0.5,0.5" anchor="true" size="1110,1973" aspect="true" alpha="0" align="center" vAlign="middle" fill="scaleMatchWidth">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
     <image id="n17_wono" name="n17" src="wonogx" fileName="imagesFight/jz_yjd_f.png" xy="0,0" visible="false"/>
@@ -15,4 +15,7 @@
     <item time="0" type="XY" target="n17_wono" tween="true" startValue="0,-1000" endValue="0,1300" duration="12" ease="Linear"/>
     <item time="12" type="Visible" target="n17_wono" value="false"/>
   </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n15_wono" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+  </transition>
 </component>

+ 58 - 9
FGUIProject/assets/Main/components/ComRoleResult.xml

@@ -1,17 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="730,1649" opaque="false">
+<component size="730,1475" opaque="false">
   <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <component id="n14_wono" name="comRole" src="wonogm" fileName="components/ComRole.xml" xy="72,90"/>
     <image id="n11_wono" name="n11" src="wonog6" fileName="imagesFight/jz_yjd_k.png" xy="39,60"/>
-    <image id="n12_wono" name="n12" src="wonog2" fileName="imagesFight/jz_ejd_yz.png" xy="0,163">
-      <gearDisplay controller="c1" pages="1"/>
-    </image>
-    <image id="n13_wono" name="n13" src="wonog3" fileName="imagesFight/jz_sanjd_xs.png" xy="0,0">
-      <gearDisplay controller="c1" pages="2"/>
-    </image>
-    <image id="n10_wono" name="n10" src="wonog4" fileName="imagesFight/jz_sijd_xs.png" xy="0,0">
+    <component id="n18_wono" name="n18" src="wonohd" fileName="components/ComRoleResult2.xml" xy="90,1142" pivot="0.5,1" anchor="true" size="158,333">
+      <gearDisplay controller="c1" pages="2,3"/>
+    </component>
+    <component id="n17_wono" name="n17" src="wonohc" fileName="components/ComRoleResult1.xml" xy="248,1410" pivot="0.5,1" anchor="true" size="491,334">
+      <gearDisplay controller="c1" pages="2,3"/>
+    </component>
+    <component id="n16_wono" name="n16" src="wonohb" fileName="components/ComRoleResult0.xml" xy="360,1463" pivot="0.5,1" anchor="true" size="721,243">
+      <gearDisplay controller="c1" pages="1,2,3"/>
+    </component>
+    <component id="n19_wono" name="n19" src="wonohe" fileName="components/ComRoleResult3.xml" xy="531,244" pivot="0.5,1" anchor="true" size="273,244">
       <gearDisplay controller="c1" pages="3"/>
-    </image>
+    </component>
+    <component id="n20_wono" name="n20" src="wonohf" fileName="components/ComRoleResult4.xml" xy="648,523" pivot="0.5,1" anchor="true" size="163,360">
+      <gearDisplay controller="c1" pages="3"/>
+    </component>
   </displayList>
+  <transition name="t3">
+    <item time="0" type="Alpha" target="n16_wono" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
+    <item time="0" type="Alpha" target="n17_wono" value="0"/>
+    <item time="0" type="Alpha" target="n18_wono" value="0"/>
+    <item time="0" type="Alpha" target="n19_wono" value="0"/>
+    <item time="0" type="Alpha" target="n20_wono" value="0"/>
+    <item time="0" type="Visible" target="n16_wono" value="true"/>
+    <item time="0" type="Visible" target="n17_wono" value="true"/>
+    <item time="0" type="Visible" target="n18_wono" value="true"/>
+    <item time="0" type="Visible" target="n19_wono" value="true"/>
+    <item time="0" type="Visible" target="n20_wono" value="true"/>
+    <item time="4" type="Alpha" target="n17_wono" tween="true" startValue="0" endValue="1" duration="16" ease="Linear"/>
+    <item time="9" type="Alpha" target="n18_wono" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
+    <item time="16" type="Alpha" target="n20_wono" tween="true" startValue="0" endValue="1" duration="9" ease="Linear"/>
+    <item time="20" type="Alpha" target="n19_wono" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>
+  </transition>
+  <transition name="t2">
+    <item time="0" type="Alpha" target="n16_wono" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
+    <item time="0" type="Alpha" target="n17_wono" value="0"/>
+    <item time="0" type="Alpha" target="n18_wono" value="0"/>
+    <item time="0" type="Visible" target="n16_wono" value="true"/>
+    <item time="0" type="Visible" target="n17_wono" value="true"/>
+    <item time="0" type="Visible" target="n18_wono" value="true"/>
+    <item time="0" type="Visible" target="n19_wono" value="false"/>
+    <item time="0" type="Visible" target="n20_wono" value="false"/>
+    <item time="4" type="Alpha" target="n17_wono" tween="true" startValue="0" endValue="1" duration="16" ease="Linear"/>
+    <item time="9" type="Alpha" target="n18_wono" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Alpha" target="n16_wono" tween="true" startValue="0" endValue="1" duration="15" ease="Linear"/>
+    <item time="0" type="Visible" target="n16_wono" value="true"/>
+    <item time="0" type="Visible" target="n17_wono" value="false"/>
+    <item time="0" type="Visible" target="n18_wono" value="false"/>
+    <item time="0" type="Visible" target="n19_wono" value="false"/>
+    <item time="0" type="Visible" target="n20_wono" value="false"/>
+  </transition>
+  <transition name="t0">
+    <item time="0" type="Visible" target="n16_wono" value="false"/>
+    <item time="0" type="Visible" target="n17_wono" value="false"/>
+    <item time="0" type="Visible" target="n18_wono" value="false"/>
+    <item time="0" type="Visible" target="n19_wono" value="false"/>
+    <item time="0" type="Visible" target="n20_wono" value="false"/>
+  </transition>
 </component>

+ 8 - 0
FGUIProject/assets/Main/components/ComRoleResult0.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="721,243" overflow="hidden">
+  <displayList>
+    <image id="n16_wono" name="n16" src="wonoh5" fileName="imagesFight/jz_shan_1.png" xy="0,0" size="721,243" fillMethod="vt" fillOrigin="1">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Main/components/ComRoleResult1.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="491,334" overflow="hidden">
+  <displayList>
+    <image id="n17_wono" name="n17" src="wonoh6" fileName="imagesFight/jz_shan_2.png" xy="0,0">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Main/components/ComRoleResult2.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="158,333" overflow="hidden">
+  <displayList>
+    <image id="n18_wono" name="n18" src="wonoh7" fileName="imagesFight/jz_shan_3.png" xy="0,0">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Main/components/ComRoleResult3.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="273,244" overflow="hidden">
+  <displayList>
+    <image id="n19_wono" name="n19" src="wonoh8" fileName="imagesFight/jz_yzi_1.png" xy="0,0">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

+ 8 - 0
FGUIProject/assets/Main/components/ComRoleResult4.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="163,360" overflow="hidden">
+  <displayList>
+    <image id="n20_wono" name="n20" src="wonoh9" fileName="imagesFight/jz_yzi_2.png" xy="0,0">
+      <relation target="" sidePair="bottom-bottom"/>
+    </image>
+  </displayList>
+</component>

二进制
FGUIProject/assets/Main/imagesFight/jz_shan_1.png


二进制
FGUIProject/assets/Main/imagesFight/jz_shan_2.png


二进制
FGUIProject/assets/Main/imagesFight/jz_shan_3.png


二进制
FGUIProject/assets/Main/imagesFight/jz_yzi_1.png


二进制
FGUIProject/assets/Main/imagesFight/jz_yzi_2.png


二进制
FGUIProject/assets/Main/imagesFight/jz_zuozi.png


+ 11 - 1
FGUIProject/assets/Main/package.xml

@@ -422,7 +422,17 @@
     <image id="wonoh1" name="zd_jz_3.png" path="/imagesStory/"/>
     <component id="wonoh2" name="ComSingleScoreStage.xml" path="/components/"/>
     <image id="wonoh3" name="zd_bl_1.png" path="/imagesStory/" exported="true"/>
-    <image id="wonoh4" name="e99aaa17c9c248f0c46e82b085a5e67.jpg" path="/"/>
+    <image id="wonoh5" name="jz_shan_1.png" path="/imagesFight/"/>
+    <image id="wonoh6" name="jz_shan_2.png" path="/imagesFight/"/>
+    <image id="wonoh7" name="jz_shan_3.png" path="/imagesFight/"/>
+    <image id="wonoh8" name="jz_yzi_1.png" path="/imagesFight/"/>
+    <image id="wonoh9" name="jz_yzi_2.png" path="/imagesFight/"/>
+    <image id="wonoha" name="jz_zuozi.png" path="/imagesFight/"/>
+    <component id="wonohb" name="ComRoleResult0.xml" path="/components/"/>
+    <component id="wonohc" name="ComRoleResult1.xml" path="/components/"/>
+    <component id="wonohd" name="ComRoleResult2.xml" path="/components/"/>
+    <component id="wonohe" name="ComRoleResult3.xml" path="/components/"/>
+    <component id="wonohf" name="ComRoleResult4.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -10,6 +10,7 @@ namespace UI.Main
         public GLoader m_loaBg;
         public GLoader m_loaRole;
         public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kwonogm";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRole";
@@ -60,12 +61,14 @@ namespace UI.Main
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRole = null;
             m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,6 +9,10 @@ namespace UI.Main
         public GComponent target;
         public Controller m_c1;
         public UI_ComRole m_comRole;
+        public Transition m_t3;
+        public Transition m_t2;
+        public Transition m_t1;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kwonogk";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRoleResult";
@@ -58,12 +62,20 @@ namespace UI.Main
         {
             m_c1 = comp.GetController("c1");
             m_comRole = (UI_ComRole)UI_ComRole.Create(comp.GetChild("comRole"));
+            m_t3 = comp.GetTransition("t3");
+            m_t2 = comp.GetTransition("t2");
+            m_t1 = comp.GetTransition("t1");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_comRole.Dispose();
             m_comRole = null;
+            m_t3 = null;
+            m_t2 = null;
+            m_t1 = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 22 - 14
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -80,7 +80,7 @@ namespace GFGGame
 
             _ui.m_comClickCircle.target.touchable = false;
             _ui.m_loaRole.texture = EquipDataCache.cacher.nTexture;
-            _ui.m_loaRole.SetSize(_ui.m_loaRole.width, _ui.m_loaRole.texture.height * _ui.m_loaRole.width / _ui.m_loaRole.texture.width);
+            // _ui.m_loaRole.SetSize(_ui.m_loaRole.width, _ui.m_loaRole.texture.height * _ui.m_loaRole.width / _ui.m_loaRole.texture.width);
 
             _ui.m_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
             _ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
@@ -178,7 +178,8 @@ namespace GFGGame
                 {
                     EquipDataCache.cacher.totalScore = _score;
                     _ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
-                    _ui.m_comScoreStage.m_c1.selectedIndex = GetCurStar();
+                    GetCurStar(out int star, out Transition transition);
+                    _ui.m_comScoreStage.m_c1.selectedIndex = star;
                     CircleResuleEnd();
                 });
         }
@@ -188,14 +189,17 @@ namespace GFGGame
             _index++;
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
-
-                _ui.m_comRoleResult.m_c1.selectedIndex = GetCurStar();
+                GetCurStar(out int star, out Transition transition);
+                _ui.m_comRoleResult.m_c1.selectedIndex = 0;
                 _ui.m_t2.Play(() =>
                 {
-                    _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
+                    _ui.m_comRoleResult.m_c1.selectedIndex = star;
+                    transition.Play(() =>
                     {
-                        // Skip();
-                        Timers.inst.Add(0.3f, 1, Skip);//评分结束
+                        _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
+                        {
+                            Timers.inst.Add(0.3f, 1, Skip);//评分结束
+                        });
                     });
                 });
             }
@@ -205,26 +209,27 @@ namespace GFGGame
             }
         }
 
-        private int GetCurStar()
+        private void GetCurStar(out int star, out Transition transition)
         {
             StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
-
-
-            int star = 0;
+            star = 0;
+            transition = _ui.m_comRoleResult.m_t0;
             if (_score >= fightCfg.score1 && _score < fightCfg.score2)
             {
                 star = 1;
+                transition = _ui.m_comRoleResult.m_t1;
             }
             else if (_score >= fightCfg.score2 && _score < fightCfg.score3)
             {
                 star = 2;
+                transition = _ui.m_comRoleResult.m_t2;
             }
             else if (_score >= fightCfg.score3)
             {
                 star = 3;
+                transition = _ui.m_comRoleResult.m_t3;
             }
-            return star;
         }
 
 
@@ -258,11 +263,15 @@ namespace GFGGame
         }
         private void Reset()
         {
-            // _stopFight = true;
             Timers.inst.Remove(SkillScore);
             Timers.inst.Remove(Skip);
+            GTween.Kill(_ui.m_proScore.m_comBar);
             _ui.m_t1.Stop(true, false);
             _ui.m_t2.Stop(true, false);
+            _ui.m_comRoleResult.m_t0.Stop(true, false);
+            _ui.m_comRoleResult.m_t1.Stop(true, false);
+            _ui.m_comRoleResult.m_t2.Stop(true, false);
+            _ui.m_comRoleResult.m_t3.Stop(true, false);
             _ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
 
             _ui.m_comRoleResult.target.SetScale(0, 0);
@@ -273,7 +282,6 @@ namespace GFGGame
             _ui.m_comClickCircle.target.SetScale(0, 0);
             _ui.m_loaGlass.SetScale(0, 0);
 
-            // GTween.Kill(_ui.m_proScore.m_comBar);
 
         }
 

+ 12 - 3
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -78,9 +78,10 @@ namespace GFGGame
             InstanceZonesDataManager.isResultFighting = true;
 
             _ui.m_ComRoleResult.m_c1.selectedIndex = _resultData.Star;
+
             GLoader loaRole = _ui.m_ComRoleResult.m_comRole.m_loaRole;
             loaRole.texture = EquipDataCache.cacher.nTexture;
-            loaRole.SetSize(loaRole.width, loaRole.texture.height * loaRole.width / loaRole.texture.width);
+            // loaRole.SetSize(loaRole.width, loaRole.texture.height * loaRole.width / loaRole.texture.width);
 
             _ui.m_comResult.m_c1.selectedIndex = _resultData.Star;
             _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;
@@ -109,8 +110,14 @@ namespace GFGGame
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
-            _ui.m_t1.Play(AddExp);
-
+            _ui.m_t1.Play(() =>
+            {
+                _ui.m_ComRoleResult.m_comRole.m_t1.Play(AddExp);
+            });
+            // _ui.m_ComRoleResult.m_comRole.m_t1.Play(() =>
+            // {
+            //     _ui.m_t1.Play(AddExp);
+            // });
 
         }
 
@@ -128,6 +135,8 @@ namespace GFGGame
             Timers.inst.Remove(CheckGuide);
             _ui.m_comResult.target.height = 0;
             _ui.m_comExpBar.target.alpha = 0;
+            _ui.m_t1.Stop(true, false);
+            _ui.m_ComRoleResult.m_comRole.m_t1.Stop(true, false);
         }
 
         private async void OnClickBtnClose(object param)

二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 945e4bd4ca303b348be29520ade9906a
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 415aed2e96f5a104a9889c09b1f0cebd
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

二进制
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes