浏览代码

战斗表现

zhaoyang 2 年之前
父节点
当前提交
23e44ff0d0
共有 44 个文件被更改,包括 273 次插入78 次删除
  1. 1 1
      FGUIProject/assets/Main/StoryFightSingleScoreUI.xml
  2. 1 1
      FGUIProject/assets/Main/StoryFightTargetScoreUI.xml
  3. 11 2
      FGUIProject/assets/Main/components/ComScoreStage.xml
  4. 3 6
      FGUIProject/assets/Main/components/Component2.xml
  5. 2 2
      FGUIProject/assets/Main/components/Component3.xml
  6. 20 6
      FGUIProject/assets/Main/components/ProgressBar1.xml
  7. 9 6
      FGUIProject/assets/Main/components/ProgressBarTargetScore.xml
  8. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jdbiao.png
  9. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_1.png
  10. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_2.png
  11. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_3.png
  12. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_4.png
  13. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_an_1.png
  14. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_an_2.png
  15. 二进制
      FGUIProject/assets/Main/imagesStory/zd_jz_an_3.png
  16. 二进制
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_1.png
  17. 二进制
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_2.png
  18. 二进制
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_3.png
  19. 二进制
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_4.png
  20. 二进制
      FGUIProject/assets/Main/imagesStory/zd_zdjdt_liang.png
  21. 8 4
      FGUIProject/assets/Main/package.xml
  22. 9 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreStage.cs
  23. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_Component2.cs
  24. 7 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBar1.cs
  25. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBarTargetScore.cs
  26. 5 42
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  27. 2 2
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  28. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  29. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  30. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  31. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  32. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png
  33. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png
  34. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  35. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  36. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  37. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  38. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  39. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  40. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  41. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png.meta
  42. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  43. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png.meta
  44. 二进制
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

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

@@ -10,7 +10,7 @@
     <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n33_vuz5" name="proScore" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="154,108" pivot="0,0.5" anchor="true">
+    <component id="n33_vuz5" name="proScore" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="160,127" pivot="0,0.5" anchor="true">
       <relation target="" sidePair="top-top"/>
       <ProgressBar max="100"/>
     </component>

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

@@ -7,7 +7,7 @@
     <component id="n37_mhyh" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="34,80">
       <Button icon="ui://eg2y0ldpuyuxtj4"/>
     </component>
-    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,108" pivot="0,0.5" anchor="true">
+    <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="160,127" pivot="0,0.5" anchor="true">
       <ProgressBar max="100"/>
     </component>
     <component id="n17_mza1" name="comMineCircle" src="c2umeg" fileName="components/comMineCircle.xml" xy="252,1300" pivot="0.5,0.5" visible="false">

+ 11 - 2
FGUIProject/assets/Main/components/ComScoreStage.xml

@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="106,62">
+<component size="70,80">
+  <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n4_oixc" name="imgFirstScore" src="wonogp" fileName="imagesStory/zd_jsjm_jdt_3 .png" xy="53,62" pivot="0.5,1" anchor="true"/>
+    <loader id="n6_v95q" name="icon" xy="0,19" size="70,70" url="ui://mfvz4q8kv95qi6" autoSize="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </loader>
+    <loader id="n7_v95q" name="icon1" xy="0,19" size="70,70" url="ui://mfvz4q8kv95qi9" autoSize="true">
+      <gearDisplay controller="c1" pages="1"/>
+    </loader>
+    <image id="n8_v95q" name="n8" src="v95qib" fileName="imagesStory/zd_jdbiao.png" xy="16,-7"/>
   </displayList>
+  <customProperty target="icon" propertyId="1"/>
+  <customProperty target="icon1" propertyId="1"/>
 </component>

+ 3 - 6
FGUIProject/assets/Main/components/Component2.xml

@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="775,24">
+<component size="835,31">
   <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="837,31">
       <relation target="" sidePair="width-width"/>
     </component>
-    <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="774,11" pivot="0.5,0.5" size="1,1">
+    <graph id="n7_k1kh" name="holder" xy="834,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"/>

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

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

+ 20 - 6
FGUIProject/assets/Main/components/ProgressBar1.xml

@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="801,40" extention="ProgressBar">
+<component size="835,31" extention="ProgressBar">
   <displayList>
-    <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="0,0">
+    <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-9,-11">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n5_rlp9" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="17,9"/>
-    <text id="n2_vuz5" name="txtCount" xy="24,44" size="113,49" fontSize="36" color="#fcf5ec" vAlign="middle" bold="true" strokeColor="#9c7735" strokeSize="2" text="总分 0"/>
-    <component id="n7_wono" name="comFirstScore" src="wonogr" fileName="components/ComScoreStage.xml" xy="349,33" pivot="0.5,1" anchor="true"/>
-    <component id="n8_wono" name="comSecondScore" src="wonogr" fileName="components/ComScoreStage.xml" xy="536,33" pivot="0.5,1" anchor="true"/>
+    <component id="n5_rlp9" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,0"/>
+    <image id="n9_v95q" name="n9" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="-16,0"/>
+    <text id="n2_vuz5" name="txtCount" xy="24,50" size="113,49" fontSize="36" color="#fff6e3" vAlign="middle" bold="true" strokeColor="#c09653" strokeSize="2" text="总分 0"/>
+    <component id="n7_wono" name="comFirstScore" src="wonogr" fileName="components/ComScoreStage.xml" xy="348,98" pivot="0.5,1" anchor="true">
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv95qi6"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv95qi9"/>
+    </component>
+    <component id="n8_wono" name="comSecondScore" src="wonogr" fileName="components/ComScoreStage.xml" xy="541,98" pivot="0.5,1" anchor="true">
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv95qi7"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv95qia"/>
+    </component>
+    <component id="n11_v95q" name="comThirdScore" src="wonogr" fileName="components/ComScoreStage.xml" xy="713,98" pivot="0.5,1" anchor="true">
+      <property target="icon" propertyId="1" value="ui://mfvz4q8kv95qi2"/>
+      <property target="icon1" propertyId="1" value="ui://mfvz4q8kv95qi8"/>
+    </component>
+    <image id="n10_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="834,14" pivot="0.518,0.438" anchor="true">
+      <relation target="n5_rlp9" sidePair="right-right"/>
+    </image>
   </displayList>
   <ProgressBar titleType="value"/>
 </component>

+ 9 - 6
FGUIProject/assets/Main/components/ProgressBarTargetScore.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="801,40" extention="ProgressBar">
+<component size="836,27" extention="ProgressBar">
   <displayList>
-    <image id="n0_uj53" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="0,0">
+    <image id="n0_uj53" name="n0" src="v95qi1" fileName="imagesStory/zd_zdjdt_4.png" xy="0,0">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="13,8" size="775,24" flip="hz"/>
-    <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="13,8"/>
-    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="193,49" fontSize="36" color="#fcf5ec" vAlign="bottom" bold="true" strokeColor="#9c7735" strokeSize="2" text="赵四10086">
+    <component id="n1_uj53" name="comBar" src="k1khe7" fileName="components/Component2.xml" xy="0,-2" size="769,31"/>
+    <image id="n7_v3k9" name="n7" src="v3k9cs" fileName="imagesStory/zd_zdjdt_3.png" xy="-17,-2"/>
+    <text id="n4_uj53" name="txtMineScore" xy="10,50" size="193,49" fontSize="36" color="#fff6e3" vAlign="bottom" bold="true" strokeColor="#c09653" strokeSize="2" text="赵四10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
-    <text id="n5_uj53" name="txtNpcScore" xy="791,50" pivot="1,0" anchor="true" size="230,49" fontSize="36" color="#fcf5ec" align="right" vAlign="bottom" bold="true" strokeColor="#9c7735" strokeSize="2" text="小宫女10086">
+    <text id="n5_uj53" name="txtNpcScore" xy="826,50" pivot="1,0" anchor="true" size="230,49" fontSize="36" color="#fff6e3" align="right" vAlign="bottom" bold="true" strokeColor="#c09653" strokeSize="2" text="小宫女10086">
       <relation target="" sidePair="width-width,height-height"/>
     </text>
+    <image id="n8_v95q" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="768,14" pivot="0.518,0.438" anchor="true">
+      <relation target="n1_uj53" sidePair="right-right"/>
+    </image>
   </displayList>
   <ProgressBar/>
 </component>

二进制
FGUIProject/assets/Main/imagesStory/zd_jdbiao.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_1.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_2.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_3.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_4.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_an_1.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_an_2.png


二进制
FGUIProject/assets/Main/imagesStory/zd_jz_an_3.png


二进制
FGUIProject/assets/Main/imagesStory/zd_zdjdt_1.png


二进制
FGUIProject/assets/Main/imagesStory/zd_zdjdt_2.png


二进制
FGUIProject/assets/Main/imagesStory/zd_zdjdt_3.png


二进制
FGUIProject/assets/Main/imagesStory/zd_zdjdt_4.png


二进制
FGUIProject/assets/Main/imagesStory/zd_zdjdt_liang.png


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

@@ -391,10 +391,6 @@
     <image id="wonogu" name="zd_bl_0.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"/>
     <image id="wonoh5" name="jz_shan_1.png" path="/imagesFight/"/>
@@ -429,6 +425,14 @@
     <image id="v95qhy" name="zjm_gsmh.png" path="/images/" atlas="alone_npot"/>
     <image id="v95qhz" name="zjm_ej_suo.png" path="/images/"/>
     <image id="v95qi0" name="zjm_mbmbmb.png" path="/images/"/>
+    <image id="v95qi1" name="zd_zdjdt_4.png" path="/imagesStory/"/>
+    <image id="v95qi2" name="zd_jz_an_3.png" path="/imagesStory/"/>
+    <image id="v95qi6" name="zd_jz_an_1.png" path="/imagesStory/"/>
+    <image id="v95qi7" name="zd_jz_an_2.png" path="/imagesStory/"/>
+    <image id="v95qi8" name="zd_jz_3.png" path="/imagesStory/"/>
+    <image id="v95qi9" name="zd_jz_1.png" path="/imagesStory/"/>
+    <image id="v95qia" name="zd_jz_2.png" path="/imagesStory/"/>
+    <image id="v95qib" name="zd_jdbiao.png" path="/imagesStory/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 9 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComScoreStage.cs

@@ -7,7 +7,9 @@ namespace UI.Main
     public partial class UI_ComScoreStage
     {
         public GComponent target;
-        public GImage m_imgFirstScore;
+        public Controller m_c1;
+        public GLoader m_icon;
+        public GLoader m_icon1;
         public const string URL = "ui://mfvz4q8kwonogr";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComScoreStage";
@@ -55,11 +57,15 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_imgFirstScore = (GImage)comp.GetChild("imgFirstScore");
+            m_c1 = comp.GetController("c1");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_icon1 = (GLoader)comp.GetChild("icon1");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_imgFirstScore = null;
+            m_c1 = null;
+            m_icon = null;
+            m_icon1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,7 +8,6 @@ namespace UI.Main
     {
         public GComponent target;
         public UI_Component3 m_bar;
-        public GImage m_imgAni;
         public GGraph m_holder;
         public GGraph m_holder1;
         public const string URL = "ui://mfvz4q8kk1khe7";
@@ -59,7 +58,6 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_bar = (UI_Component3)UI_Component3.Create(comp.GetChild("bar"));
-            m_imgAni = (GImage)comp.GetChild("imgAni");
             m_holder = (GGraph)comp.GetChild("holder");
             m_holder1 = (GGraph)comp.GetChild("holder1");
         }
@@ -67,7 +65,6 @@ namespace UI.Main
         {
             m_bar.Dispose();
             m_bar = null;
-            m_imgAni = null;
             m_holder = null;
             m_holder1 = null;
             if(disposeTarget && target != null)

+ 7 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ProgressBar1.cs

@@ -11,6 +11,8 @@ namespace UI.Main
         public GTextField m_txtCount;
         public UI_ComScoreStage m_comFirstScore;
         public UI_ComScoreStage m_comSecondScore;
+        public UI_ComScoreStage m_comThirdScore;
+        public GImage m_imgAni;
         public const string URL = "ui://mfvz4q8kvuz5bh";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ProgressBar1";
@@ -62,6 +64,8 @@ namespace UI.Main
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_comFirstScore = (UI_ComScoreStage)UI_ComScoreStage.Create(comp.GetChild("comFirstScore"));
             m_comSecondScore = (UI_ComScoreStage)UI_ComScoreStage.Create(comp.GetChild("comSecondScore"));
+            m_comThirdScore = (UI_ComScoreStage)UI_ComScoreStage.Create(comp.GetChild("comThirdScore"));
+            m_imgAni = (GImage)comp.GetChild("imgAni");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -72,6 +76,9 @@ namespace UI.Main
             m_comFirstScore = null;
             m_comSecondScore.Dispose();
             m_comSecondScore = null;
+            m_comThirdScore.Dispose();
+            m_comThirdScore = null;
+            m_imgAni = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -10,6 +10,7 @@ namespace UI.Main
         public UI_Component2 m_comBar;
         public GTextField m_txtMineScore;
         public GTextField m_txtNpcScore;
+        public GImage m_imgAni;
         public const string URL = "ui://mfvz4q8kv3k9c7";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ProgressBarTargetScore";
@@ -60,6 +61,7 @@ namespace UI.Main
             m_comBar = (UI_Component2)UI_Component2.Create(comp.GetChild("comBar"));
             m_txtMineScore = (GTextField)comp.GetChild("txtMineScore");
             m_txtNpcScore = (GTextField)comp.GetChild("txtNpcScore");
+            m_imgAni = (GImage)comp.GetChild("imgAni");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -67,6 +69,7 @@ namespace UI.Main
             m_comBar = null;
             m_txtMineScore = null;
             m_txtNpcScore = null;
+            m_imgAni = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 5 - 42
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -95,6 +95,7 @@ namespace GFGGame
             _ui.m_proScore.m_comBar.target.width = 0;
             _ui.m_proScore.m_comFirstScore.target.x = (((float)fightCfg.score1 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
             _ui.m_proScore.m_comSecondScore.target.x = (((float)fightCfg.score2 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
+            _ui.m_proScore.m_comThirdScore.target.x = (((float)fightCfg.score3 / (float)fightCfg.score3)) * _ui.m_proScore.target.width;
             _ui.m_proScore.m_txtCount.text = "总分 0";
 
             _stopFight = false;
@@ -154,19 +155,9 @@ namespace GFGGame
             _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);
-            _ui.m_t1.SetValue("end", _ui.m_proScore.m_comBar.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2, _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2);
+            _ui.m_t1.SetValue("end", _ui.m_proScore.m_imgAni.LocalToGlobal(Vector2.zero).x - _ui.m_loaGlass.width / 2, _ui.m_proScore.target.y - _ui.m_loaGlass.height / 2);
 
-            // if (_index == 0 && GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
-            // {
-            //     _ui.m_t1.Play(1, 0, 0, 2, () =>
-            //     {
-            //         Timers.inst.AddUpdate(UpdateToCheckGuide);
-            //     });
-            // }
-            // else
-            // {
             _ui.m_t1.Play(UpdateProgress);
-            // }
 
         }
 
@@ -184,6 +175,9 @@ namespace GFGGame
                     _ui.m_proScore.m_txtCount.text = string.Format("总分 {0}", _score);
                     GetCurStar(out int star, out Transition transition);
                     _ui.m_comScoreStage.m_c1.selectedIndex = star;
+                    _ui.m_proScore.m_comFirstScore.m_c1.selectedIndex = star > 0 ? 1 : 0;
+                    _ui.m_proScore.m_comSecondScore.m_c1.selectedIndex = star > 1 ? 1 : 0;
+                    _ui.m_proScore.m_comThirdScore.m_c1.selectedIndex = star > 2 ? 1 : 0;
                     CircleResuleEnd();
                 });
         }
@@ -249,8 +243,6 @@ namespace GFGGame
 
         private void Skip(object param = null)
         {
-            // Reset();
-
             InstanceZonesController.CheckStoryFightResult().Coroutine();
         }
         private void OnBtnBackClick()
@@ -302,35 +294,6 @@ namespace GFGGame
             }
 
             Reset();
-            Timers.inst.Remove(UpdateToCheckGuide);
-        }
-
-
-
-        // private void CheckGuide(object param)
-        // {
-        //     if (GuideDataManager.IsGuideFinish(ConstGuideId.SINGLE_FIGHT) <= 0)
-        //     {
-        //         UpdateToCheckGuide(null);
-        //     }
-        //     else
-        //     {
-        //         Timers.inst.Remove(CheckGuide);
-        //     }
-        // }
-
-        protected override void UpdateToCheckGuide(object param)
-        {
-
-            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-
-
-            // bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧。");
-            // if (isGuide)
-            // {
-            //     _ui.m_comClickCircle.target.touchable = true;
-            // }
-            // GuideController.TryCompleteGuide(ConstGuideId.SINGLE_FIGHT, 9);
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -160,7 +160,7 @@ namespace GFGGame
             SceneController.AddObjectToView(_gameObject17, null, _ui.m_holderAddScore, resPath9, out _gameObject17, out GoWrapper _wrapper17);
             SceneController.AddObjectToView(_gameObject18, null, _ui.m_holderAddScoreNpc, resPath9, out _gameObject18, out GoWrapper _wrapper18);
             string resPath10 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
-            SceneController.AddObjectToView(_gameObject19, null, _ui.m_proScore.m_comBar.m_holder1, resPath10, out _gameObject19, out GoWrapper _wrapper19);
+            // SceneController.AddObjectToView(_gameObject19, null, _ui.m_proScore.m_comBar.m_holder1, resPath10, out _gameObject19, out GoWrapper _wrapper19);
 
             string resPath3 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jn_an");
             for (int i = 0; i < _skillCount; i++)
@@ -174,7 +174,7 @@ namespace GFGGame
             }
 
             string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
-            SceneController.AddObjectToView(_gameObject6, null, _ui.m_proScore.m_comBar.m_holder, resPath4, out _gameObject6, out GoWrapper _wrapper6);
+            // SceneController.AddObjectToView(_gameObject6, null, _ui.m_proScore.m_comBar.m_holder, resPath4, out _gameObject6, out GoWrapper _wrapper6);
 
             _ui.m_ComShieldMine.m_holder.visible = false;
             _ui.m_ComShieldMine.m_holder1.visible = false;

二进制
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_4!a.png


二进制
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.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_8!a.png


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

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


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

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