结算特效

FGUIProject/assets/Main/ArenaFightResultUI.xml

@@ -6,8 +6,4 @@
     </graph>
     <component id="n8_wono" name="comResult" src="wonogf" fileName="components/ComResult.xml" xy="48,38" pivot="0.5,0"/>
   </displayList>
-  <transition name="t1">
-    <item time="0" type="Size" target="n8_wono" value="265,0"/>
-    <item time="6" type="Size" target="n8_wono" tween="true" startValue="265,0" endValue="265,601" duration="12" ease="Linear"/>
-  </transition>
 </component>

FGUIProject/assets/Main/components/ComAllPerfect.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="345,367">
+  <controller name="c1" pages="0,,1," selected="0">
+    <remark page="0" value="非自动战斗"/>
+    <remark page="1" value="自动战斗"/>
+  </controller>
   <displayList>
     <graph id="n42_gfx4" name="holderLoop" xy="190,183" size="1,1" visible="false"/>
     <graph id="n43_gfx4" name="holder" xy="190,183" size="1,1" visible="false"/>
     <graph id="n44_gfx4" name="holderSmokeIn" xy="190,183" size="1,1" visible="false"/>
     <graph id="n45_gfx4" name="holderSmokeOut" xy="190,183" size="1,1" visible="false"/>
     <text id="n38_qgxy" name="txtCount" xy="-25,96" pivot="0.5,0.5" size="419,121" visible="false" font="ui://mfvz4q8kqkjsnw" fontSize="50" text="66666"/>
-    <image id="n47_fqor" name="img3Second" src="9jv6o2" fileName="imagesNew/3Second.png" xy="-202,545"/>
+    <image id="n47_fqor" name="img3Second" src="9jv6o2" fileName="imagesNew/3Second.png" xy="-202,545">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
   </displayList>
   <transition name="t0">
     <item time="0" type="Visible" target="n38_qgxy" value="false"/>

FGUIProject/assets/Main/components/ComResult.xml

@@ -2,26 +2,57 @@
 <component size="983,374" pivot="0.5,0" anchor="true" overflow="hidden">
   <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
-    <image id="n16_qkjs" name="n16" src="qkjskj" fileName="imagesNew/zdpf_dikuang.png" xy="90,138"/>
-    <image id="n17_qkjs" name="n17" src="qkjsk7" fileName="imagesNew/result.png" xy="450,159"/>
-    <loader id="n15_qkjs" name="loaResultBg" xy="0,0" size="360,374" url="ui://mfvz4q8kqkjsjc" autoSize="true">
-      <gearIcon controller="c1" pages="0,1,2" values="ui://mfvz4q8kqkjsju|ui://mfvz4q8kqkjsjj|ui://mfvz4q8kqkjsjt" default="ui://mfvz4q8kqkjsjc"/>
-    </loader>
-    <loader id="n9_wono" name="logResult" xy="68,95" pivot="0.5,0.5" size="216,184" url="ui://mfvz4q8kqkjsjh" autoSize="true">
-      <gearIcon controller="c1" pages="0,1,2,3" values="ui://mfvz4q8kqkjsje|ui://mfvz4q8kqkjsjg|ui://mfvz4q8kqkjsjf|ui://mfvz4q8kqkjsjh"/>
-    </loader>
-    <image id="n10_wono" name="n10" src="qkjsnz" fileName="imagesNew/zspf_picture.png" xy="401,70" group="n13_wono">
+    <graph id="n22_fqor" name="holderScore" xy="560,186" size="1,1" visible="false" type="rect"/>
+    <image id="n17_qkjs" name="n17" src="qkjsk7" fileName="imagesNew/result.png" xy="477,159" visible="false"/>
+    <text id="n14_wono" name="txtScore" xy="594,158" size="104,60" visible="false" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="666">
+      <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
+    </text>
+    <graph id="n18_fqor" name="holderResult0" xy="184,186" size="2,2" visible="false" type="rect">
+      <gearDisplay controller="c1" pages="0"/>
+    </graph>
+    <graph id="n26_fqor" name="holderResult1" xy="184,186" size="2,2" visible="false">
+      <gearDisplay controller="c1" pages="1"/>
+    </graph>
+    <graph id="n27_fqor" name="holderResult2" xy="184,186" size="2,2" visible="false">
+      <gearDisplay controller="c1" pages="2"/>
+    </graph>
+    <graph id="n28_fqor" name="holderResult3" xy="184,186" size="2,2" visible="false">
+      <gearDisplay controller="c1" pages="3"/>
+    </graph>
+    <graph id="n29_fqor" name="holderStar1" xy="432,100" size="2,2" visible="false">
       <gearDisplay controller="c1" pages="1,2,3"/>
-    </image>
-    <image id="n11_wono" name="n11" src="qkjsnz" fileName="imagesNew/zspf_picture.png" xy="476,70" group="n13_wono">
+    </graph>
+    <graph id="n30_fqor" name="holderStar2" xy="507,100" size="2,2" visible="false">
       <gearDisplay controller="c1" pages="2,3"/>
-    </image>
-    <image id="n12_wono" name="n12" src="qkjsnz" fileName="imagesNew/zspf_picture.png" xy="551,70" group="n13_wono">
+    </graph>
+    <graph id="n31_fqor" name="holderStar3" xy="582,100" size="2,2" visible="false">
       <gearDisplay controller="c1" pages="3"/>
-    </image>
-    <group id="n13_wono" name="grpStar" xy="401,70" size="210,60" advanced="true" layout="hz" colGap="15" excludeInvisibles="true"/>
-    <text id="n14_wono" name="txtScore" xy="567,158" size="104,60" font="ui://mfvz4q8kqkjsnx" fontSize="40" color="#ecf6fc" letterSpacing="-10" singleLine="true" text="666">
-      <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
-    </text>
+    </graph>
   </displayList>
+  <transition name="t0">
+    <item time="0" type="Visible" target="n14_wono" value="false"/>
+    <item time="0" type="Visible" target="n17_qkjs" value="false"/>
+    <item time="0" type="Visible" target="n18_fqor" value="true"/>
+    <item time="0" type="Visible" target="n26_fqor" value="true"/>
+    <item time="0" type="Visible" target="n27_fqor" value="true"/>
+    <item time="0" type="Visible" target="n28_fqor" value="true"/>
+    <item time="12" type="Visible" target="n22_fqor" value="true"/>
+    <item time="24" type="Visible" target="n14_wono" value="true"/>
+    <item time="24" type="Visible" target="n17_qkjs" value="true"/>
+    <item time="24" type="Visible" target="n29_fqor" value="true"/>
+    <item time="30" type="Visible" target="n30_fqor" value="true"/>
+    <item time="36" type="Visible" target="n31_fqor" value="true"/>
+  </transition>
+  <transition name="t1">
+    <item time="0" type="Visible" target="n14_wono" value="false"/>
+    <item time="0" type="Visible" target="n17_qkjs" value="false"/>
+    <item time="0" type="Visible" target="n18_fqor" value="false"/>
+    <item time="0" type="Visible" target="n22_fqor" value="false"/>
+    <item time="0" type="Visible" target="n26_fqor" value="false"/>
+    <item time="0" type="Visible" target="n27_fqor" value="false"/>
+    <item time="0" type="Visible" target="n28_fqor" value="false"/>
+    <item time="0" type="Visible" target="n29_fqor" value="false"/>
+    <item time="0" type="Visible" target="n30_fqor" value="false"/>
+    <item time="0" type="Visible" target="n31_fqor" value="false"/>
+  </transition>
 </component>

FGUIProject/assets/Main/components/ComResultProMask.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="850,239" mask="n5_fqor">
+  <displayList>
+    <image id="n5_fqor" name="imgMask" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="0,0" size="850,239">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <graph id="n4_fqor" name="holder" xy="424,110" size="1,1"/>
+  </displayList>
+</component>

FGUIProject/assets/Main/components/CompFightExpBar.xml

@@ -10,5 +10,7 @@
     <text id="n16_qkjs" name="txtAllExp" xy="222,31" size="47,41" group="n18_qkjs" font="ui://eg2y0ldpa0cftks" fontSize="30" color="#fff1c1" leading="0" vars="true" singleLine="true" text="999"/>
     <group id="n18_qkjs" name="n18" xy="155,20" size="114,54" advanced="true" layout="hz" colGap="-6" excludeInvisibles="true"/>
     <component id="n10_wono" name="comHead" src="qkjstl8" fileName="components/ComHeadWithLv1.xml" pkg="eg2y0ldp" xy="22,26" aspect="true"/>
+    <graph id="n20_fqor" name="holderHead" xy="78,76" size="1,1" type="rect"/>
+    <graph id="n21_fqor" name="holderProHead" xy="1013,87" size="1,1" type="rect"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ProgressBar3.xml

@@ -5,6 +5,10 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n1_qkjs" name="bar" src="qkjsl9" fileName="imagesNew/pro_activate.png" xy="37,5" fillMethod="hz"/>
+    <component id="n4_fqor" name="comHolder" src="fqoro3" fileName="components/ComResultProMask.xml" xy="36,-103"/>
+    <graph id="n6_fqor" name="holder" xy="885,16" pivot="0.5,0.5" anchor="true" size="1,1">
+      <relation target="n4_fqor" sidePair="right-right"/>
+    </graph>
   </displayList>
   <ProgressBar/>
 </component>

FGUIProject/assets/Main/package.xml

@@ -615,6 +615,7 @@
     <component id="o9gho0" name="ComSkillCardMask.xml" path="/components/"/>
     <component id="o9gho1" name="ProgressBar3.xml" path="/components/"/>
     <image id="9jv6o2" name="3Second.png" path="/imagesNew/"/>
+    <component id="fqoro3" name="ComResultProMask.xml" path="/components/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 2;
+        public int maxFightSpeed = 4;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

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

@@ -9,7 +9,6 @@ namespace UI.Main
         public GComponent target;
         public GGraph m_btnClose;
         public UI_ComResult m_comResult;
-        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kjcejj6";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ArenaFightResultUI";
@@ -59,14 +58,12 @@ namespace UI.Main
         {
             m_btnClose = (GGraph)comp.GetChild("btnClose");
             m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnClose = null;
             m_comResult.Dispose();
             m_comResult = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_ComAllPerfect
     {
         public GComponent target;
+        public Controller m_c1;
         public GGraph m_holderLoop;
         public GGraph m_holder;
         public GGraph m_holderSmokeIn;
@@ -63,6 +64,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_holderLoop = (GGraph)comp.GetChild("holderLoop");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holderSmokeIn = (GGraph)comp.GetChild("holderSmokeIn");
@@ -75,6 +77,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_holderLoop = null;
             m_holder = null;
             m_holderSmokeIn = null;

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

@@ -8,10 +8,17 @@ namespace UI.Main
     {
         public GComponent target;
         public Controller m_c1;
-        public GLoader m_loaResultBg;
-        public GLoader m_logResult;
-        public GGroup m_grpStar;
+        public GGraph m_holderScore;
         public GTextField m_txtScore;
+        public GGraph m_holderResult0;
+        public GGraph m_holderResult1;
+        public GGraph m_holderResult2;
+        public GGraph m_holderResult3;
+        public GGraph m_holderStar1;
+        public GGraph m_holderStar2;
+        public GGraph m_holderStar3;
+        public Transition m_t0;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8kwonogf";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComResult";
@@ -60,18 +67,32 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_loaResultBg = (GLoader)comp.GetChild("loaResultBg");
-            m_logResult = (GLoader)comp.GetChild("logResult");
-            m_grpStar = (GGroup)comp.GetChild("grpStar");
+            m_holderScore = (GGraph)comp.GetChild("holderScore");
             m_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_holderResult0 = (GGraph)comp.GetChild("holderResult0");
+            m_holderResult1 = (GGraph)comp.GetChild("holderResult1");
+            m_holderResult2 = (GGraph)comp.GetChild("holderResult2");
+            m_holderResult3 = (GGraph)comp.GetChild("holderResult3");
+            m_holderStar1 = (GGraph)comp.GetChild("holderStar1");
+            m_holderStar2 = (GGraph)comp.GetChild("holderStar2");
+            m_holderStar3 = (GGraph)comp.GetChild("holderStar3");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_loaResultBg = null;
-            m_logResult = null;
-            m_grpStar = null;
+            m_holderScore = null;
             m_txtScore = null;
+            m_holderResult0 = null;
+            m_holderResult1 = null;
+            m_holderResult2 = null;
+            m_holderResult3 = null;
+            m_holderStar1 = null;
+            m_holderStar2 = null;
+            m_holderStar3 = null;
+            m_t0 = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComResultProMask
+    {
+        public GComponent target;
+        public GImage m_imgMask;
+        public GGraph m_holder;
+        public const string URL = "ui://mfvz4q8kfqoro3";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComResultProMask";
+        private static UI_ComResultProMask _proxy;
+
+        public static UI_ComResultProMask Create(GObject gObject = null)
+        {
+            var ui = new UI_ComResultProMask();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ComResultProMask Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComResultProMask();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_imgMask = (GImage)comp.GetChild("imgMask");
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_imgMask = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComResultProMask.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cce24e6e93e228249928fc76ace239a3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -7,11 +7,13 @@ namespace UI.Main
     public partial class UI_CompFightExpBar
     {
         public GComponent target;
-        public GProgressBar m_proExp;
+        public UI_ProgressBar3 m_proExp;
         public GTextField m_txtExpAdded;
         public GTextField m_txtCurExp;
         public GTextField m_txtAllExp;
         public GComponent m_comHead;
+        public GGraph m_holderHead;
+        public GGraph m_holderProHead;
         public const string URL = "ui://mfvz4q8k8xpg52";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "CompFightExpBar";
@@ -59,19 +61,24 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_proExp = (GProgressBar)comp.GetChild("proExp");
+            m_proExp = (UI_ProgressBar3)UI_ProgressBar3.Create(comp.GetChild("proExp"));
             m_txtExpAdded = (GTextField)comp.GetChild("txtExpAdded");
             m_txtCurExp = (GTextField)comp.GetChild("txtCurExp");
             m_txtAllExp = (GTextField)comp.GetChild("txtAllExp");
             m_comHead = (GComponent)comp.GetChild("comHead");
+            m_holderHead = (GGraph)comp.GetChild("holderHead");
+            m_holderProHead = (GGraph)comp.GetChild("holderProHead");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_proExp.Dispose();
             m_proExp = null;
             m_txtExpAdded = null;
             m_txtCurExp = null;
             m_txtAllExp = null;
             m_comHead = null;
+            m_holderHead = null;
+            m_holderProHead = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,75 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ProgressBar3
+    {
+        public GProgressBar target;
+        public UI_ComResultProMask m_comHolder;
+        public GGraph m_holder;
+        public const string URL = "ui://mfvz4q8ko9gho1";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ProgressBar3";
+        private static UI_ProgressBar3 _proxy;
+
+        public static UI_ProgressBar3 Create(GObject gObject = null)
+        {
+            var ui = new UI_ProgressBar3();
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ProgressBar3 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ProgressBar3();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GProgressBar)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_comHolder = (UI_ComResultProMask)UI_ComResultProMask.Create(comp.GetChild("comHolder"));
+            m_holder = (GGraph)comp.GetChild("holder");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_comHolder.Dispose();
+            m_comHolder = null;
+            m_holder = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBar3.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f14cd25eba01c3c46b6ada7902319040
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -60,7 +60,7 @@ namespace GFGGame
             long targetScore = ArenaDataManager.Instance.targetScore[ArenaDataManager.Instance.CurFightIndex];
             _ui.m_comResult.m_c1.selectedIndex = myScore > targetScore ? 3 : 0;
             _ui.m_comResult.m_txtScore.text = myScore.ToString();
-            _ui.m_comResult.m_grpStar.visible = false;
+            // _ui.m_comResult.m_grpStar.visible = false;
 
             _ui.m_btnClose.enabled = false;
 
@@ -70,7 +70,7 @@ namespace GFGGame
         {
             ArenaDataManager.Instance.CurFightIndex++;
 
-            _ui.m_t1.Play(() =>
+            _ui.m_comResult.m_t0.Play(() =>
             {
                 ViewManager.Show<ArenaRoundResultView>();
                 _ui.m_btnClose.enabled = true;
@@ -88,7 +88,8 @@ namespace GFGGame
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
 
             _ui.m_comResult.target.height = 0;
-            _ui.m_t1.Stop(true, false);
+            _ui.m_comResult.m_t1.Play();
+            _ui.m_comResult.m_t0.Stop(true, false);
             // _ui.m_t0.Stop(true, false);
             // _ui.m_comRoleResult.m_t3.Stop(true, false);
             // _ui.m_comRoleResult.m_t0.Stop(true, false);

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

@@ -395,8 +395,7 @@ namespace GFGGame
             _isAllPerfect = true;
             _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
             _ui.m_comClick.m_comAllPerfect.target.visible = true;
-            // _ui.m_comClick.m_comAllPerfect.m_img3Second.visible = !FightDataManager.Instance.autoPlay;
-
+            _ui.m_comClick.m_comAllPerfect.m_c1.selectedIndex = FightDataManager.Instance.autoPlay ? 1 : 0;
             _ui.m_comClick.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
             if (FightDataManager.Instance.autoPlay)
             {
@@ -406,6 +405,7 @@ namespace GFGGame
             {
                 _ui.m_comClick.m_comAllPerfect.m_t0.Play();
             }
+
         }
         private void OnComAllCircleClickBegin()
         {

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

@@ -545,7 +545,7 @@ namespace GFGGame
             _partId++;
             if (_partId > FightScoreCfgArray.Instance.dataArray.Length)
             {
-                if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= 0)// FightScoreCfgArray.Instance.dataArray.Length)
+                if (_partId == FightScoreCfgArray.Instance.dataArray.Length + 1 && _prefectCount >= FightScoreCfgArray.Instance.dataArray.Length)// 0)// 
                 {
                     _ui.m_comClick.m_comAllPerfect.target.visible = true;
                     AllCirclePlayStart();//完美八连击
@@ -568,8 +568,7 @@ namespace GFGGame
             _isAllPerfect = true;
             _ui.m_comClick.target.touchable = !FightDataManager.Instance.autoPlay;
             _ui.m_comClick.m_comAllPerfect.target.visible = true;
-            // _ui.m_comClick.m_comAllPerfect.m_img3Second.visible = !FightDataManager.Instance.autoPlay;
-
+            _ui.m_comClick.m_comAllPerfect.m_c1.selectedIndex = FightDataManager.Instance.autoPlay ? 1 : 0;
             _ui.m_comClick.m_comAllPerfect.m_t0.timeScale = FightDataManager.Instance.fightSpeed;// 1 / _speed;
             if (FightDataManager.Instance.autoPlay)
             {
@@ -579,6 +578,7 @@ namespace GFGGame
             {
                 _ui.m_comClick.m_comAllPerfect.m_t0.Play();
             }
+
         }
         private void OnComAllCircleClickBegin()
         {

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

@@ -14,11 +14,42 @@ namespace GFGGame
 
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+        private GameObject _gameObject4;
+        private GameObject _gameObject5;
+        private GameObject _gameObject6;
+        private GameObject _gameObject7;
+        private GameObject _gameObject8;
+        private GameObject _gameObject9;
+        private GameObject _gameObject10;
+        private GameObject _gameObject11;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
+        private GoWrapper _wrapper4;
+        private GoWrapper _wrapper5;
+        private GoWrapper _wrapper6;
+        private GoWrapper _wrapper7;
+        private GoWrapper _wrapper8;
+        private GoWrapper _wrapper9;
+        private GoWrapper _wrapper10;
+        private GoWrapper _wrapper11;
         private StoryFightResultData _resultData;
 
         public override void Dispose()
         {
-
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
+            SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
+            SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -45,8 +76,36 @@ namespace GFGGame
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightResult"));
+
+            AddEffect();
         }
+        private void AddEffect()
+        {
+            string resPath0 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_lose");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult0, resPath0, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_qualified");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult1, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_good");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult2, resPath2, out _gameObject2, out _wrapper2);
+            string resPath3 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_Perfect");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderResult3, resPath3, out _gameObject3, out _wrapper3);
+            string resPath4 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_Text_kuang");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderScore, resPath4, out _gameObject4, out _wrapper4);
+            string resPath5 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_STAR");
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderStar3, resPath5, out _gameObject7, out _wrapper7);
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderStar2, resPath5, out _gameObject6, out _wrapper6);
+            SceneController.AddObjectToView(null, null, _ui.m_comResult.m_holderStar1, resPath5, out _gameObject5, out _wrapper5);
+
+            string resPath8 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_jindu_di");
+            SceneController.AddObjectToView(null, null, _ui.m_comExpBar.m_holderProHead, resPath8, out _gameObject8, out _wrapper8);
+            string resPath9 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_jindu_head");
+            SceneController.AddObjectToView(null, null, _ui.m_comExpBar.m_proExp.m_holder, resPath9, out _gameObject9, out _wrapper9);
+            string resPath10 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_jindu_tx");
+            SceneController.AddObjectToView(null, null, _ui.m_comExpBar.m_proExp.m_comHolder.m_holder, resPath10, out _gameObject10, out _wrapper10);
+            string resPath11 = ResPathUtil.GetViewEffectPath("ui_fight_new", "ZDJS_player");
+            SceneController.AddObjectToView(null, null, _ui.m_comExpBar.m_holderHead, resPath11, out _gameObject11, out _wrapper11);
 
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -87,7 +146,7 @@ namespace GFGGame
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
-            AddExp();
+            _ui.m_comResult.m_t0.Play(AddExp);
         }
 
         protected override void OnHide()
@@ -100,7 +159,8 @@ namespace GFGGame
             }
             InstanceZonesDataManager.isResultFighting = false;
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
-
+            _ui.m_comResult.m_t1.Play();
+            _ui.m_comExpBar.m_proExp.m_comHolder.target.width = 0;
         }
 
         private async void OnClickBtnClose(object param)
@@ -142,9 +202,13 @@ namespace GFGGame
             _ui.m_comExpBar.m_txtCurExp.text = exp.ToString();
             _ui.m_comExpBar.m_txtAllExp.text = cfgExp.ToString();
 
-            _ui.m_comExpBar.m_proExp.max = cfgExp;
-            _ui.m_comExpBar.m_proExp.value = 0;
-            _ui.m_comExpBar.m_proExp.TweenValue(exp, 0.2f).OnComplete(() =>
+
+            _ui.m_comExpBar.m_proExp.target.max = cfgExp;
+            _ui.m_comExpBar.m_proExp.target.value = 0;
+            _ui.m_comExpBar.m_proExp.target.TweenValue(exp, 0.2f).OnUpdate((GTweener t) =>
+            {
+                _ui.m_comExpBar.m_proExp.m_comHolder.target.width = t.value.x / cfgExp * _ui.m_comExpBar.m_proExp.m_comHolder.target.initWidth;
+            }).OnComplete(() =>
             {
                 InstanceZonesDataManager.isResultFighting = false;
             });

GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: a1370566a44a09341895ace2478f4afe
-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_8.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: e7b28521e348a4040bcec92a2956f78e
-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: