zhaoyang 3 жил өмнө
parent
commit
ae13c66759

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

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://mfvz4q8kuo1t9j" designImageOffsetY="-120">
   <displayList>
-    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,142"/>
+    <component id="n34_tc53" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="52,80"/>
     <component id="n0_8xpg" name="selfScore" src="8xpg4e" fileName="components/CompFightScore.xml" xy="419,843" visible="false">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
     <component id="n4_n0js" name="comClickCircle" src="n0js9b" fileName="components/comClickCircle.xml" xy="212,855" pivot="0.5,0.5" anchor="true" visible="false"/>
     <component id="n31_cn27" name="comAllCircle" src="cn279k" fileName="components/ComAllCircle.xml" xy="382,1182" visible="false"/>
-    <graph id="n30_uo1t" name="grh_0" xy="354,208" pivot="0.5,0.5" size="25,25" aspect="true"/>
+    <graph id="n30_uo1t" name="grh_0" xy="360,271" 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"/>
     <graph id="n24_uo1t" name="grh_2" xy="817,1303" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n25_uo1t" name="grh_3" xy="208,542" pivot="0.5,0.5" size="25,25" aspect="true"/>
@@ -15,7 +15,7 @@
     <graph id="n27_uo1t" name="grh_5" xy="238,1579" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n28_uo1t" name="grh_6" xy="200,865" pivot="0.5,0.5" size="25,25" aspect="true"/>
     <graph id="n29_uo1t" name="grh_7" xy="782,389" pivot="0.5,0.5" size="25,25" aspect="true"/>
-    <component id="n33_vuz5" name="proScore" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="79,80">
+    <component id="n33_vuz5" name="proScore" src="vuz5bh" fileName="components/ProgressBar1.xml" xy="192,80">
       <relation target="" sidePair="top-top"/>
       <ProgressBar max="100"/>
     </component>

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

@@ -7,7 +7,7 @@
     <image id="n6_uj53" name="imgAni" src="k1khdp" fileName="imagesStory/zd_zdjdt_liang.png" xy="836,15" pivot="0.65,0.6" anchor="true">
       <relation target="" sidePair="right-right"/>
     </image>
-    <graph id="n7_k1kh" name="holder" xy="736,-38" pivot="0.5,0.5" size="100,100">
+    <graph id="n7_k1kh" name="holder" xy="725,-38" pivot="0.5,0.5" size="100,100">
       <relation target="" sidePair="right-right"/>
     </graph>
   </displayList>

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

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="948,30" extention="ProgressBar">
+<component size="836,45" extention="ProgressBar">
   <displayList>
-    <image id="n0_vuz5" name="n0" src="vuz5ba" fileName="imagesStory/zd_pfjdt_1.png" xy="0,0">
+    <image id="n0_vuz5" name="n0" src="v3k9cq" fileName="imagesStory/zd_zdjdt_1.png" xy="-17,0" size="870,49">
       <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="933,-12">
+    <image id="n1_vuz5" name="bar" src="v3k9cr" fileName="imagesStory/zd_zdjdt_2.png" xy="0,10"/>
+    <text id="n2_vuz5" name="txtCount" xy="32,-4" size="126,51" font="ui://eg2y0ldpk1kha2" fontSize="26" color="#fff6ee" vAlign="middle" autoSize="none" text="总分:0"/>
+    <image id="n3_vuz5" name="ani" src="vuz5bc" fileName="imagesStory/zd_pfjdt_3.png" xy="818,-7">
       <relation target="n1_vuz5" sidePair="right-right"/>
     </image>
-    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="-12,-11"/>
+    <image id="n4_oixc" name="imgFirstScore" src="oixcby" fileName="imagesStory/zd_pfjdt_4.png" xy="-12,-4"/>
   </displayList>
   <ProgressBar titleType="value"/>
 </component>

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

@@ -285,7 +285,8 @@ namespace GFGGame
         private void PlayScoreTWEffect()
         {
             _ui.m_holderPartScore.visible = true;
-            GTween.To(_ui.m_comClickCircle.target.position, _ui.m_proScore.target.position, 0.5f).SetTarget(_ui.m_holderPartScore).OnUpdate((GTweener t) =>
+            Vector3 endVaule = _ui.m_proScore.target.GetChild("ani").asImage.LocalToGlobal(Vector2.zero);
+            GTween.To(_ui.m_comClickCircle.target.position, endVaule, 0.5f).SetTarget(_ui.m_holderPartScore).OnUpdate((GTweener t) =>
             {
                 _ui.m_holderPartScore.position = t.value.vec2;
             }).OnComplete(() =>

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes