Procházet zdrojové kódy

单人战斗表现

zhaoyang před 2 roky
rodič
revize
253471c6e9
41 změnil soubory, kde provedl 213 přidání a 65 odebrání
  1. 7 3
      FGUIProject/assets/Main/StoryFightResultUI.xml
  2. 18 5
      FGUIProject/assets/Main/StoryFightSingleScoreUI.xml
  3. 5 5
      FGUIProject/assets/Main/components/ComResult.xml
  4. 8 2
      FGUIProject/assets/Main/components/ComRole.xml
  5. 0 1
      FGUIProject/assets/Main/components/ComRoleResult.xml
  6. 9 0
      FGUIProject/assets/Main/components/ComSingleScoreStage.xml
  7. 4 4
      FGUIProject/assets/Main/components/Component2.xml
  8. 1 1
      FGUIProject/assets/Main/components/Component3.xml
  9. 1 1
      FGUIProject/assets/Main/components/ProgressBar1.xml
  10. 0 17
      FGUIProject/assets/Main/components/ProgressBarSingleScore.xml
  11. binární
      FGUIProject/assets/Main/imagesFight/jz_sijd_xs.png
  12. binární
      FGUIProject/assets/Main/imagesFight/jz_yjd_dd.png
  13. binární
      FGUIProject/assets/Main/imagesFight/jz_yjd_f.png
  14. binární
      FGUIProject/assets/Main/imagesStory/zd_bl_1.png
  15. binární
      FGUIProject/assets/Main/imagesStory/zd_bl_2.png
  16. binární
      FGUIProject/assets/Main/imagesStory/zd_jsjm_jdt_2.png
  17. binární
      FGUIProject/assets/Main/imagesStory/zd_jz_1.png
  18. binární
      FGUIProject/assets/Main/imagesStory/zd_jz_2.png
  19. binární
      FGUIProject/assets/Main/imagesStory/zd_jz_3.png
  20. binární
      FGUIProject/assets/Main/imagesStory/zd_jz_4.png
  21. binární
      FGUIProject/assets/Main/imagesStory/zd_pfjdt_2.png
  22. binární
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_1.png
  23. 8 3
      FGUIProject/assets/Main/package.xml
  24. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComRole.cs
  25. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs
  26. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs.meta
  27. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightResultUI.cs
  28. 14 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryFightSingleScoreUI.cs
  29. 41 8
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  30. 9 15
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  31. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  32. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  33. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  34. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  35. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  36. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  37. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  38. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  39. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  40. binární
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  41. binární
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 7 - 3
FGUIProject/assets/Main/StoryFightResultUI.xml

@@ -7,14 +7,18 @@
     <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">
-      <relation target="" sidePair="center-center,middle-middle"/>
+    <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>
     <component id="n10_wono" name="ComRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="129,106">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
-    <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="0,1673">
+    <component id="n2_8xpg" name="comExpBar" src="8xpg52" fileName="components/CompFightExpBar.xml" xy="0,1673" alpha="0">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </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"/>
+  </transition>
 </component>

+ 18 - 5
FGUIProject/assets/Main/StoryFightSingleScoreUI.xml

@@ -14,7 +14,8 @@
       <relation target="" sidePair="top-top"/>
       <ProgressBar max="100"/>
     </component>
-    <loader id="n40_wono" name="loaGlass" xy="539,959" pivot="0.5,0.5" anchor="true" size="155,228" scale="0,0" url="ui://mfvz4q8kwonogt" autoSize="true"/>
+    <component id="n42_wono" name="comScoreStage" src="wonoh2" fileName="components/ComSingleScoreStage.xml" xy="1022,108" pivot="0.5,0.5" anchor="true"/>
+    <loader id="n40_wono" name="loaGlass" xy="539,959" pivot="0.5,0.5" anchor="true" size="124,208" scale="0,0" url="ui://mfvz4q8kwonogt" autoSize="true"/>
     <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="540,960" pivot="0.5,0.5" anchor="true" scale="0,0"/>
     <graph id="n30_uo1t" name="grh_0" xy="318,349" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n23_uo1t" name="grh_1" xy="824,739" pivot="0.5,0.5" size="25,25" aspect="true"/>
@@ -28,6 +29,12 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1"/>
     </component>
+    <graph id="n47_wono" name="grhMask" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0" fillColor="#ff000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
+    <component id="n46_wono" name="comRoleResult" src="wonogk" fileName="components/ComRoleResult.xml" xy="540,959" pivot="0.5,0.5" anchor="true" scale="0,0" touchable="false">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </component>
   </displayList>
   <transition name="t1" options="2">
     <item time="0" type="Alpha" target="n40_wono" value="0"/>
@@ -35,9 +42,15 @@
     <item time="0" type="Scale" target="n40_wono" value="1,1"/>
     <item time="0" type="Scale" target="n4_n0js" tween="true" startValue="0,0" endValue="1,1" duration="18" ease="Elastic.Out"/>
     <item time="19" type="Alpha" target="n40_wono" tween="true" startValue="0" endValue="1" duration="11" ease="Linear"/>
-    <item time="60" type="Rotation" target="n40_wono" tween="true" startValue="0" endValue="360" duration="24" ease="Linear"/>
-    <item time="60" type="Scale" target="n40_wono" tween="true" startValue="1,1" endValue="0,0" duration="24" ease="Linear"/>
-    <item time="60" type="Scale" target="n4_n0js" value="0,0"/>
-    <item time="60" type="XY" target="n40_wono" label="start" tween="true" startValue="539.5,959.5" endValue="539.5,108" duration="24" label2="end" ease="Linear"/>
+    <item time="48" type="Rotation" target="n40_wono" tween="true" startValue="0" endValue="360" duration="12" ease="Linear"/>
+    <item time="48" type="Scale" target="n40_wono" tween="true" startValue="1,1" endValue="0,0" duration="12" ease="Linear"/>
+    <item time="48" type="Scale" target="n4_n0js" value="0,0"/>
+    <item time="48" type="XY" target="n40_wono" label="start" tween="true" startValue="539.5,959.5" endValue="539.5,108" duration="12" label2="end" ease="Linear"/>
+  </transition>
+  <transition name="t2">
+    <item time="0" type="Alpha" target="n47_wono" tween="true" startValue="0" endValue="0.6" duration="12" ease="Linear"/>
+    <item time="0" type="Scale" target="n46_wono" tween="true" startValue="0,0" endValue="1,1" duration="12" ease="Linear"/>
+    <item time="0" type="Skew" target="n46_wono" tween="true" startValue="0,-180" endValue="0,0" duration="12" ease="Linear"/>
+    <item time="0" type="Visible" target="n42_wono" value="false"/>
   </transition>
 </component>

+ 5 - 5
FGUIProject/assets/Main/components/ComResult.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="265,601">
-  <controller name="c1" pages="0,,1,,2,,3," selected="3"/>
+<component size="265,601" pivot="0.5,0" anchor="true" overflow="hidden">
+  <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <loader id="n9_wono" name="logResult" xy="0,0" size="265,601" url="ui://mfvz4q8kwonoge" autoSize="true">
+    <loader id="n9_wono" name="logResult" xy="0,0" size="265,601" url="ui://mfvz4q8kwonog1" autoSize="true">
       <gearIcon controller="c1" pages="1,2,3" values="ui://mfvz4q8kwonogc|ui://mfvz4q8kwonogd|ui://mfvz4q8kwonoge" default="ui://mfvz4q8kwonog1"/>
     </loader>
     <image id="n10_wono" name="n10" src="wonog7" fileName="imagesFight/zd_js_xing_1.png" xy="177,210" group="n13_wono">
@@ -14,8 +14,8 @@
     <image id="n12_wono" name="n12" src="wonog7" fileName="imagesFight/zd_js_xing_1.png" xy="177,276" group="n13_wono">
       <gearDisplay controller="c1" pages="3"/>
     </image>
-    <group id="n13_wono" name="n13" xy="177,210" size="32,99" advanced="true" layout="vt" excludeInvisibles="true"/>
-    <text id="n14_wono" name="txtScore" xy="109,352" pivot="0.5,0" size="78,54" fontSize="40" color="#ecf6fc" strokeColor="#c49a49" strokeSize="2" singleLine="true" text="666">
+    <group id="n13_wono" name="n13" xy="177,210" size="0,0" advanced="true" layout="vt" excludeInvisibles="true"/>
+    <text id="n14_wono" name="txtScore" xy="109,352" pivot="0.5,0" size="78,54" fontSize="40" color="#ecf6fc" strokeColor="#749dc8" strokeSize="2" singleLine="true" text="666">
       <gearColor controller="c1" pages="0" values="#ecf6fc,#749dc8" default="#ecf6fc,#c49a49"/>
     </text>
   </displayList>

+ 8 - 2
FGUIProject/assets/Main/components/ComRole.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="585,1317" overflow="hidden" mask="n14_wono">
   <displayList>
-    <image id="n14_wono" name="n14" src="wonog5" fileName="imagesFight/jz_yjd_d.png" xy="0,0"/>
-    <loader id="n16_wono" name="loaBg" xy="0,0" size="585,1317" url="ui://mfvz4q8kwonog5" fill="scaleMatchWidth" autoSize="true">
+    <image id="n14_wono" name="n14" src="wonogw" fileName="imagesFight/jz_yjd_dd.png" xy="0,0"/>
+    <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">
       <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"/>
   </displayList>
+  <transition name="t0">
+    <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="Visible" target="n17_wono" value="false"/>
+  </transition>
 </component>

+ 0 - 1
FGUIProject/assets/Main/components/ComRoleResult.xml

@@ -2,7 +2,6 @@
 <component size="730,1649">
   <controller name="c1" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
-    <image id="n15_wono" name="n15" src="wonog5" fileName="imagesFight/jz_yjd_d.png" xy="72,90"/>
     <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">

+ 9 - 0
FGUIProject/assets/Main/components/ComSingleScoreStage.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="109,109">
+  <controller name="c1" pages="0,,1,,2,,3," selected="2"/>
+  <displayList>
+    <loader id="n43_wono" name="n43" xy="0,0" size="110,110" url="ui://mfvz4q8kwonoh1" autoSize="true">
+      <gearIcon controller="c1" pages="0,1,2" values="ui://mfvz4q8kwonogz|ui://mfvz4q8kwonoh0|ui://mfvz4q8kwonoh1" default="ui://mfvz4q8kwonogy"/>
+    </loader>
+  </displayList>
+</component>

+ 4 - 4
FGUIProject/assets/Main/components/Component2.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="836,24">
+<component size="775,24">
   <displayList>
-    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0">
+    <component id="n1_uj53" name="bar" src="k1khe8" fileName="components/Component3.xml" xy="0,0" size="775,24">
       <relation target="" sidePair="width-width"/>
     </component>
-    <image id="n6_uj53" name="imgAni" src="wonogq" fileName="imagesStory/zd_jsjm_jdt_3.png" xy="828,15" pivot="0.65,0.6" anchor="true">
+    <image id="n6_uj53" name="imgAni" src="wonogq" fileName="imagesStory/zd_jsjm_jdt_3.png" xy="773,15" pivot="0.65,0.6" anchor="true">
       <relation target="" sidePair="right-right"/>
     </image>
-    <graph id="n7_k1kh" name="holder" xy="835,11" pivot="0.5,0.5" size="1,1">
+    <graph id="n7_k1kh" name="holder" xy="774,11" pivot="0.5,0.5" size="1,1">
       <relation target="" sidePair="right-right"/>
     </graph>
     <graph id="n8_ecw3" name="holder1" xy="417,11" pivot="0.5,0.5" size="1,1"/>

+ 1 - 1
FGUIProject/assets/Main/components/Component3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="824,24" overflow="hidden">
+<component size="769,24" overflow="hidden">
   <displayList>
     <image id="n1_uj53" name="bar" src="wonogo" fileName="imagesStory/zd_jsjm_jdt_2.png" xy="0,0"/>
   </displayList>

+ 1 - 1
FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="856,40" extention="ProgressBar">
+<component size="801,40" extention="ProgressBar">
   <displayList>
     <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>

+ 0 - 17
FGUIProject/assets/Main/components/ProgressBarSingleScore.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="948,30" extention="ProgressBar">
-  <displayList>
-    <image id="n0_vuz5" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0" size="947,30">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n1_vuz5" name="bar" src="vuz5bb" fileName="imagesStory/zd_pfjdt_2.png" xy="0,2"/>
-    <text id="n2_vuz5" name="txtCount" xy="32,-4" size="238,36" fontSize="26" color="#fff6ee" vAlign="middle" autoSize="none" text="总分:0">
-      <relation target="" sidePair="width-width,height-height"/>
-    </text>
-    <image id="n3_vuz5" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="932,-13">
-      <relation target="n1_vuz5" sidePair="right-right"/>
-    </image>
-    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="0,-11" pivot="0.5,0" anchor="true"/>
-  </displayList>
-  <ProgressBar titleType="value"/>
-</component>

binární
FGUIProject/assets/Main/imagesFight/jz_sijd_xs.png


binární
FGUIProject/assets/Main/imagesFight/jz_yjd_dd.png


binární
FGUIProject/assets/Main/imagesFight/jz_yjd_f.png


binární
FGUIProject/assets/Main/imagesStory/zd_bl_1.png


binární
FGUIProject/assets/Main/imagesStory/zd_bl_2.png


binární
FGUIProject/assets/Main/imagesStory/zd_jsjm_jdt_2.png


binární
FGUIProject/assets/Main/imagesStory/zd_jz_1.png


binární
FGUIProject/assets/Main/imagesStory/zd_jz_2.png


binární
FGUIProject/assets/Main/imagesStory/zd_jz_3.png


binární
FGUIProject/assets/Main/imagesStory/zd_jz_4.png


binární
FGUIProject/assets/Main/imagesStory/zd_pfjdt_2.png


binární
FGUIProject/assets/Main/imagesStory/zd_zdjdt_1.png


+ 8 - 3
FGUIProject/assets/Main/package.xml

@@ -281,7 +281,6 @@
     <image id="vuz5b8" name="zd_pfanniu_3.png" path="/imagesStory/"/>
     <image id="vuz5b9" name="zd_pfanniu_4.png" path="/imagesStory/"/>
     <image id="vuz5ba" name="zd_pfjdt_1.png" path="/imagesStory/"/>
-    <image id="vuz5bb" name="zd_pfjdt_2.png" path="/imagesStory/"/>
     <image id="vuz5bc" name="zd_pfjdt_3.png" path="/imagesStory/"/>
     <image id="vuz5bd" name="zd_pfziti_1.png" path="/imagesStory/"/>
     <image id="vuz5be" name="zd_pfziti_2.png" path="/imagesStory/"/>
@@ -302,7 +301,6 @@
     <component id="v3k9c3" name="ComSkillShield.xml" path="/components/"/>
     <component id="v3k9c4" name="comTargetCircle.xml" path="/components/"/>
     <component id="v3k9c5" name="ProgressBarCD.xml" path="/components/"/>
-    <component id="v3k9c6" name="ProgressBarSingleScore.xml" path="/components/"/>
     <component id="v3k9c7" name="ProgressBarTargetScore.xml" path="/components/"/>
     <image id="v3k9c9" name="zd_daoshu_1.png" path="/imagesStory/"/>
     <image id="v3k9ca" name="zd_daoshu_2.png" path="/imagesStory/"/>
@@ -416,7 +414,14 @@
     <component id="wonogs" name="ComSingleScore.xml" path="/components/"/>
     <image id="wonogt" name="zd_bl_2.png" path="/imagesStory/" exported="true"/>
     <image id="wonogu" name="zd_bl_0.png" path="/imagesStory/" exported="true"/>
-    <image id="wonogv" name="zd_bl_1.png" path="/imagesStory/" exported="true"/>
+    <image id="wonogw" name="jz_yjd_dd.png" path="/imagesFight/"/>
+    <image id="wonogx" name="jz_yjd_f.png" path="/imagesFight/"/>
+    <image id="wonogy" name="zd_jz_4.png" path="/imagesStory/"/>
+    <image id="wonogz" name="zd_jz_1.png" path="/imagesStory/"/>
+    <image id="wonoh0" name="zd_jz_2.png" path="/imagesStory/"/>
+    <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"/>
   </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

@@ -9,6 +9,7 @@ namespace UI.Main
         public GComponent target;
         public GLoader m_loaBg;
         public GLoader m_loaRole;
+        public Transition m_t0;
         public const string URL = "ui://mfvz4q8kwonogm";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComRole";
@@ -58,11 +59,13 @@ namespace UI.Main
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaRole = (GLoader)comp.GetChild("loaRole");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_loaRole = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ComSingleScoreStage
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public const string URL = "ui://mfvz4q8kwonoh2";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ComSingleScoreStage";
+        private static UI_ComSingleScoreStage _proxy;
+
+        public static UI_ComSingleScoreStage Create(GObject gObject = null)
+        {
+            var ui = new UI_ComSingleScoreStage();
+            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_ComSingleScoreStage Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComSingleScoreStage();
+            }
+            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_c1 = comp.GetController("c1");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComSingleScoreStage.cs.meta

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

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

@@ -12,6 +12,7 @@ namespace UI.Main
         public UI_ComResult m_comResult;
         public UI_ComRoleResult m_ComRoleResult;
         public UI_CompFightExpBar m_comExpBar;
+        public Transition m_t1;
         public const string URL = "ui://mfvz4q8k8xpg3y";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightResultUI";
@@ -64,6 +65,7 @@ namespace UI.Main
             m_comResult = (UI_ComResult)UI_ComResult.Create(comp.GetChild("comResult"));
             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");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +77,7 @@ namespace UI.Main
             m_ComRoleResult = null;
             m_comExpBar.Dispose();
             m_comExpBar = null;
+            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -11,6 +11,7 @@ namespace UI.Main
         public GLoader m_loaRole;
         public GButton m_btnBack;
         public UI_ProgressBar1 m_proScore;
+        public UI_ComSingleScoreStage m_comScoreStage;
         public GLoader m_loaGlass;
         public UI_comClickCircle m_comClickCircle;
         public GGraph m_grh_0;
@@ -22,7 +23,10 @@ namespace UI.Main
         public GGraph m_grh_6;
         public GGraph m_grh_7;
         public GButton m_btnSpeedUp;
+        public GGraph m_grhMask;
+        public UI_ComRoleResult m_comRoleResult;
         public Transition m_t1;
+        public Transition m_t2;
         public const string URL = "ui://mfvz4q8k8xpg3x";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "StoryFightSingleScoreUI";
@@ -74,6 +78,7 @@ namespace UI.Main
             m_loaRole = (GLoader)comp.GetChild("loaRole");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_proScore = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proScore"));
+            m_comScoreStage = (UI_ComSingleScoreStage)UI_ComSingleScoreStage.Create(comp.GetChild("comScoreStage"));
             m_loaGlass = (GLoader)comp.GetChild("loaGlass");
             m_comClickCircle = (UI_comClickCircle)UI_comClickCircle.Create(comp.GetChild("comClickCircle"));
             m_grh_0 = (GGraph)comp.GetChild("grh_0");
@@ -85,7 +90,10 @@ namespace UI.Main
             m_grh_6 = (GGraph)comp.GetChild("grh_6");
             m_grh_7 = (GGraph)comp.GetChild("grh_7");
             m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_grhMask = (GGraph)comp.GetChild("grhMask");
+            m_comRoleResult = (UI_ComRoleResult)UI_ComRoleResult.Create(comp.GetChild("comRoleResult"));
             m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -94,6 +102,8 @@ namespace UI.Main
             m_btnBack = null;
             m_proScore.Dispose();
             m_proScore = null;
+            m_comScoreStage.Dispose();
+            m_comScoreStage = null;
             m_loaGlass = null;
             m_comClickCircle.Dispose();
             m_comClickCircle = null;
@@ -106,7 +116,11 @@ namespace UI.Main
             m_grh_6 = null;
             m_grh_7 = null;
             m_btnSpeedUp = null;
+            m_grhMask = null;
+            m_comRoleResult.Dispose();
+            m_comRoleResult = null;
             m_t1 = null;
+            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 41 - 8
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -74,16 +74,13 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            //if (_sceneObject == null) _sceneObject = GameObject.Instantiate(_scenePrefab);
-            //SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
-            _ui.m_loaRole.texture = EquipDataCache.cacher.nTexture;
 
+            _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_btnSpeedUp.visible = EquipDataCache.cacher.autoPlay;
             _ui.m_btnSpeedUp.title = "x" + EquipDataCache.cacher.fightSpeed;
 
-            _ui.m_comClickCircle.target.touchable = !EquipDataCache.cacher.autoPlay;
 
             ScoreSystemData.Instance.SetEquipDicWithType();
 
@@ -160,7 +157,6 @@ namespace GFGGame
             else
             {
 
-
                 _ui.m_t1.ignoreEngineTimeScale = false;
                 _ui.m_t1.timeScale = EquipDataCache.cacher.fightSpeed;
                 _ui.m_t1.SetValue("start", _ui.m_loaGlass.x, _ui.m_loaGlass.y);
@@ -182,6 +178,7 @@ namespace GFGGame
                 {
                     EquipDataCache.cacher.totalScore = _score;
                     _ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
+                    _ui.m_comScoreStage.m_c1.selectedIndex = GetCurStar();
                     CircleResuleEnd();
                 });
         }
@@ -191,7 +188,16 @@ namespace GFGGame
             _index++;
             if (_index >= FightScoreCfgArray.Instance.dataArray.Length)
             {
-                Timers.inst.Add(0.5f, 1, Skip);//评分结束
+
+                _ui.m_comRoleResult.m_c1.selectedIndex = GetCurStar();
+                _ui.m_t2.Play(() =>
+                {
+                    _ui.m_comRoleResult.m_comRole.m_t0.Play(() =>
+                    {
+                        // Skip();
+                        Timers.inst.Add(0.3f, 1, Skip);//评分结束
+                    });
+                });
             }
             else
             {
@@ -199,6 +205,27 @@ namespace GFGGame
             }
         }
 
+        private int GetCurStar()
+        {
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
+
+
+            int star = 0;
+            if (_score >= fightCfg.score1 && _score < fightCfg.score2)
+            {
+                star = 1;
+            }
+            else if (_score >= fightCfg.score2 && _score < fightCfg.score3)
+            {
+                star = 2;
+            }
+            else if (_score >= fightCfg.score3)
+            {
+                star = 3;
+            }
+            return star;
+        }
 
 
 
@@ -210,15 +237,15 @@ namespace GFGGame
 
         private void Skip(object param = null)
         {
-            Reset();
+            // Reset();
 
             InstanceZonesController.CheckStoryFightResult().Coroutine();
         }
         private void OnBtnBackClick()
         {
-            Reset();
             this.Hide();
             InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);
+            Reset();
         }
         protected override void RemoveEventListener()
         {
@@ -230,9 +257,15 @@ namespace GFGGame
             // _stopFight = true;
             Timers.inst.Remove(SkillScore);
             Timers.inst.Remove(Skip);
+            _ui.m_t1.Stop(true, false);
+            _ui.m_t2.Stop(true, false);
+            _ui.m_comRoleResult.m_comRole.m_t0.Stop(true, false);
 
+            _ui.m_comRoleResult.target.SetScale(0, 0);
+            _ui.m_grhMask.alpha = 0;
             _ui.m_proScore.target.value = 0;
             _ui.m_proScore.m_txtCount.text = "总分 0";
+            _ui.m_comScoreStage.target.visible = true;
             _ui.m_comClickCircle.target.SetScale(0, 0);
             _ui.m_loaGlass.SetScale(0, 0);
 

+ 9 - 15
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -73,16 +73,10 @@ namespace GFGGame
         {
             base.OnShown();
             _resultData = (StoryFightResultData)this.viewData;
-            // if (_sceneObject == null)
-            // {
-            //     _sceneObject = GameObject.Instantiate(_scenePrefab);
-            // }
+
             InstanceZonesDataManager.usedRecommend = false;
             InstanceZonesDataManager.isResultFighting = true;
-            // SceneController.UpdateRole(EquipDataCache.cacher.equipDatas, _sceneObject);
 
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(EquipDataCache.cacher.bgId);
-            // _ui.m_ComRoleResult.m_comRole.m_loaBg.url = ResPathUtil.GetDressUpPath(itemCfg.res, ItemUtil.GetItemResExt(itemCfg.itemType, itemCfg.subType));
             _ui.m_ComRoleResult.m_c1.selectedIndex = _resultData.Star;
             GLoader loaRole = _ui.m_ComRoleResult.m_comRole.m_loaRole;
             loaRole.texture = EquipDataCache.cacher.nTexture;
@@ -92,11 +86,8 @@ namespace GFGGame
             _ui.m_comResult.m_txtScore.text = "" + _resultData.Score;
             _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));
 
-            UpdateToCheckGuide(null);
 
             _levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
-
-
             if (!this._resultData.Result)
             {
                 _ui.m_comExpBar.target.visible = false;
@@ -111,7 +102,7 @@ namespace GFGGame
 
                 StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
                 _ui.m_comExpBar.m_txtLvlAdded.text = string.Format("经验值:+{0}", fightCfg.exp);
-                Timers.inst.Add(0.5f, 1, this.AddExp);
+                // Timers.inst.Add(0.5f, 1, this.AddExp);
             }
 
             if (_levelCfg.type == ConstInstanceZonesType.Field)
@@ -119,6 +110,9 @@ namespace GFGGame
                 _ui.m_comExpBar.target.visible = false;
                 Timers.inst.Add(3, 1, OnClickBtnClose);
             }
+            _ui.m_t1.Play(AddExp);
+
+            UpdateToCheckGuide(null);
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -126,7 +120,7 @@ namespace GFGGame
         {
             base.OnHide();
             InstanceZonesDataManager.isResultFighting = false;
-            Timers.inst.Remove(AddExp);
+            // Timers.inst.Remove(AddExp);
             if (_sceneObject != null)
             {
                 GameObject.Destroy(_sceneObject);
@@ -134,6 +128,8 @@ namespace GFGGame
             }
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             Timers.inst.Remove(CheckGuide);
+            _ui.m_comResult.target.height = 0;
+            _ui.m_comExpBar.target.alpha = 0;
         }
 
         private async void OnClickBtnClose(object param)
@@ -158,11 +154,9 @@ namespace GFGGame
                     ViewManager.Show<FieldView>();
                     ViewManager.Show<FieldFightInfoView>();
                 }
-
             }
             else
             {
-
                 InstanceZonesController.OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, _resultData.FirstPass, true);
                 //尝试显示奖励
                 BonusController.TryShowBonusList(_resultData.BonusList);
@@ -170,7 +164,7 @@ namespace GFGGame
             InstanceZonesDataManager.currentCardId = -1;
         }
 
-        private void AddExp(object param)
+        private void AddExp()
         {
             int lv = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
             _ui.m_comExpBar.m_txtLvl.text = string.Format("等级 {0}", GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl));

binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


binární
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png


binární
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes